From 349a8e0199893b2a8ee2bb4a69e35e2eea92d1cc Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 25 Jan 2023 01:53:11 +0800
Subject: [PATCH] update: implement responsive design

---
 src/components/Topbar/Topbar.vue        | 234 ++++++++++++++----------
 src/components/Topbar/TopbarMorePop.vue |  44 +++++
 src/contentScripts/views/App.vue        |  40 ++--
 src/styles/reset.scss                   |   9 +-
 4 files changed, 210 insertions(+), 117 deletions(-)
 create mode 100644 src/components/Topbar/TopbarMorePop.vue

diff --git a/src/components/Topbar/Topbar.vue b/src/components/Topbar/Topbar.vue
index 528fc78b..87427011 100644
--- a/src/components/Topbar/Topbar.vue
+++ b/src/components/Topbar/Topbar.vue
@@ -17,6 +17,7 @@ const props = withDefaults(defineProps<Props>(), {
 const { t } = useI18n()
 const mid = getUserID() || ''
 const userInfo = reactive<UserInfo | {}>({}) as UnwrapNestedRefs<UserInfo>
+
 const showChannelsPop = ref<boolean>(false)
 const showUserPanelPop = ref<boolean>(false)
 const showTopbarMask = ref<boolean>(false)
@@ -25,6 +26,8 @@ const showMomentsPop = ref<boolean>(false)
 const showFavoritesPop = ref<boolean>(false)
 const showUploadPop = ref<boolean>(false)
 const showHistoryPop = ref<boolean>(false)
+const showMorePop = ref<boolean>(false)
+
 const isLogin = ref<boolean>(!!getUserID())
 const unReadMessage = reactive<UnReadMessage | {}>(
   {},
@@ -160,7 +163,7 @@ function getNewMomentsCount() {
     flex="~"
     justify="between"
     align="items-center"
-    p="lg:x-23 <lg:x-16 y-2"
+    p="lg:x-20 md:x-16 x-14"
     w="screen"
   >
     <Transition name="topbar">
@@ -170,7 +173,7 @@ function getNewMomentsCount() {
         w="full"
         h="160px"
         opacity="100"
-        pointer="none"
+        pointer-events-none
         style="background: linear-gradient(var(--bew-bg), transparent)"
       />
     </Transition>
@@ -216,14 +219,6 @@ function getNewMomentsCount() {
 
     <!-- search bar -->
     <div flex="~" w="full" justify="md:center <md:end" items-center>
-      <!-- <button
-        class="icon-btn"
-        text="$bew-text-1 2xl"
-        display="!md:hidden !<md:block"
-        m="r-4"
-      >
-        <tabler:search />
-      </button> -->
       <SearchBar v-if="props.showSearchBar" ref="searchBar" />
     </div>
 
@@ -237,6 +232,7 @@ function getNewMomentsCount() {
         </a>
       </div>
       <template v-if="isLogin">
+        <!-- Avatar -->
         <div
           class="avatar right-side-item"
           @mouseenter="openUserPanel"
@@ -288,102 +284,130 @@ function getNewMomentsCount() {
           </Transition>
         </div>
 
-        <!-- Notifications -->
-        <div
-          class="right-side-item"
-          @mouseenter="showNotificationsPop = true"
-          @mouseleave="showNotificationsPop = false"
-        >
-          <div v-if="unReadMessageCount !== 0" class="unread-message">
-            {{ unReadMessageCount > 999 ? '999+' : unReadMessageCount }}
+        <div display="lg:flex none">
+          <!-- Notifications -->
+          <div
+            class="right-side-item"
+            :class="{ active: showNotificationsPop }"
+            @mouseenter="showNotificationsPop = true"
+            @mouseleave="showNotificationsPop = false"
+          >
+            <div v-if="unReadMessageCount !== 0" class="unread-message">
+              {{ unReadMessageCount > 999 ? '999+' : unReadMessageCount }}
+            </div>
+            <a
+              href="https://message.bilibili.com"
+              target="_blank"
+              :title="t('topbar.notifications')"
+            >
+              <tabler:bell />
+            </a>
+
+            <Transition name="slide">
+              <TopbarNotificationsPop
+                v-if="showNotificationsPop"
+                ref="notificationsDropdown"
+                class="bew-popover"
+              />
+            </Transition>
           </div>
-          <a
-            href="https://message.bilibili.com"
-            target="_blank"
-            :title="t('topbar.notifications')"
+
+          <!-- Moments -->
+          <div
+            class="right-side-item"
+            :class="{ active: showMomentsPop }"
+            @mouseenter="showMomentsPop = true"
+            @mouseleave="showMomentsPop = false"
           >
-            <tabler:bell />
-          </a>
+            <div v-if="newMomentsCount !== 0" class="unread-message">
+              {{ newMomentsCount > 999 ? '999+' : newMomentsCount }}
+            </div>
+            <a
+              href="https://t.bilibili.com"
+              target="_blank"
+              :title="t('topbar.moments')"
+            >
+              <tabler:windmill />
+            </a>
 
-          <Transition name="slide">
-            <TopbarNotificationsPop
-              v-if="showNotificationsPop"
-              ref="notificationsDropdown"
-              class="bew-popover"
-            />
-          </Transition>
-        </div>
-
-        <!-- Moments -->
-        <div
-          class="right-side-item"
-          @mouseenter="showMomentsPop = true"
-          @mouseleave="showMomentsPop = false"
-        >
-          <div v-if="newMomentsCount !== 0" class="unread-message">
-            {{ newMomentsCount > 999 ? '999+' : newMomentsCount }}
+            <Transition name="slide">
+              <TopbarMomentsPop v-if="showMomentsPop" class="bew-popover" />
+            </Transition>
           </div>
-          <a
-            href="https://t.bilibili.com"
-            target="_blank"
-            :title="t('topbar.moments')"
-          >
-            <tabler:windmill />
-          </a>
 
-          <Transition name="slide">
-            <TopbarMomentsPop v-if="showMomentsPop" class="bew-popover" />
-          </Transition>
+          <!-- Favorites -->
+          <div
+            class="right-side-item"
+            :class="{ active: showFavoritesPop }"
+            @mouseenter="showFavoritesPop = true"
+            @mouseleave="showFavoritesPop = false"
+          >
+            <a
+              :href="`https://space.bilibili.com/${mid}/favlist`"
+              target="_blank"
+              :title="t('topbar.favorites')"
+            >
+              <tabler:star />
+            </a>
+
+            <Transition name="slide">
+              <TopbarFavoritesPop
+                v-show="showFavoritesPop"
+                class="bew-popover"
+              />
+            </Transition>
+          </div>
+
+          <!-- History -->
+          <div
+            class="right-side-item"
+            :class="{ active: showHistoryPop }"
+            @mouseenter="showHistoryPop = true"
+            @mouseleave="showHistoryPop = false"
+          >
+            <a
+              href="https://www.bilibili.com/account/history"
+              target="_blank"
+              :title="t('topbar.history')"
+            >
+              <tabler:clock />
+            </a>
+
+            <Transition name="slide">
+              <TopbarHistoryPop v-if="showHistoryPop" class="bew-popover" />
+            </Transition>
+          </div>
+
+          <!-- Creative center -->
+          <div class="right-side-item">
+            <a
+              href="https://member.bilibili.com/platform/home"
+              target="_blank"
+              :title="t('topbar.creative_center')"
+            >
+              <tabler:bulb />
+            </a>
+          </div>
         </div>
 
-        <!-- Favorites -->
+        <!-- More -->
         <div
           class="right-side-item"
-          @mouseenter="showFavoritesPop = true"
-          @mouseleave="showFavoritesPop = false"
+          :class="{ active: showMorePop }"
+          display="lg:none block"
+          @mouseenter="showMorePop = true"
+          @mouseleave="showMorePop = false"
         >
-          <a
-            :href="`https://space.bilibili.com/${mid}/favlist`"
-            target="_blank"
-            :title="t('topbar.favorites')"
-          >
-            <tabler:star />
+          <a title="More">
+            <tabler:menu-2 />
           </a>
 
           <Transition name="slide">
-            <TopbarFavoritesPop v-show="showFavoritesPop" class="bew-popover" />
+            <TopbarMorePop v-show="showMorePop" class="bew-popover" />
           </Transition>
         </div>
 
-        <!-- History -->
-        <div
-          class="right-side-item"
-          @mouseenter="showHistoryPop = true"
-          @mouseleave="showHistoryPop = false"
-        >
-          <a
-            href="https://www.bilibili.com/account/history"
-            target="_blank"
-            :title="t('topbar.history')"
-          >
-            <tabler:clock />
-          </a>
-
-          <Transition name="slide">
-            <TopbarHistoryPop v-if="showHistoryPop" class="bew-popover" />
-          </Transition>
-        </div>
-
-        <!-- Creative center -->
-        <div class="right-side-item">
-          <a
-            href="https://member.bilibili.com/platform/home"
-            target="_blank"
-            :title="t('topbar.creative_center')"
-          >
-            <tabler:bulb />
-          </a>
-        </div>
+        <!-- Upload -->
         <div
           class="upload right-side-item"
           @mouseenter="showUploadPop = true"
@@ -392,15 +416,21 @@ function getNewMomentsCount() {
           <a
             href="https://member.bilibili.com/platform/upload/video/frame"
             target="_blank"
-            class="bg-$bew-theme-color rounded-full !text-white !text-base !px-4 mx-1"
+            bg="$bew-theme-color"
+            rounded-40px
+            un-text="!white !base"
+            m="x-1"
             flex="~"
             justify="center"
-            w="xl:100px <xl:42px"
-            h="xl:auto <xl:42px"
-            p="xl:auto <xl:unset"
+            w="xl:100px 42px"
+            h="xl:auto 42px"
+            p="xl:auto x-4"
+            shadow
+            filter="hover:brightness-110"
+            style="--un-shadow: 0 0 10px var(--bew-theme-color-60)"
           >
-            <tabler:upload />
-            <span m="l-2" display="xl:block <xl:hidden">{{
+            <tabler:upload flex-shrink-0 />
+            <span m="l-2" display="xl:block none">{{
               t('topbar.upload')
             }}</span>
           </a>
@@ -492,13 +522,21 @@ function getNewMomentsCount() {
 
     &:not(.avatar) {
       a {
-        @apply text-xl flex items-center p-2;
+        --at-apply: text-xl flex items-center p-2 rounded-40px
+          duration-300;
       }
     }
 
     &:not(.avatar):not(.upload) a {
       --un-drop-shadow: drop-shadow(0 0 6px white);
-      --at-apply: filter;
+      --at-apply: dark:filter dark-hover:bg-white dark-hover:text-black
+        hover:bg-$bew-fill-2;
+    }
+
+    &.active a {
+      --un-drop-shadow: drop-shadow(0 0 6px white);
+      --at-apply: dark:filter dark:bg-white dark:text-black
+        bg-$bew-fill-2;
     }
   }
 
diff --git a/src/components/Topbar/TopbarMorePop.vue b/src/components/Topbar/TopbarMorePop.vue
new file mode 100644
index 00000000..6c6d9506
--- /dev/null
+++ b/src/components/Topbar/TopbarMorePop.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import { getUserID } from '~/utils'
+
+const { t } = useI18n()
+
+const list = [
+  { name: t('topbar.notifications'), url: '//message.bilibili.com' },
+  { name: t('topbar.moments'), url: '//t.bilibili.com/' },
+  { name: t('topbar.favorites'), url: `//space.bilibili.com/${getUserID ?? ''}/favlist` },
+  { name: t('topbar.history'), url: '//www.bilibili.com/account/history' },
+  { name: t('topbar.creative_center'), url: '//member.bilibili.com/platform/home' },
+]
+</script>
+
+<template>
+  <div
+    bg="$bew-content-solid-1"
+    w="170px"
+    p="4"
+    rounded="$bew-radius"
+    flex="~ col"
+    style="box-shadow: var(--bew-shadow-3)"
+  >
+    <a
+      v-for="item in list"
+      :key="item.name"
+      :href="item.url"
+      target="_blank"
+      pos="relative"
+      p="x-4 y-2"
+      bg="hover:$bew-fill-2"
+      rounded="$bew-radius"
+      transition="all duration-300"
+      m="b-1 last:b-0"
+      flex="~"
+      justify="between"
+      items="center"
+      h="35px"
+    >
+      {{ item.name }}
+    </a>
+  </div>
+</template>
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 52d4252a..be37337e 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -44,7 +44,7 @@ function changeActivatePage(pageName: AppPage) {
 </script>
 
 <template>
-  <Transition>
+  <Transition name="topbar">
     <Topbar
       v-show="isShowTopbar"
       :show-search-bar="activatedPage !== AppPage.Search"
@@ -57,7 +57,7 @@ function changeActivatePage(pageName: AppPage) {
       <div
         p-2
         bg="$bew-content-1"
-        flex="~ col gap-2"
+        flex="~ col gap-2 shrink-0"
         rounded="r-$bew-radius"
         shadow="$bew-shadow-2"
         style="backdrop-filter: var(--bew-filter-glass)"
@@ -106,16 +106,13 @@ function changeActivatePage(pageName: AppPage) {
       </div>
     </aside>
 
-    <main p="t-80px x-5" m="x-100px" w-full>
-      <KeepAlive>
+    <main p="t-80px x-5" m="lg:x-30 md:x-16 x-12" w-full>
+      <Transition name="fade">
         <Home v-if="activatedPage === AppPage.Home" />
         <Search v-else-if="activatedPage === AppPage.Search" />
         <Anime v-else-if="activatedPage === AppPage.Anime" />
-      </KeepAlive>
+      </Transition>
     </main>
-
-    <!-- button -->
-    <div flex="~ col" pos="fixed bottom-5 lg:right-5 <lg:right-3" />
   </div>
   <!-- settings dialog -->
   <Settings v-if="showSettings" @close="showSettings = false" />
@@ -123,9 +120,12 @@ function changeActivatePage(pageName: AppPage) {
 
 <style lang="scss" scoped>
 .tab-item {
-  --at-apply: transform active:scale-90 lg:w-45px <lg:w-40px
-    aspect-square lg:p-3 <lg:p-2
-    text-2xl text-$bew-text-1 leading-0 duration-300
+  --at-apply: transform active:scale-90
+    md:w-45px w-35px
+    md:p-3 p-2
+    md:text-2xl text-xl
+    aspect-square
+    text-$bew-text-1 leading-0 duration-300
     rounded-$bew-radius
     bg-$bew-fill-1
     hover:bg-$bew-theme-color
@@ -140,13 +140,23 @@ function changeActivatePage(pageName: AppPage) {
 </style>
 
 <style lang="scss">
-.v-enter-active,
-.v-leave-active {
+.topbar-enter-active,
+.topbar-leave-active {
   transition: all 0.5s ease;
 }
 
-.v-enter-from,
-.v-leave-to {
+.topbar-enter-from,
+.topbar-leave-to {
   @apply opacity-0 transform -translate-y-full;
 }
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: all 0.5s ease;
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  @apply opacity-0;
+}
 </style>
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index a926977f..ef549f6c 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -2,9 +2,10 @@
   * this stylesheet is used to reset the styles of the bilibili default style
   */
 
-html, body {
+html,
+body {
   font-size: 14px;
-  min-width: unset;
+  min-width: unset !important;
 }
 
 a,
@@ -18,7 +19,7 @@ button {
 
   &:focus,
   &:active {
-    background: currentColor
+    background: currentColor;
   }
 }
 
@@ -35,4 +36,4 @@ body > #i_cecream,
   height: 0;
   overflow: hidden !important;
   pointer-events: none !important;
-}
\ No newline at end of file
+}