From a4cafe9a5a1f1531783581694ff3a4722ed2ba29 Mon Sep 17 00:00:00 2001 From: Thomas Roque Date: Mon, 1 May 2023 20:21:43 +0200 Subject: [PATCH 1/2] Bugfix welcome --- .idea/.gitignore | 5 + .idea/BTCV-Launcher.iml | 12 + .idea/codeStyles/Project.xml | 15 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + app/assets/css/launcher.css | 2 - app/assets/js/scripts/welcome.js | 5 +- app/welcome.ejs | 14 +- package-lock.json | 4425 ++++++------------ 11 files changed, 1627 insertions(+), 2876 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/BTCV-Launcher.iml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..ea7ed093 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/BTCV-Launcher.iml b/.idea/BTCV-Launcher.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/BTCV-Launcher.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..34af152a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..b72cae11 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 6a994135..7b05533a 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -273,10 +273,8 @@ body, button { */ #welcomeImageSeal { - background: rgba(1, 2, 1, 0.5); height: 125px; width: 125px; - box-shadow: 0px 0px 10px 0px rgb(0, 0, 0); margin-bottom: 5%; margin-top: 10%; } diff --git a/app/assets/js/scripts/welcome.js b/app/assets/js/scripts/welcome.js index ed0399c3..0872be5c 100644 --- a/app/assets/js/scripts/welcome.js +++ b/app/assets/js/scripts/welcome.js @@ -1,6 +1,5 @@ -/** - * Script for welcome.ejs - */ + +// Welcome view document.getElementById('welcomeButton').addEventListener('click', e => { loginOptionsCancelEnabled(false) // False by default, be explicit. loginOptionsViewOnLoginSuccess = VIEWS.landing diff --git a/app/welcome.ejs b/app/welcome.ejs index 701adccd..bf832f33 100644 --- a/app/welcome.ejs +++ b/app/welcome.ejs @@ -5,13 +5,19 @@ -->
- La - Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you aren’t afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming. + La Batcave + + Salut le sang !
+ Bienvenue sur le launcher de la Batcave !
+ Ici tu pourras télécharger les mods nécessaires pour jouer sur tout nos serveurs.
+ Grâce à ce launcher, tu pourras aussi rejoindre les serveurs en un clic.
+ +

- You are just a few clicks away from Westeros. + Gros bisous !