From b1a8ddf68c9cabec4cac48638bd64e0b23d09b80 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 21 Oct 2024 10:51:37 -0700
Subject: [PATCH] Simplify primary nav

---
 .env                                 |  2 +-
 src/app/components/PrimaryNav.svelte | 53 ++++++++++------------------
 src/routes/home/+layout.svelte       |  2 +-
 3 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/.env b/.env
index 68957f05..d4d2cd4d 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
 VITE_DEFAULT_PUBKEYS=fe7f6bc6f7338b76bbf80db402ade65953e20b2f23e66e898204b63cc42539a3,391819e2f2f13b90cac7209419eb574ef7c0d1f4e81867fc24c47a3ce5e8a248,84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240,dace63b00c42e6e017d00dd190a9328386002ff597b841eb5ef91de4f1ce8491,82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2,58c741aa630c2da35a56a77c1d05381908bd10504fdd2d8b43f725efa6d23196,eeb11961b25442b16389fe6c7ebea9adf0ac36dd596816ea7119e521b8821b9e,b676ded7c768d66a757aa3967b1243d90bf57afb09d1044d3219d8d424e4aea0,61066504617ee79387021e18c89fb79d1ddbc3e7bff19cf2298f40466f8715e9
-VITE_PLATFORM_RELAY=wss://coracle-dev.nostr1.com
+# VITE_PLATFORM_RELAY=wss://coracle-dev.nostr1.com
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 51fd1d90..e674aa73 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -21,37 +21,20 @@
   const showSettingsMenu = () => pushModal(MenuSettings)
 </script>
 
-{#if import.meta.env.VITE_PLATFORM_RELAY}
-  <div class="relative hidden w-14 flex-shrink-0 bg-base-100 pt-4 md:block">
-    <div class="flex h-full flex-col justify-between">
-      <div>
-        <PrimaryNavItem href="/home/people" class="tooltip-right">
-          <Avatar icon="home-smile" class="!h-10 !w-10" />
-        </PrimaryNavItem>
+<div class="relative hidden w-14 flex-shrink-0 bg-base-100 pt-4 md:block">
+  <div class="flex h-full flex-col justify-between">
+    <div>
+      <PrimaryNavItem href="/home/people" class="tooltip-right">
+        <Avatar icon="home-smile" class="!h-10 !w-10" />
+      </PrimaryNavItem>
+      {#if import.meta.env.VITE_PLATFORM_RELAY}
         <PrimaryNavItem
           title={displayRelayUrl(import.meta.env.VITE_PLATFORM_RELAY)}
           href={makeSpacePath(import.meta.env.VITE_PLATFORM_RELAY)}
           class="tooltip-right">
           <SpaceAvatar url={import.meta.env.VITE_PLATFORM_RELAY} />
         </PrimaryNavItem>
-      </div>
-      <div>
-        <PrimaryNavItem title="Profile" href="/settings/profile" class="tooltip-right">
-          <Avatar src={$userProfile?.picture} class="!h-10 !w-10" />
-        </PrimaryNavItem>
-        <PrimaryNavItem title="Settings" href="/settings/relays" class="tooltip-right">
-          <Avatar icon="settings" class="!h-10 !w-10" />
-        </PrimaryNavItem>
-      </div>
-    </div>
-  </div>
-{:else}
-  <div class="relative hidden w-14 flex-shrink-0 bg-base-100 pt-4 md:block">
-    <div class="flex h-full flex-col justify-between">
-      <div>
-        <PrimaryNavItem href="/home/people" class="tooltip-right">
-          <Avatar icon="home-smile" class="!h-10 !w-10" />
-        </PrimaryNavItem>
+      {:else}
         {#each getMembershipUrls($userMembership) as url (url)}
           <PrimaryNavItem
             title={displayRelayUrl(url)}
@@ -66,18 +49,18 @@
         <PrimaryNavItem title="Discover Spaces" href="/discover" class="tooltip-right">
           <Avatar icon="compass-big" class="!h-10 !w-10" />
         </PrimaryNavItem>
-      </div>
-      <div>
-        <PrimaryNavItem title="Profile" href="/settings/profile" class="tooltip-right">
-          <Avatar src={$userProfile?.picture} class="!h-10 !w-10" />
-        </PrimaryNavItem>
-        <PrimaryNavItem title="Settings" href="/settings/relays" class="tooltip-right">
-          <Avatar icon="settings" class="!h-10 !w-10" />
-        </PrimaryNavItem>
-      </div>
+      {/if}
+    </div>
+    <div>
+      <PrimaryNavItem title="Profile" href="/settings/profile" class="tooltip-right">
+        <Avatar src={$userProfile?.picture} class="!h-10 !w-10" />
+      </PrimaryNavItem>
+      <PrimaryNavItem title="Settings" href="/settings/relays" class="tooltip-right">
+        <Avatar icon="settings" class="!h-10 !w-10" />
+      </PrimaryNavItem>
     </div>
   </div>
-{/if}
+</div>
 
 <slot />
 
diff --git a/src/routes/home/+layout.svelte b/src/routes/home/+layout.svelte
index 18df461f..f4b9ba5c 100644
--- a/src/routes/home/+layout.svelte
+++ b/src/routes/home/+layout.svelte
@@ -48,7 +48,7 @@
     </div>
     <div in:fly={{delay: 100}}>
       <SecondaryNavItem href="/home/notes">
-        <Icon icon="notes-minimalistic" /> Notes
+        <Icon icon="notes-minimalistic" /> Your Notes
       </SecondaryNavItem>
     </div>
     <div in:fly={{delay: 150}}>