diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..b58b603f --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/HeliosLauncher.iml b/.idea/HeliosLauncher.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/HeliosLauncher.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..089b600c --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..c65f1d19 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/app.ejs b/app/app.ejs index e829fa14..f3259b9d 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -41,7 +41,6 @@
-
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 8b239311..108d85fc 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -64,7 +64,7 @@ body, button { display: flex; flex-direction: column; transition: background-color 1s ease; - /*background-color: rgba(0, 0, 0, 0.5);*/ + background-color: rgba(0, 0, 0, 0); -webkit-user-select: none; } @@ -2858,9 +2858,6 @@ input:checked + .toggleSwitchSlider:before { height: 70px; width: auto; position: relative; - border: 2px solid white; - box-sizing: border-box; - border-radius: 50%; } /* Logo container styles. */ @@ -3965,4 +3962,31 @@ input:checked + .toggleSwitchSlider:before { /* Class which is applied when the spinner image is spinning. */ .rotating { animation: rotating 10s linear infinite; +} + +#test { + background-color: #04AA6D; + border: none; + color: white; + padding: 20px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + margin: 4px 2px; + border-radius: 15px; +} + +#container { + height: 200px; + position: relative; + border: 3px solid green; +} + +#vertical-center { + margin: 0; + position: absolute; + top: 50%; + -ms-transform: translateY(-50%); + transform: translateY(-50%); } \ No newline at end of file diff --git a/app/assets/images/LoadingSeal.png b/app/assets/images/LoadingSeal.png index afe2c4d4..aff4a145 100644 Binary files a/app/assets/images/LoadingSeal.png and b/app/assets/images/LoadingSeal.png differ diff --git a/app/assets/images/SealCircle.ico b/app/assets/images/SealCircle.ico index e37b95df..8e694453 100644 Binary files a/app/assets/images/SealCircle.ico and b/app/assets/images/SealCircle.ico differ diff --git a/app/assets/images/SealCircle.png b/app/assets/images/SealCircle.png index 9e21d08b..aff4a145 100644 Binary files a/app/assets/images/SealCircle.png and b/app/assets/images/SealCircle.png differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 00000000..8e08394c Binary files /dev/null and b/app/assets/images/logo.png differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864fe..966810af 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -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 dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.btcv-launcher') const launcherDir = require('@electron/remote').app.getPath('userData') diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 8ae8ca0c..efe04d53 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -4,7 +4,7 @@ const ConfigManager = require('./configmanager') // Old WesterosCraft url. // exports.REMOTE_DISTRO_URL = 'http://mc.westeroscraft.com/WesterosCraftLauncher/distribution.json' -exports.REMOTE_DISTRO_URL = 'https://helios-files.geekcorner.eu.org/distribution.json' +exports.REMOTE_DISTRO_URL = 'https://btcv.fr/minecraft/distribution.json' const api = new DistributionAPI( ConfigManager.getLauncherDirectory(), diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 94d311a0..0628b497 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -151,7 +151,7 @@ function updateSelectedAccount(authUser){ username = authUser.displayName } if(authUser.uuid != null){ - document.getElementById('avatarContainer').style.backgroundImage = `url('https://mc-heads.net/body/${authUser.uuid}/right')` + document.getElementById('avatarContainer').style.backgroundImage = `url('https://mc-heads.net/head/${authUser.uuid}')` } } user_text.innerHTML = username @@ -243,14 +243,14 @@ const refreshServerStatus = async (fade = false) => { loggerLanding.info('Refreshing Server Status') const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()) - let pLabel = 'SERVER' - let pVal = 'OFFLINE' + let pLabel = 'SERVEUR' + let pVal = 'HORS LIGNE' try { const servStat = await getServerStatus(47, serv.hostname, serv.port) console.log(servStat) - pLabel = 'PLAYERS' + pLabel = 'JOUEURS' pVal = servStat.players.online + '/' + servStat.players.max } catch (err) { diff --git a/app/assets/lang/en_US.json b/app/assets/lang/en_US.json index 25b34c24..0b5082ba 100644 --- a/app/assets/lang/en_US.json +++ b/app/assets/lang/en_US.json @@ -1,7 +1,4 @@ { - "html": { - "avatarOverlay": "Edit" - }, "js": { "login": { "error": { diff --git a/app/assets/lang/fr_FR.json b/app/assets/lang/fr_FR.json new file mode 100644 index 00000000..e69de29b diff --git a/app/frame.ejs b/app/frame.ejs index c2aaf337..9d2ed210 100644 --- a/app/frame.ejs +++ b/app/frame.ejs @@ -13,7 +13,7 @@ <% } else{ %>
- Helios Launcher +
+
-
-
-
- - - - - - - - -
-
- - - - - - - -
-
- - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
-
- - - - - - - -
-
+