diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index e5664ceb..963680f1 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -2984,6 +2984,52 @@ input:checked + .toggleSwitchSlider:before { background-size: contain; } +/* Avatar edit overlay. */ +#ouiheberg { + opacity: 0; + position: absolute; + z-index: 1; + display: flex; + justify-content: center; + align-items: center; + transition: 0.25s ease; + font-weight: bold; + letter-spacing: 2px; + background-color: rgba(0, 0, 0, 0.35); + -webkit-user-select: none; + border: none; + cursor: pointer; + width: 100%; + height: 100%; + border-radius: 50%; +} +#ouiheberg:hover, +#ouiheberg:focus { + opacity: 1; +} +#ouiheberg:active { + background-color: rgba(0, 0, 0, 0.45); +} + +/* User profile avatar container. */ +#test { + + border-radius: 50%; + border: 2px solid #cad7e1; + box-sizing: border-box; + background: rgba(1, 2, 1, 0.5); + height: 100px; + width: 100px; + box-shadow: 0px 0px 10px 0px rgb(0, 0, 0); + overflow: hidden; + position: relative; + background-position: center; + background-repeat: no-repeat; + background-size: contain; + background-image: url("../images/ouiheberg.png"); + margin-top: 50px; +} + /* Avatar edit overlay. */ #avatarOverlay { opacity: 0; diff --git a/app/assets/images/ouiheberg.png b/app/assets/images/ouiheberg.png new file mode 100644 index 00000000..708fe2d9 Binary files /dev/null and b/app/assets/images/ouiheberg.png differ diff --git a/app/assets/js/discordwrapper.js b/app/assets/js/discordwrapper.js index 604201c2..753ea3da 100644 --- a/app/assets/js/discordwrapper.js +++ b/app/assets/js/discordwrapper.js @@ -1,5 +1,7 @@ const logger = require('./loggerutil')('%c[DiscordWrapper]', 'color: #7289da; font-weight: bold') +const t = require("../../../package.json") + let rpc = require("discord-rpc") const client = new rpc.Client({ transport: 'ipc' }) @@ -16,7 +18,7 @@ client.on("ready", () => { }, //details: "kuku", state: "Serveur Minecraft Communautaire !", - buttons: [{ label: "Discord", url: "https://discord.gg/RspuRbNn4M"}, { label: "Rejoins nous !", url: "https://github.com/luki-39/LukiEnLiveLauncher/releases/download/v2.0.3/LukiEnLiveLauncher-setup-2.0.3.exe"}], + buttons: [{ label: "Discord", url: "https://discord.gg/RspuRbNn4M"}, { label: "Rejoins nous !", url: `https://github.com/luki-39/LukiEnLiveLauncher/releases/download/v${t.version}/LukiEnLiveLauncher-setup-${t.version}.exe`}], } }) diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 3628d60d..e556f288 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -537,7 +537,7 @@ exports.pullRemote = function(){ return exports.pullLocal() } return new Promise((resolve, reject) => { - const distroURL = 'http://45.140.164.232:1800/lukienlivelauncher/distribution.json' + const distroURL = 'https://raw.githubusercontent.com/luki-39/distribution/main/distribution.json' const opts = { url: distroURL, timeout: 2500 diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index a83606f1..5b5fd832 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -122,6 +122,11 @@ document.getElementById('avatarOverlay').onclick = (e) => { }) } +// Bind avatar overlay button. +document.getElementById('ouiheberg').onclick = (e) => { + +} + // Bind selected account function updateSelectedAccount(authUser){ let username = 'Aucun compte sélectionné' diff --git a/app/landing.ejs b/app/landing.ejs index 648dc876..2156ff2c 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -1,13 +1,16 @@