diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 30350e0d..dc717769 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -911,12 +911,12 @@ p { } #landingContainer > #upper > #content { display: inline-flex; - width: 59%; + width: 70%; height: 100%; } #landingContainer > #upper > #right { display: inline-flex; - width: 26%; + width: 15%; height: 100%; } @@ -1128,7 +1128,7 @@ p { flex-direction: column; position: relative; top: 50px; - align-items: flex-end; + align-items: flex-start; height: calc(100% - 50px); } @@ -1139,18 +1139,22 @@ p { justify-content: center; box-sizing: border-box; height: 75px; + position: relative; } /* User profile avatar container. */ #avatarContainer { border-radius: 50%; border: 2px solid #cad7e1; + box-sizing: border-box; background: rgba(1, 2, 1, 0.5); height: 70px; width: 70px; box-shadow: 0px 0px 10px 0px rgb(0, 0, 0); overflow: hidden; position: relative; + background-image: url('https://cdn.discordapp.com/avatars/169197209630277642/6650b5a50e1cb3d00a79b9b88b9a0cd4.png'); + background-size: contain; } /* Avatar edit overlay. */ @@ -1158,10 +1162,6 @@ p { opacity: 0; position: absolute; z-index: 1; - top: 0; - bottom: 0; - left: 0; - right: 0; display: flex; justify-content: center; align-items: center; @@ -1173,28 +1173,25 @@ p { background: linear-gradient(65deg, rgba(0, 0, 0, 0.4), rgba(136, 77, 77, 0.4) 60%); -webkit-user-select: none; cursor: pointer; + width: 100%; + height: 100%; + border-radius: 50%; } #avatarOverlay:hover { opacity: 1; } -/* User profile avater image. */ -#avatarImage { - height: 100%; - width: auto; -} - /* User profile name text. */ #user_text { font-family: 'Avenir Book'; font-size: 12px; - min-width: 112px; + min-width: 135px; font-weight: 900; letter-spacing: 1px; color: white; text-shadow: 0px 0px 20px black; - position: relative; - right: 25px; + position: absolute; + right: 95px; text-align: right; } @@ -1203,10 +1200,9 @@ p { position: relative; display: flex; flex-direction: column; - right: 25px; - align-items: flex-end; - margin-top: 40px; - height: 100%; + margin-top: 25px; + height: calc(100% - 95px); + width: 70px; align-items: center; } diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index af5717ba..240c8fb7 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -21,7 +21,7 @@ const Mojang = require('./mojang.js') * * @param {string} username The account username (email if migrated). * @param {string} password The account password. - * @returns {Promise.} Promise which resolves to the Mojang authentication response. + * @returns {Promise.} Promise which resolves the resolved authenticated account object. */ exports.addAccount = async function(username, password){ try{ diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 6a6088cb..0efdb615 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -20,6 +20,7 @@ const launch_progress = document.getElementById('launch_progress') const launch_progress_label = document.getElementById('launch_progress_label') const launch_details_text = document.getElementById('launch_details_text') const server_selection_button = document.getElementById('server_selection_button') +const user_text = document.getElementById('user_text') /* Launch Progress Wrapper Functions */ @@ -103,6 +104,16 @@ document.getElementById('launch_button').addEventListener('click', function(e){ } }) +// Bind selected account +function updateSelectedAccount(authUser){ + let username = 'No Account Selected' + if(authUser != null && authUser.username != null){ + username = authUser.displayName + } + user_text.innerHTML = username +} +updateSelectedAccount(ConfigManager.getSelectedAccount()) + // Bind selected server function updateSelectedServer(serverName){ if(serverName == null){ diff --git a/app/assets/js/scripts/login.js b/app/assets/js/scripts/login.js index 2465ed9f..ed47ef31 100644 --- a/app/assets/js/scripts/login.js +++ b/app/assets/js/scripts/login.js @@ -227,6 +227,7 @@ loginButton.addEventListener('click', () => { loginLoading(true) AuthManager.addAccount(loginUsername.value, loginPassword.value).then((value) => { + updateSelectedAccount(value) loginButton.innerHTML = loginButton.innerHTML.replace('LOGGING IN', 'SUCCESS') $('.circle-loader').toggleClass('load-complete') $('.checkmark').toggle() diff --git a/app/landing.ejs b/app/landing.ejs index 735bb1fb..a1f46199 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -14,7 +14,6 @@ Username
Edit
-
diff --git a/index.js b/index.js index f87fd06e..5de007be 100644 --- a/index.js +++ b/index.js @@ -68,7 +68,8 @@ function createWindow() { frame: false, webPreferences: { preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js') - } + }, + backgroundColor: '#2e2c29' }) ejse.data('bkid', Math.floor((Math.random() * fs.readdirSync(path.join(__dirname, 'app', 'assets', 'images', 'backgrounds')).length))) @@ -79,6 +80,10 @@ function createWindow() { slashes: true })) + /*win.once('ready-to-show', () => { + win.show() + })*/ + win.setMenu(null) win.setResizable(true)