Merge branch 'main' into fix/posts-nested-link-clicks

MozillaSocial · Oct 30, 2023 · b9e0f2d · b9e0f2d
2 parents 188e9fb + 0c395a2
commit b9e0f2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/components/nav/NavBottom.vue b/components/nav/NavBottom.vue
@@ -16,6 +16,9 @@ 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="/discover" :aria-label="$t('nav.discover')" :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:compass-fill />
+ </NuxtLink>
  <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>
@@ -32,9 +35,6 @@ const { notifications } = useNotifications()
  </NuxtLink>
  </template>
  <template v-else>
- <NuxtLink :to="`/${currentServer}/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">
- <div i-ri:hashtag />
- </NuxtLink>
  <NuxtLink group :to="`/${currentServer}/public/local`" :aria-label="$t('nav.local')" :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:group-2-line />
  </NuxtLink>

diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
@@ -12,6 +12,7 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
 
  <div class="spacer" shrink xl:hidden />
  <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
+ <NavSideItem :text="$t('nav.discover')" to="/discover" icon="i-ri-compass-fill" :command="command" />
  <NavSideItem :text="$t('nav.notifications')" to="/notifications" icon="i-ri:notification-4-line" user-only :command="command">
  <template #icon>
  <div flex relative>
@@ -30,7 +31,6 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
  <div class="spacer" shrink hidden sm:block />
 
  <div class="spacer" shrink hidden sm: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/locales/de-DE.json b/locales/de-DE.json
@@ -273,6 +273,7 @@
  "built_at": "Letzter Build: {0}",
  "compose": "Verfassen",
  "conversations": "Direktnachrichten",
+ "discover": "Entdecken",
  "explore": "Entdecken",
  "favourites": "Favoriten",
  "federated": "Föderiert",