From e372ebbacce67c53db60755cd14c68c9f6deb27e Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Thu, 18 Apr 2024 23:11:19 +0000
Subject: [PATCH] Update user avatar component and settings page

---
 src/app.d.ts                         | 2 +-
 src/lib/components/UserAvatar.svelte | 7 ++++++-
 src/routes/settings/+page.svelte     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app.d.ts b/src/app.d.ts
index 7f4085a..f82ee4a 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -3,7 +3,7 @@ declare global {
     interface Locals {
       user: import("lucia").User | null;
       session: import("lucia").Session | null;
-      isServerSetup: boolean;
+      isServerSetup: boolean | null;
     }
   }
 }
diff --git a/src/lib/components/UserAvatar.svelte b/src/lib/components/UserAvatar.svelte
index ba5628a..0af9f6c 100644
--- a/src/lib/components/UserAvatar.svelte
+++ b/src/lib/components/UserAvatar.svelte
@@ -36,7 +36,12 @@
     <p class="text-lg ml-4 font-bold">Hi, {user.first_name} {user.last_name}</p>
     <li><a>Profile</a></li>
     <li><button on:click={navToLog}>My Log</button></li>
-    <li><button on:click={navToSettings}>Settings</button></li>
+    <li><button on:click={navToSettings}>User Settings</button></li>
+    {#if user.role == "admin"}
+      <li>
+        <button on:click={() => goto("/settings/admin")}>Admin Settings</button>
+      </li>
+    {/if}
     <form method="post">
       <li><button formaction="/?/logout">Logout</button></li>
     </form>
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 9d2ce7b..b97ce37 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -1,5 +1,6 @@
 <script>
     import { enhance } from "$app/forms";
+    import AdventureCard from "$lib/components/AdventureCard.svelte";
 
     export let data;
     let username = data.user?.username;
@@ -14,7 +15,6 @@
 <h1 class="text-center font-extrabold text-4xl mb-6">Settings Page</h1>
 
 <h1 class="text-center font-extrabold text-xl">User Account Settings</h1>
-
 <div class="flex justify-center">
     <form method="post" use:enhance class="w-full max-w-xs">
         <label for="username">Username</label>