init projet
This commit is contained in:
Ward 2023-10-04 14:09:56 +02:00
parent 92f2aab2a1
commit 4f2b45a3e9
30 changed files with 95 additions and 60 deletions

View File

@ -1,7 +1,7 @@
<html lang="en" xmlns="http://www.w3.org/1999/xhtml"> <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-In6B8teKZQll5heMl9bS7CESTbGvuAt3VVV86BUQBDk='"/> <meta charset="utf-8" http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-In6B8teKZQll5heMl9bS7CESTbGvuAt3VVV86BUQBDk='"/>
<title>Helios Launcher</title> <title>MineCharity Launcher</title>
<script src="./assets/js/scripts/uicore.js"></script> <script src="./assets/js/scripts/uicore.js"></script>
<script src="./assets/js/scripts/uibinder.js"></script> <script src="./assets/js/scripts/uibinder.js"></script>
<link type="text/css" rel="stylesheet" href="./assets/css/launcher.css"> <link type="text/css" rel="stylesheet" href="./assets/css/launcher.css">
@ -40,8 +40,8 @@
<div id="loadingContainer"> <div id="loadingContainer">
<div id="loadingContent"> <div id="loadingContent">
<div id="loadSpinnerContainer"> <div id="loadSpinnerContainer">
<img id="loadCenterImage" src="assets/images/LoadingSeal.png"> <img id="loadCenterImage" src="assets/images/MineCharityLogo.png">
<img id="loadSpinnerImage" class="rotating" src="assets/images/LoadingText.png"> <!-- <img id="loadSpinnerImage" class="rotating" src="assets/images/LoadingText.png"> -->
</div> </div>
</div> </div>
</div> </div>

View File

@ -119,8 +119,10 @@ body, button {
-webkit-app-region: no-drag !important; -webkit-app-region: no-drag !important;
position: relative; position: relative;
top: -2px; top: -2px;
right: -2px; right: -900px;
height: 22px; height: 22px;
display: flex;
justify-content: flex-end;
} }
#frameButtonDockWin > .frameButton:not(:first-child) { #frameButtonDockWin > .frameButton:not(:first-child) {
margin-left: -4px; margin-left: -4px;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 502 KiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 KiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 KiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 MiB

After

Width:  |  Height:  |  Size: 205 KiB

View File

@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager')
const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME)
const dataPath = path.join(sysRoot, '.helioslauncher') const dataPath = path.join(sysRoot, '.minecharity-launcher')
const launcherDir = require('@electron/remote').app.getPath('userData') const launcherDir = require('@electron/remote').app.getPath('userData')

View File

@ -23,7 +23,7 @@ DistroAPI['commonDir'] = ConfigManager.getCommonDirectory()
DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory() DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory()
// Load Strings // Load Strings
LangLoader.loadLanguage('en_US') LangLoader.loadLanguage('fr_FR')
/** /**
* *

View File

@ -0,0 +1,49 @@
{
"html": {
"avatarOverlay": "Éditer"
},
"js": {
"login": {
"error": {
"invalidValue": "* Valeur invalide",
"requiredValue": "* Requis",
"userMigrated": {
"title": "Erreur pendant la connexion :<br>Identifiants invalides",
"desc": "Vous avez tenté de vous connecter avec un compte migré. Essayez à nouveau en utilisant l'email du compte comme nom d'utilisateur."
},
"invalidCredentials": {
"title": "Erreur pendant la connexion :<br>Identifiants invalides",
"desc": "L'email ou le mot de passe que vous avez saisi est incorrect. Veuillez réessayer."
},
"rateLimit": {
"title": "Erreur pendant la connexion :<br>Trop de tentatives",
"desc": "Il y a eu trop de tentatives de connexion avec ce compte récemment. Veuillez réessayer plus tard."
},
"noInternet": {
"title": "Erreur pendant la connexion :<br>Pas de connexion Internet",
"desc": "Vous devez être connecté à Internet pour vous connecter. Veuillez vous connecter et réessayer."
},
"authDown": {
"title": "Erreur pendant la connexion :<br>Serveur d'authentification hors ligne",
"desc": "Le serveur d'authentification de Mojang est actuellement hors ligne ou injoignable. Veuillez attendre un moment et réessayer. Vous pouvez vérifier l'état du serveur sur <a href=\"https://help.mojang.com/\">le portail d'aide de Mojang</a>."
},
"notPaid": {
"title": "Erreur pendant la connexion :<br>Jeu non acheté",
"desc": "Le compte avec lequel vous essayez de vous connecter n'a pas acheté une copie de Minecraft.<br>Vous pouvez acheter une copie sur <a href=\"https://minecraft.net/\">Minecraft.net</a>"
},
"unknown": {
"title": "Erreur pendant la connexion :<br>Erreur inconnue"
}
},
"login": "CONNEXION",
"loggingIn": "CONNEXION EN COURS",
"success": "SUCCÈS",
"tryAgain": "Essayer à nouveau"
},
"landing": {
"launch": {
"pleaseWait": "Veuillez patienter.."
}
}
}
}

View File

@ -4,24 +4,17 @@
<div class="frameResizableVert frameDragPadder"></div> <div class="frameResizableVert frameDragPadder"></div>
<%if (process.platform === 'darwin') { %> <%if (process.platform === 'darwin') { %>
<div id="frameContentDarwin"> <div id="frameContentDarwin">
<div id="frameButtonDockDarwin"> <div id="frameButtonDockDarwin" style="display: flex; justify-content: flex-end;"> <!-- Ajouté du style en ligne ici -->
<button class="frameButtonDarwin fCb" id="frameButtonDarwin_close" tabIndex="-1"></button> <button class="frameButtonDarwin fCb" id="frameButtonDarwin_close" tabIndex="-1"></button>
<button class="frameButtonDarwin fMb" id="frameButtonDarwin_minimize" tabIndex="-1"></button> <button class="frameButtonDarwin fMb" id="frameButtonDarwin_minimize" tabIndex="-1"></button>
<button class="frameButtonDarwin fRb" id="frameButtonDarwin_restoredown" tabIndex="-1"></button>
</div> </div>
</div> </div>
<% } else{ %> <% } else{ %>
<div id="frameContentWin"> <div id="frameContentWin">
<div id="frameTitleDock"> <div id="frameButtonDockWin" style="display: flex; justify-content: flex-end;"> <!-- Et ici -->
<span id="frameTitleText">Helios Launcher</span>
</div>
<div id="frameButtonDockWin">
<button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1"> <button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1">
<svg name="TitleBarMinimize" width="10" height="10" viewBox="0 0 12 12"><rect stroke="#ffffff" fill="#ffffff" width="10" height="1" x="1" y="6"></rect></svg> <svg name="TitleBarMinimize" width="10" height="10" viewBox="0 0 12 12"><rect stroke="#ffffff" fill="#ffffff" width="10" height="1" x="1" y="6"></rect></svg>
</button> </button>
<button class="frameButton fRb" id="frameButton_restoredown" tabIndex="-1">
<svg name="TitleBarMaximize" width="10" height="10" viewBox="0 0 12 12"><rect width="9" height="9" x="1.5" y="1.5" fill="none" stroke="#ffffff" stroke-width="1.4px"></rect></svg>
</button>
<button class="frameButton fCb" id="frameButton_close" tabIndex="-1"> <button class="frameButton fCb" id="frameButton_close" tabIndex="-1">
<svg name="TitleBarClose" width="10" height="10" viewBox="0 0 12 12"><polygon stroke="#ffffff" fill="#ffffff" fill-rule="evenodd" points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"></polygon></svg> <svg name="TitleBarClose" width="10" height="10" viewBox="0 0 12 12"><polygon stroke="#ffffff" fill="#ffffff" fill-rule="evenodd" points="11 1.576 6.583 6 11 10.424 10.424 11 6 6.583 1.576 11 1 10.424 5.417 6 1 1.576 1.576 1 6 5.417 10.424 1"></polygon></svg>
</button> </button>

View File

@ -2,7 +2,7 @@
<div id="upper"> <div id="upper">
<div id="left"> <div id="left">
<div id="image_seal_container"> <div id="image_seal_container">
<img id="image_seal" src="assets/images/SealCircle.png"/> <img id="image_seal" src="assets/images/MineCharityLogo.png"/>
<div id="updateAvailableTooltip">Update Available</div> <div id="updateAvailableTooltip">Update Available</div>
</div> </div>
</div> </div>

View File

@ -7,7 +7,7 @@
</div> </div>
<div id="loginContent"> <div id="loginContent">
<form id="loginForm"> <form id="loginForm">
<img id="loginImageSeal" src="assets/images/SealCircle.png"/> <img id="loginImageSeal" src="assets/images/MineCharityLogo.png"/>
<span id="loginSubheader">MINECRAFT LOGIN</span> <span id="loginSubheader">MINECRAFT LOGIN</span>
<div class="loginFieldContainer"> <div class="loginFieldContainer">
<svg id="profileSVG" class="loginSVG" viewBox="40 37 65.36 61.43"> <svg id="profileSVG" class="loginSVG" viewBox="40 37 65.36 61.43">

View File

@ -1,34 +1,29 @@
<div id="loginOptionsContainer" style="display: none;"> <div id="loginOptionsContainer" style="display: none;">
<div id="loginOptionsContent"> <div id="loginOptionsContent" style="text-align: center; padding-top: 10px;">
<img src="assets/images/MineCharityLogo.png" alt="Logo" style="width: 200px; margin-top: 80px;"> <!-- Doublement de la taille du logo -->
<div class="loginOptionsMainContent"> <div class="loginOptionsMainContent">
<h2>Login Options</h2> <div class="loginOptionActions" style="margin-bottom: 5px;"> <!-- Réduction de la marge en bas pour rapprocher le texte -->
<div class="loginOptionActions"> <div class="loginOptionButtonContainer" style="margin: 20px auto;"> <!-- Réduction de la marge autour du bouton -->
<div class="loginOptionButtonContainer"> <button id="loginOptionMicrosoft" class="loginOptionButton" style="padding: 15px 30px; font-size: 18px;">
<button id="loginOptionMicrosoft" class="loginOptionButton"> <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 23 23" style="vertical-align: middle; margin-right: 10px;">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 23 23">
<path fill="#f35325" d="M1 1h10v10H1z" /> <path fill="#f35325" d="M1 1h10v10H1z" />
<path fill="#81bc06" d="M12 1h10v10H12z" /> <path fill="#81bc06" d="M12 1h10v10H12z" />
<path fill="#05a6f0" d="M1 12h10v10H1z" /> <path fill="#05a6f0" d="M1 12h10v10H1z" />
<path fill="#ffba08" d="M12 12h10v10H12z" /> <path fill="#ffba08" d="M12 12h10v10H12z" />
</svg> </svg>
<span>Login with Microsoft</span> <span style="vertical-align: middle;">Connexion</span>
</button>
</div>
<div class="loginOptionButtonContainer">
<button id="loginOptionMojang" class="loginOptionButton">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 9.677 9.667">
<path d="M-26.332-12.098h2.715c-1.357.18-2.574 1.23-2.715 2.633z" fill="#fff" />
<path d="M2.598.022h7.07L9.665 7c-.003 1.334-1.113 2.46-2.402 2.654H0V2.542C.134 1.2 1.3.195 2.598.022z" fill="#db2331" />
<path d="M1.54 2.844c.314-.76 1.31-.46 1.954-.528.785-.083 1.503.272 2.1.758l.164-.9c.327.345.587.756.964 1.052.28.254.655-.342.86-.013.42.864.408 1.86.54 2.795l-.788-.373C6.9 4.17 5.126 3.052 3.656 3.685c-1.294.592-1.156 2.65.06 3.255 1.354.703 2.953.51 4.405.292-.07.42-.34.87-.834.816l-4.95.002c-.5.055-.886-.413-.838-.89l.04-4.315z" fill="#fff" />
</svg>
<span>Login with Mojang</span>
</button> </button>
</div> </div>
</div> </div>
<p style="margin-top: 0px; color: #999;"> <!-- Suppression de la marge au-dessus du texte -->
PAS DE COMPTE MINECRAFT ?
<a href="URL_ICI" style="color: cyan;">EN ACHETER UN</a>
</p>
<div id="loginOptionCancelContainer" style="display: none;"> <div id="loginOptionCancelContainer" style="display: none;">
<button id="loginOptionCancelButton">Cancel</button> <button id="loginOptionCancelButton">Annuler</button>
</div> </div>
</div> </div>
</div> </div>
<script src="./assets/js/scripts/loginOptions.js"></script> <script src="./assets/js/scripts/loginOptions.js"></script>
<p style="position: absolute; bottom: 10px; right: 10px; color: #999;">V0.0.1</p>
</div> </div>

View File

@ -314,7 +314,7 @@
<div id="settingsAboutCurrentContainer"> <div id="settingsAboutCurrentContainer">
<div id="settingsAboutCurrentContent"> <div id="settingsAboutCurrentContent">
<div id="settingsAboutCurrentHeadline"> <div id="settingsAboutCurrentHeadline">
<img id="settingsAboutLogo" src="./assets/images/SealCircle.png"> <img id="settingsAboutLogo" src="./assets/images/MineCharityLogo.png">
<span id="settingsAboutTitle">Helios Launcher</span> <span id="settingsAboutTitle">Helios Launcher</span>
</div> </div>
<div id="settingsAboutCurrentVersion"> <div id="settingsAboutCurrentVersion">

View File

@ -2,7 +2,7 @@
<div id="waitingContent"> <div id="waitingContent">
<div class="waitingSpinner"></div> <div class="waitingSpinner"></div>
<div id="waitingTextContainer"> <div id="waitingTextContainer">
<h2>Waiting for Microsoft..</h2> <h2>En attente de Microsoft..</h2>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,17 +1,13 @@
<div id="welcomeContainer" style="display: none;"> <div id="welcomeContainer" style="display: none;">
<!--<div class="cloudDiv">
<div class="cloudTop"></div>
<div class="cloudBottom"></div>
</div>-->
<div id="welcomeContent"> <div id="welcomeContent">
<img id="welcomeImageSeal" src="assets/images/SealCircle.png"/> <img id="welcomeImageSeal" src="assets/images/MineCharityLogo.png"/>
<span id="welcomeHeader">WELCOME TO WESTEROSCRAFT</span> <span id="welcomeHeader">BIENVENUE SUR MINECHARITY</span>
<span id="welcomeDescription">Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you arent afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming.</span> <span id="welcomeDescription">Rejoignez-nous dans une aventure unique sur Minecraft où chaque soirée spéciale est conçue pour apporter du fun et de la bienveillance. À travers MineCharity, nous organisons des soirées mémorables remplies d'effets spéciaux et de moments uniques, le tout pour soutenir des causes charitables et bâtir une communauté solide et engagée.</span>
<br> <br>
<span id="welcomeDescCTA">You are just a few clicks away from Westeros.</span> <span id="welcomeDescCTA">Vous n'êtes qu'à quelques clics de l'aventure.</span>
<button id="welcomeButton"> <button id="welcomeButton">
<div id="welcomeButtonContent"> <div id="welcomeButtonContent">
CONTINUE CONTINUER
<svg id="welcomeSVG" viewBox="0 0 24.87 13.97"> <svg id="welcomeSVG" viewBox="0 0 24.87 13.97">
<defs> <defs>
<style>.arrowLine{fill:none;stroke:#FFF;stroke-width:2px;transition: 0.25s ease;}</style> <style>.arrowLine{fill:none;stroke:#FFF;stroke-width:2px;transition: 0.25s ease;}</style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 5.6 MiB

View File

@ -126,7 +126,7 @@ ipcMain.on(MSFT_OPCODE.OPEN_LOGIN, (ipcEvent, ...arguments_) => {
width: 520, width: 520,
height: 600, height: 600,
frame: true, frame: true,
icon: getPlatformIcon('SealCircle') icon: getPlatformIcon('IconLogo')
}) })
msftAuthWindow.on('closed', () => { msftAuthWindow.on('closed', () => {
@ -179,7 +179,7 @@ ipcMain.on(MSFT_OPCODE.OPEN_LOGOUT, (ipcEvent, uuid, isLastAccount) => {
width: 520, width: 520,
height: 600, height: 600,
frame: true, frame: true,
icon: getPlatformIcon('SealCircle') icon: getPlatformIcon('IconLogo')
}) })
msftLogoutWindow.on('closed', () => { msftLogoutWindow.on('closed', () => {
@ -225,7 +225,7 @@ function createWindow() {
win = new BrowserWindow({ win = new BrowserWindow({
width: 980, width: 980,
height: 552, height: 552,
icon: getPlatformIcon('SealCircle'), icon: getPlatformIcon('IconLogo'),
frame: false, frame: false,
webPreferences: { webPreferences: {
preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'), preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'),

10
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "helioslauncher", "name": "minecharitylauncher",
"version": "2.0.5", "version": "2.0.5",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "helioslauncher", "name": "minecharitylauncher",
"version": "2.0.5", "version": "2.0.5",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
@ -1520,9 +1520,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "26.0.0", "version": "26.2.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-26.0.0.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-26.2.4.tgz",
"integrity": "sha512-x57bdCaDvgnlc41VOm/UWihJCCiI3OxJKiBgB/e5F7Zd6avo+61mO6IzQS7Bu/k/a1KPjou25EUORR6UPKznBQ==", "integrity": "sha512-weMUSMyDho5E0DPQ3breba3D96IxwNvtYHjMd/4/wNN3BdI5s3+0orNnPVGJFcLhSvKoxuKUqdVonUocBPwlQA==",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@electron/get": "^2.0.0", "@electron/get": "^2.0.0",

View File

@ -1,13 +1,13 @@
{ {
"name": "helioslauncher", "name": "minecharitylauncher",
"version": "2.0.5", "version": "2.0.5",
"productName": "Helios Launcher", "productName": "MineCharity Launcher",
"description": "Modded Minecraft Launcher", "description": "Modded Minecraft Launcher",
"author": "Daniel Scalzi (https://github.com/dscalzi/)", "author": "Daniel Scalzi (https://github.com/dscalzi/) and MineCharity (https://github.com/MineCharity/)",
"license": "UNLICENSED", "license": "UNLICENSED",
"homepage": "https://github.com/dscalzi/HeliosLauncher", "homepage": "https://github.com/MineCharity/MineCharity-Launcher",
"bugs": { "bugs": {
"url": "https://github.com/dscalzi/HeliosLauncher/issues" "url": "https://github.com/MineCharity/MineCharity-Launcher/issues"
}, },
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -44,6 +44,6 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/dscalzi/HeliosLauncher.git" "url": "git+https://github.com/MineCharity/MineCharity-Launcher.git"
} }
} }