From e9740fe693cfec761cce69d47d25dc98825d0ce2 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Sun, 7 May 2023 17:41:18 +0200
Subject: [PATCH] feat: separate search and explore (#2075)

Co-authored-by: TAKAHASHI Shuuji <shuuji3@gmail.com>
---
 components/nav/NavBottom.vue |  2 +-
 components/nav/NavSide.vue   |  4 ++--
 pages/[[server]]/explore.vue |  7 ++-----
 pages/[[server]]/search.vue  | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 pages/[[server]]/search.vue

diff --git a/components/nav/NavBottom.vue b/components/nav/NavBottom.vue
index 43e9cb87..4b663fbd 100644
--- a/components/nav/NavBottom.vue
+++ b/components/nav/NavBottom.vue
@@ -16,7 +16,7 @@ const { notifications } = useNotifications()
       <NuxtLink to="/home" :aria-label="$t('nav.home')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:home-5-line />
       </NuxtLink>
-      <NuxtLink :to="isHydrated ? `/${currentServer}/explore` : '/explore'" :aria-label="$t('nav.explore')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
+      <NuxtLink to="/search" :aria-label="$t('nav.search')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
         <div i-ri:search-line />
       </NuxtLink>
       <NuxtLink to="/notifications" :aria-label="$t('nav.notifications')" :active-class="moreMenuVisible ? '' : 'text-primary'" flex flex-row items-center place-content-center h-full flex-1 class="coarse-pointer:select-none" @click="$scrollToTop">
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 91ac359d..eaa1cd9f 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -8,7 +8,7 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
 
 <template>
   <nav sm:px3 flex="~ col gap2" shrink text-size-base leading-normal md:text-lg h-full mt-1 overflow-y-auto>
-    <NavSideItem :text="$t('nav.search')" :to="isHydrated ? `/${currentServer}/explore` : '/explore'" icon="i-ri:search-line" hidden sm:block xl:hidden :command="command" />
+    <NavSideItem :text="$t('nav.search')" to="/search" icon="i-ri:search-line" xl:hidden :command="command" />
 
     <div class="spacer" shrink hidden sm:block />
     <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
@@ -28,7 +28,7 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
     <NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
 
     <div class="spacer" shrink hidden sm:block />
-    <NavSideItem :text="$t('nav.explore')" :to="isHydrated ? `/${currentServer}/explore` : '/explore'" icon="i-ri:hashtag" :command="command" xs:hidden sm:hidden xl:block />
+    <NavSideItem :text="$t('nav.explore')" :to="isHydrated ? `/${currentServer}/explore` : '/explore'" icon="i-ri:hashtag" :command="command" />
     <NavSideItem :text="$t('nav.local')" :to="isHydrated ? `/${currentServer}/public/local` : '/public/local'" icon="i-ri:group-2-line " :command="command" />
     <NavSideItem :text="$t('nav.federated')" :to="isHydrated ? `/${currentServer}/public` : '/public'" icon="i-ri:earth-line" :command="command" />
     <NavSideItem :text="$t('nav.lists')" :to="isHydrated ? `/${currentServer}/lists` : '/lists'" icon="i-ri:list-check" user-only :command="command" />
diff --git a/pages/[[server]]/explore.vue b/pages/[[server]]/explore.vue
index b0e257d4..15fc40f4 100644
--- a/pages/[[server]]/explore.vue
+++ b/pages/[[server]]/explore.vue
@@ -40,16 +40,13 @@ const tabs = $computed<CommonRouteTabOption[]>(() => [
 </script>
 
 <template>
-  <MainContent :no-overflow-hidden="isExtraLargeScreen" :back-on-small-screen="isExtraLargeScreen">
-    <template v-if="!isExtraLargeScreen" #title>
+  <MainContent>
+    <template #title>
       <span timeline-title-style flex items-center gap-2 cursor-pointer @click="$scrollToTop">
         <div i-ri:hashtag />
         <span>{{ t('nav.explore') }}</span>
       </span>
     </template>
-    <template v-else #title>
-      <SearchWidget v-if="isHydrated" ref="search" class="m-1" />
-    </template>
 
     <template #header>
       <CommonRouteTabs replace :options="tabs" />
diff --git a/pages/[[server]]/search.vue b/pages/[[server]]/search.vue
new file mode 100644
index 00000000..2f86a142
--- /dev/null
+++ b/pages/[[server]]/search.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+const { t } = useI18n()
+useHydratedHead({
+  title: () => t('nav.search'),
+})
+
+const search = $ref<{ input?: HTMLInputElement }>()
+watchEffect(() => {
+  if (search?.input)
+    search?.input?.focus()
+})
+onActivated(() =>
+  search?.input?.focus(),
+)
+onDeactivated(() => search?.input?.blur())
+</script>
+
+<template>
+  <MainContent>
+    <template #title>
+      <NuxtLink to="/search" timeline-title-style flex items-center gap-2 @click="$scrollToTop">
+        <div i-ri:search-line class="rtl-flip" />
+        <span>{{ $t('nav.search') }}</span>
+      </NuxtLink>
+    </template>
+
+    <div px2 mt3>
+      <SearchWidget v-if="isHydrated" ref="search" m-1 />
+    </div>
+  </MainContent>
+</template>