Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
LeMocha committed Jul 6, 2024
1 parent 87beee2 commit 0b7ecc9
Show file tree
Hide file tree
Showing 11 changed files with 244 additions and 161 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "launcher",
"preductname": "AlmyriaCraft Launcher",
"version": "1.0.18",
"version": "1.0.19",
"description": "Launcher pour le serveur AlmyriaCraft",
"main": "src/app.js",
"author": "Luuxis, LeWarpy <coucou@lewarpy.fr>, LeMocha <cadet@lucie.re>",
Expand Down Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"cross-env": "^7.0.3",
"electron": "^20.0.0",
"electron-builder": "^23.0.3",
"electron-builder": "latest",
"nodemon": "^2.0.16"
},
"repository": {
Expand Down
25 changes: 24 additions & 1 deletion src/assets/css/panels/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -338,4 +338,27 @@
top: 22px;
left: 90px;
transition: color .2s;
}
}

.modal {
display: none;
position: fixed;
z-index: 1;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: auto;
background-color: rgba(0,0,0,0.4);
}

.modal-content {
background: #292929;
text-align: center;

color: white;
margin: 15% auto;
padding: 20px;
border-radius: 20px;
width: 80%;
}
6 changes: 3 additions & 3 deletions src/assets/css/panels/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
border-radius: 23px;
width: 160px;
height: 37px;
margin: auto 30px;
margin: auto 15px;
background: var(--couleur-primaire);
border: 4px solid var(--couleur-primaire);
font: normal normal bold 20px/25px Roboto;
Expand Down Expand Up @@ -77,7 +77,7 @@
text-align: center;
font: normal normal bold 20px/25px Roboto;
color: #F1F1F1;
margin: 2% 0;
margin-bottom: 2%;
}

.center-align {
Expand Down Expand Up @@ -218,7 +218,7 @@
background: #292929;
border-radius: 20px;
width: 90%;
margin: 0 auto;
margin: 2% auto;
padding: 20px;
}

Expand Down
17 changes: 11 additions & 6 deletions src/assets/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ class Splash {
if (dev) return this.startLauncher();
this.setStatus(`Recherche de mise à jour...`);

ipcRenderer.invoke('update-app').then(err => {
if (err.error) {
let error = err.message;
this.shutdown(`Erreur lors de la recherche de mise à jour :<br>${error}`);
}
})
ipcRenderer.invoke('update-app').then(
console.log('Laancement de la MàJ')
).catch(err => {
console.error(err);
return this.shutdown(`Erreur lors de la recherche de mise à jour :<br>${err.message}`);
});

ipcRenderer.on('updateAvailable', () => {
this.setStatus(`Mise à jour disponible !`);
Expand All @@ -77,6 +77,11 @@ class Splash {
ipcRenderer.on('update-not-available', () => {
this.maintenanceCheck();
})

ipcRenderer.on('error', (event, err) => {
console.error(err);
return this.shutdown(`Erreur lors de la mise à jour :<br>${err.message}`);
})
}

async maintenanceCheck() {
Expand Down
Loading

0 comments on commit 0b7ecc9

Please sign in to comment.