From 5b74ecef2159d316e7c964bb7155827a92af814b Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Sat, 28 Apr 2018 04:16:09 -0400 Subject: [PATCH] Experimental changes in preparation for auto-update support. --- app/assets/css/launcher.css | 93 +++++++++++++++++++++++++++++++++++- app/assets/js/authmanager.js | 6 ++- app/landing.ejs | 4 +- index.js | 1 + package-lock.json | 68 ++++++++++++++------------ package.json | 1 + 6 files changed, 138 insertions(+), 35 deletions(-) diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index fdc0cc8..9d210aa 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -976,7 +976,7 @@ p { * * */ /* Logo image. */ -#image_seal { +/*#image_seal { height: 70px; width: auto; position: relative; @@ -984,8 +984,99 @@ p { border: 2px solid white; border-radius: 50%; box-shadow: 0px 0px 10px 0px rgb(0, 0, 0); +}*/ + +#image_seal { + height: 70px; + width: auto; + position: relative; + border: 2px solid white; + box-sizing: border-box; + border-radius: 50%; } +#image_seal_container { + position: relative; + height: 70px; + width: 70px; + border-radius: 50%; + margin-top: 50px; +} +#image_seal_container[update]:before, +#image_seal_container[update]:after { + position: absolute; + content: ''; + height: 100%; + width: 100%; + top: 0%; + left: 0%; + border-radius: 50%; + box-shadow: 0 0 15px #43c628; + animation: glow-grow 4s ease-out infinite; +} +#image_seal_container[update]:after { + animation-delay: 2s; +} +@keyframes glow-grow { + 0% { + opacity: 0; + transform: scale(1); + } + 80% { + opacity: 1; + } + 100% { + transform: scale(1.5); + opacity: 0; + } +} +/* +#image_seal { + height: 70px; + width: auto; + position: relative; + border-radius: 50%; + box-shadow: 0px 0px 10px 0px rgb(0, 0, 0); +} + +#image_seal_container { + position: relative; + height: 70px; + width: 70px; + border-radius: 50%; + border: 2px solid white; + margin-top: 50px; +} +#image_seal_container:before, +#image_seal_container:after { + position: absolute; + content: ''; + height: 100%; + width: 100%; + top: 0%; + left: 0%; + border-radius: 50%; + box-shadow: 0 0 15px #43c628; + animation: glow-grow 3.25s ease-out infinite; +} +#image_seal_container{ + animation-delay: 0s; +} +@keyframes glow-grow { + 0% { + opacity: 0.8; + transform: scale(1.02); + } + 50% { + opacity: 1; + transform: scale(1.07); + } + 100% { + transform: scale(1.02); + opacity: 0.8; + } +} +*/ /* * * * Landing View (Bottom Styles) | Right Content * * */ diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index 804d49a..af5717b 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -74,9 +74,11 @@ exports.validateSelected = async function(){ ConfigManager.updateAuthAccount(current.uuid, session.accessToken) ConfigManager.save() } catch(err) { - if(err && err.message === 'ForbiddenOperationException'){ - return false + console.debug('Error while validating selected profile:', err) + if(err && err.error === 'ForbiddenOperationException'){ + // What do we do? } + return false } return true } else { diff --git a/app/landing.ejs b/app/landing.ejs index d688ff5..ee4f6b3 100644 --- a/app/landing.ejs +++ b/app/landing.ejs @@ -1,7 +1,9 @@