Merge branch 's7' into stable

Almyria · Apr 21, 2024 · 9a0ab87 · 9a0ab87
2 parents 1d4ed86 + bddcd3c
commit 9a0ab87
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@ dist
 node-v*
 data
 .DS_Store
+AppData
+.idea
+.vscode
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/assets/js/panels/home.js b/src/assets/js/panels/home.js
@@ -29,7 +29,7 @@ class Home {
                     <div class="news-header">
                         <img class="server-status-icon" src="assets/images/icon.png">
                         <div class="header-text">
-                            <div class="title">Aucun news n'ai actuellement disponible.</div>
+                            <div class="title">Aucun news n'est actuellement disponible.</div>
                         </div>
                         <div class="date">
                             <div class="day">1</div>
@@ -38,7 +38,7 @@ class Home {
                     </div>
                     <div class="news-content">
                         <div class="bbWrapper">
-                            <p>Vous pourrez suivre ici toutes les news relative au serveur.</p>
+                            <p>Vous pourrez suivre ici toutes les nouvelles relatives au serveur.</p>
                         </div>
                     </div>`
                 newsElement.appendChild(blockNews);
@@ -72,16 +72,17 @@ class Home {
             blockNews.classList.add('news-block');
             blockNews.innerHTML = `
                 <div class="news-header">
+
                         <img class="server-status-icon" src="assets/images/icon.png">
                         <div class="header-text">
-                            <div class="title">Error.</div>
+                            <div class="title">Erreur :</div>
                         </div>
                         <div class="date">
                             <div class="day">1</div>
                             <div class="month">Janvier</div>
                         </div>
-                    </div>
-                    <div class="news-content">
+                </div>
+                <div class="news-content">
                         <div class="bbWrapper">
                             <p>Impossible de contacter le serveur des news.</br>Merci de vérifier votre configuration.</p>
                         </div>

diff --git a/src/assets/js/utils.js b/src/assets/js/utils.js
@@ -80,8 +80,8 @@ async function accountSelect(data) {
 
 async function isVIP(uuid) {
     try {
-        const { data: response } = await axios.get(`https://api.almyria.fr/minecraft/checkvip/` + uuid); 
-        return response;
+        const { data: response } = await axios.get(`https://api.almyria.fr/launcher/checkvip/` + uuid);
+        return response.vip;
     } catch (error) {
         console.log(error);
     }
@@ -97,7 +97,7 @@ async function headplayer(pseudo, uuid) {
 async function VIPperks(uuid) {
     const checkVIP = await isVIP(uuid);
 
-    if (checkVIP == true) {
+    if (checkVIP) {
         var styleVIP = `
         .account-name::before, .player-username::before {
             font-weight: bold;

diff --git a/src/assets/js/utils/config.js b/src/assets/js/utils/config.js
@@ -14,8 +14,10 @@ let cdn = pkg.cdn_url;
 let config = `${url}/launcher/config-launcher/config.json`;
 let news = `${url}/launcher/news-launcher/news.json`;
 let launcherstatus = `${api}/launcher/status`;
-let staffmembers = `${api}/users/staffmembers`;
-let checkbughunter = `${api}/minecraft/checkbughunter`;
+
+let staffmembers = `${api}/config/staffmembers`;
+let checkbughunter = `${api}/launcher/checkbughunter`;
+
 
 class Config {
     GetConfig() {
@@ -82,18 +84,18 @@ class Config {
 
     async GetLauncherStatus() {
         let status = await axios.get(launcherstatus);
-        return status.data[0].launcher_status;
+        return status.data.status;
     }
 
     async GetStaffUsernames() {
         let staff = await axios.get(staffmembers);
         // Return only the usernames
-        return staff.data.map(staff => staff.username_mc);
+        return staff.data.staff.map(staff => staff.username_mc);
     }
 
     async IsPlayerBugHunter(uuid) {
         let bughunter = await axios.get(checkbughunter + "/" + uuid);
-        return bughunter.data;
+        return bughunter.data.bughunter;
     }
 }
 

diff --git a/src/assets/js/windows/mainWindow.js b/src/assets/js/windows/mainWindow.js
@@ -46,6 +46,7 @@ function createWindow() {
             mainWindow.show()
         }
     });
+    mainWindow.webContents.openDevTools({ mode: 'undocked' });
 }
 
 module.exports = {

diff --git a/src/panels/login.html b/src/panels/login.html
@@ -11,6 +11,7 @@
 <div class="container dark">
     <div class="login-home login-tabs">
         <img alt="logo" style="height: 120px" src="assets/images/logo/AO.png"/>
+
         <p>Connectez-vous avec votre compte <span class="store">Microsoft</span> pour vous connecter au launcher.</p>
         <p>Vos données de connexion restent sur votre ordinateur, elles ne sont pas partagées.</p>
         <div class="login-type">

diff --git a/src/panels/settings.html b/src/panels/settings.html
@@ -23,6 +23,7 @@
         </div>
     </div>
 
+
     <div id="java-tab" class="container-settings content-scroll">
         <div class="titre-tab">Paramètre de votre RAM</div>
         <div class="settings-elements-box">
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,6 @@ dist @@
     node-v*
     data
     .DS_Store
+    AppData
+    .idea
+    .vscode