From 36f11e48da16524cdf3988cdb9a2f02bb1644a15 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Fri, 6 Jan 2023 10:44:02 +0100
Subject: [PATCH] feat: categorized sidebar

---
 components/nav/NavSide.vue         | 25 +++++++++++++++----------
 components/search/SearchWidget.vue |  2 +-
 layouts/default.vue                |  8 +++-----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 1baa870f..4c82cd6b 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -6,10 +6,12 @@ const { notifications } = useNotifications()
 </script>
 
 <template>
-  <nav sm:px3 sm:py4 flex="~ col gap2" text-size-base leading-normal md:text-lg>
-    <SearchWidget lg:ms-1 lg:me-5 mb-5 hidden xl:block />
-    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" xl:hidden :command="command" mb-5 />
+  <nav sm:px3 flex="~ col gap2" shrink text-size-base leading-normal md:text-lg>
+    <div shrink hidden sm:block mt-4 />
+    <SearchWidget lg:ms-1 lg:me-5 hidden xl:block />
+    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" xl:hidden :command="command" />
 
+    <div shrink hidden sm:block mt-4 />
     <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
     <NavSideItem :text="$t('nav.notifications')" to="/notifications" icon="i-ri:notification-4-line" user-only :command="command">
       <template #icon>
@@ -21,16 +23,19 @@ const { notifications } = useNotifications()
         </div>
       </template>
     </NavSideItem>
-    <NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
-
-    <!-- Use Search for small screens once the right sidebar is collapsed -->
-    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" sm:hidden :command="command" />
-    <NavSideItem :text="$t('nav.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" :command="command" />
-    <NavSideItem :text="$t('nav.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " :command="command" />
-    <NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" :command="command" />
     <NavSideItem :text="$t('nav.conversations')" to="/conversations" icon="i-ri:at-line" user-only :command="command" />
     <NavSideItem :text="$t('nav.favourites')" to="/favourites" icon="i-ri:heart-3-line" user-only :command="command" />
     <NavSideItem :text="$t('nav.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line" user-only :command="command" />
+
+    <div shrink hidden sm:block mt-4 />
+    <NavSideItem :text="$t('nav.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" :command="command" />
+    <NavSideItem :text="$t('nav.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " :command="command" />
+    <NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" :command="command" />
+
+    <div shrink hidden sm:block mt-4 />
+    <NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
+
+    <div shrink hidden sm:block mt-4 />
     <NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" />
   </nav>
 </template>
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 0b150f64..2eaca6a8 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -70,7 +70,7 @@ const activate = () => {
 
 <template>
   <div ref="el" relative group>
-    <div bg-base border="~ base" h10 px-3 rounded-3 flex="~ row" items-center relative focus-within:box-shadow-outline gap-3>
+    <div bg-base border="~ base" h10 px-4 rounded-3 flex="~ row" items-center relative focus-within:box-shadow-outline gap-3>
       <div i-ri:search-2-line pointer-events-none text-secondary mt="1px" class="rtl-flip" />
       <input
         ref="input"
diff --git a/layouts/default.vue b/layouts/default.vue
index f3c664cc..d51552fa 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -11,11 +11,9 @@ const wideLayout = computed(() => route.meta.wideLayout ?? false)
         <div sticky top-0 w-20 xl:w-100 h-screen flex="~ col" lt-xl-items-center>
           <slot name="left">
             <div flex="~ col" overflow-y-auto justify-between h-full max-w-full mt-5>
-              <div flex flex-col gap-2>
-                <NavTitle />
-                <NavSide command />
-                <!-- <PublishButton ms5.5 mt4 xl:me8 xl:ms4 /> -->
-              </div>
+              <NavTitle />
+              <NavSide command />
+              <div flex-auto />
               <div v-if="isMastoInitialised" flex flex-col>
                 <div hidden xl:block>
                   <UserSignInEntry v-if="!currentUser" />