From 4f39b8ab5685eca19e9281969251bf558682da7a Mon Sep 17 00:00:00 2001
From: Damillora <developer@damillora.com>
Date: Sat, 22 Feb 2025 16:09:02 +0000
Subject: [PATCH] feat: update navbar

---
 web/app/src/lib/components/ui/Navbar.svelte | 45 +++++++++++----------
 web/app/src/lib/login-check.js              | 18 +++++++--
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/web/app/src/lib/components/ui/Navbar.svelte b/web/app/src/lib/components/ui/Navbar.svelte
index 4102b67..b12b1e5 100644
--- a/web/app/src/lib/components/ui/Navbar.svelte
+++ b/web/app/src/lib/components/ui/Navbar.svelte
@@ -1,12 +1,14 @@
 <script>
     import { token } from "$lib/stores";
-    import { isTokenExpired } from "$lib/login-check";
+    import { isTokenExpired, getUsernameFromToken } from "$lib/login-check";
 
     let menu_shown = $state(false);
-    
+
     let loggedIn = $state(false);
+    let username = $state("");
     token.subscribe((value) => {
         loggedIn = !isTokenExpired(value);
+        username = getUsernameFromToken(value);
     });
 
     const toggleMenu = () => {
@@ -14,9 +16,11 @@
     };
 </script>
 
-<nav class="navbar" role="navigation" aria-label="main navigation">
+<nav class="navbar is-primary" aria-label="main navigation">
     <div class="navbar-brand">
-        <a class="navbar-item" href="/">Shioriko</a>
+        <a class="navbar-item" href="/">
+            <strong>shioriko</strong>
+        </a>
 
         <a
             href={"#"}
@@ -42,29 +46,28 @@
         </div>
 
         <div class="navbar-end">
-            {#if loggedIn}
-                <div class="navbar-item">
-                    <div class="buttons">
-                        <a href="/user/profile" class="button is-primary">
+            <div class="navbar-item has-dropdown is-hoverable">
+                {#if loggedIn}
+                    <div class="navbar-link">{username}</div>
+
+                    <div class="navbar-dropdown">
+                        <a href="/user/profile" class="navbar-item">
                             Profile
                         </a>
-                        <a href="/auth/logout" class="button is-light">
-                            Log out
-                        </a>
+
+                        <a href="/auth/logout" class="navbar-item">Log out</a>
                     </div>
-                </div>
-            {:else}
-                <div class="navbar-item">
-                    <div class="buttons">
-                        <a href="/auth/register" class="button is-primary">
+                {:else}
+                    <div class="navbar-link">logged out</div>
+
+                    <div class="navbar-dropdown">
+                        <a href="/auth/register" class="navbar-item">
                             Register
                         </a>
-                        <a href="/auth/login" class="button is-light">
-                            Log in
-                        </a>
+                        <a href="/auth/login" class="navbar-item">Log in</a>
                     </div>
-                </div>
-            {/if}
+                {/if}
+            </div>
         </div>
     </div>
 </nav>
diff --git a/web/app/src/lib/login-check.js b/web/app/src/lib/login-check.js
index 11a3d64..2389265 100644
--- a/web/app/src/lib/login-check.js
+++ b/web/app/src/lib/login-check.js
@@ -1,8 +1,20 @@
 const isTokenExpired = (token) => {
     if (token === "") return true;
-    
-    const expiry = (JSON.parse(atob(token.split('.')[1]))).exp;
+    const tokenData = (JSON.parse(atob(token.split('.')[1])));
+    const expiry = tokenData.exp;
     return (Math.floor((new Date).getTime() / 1000)) >= expiry;
 }
+const getUsernameFromToken = (token) => {
+    if (token === "") return "logged out";
 
-export { isTokenExpired }
\ No newline at end of file
+    const isExpired = isTokenExpired(token);
+
+    if (!isExpired) {
+        const tokenData = (JSON.parse(atob(token.split('.')[1])));
+        return tokenData.name;
+    }
+    return "logged out";
+
+}
+
+export { isTokenExpired, getUsernameFromToken }
\ No newline at end of file