From 41e148633d8de31ad71f91b97256992d445ba489 Mon Sep 17 00:00:00 2001 From: Thomas G <62822072+Thomasluigi07@users.noreply.github.com> Date: Mon, 20 Jun 2022 14:08:29 +1000 Subject: [PATCH] Added Username support for navbar, fixed panel not working --- 404.html | 6 +++++- games.html | 5 ++++- home.html | 5 ++++- home.js | 13 +++++++++++++ index.html | 5 ++++- index.js | 10 ++++++++++ login.html | 5 ++++- main.css | 4 ++-- main.js | 13 +++++++++++++ nimda/panel.html | 47 ++++++++++++++++++++++++++--------------------- privacy.html | 5 ++++- signup.html | 5 ++++- tos.html | 5 ++++- 13 files changed, 97 insertions(+), 31 deletions(-) diff --git a/404.html b/404.html index 8acfdcc..2b6d32c 100644 --- a/404.html +++ b/404.html @@ -29,9 +29,12 @@ Upgrade Forum -
+ +
@@ -46,6 +49,7 @@

404

The page you have tried to visit does not exist, or it is missing!

+

You may have mistyped a URL.

Error Image
diff --git a/games.html b/games.html index 40651a7..0763cdf 100644 --- a/games.html +++ b/games.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/home.html b/home.html index 2a8a7d7..0ce7eff 100644 --- a/home.html +++ b/home.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/home.js b/home.js index be94da0..b8eeff6 100644 --- a/home.js +++ b/home.js @@ -102,4 +102,17 @@ window.onload = function() { alerttext.innerHTML = `You are using an unknown site (${window.location.hostname})`; alert.className = ""; } + var username = localStorage.getItem("username"); + var navbarsignedincontainer = document.getElementById("navbarsignedincontainer"); + var navbarusername = document.getElementById("navbarusername"); + var navbarlogincontainer = document.getElementById("navbarlogincontainer"); + if (username == null) { + username = "" + navbarsignedincontainer.className = "invisible" + navbarlogincontainer.className = "" + } else { + navbarsignedincontainer.className = "" + navbarlogincontainer.className = "invisible" + } + navbarusername.innerHTML = username }; \ No newline at end of file diff --git a/index.html b/index.html index 4429932..d95efea 100644 --- a/index.html +++ b/index.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/index.js b/index.js index 5a3b744..d6d9841 100644 --- a/index.js +++ b/index.js @@ -107,8 +107,16 @@ window.onload = function() { } var usernamecontainer = document.getElementById("UsernameContainer"); var username = localStorage.getItem("username"); + var navbarsignedincontainer = document.getElementById("navbarsignedincontainer"); + var navbarusername = document.getElementById("navbarusername"); + var navbarlogincontainer = document.getElementById("navbarlogincontainer"); if (username == null) { username = "" + navbarsignedincontainer.className = "invisible" + navbarlogincontainer.className = "" + } else { + navbarsignedincontainer.className = "" + navbarlogincontainer.className = "invisible" } usernamecontainer.innerHTML = "Your username is: " + username document.getElementById('UsernameButton').onclick = function() { @@ -116,5 +124,7 @@ window.onload = function() { var usernamecontainer = document.getElementById("UsernameContainer"); localStorage.setItem("username",usernameset); usernamecontainer.innerHTML = "Your username is: " + usernameset + navbarusername.innerHTML = username }; + navbarusername.innerHTML = username }; \ No newline at end of file diff --git a/login.html b/login.html index 66c6635..77fbe8c 100644 --- a/login.html +++ b/login.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/main.css b/main.css index f956a36..d968b36 100644 --- a/main.css +++ b/main.css @@ -32,7 +32,7 @@ display: table-cell; vertical-align: middle; } -.navbarlogincontainer { +#navbarlogincontainer, #navbarsignedincontainer { position: relative; padding-right: 10px; margin-right: 3%; @@ -114,7 +114,7 @@ footer { p,h1 { margin: 0px; } -a { +a, #navbarusername { color: white; text-decoration: none; font-weight: bolder; diff --git a/main.js b/main.js index 42c1423..6599c0a 100644 --- a/main.js +++ b/main.js @@ -93,4 +93,17 @@ window.onload = function() { alerttext.innerHTML = `You are using an unknown site (${window.location.hostname})`; alert.className = ""; } + var username = localStorage.getItem("username"); + var navbarsignedincontainer = document.getElementById("navbarsignedincontainer"); + var navbarusername = document.getElementById("navbarusername"); + var navbarlogincontainer = document.getElementById("navbarlogincontainer"); + if (username == null) { + username = "" + navbarsignedincontainer.className = "invisible" + navbarlogincontainer.className = "" + } else { + navbarsignedincontainer.className = "" + navbarlogincontainer.className = "invisible" + } + navbarusername.innerHTML = username }; \ No newline at end of file diff --git a/nimda/panel.html b/nimda/panel.html index bae3011..970b47a 100644 --- a/nimda/panel.html +++ b/nimda/panel.html @@ -10,44 +10,49 @@ - - - - - + + + + +
- MORBLOX Logo - + MORBLOX Logo +
- Home - Games - Catalog - Build - Upgrade - Forum + Home + Games + Catalog + Build + Upgrade + Forum
-
-

Sign Up or Log In +

+
- Profile - Avatar - Settings + Profile + Avatar + Settings
-

404 unauthorized

+

401 Unauthorized

+

You do not have access to this page.

+ Error Image
\ No newline at end of file diff --git a/privacy.html b/privacy.html index 15bf87d..cd194be 100644 --- a/privacy.html +++ b/privacy.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/signup.html b/signup.html index fae3c49..3a0e88d 100644 --- a/signup.html +++ b/signup.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +
diff --git a/tos.html b/tos.html index dc72085..50cc350 100644 --- a/tos.html +++ b/tos.html @@ -28,9 +28,12 @@ Upgrade Forum
-
+ +