From a659b5578d8fa1959e697eecf9fd8d7b838d9318 Mon Sep 17 00:00:00 2001
From: Samantha <samantha.piatt@childrens.harvard.edu>
Date: Wed, 3 Jul 2024 09:08:13 -0400
Subject: [PATCH] [ALS-6771] Reorder header and change to login button (#87)

---
 src/app.postcss                      |  1 +
 src/lib/components/Navigation.svelte | 14 +++++++-------
 src/lib/configuration.ts             |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app.postcss b/src/app.postcss
index 7e3372d9..da825d50 100644
--- a/src/app.postcss
+++ b/src/app.postcss
@@ -211,6 +211,7 @@ nav#page-navigation li {
 
 nav#page-navigation li a.nav-link {
   font-size: 1rem;
+  padding: 0 1rem;
   line-height: 1rem;
   display: flex;
   text-align: center;
diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 26ea5b40..e29527be 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -126,13 +126,13 @@
         </div>
       {:else}
         <!-- Login -->
-        <button id="user-login-btn" title="Login" on:click={handleLogin}>
-          <span
-            class="avatar flex aspect-square justify-center items-center overflow-hidden isolate variant-ringed-surface hover:variant-ghost-secondary w-12 rounded-full text-2xl"
-          >
-            <i class="fa-solid fa-user"></i>
-            <span class="sr-only">Login</span>
-          </span>
+        <button
+          id="user-login-btn"
+          title="Login"
+          class="btn variant-ghost-primary hover:variant-ghost-secondary"
+          on:click={handleLogin}
+        >
+          Login
         </button>
       {/if}
     </div>
diff --git a/src/lib/configuration.ts b/src/lib/configuration.ts
index c3504d2a..f312dd0a 100644
--- a/src/lib/configuration.ts
+++ b/src/lib/configuration.ts
@@ -158,6 +158,10 @@ export const branding = {
 };
 
 export const routes: Route[] = [
+  { path: '/explorer', text: 'Explore' },
+  { path: '/api', text: 'Analyze', privilege: PicsurePrivileges.QUERY },
+  { path: '/dataset', text: 'Manage Datasets', privilege: PicsurePrivileges.QUERY },
+  { path: '/admin/users', text: 'User Management', privilege: PicsurePrivileges.ADMIN },
   {
     path: '/admin',
     text: 'Configuration',
@@ -167,10 +171,6 @@ export const routes: Route[] = [
       { path: '/admin/authentication', text: 'Authentication', privilege: PicsurePrivileges.SUPER },
     ],
   },
-  { path: '/admin/users', text: 'User Management', privilege: PicsurePrivileges.ADMIN },
-  { path: '/explorer', text: 'Explorer' },
-  { path: '/api', text: 'API', privilege: PicsurePrivileges.QUERY },
-  { path: '/dataset', text: 'Dataset Management', privilege: PicsurePrivileges.QUERY },
   { path: '/help', text: 'Help' },
 ];