From 24d7d0c4c3e9ccbecd7e45a9bd08bfa303f23c5d Mon Sep 17 00:00:00 2001
From: KUN1007 <yuyu_kun@sina.com>
Date: Fri, 26 May 2023 02:05:35 +0800
Subject: [PATCH] aside template styles

---
 .vscode/settings.json                         |  1 +
 .../setting-panel/KUNGalgameSettingPanel.vue  | 35 +-----------
 src/config/storage/lang-storage.ts            | 39 +++++++++++++
 src/language/en.ts                            |  6 ++
 src/language/zh.ts                            |  6 ++
 src/styles/color.scss                         |  2 +
 src/utils/cache/cookies.ts                    |  0
 .../Home/content/aside/components/Aside.vue   | 10 ++--
 .../content/aside/components/AsideActive.vue  |  3 +-
 src/views/Home/content/aside/topic/Topic.vue  | 56 +++++++++++--------
 .../aside/topic/components/SingleTopic.vue    | 15 +++--
 src/views/contacts/Contacts.vue               | 19 +++----
 src/views/rank/Rank.vue                       |  2 +-
 13 files changed, 113 insertions(+), 81 deletions(-)
 create mode 100644 src/config/storage/lang-storage.ts
 delete mode 100644 src/utils/cache/cookies.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f162934a..d6dc7415 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
   "cSpell.words": [
     "axios",
+    "Bilibili",
     "galgame",
     "Galgame",
     "iconify",
diff --git a/src/components/setting-panel/KUNGalgameSettingPanel.vue b/src/components/setting-panel/KUNGalgameSettingPanel.vue
index cecdec4c..290b7000 100644
--- a/src/components/setting-panel/KUNGalgameSettingPanel.vue
+++ b/src/components/setting-panel/KUNGalgameSettingPanel.vue
@@ -1,7 +1,5 @@
 <!-- 设置面板组件，展示整个论坛的设置面板 -->
 <script setup lang="ts">
-// 引入 vue 函数
-import { ref, watch, onMounted } from 'vue'
 // 引入图标字体
 import { Icon } from '@iconify/vue'
 // 引入看板娘组件
@@ -11,36 +9,9 @@ import Background from './components/Background.vue'
 // 导入设置面板 store
 import { useSettingsPanelStore } from '@/store/modules/settings'
 import { storeToRefs } from 'pinia'
-// 导入 i18n
-import { useI18n } from 'vue-i18n'
-
-/*
- * 网站的语言设置
- */
-const { locale } = useI18n({ useScope: 'global' })
-const selectedLocale = ref(locale.value)
-
-// 监听selectedLocale的变化，并更新Vue I18n的locale
-watch(selectedLocale, (newVal) => {
-  locale.value = newVal
-})
-
-// 在页面加载时从localStorage中读取保存的语言设置
-onMounted(() => {
-  const savedLocale = localStorage.getItem('KUNGalgame-locale')
-  if (savedLocale) {
-    selectedLocale.value = savedLocale
-  }
-})
-
-// 监听语言变化，并将语言设置保存到localStorage
-watch(locale, (newVal) => {
-  localStorage.setItem('KUNGalgame-locale', newVal)
-})
-
-const changeLanguage = () => {
-  locale.value = selectedLocale.value
-}
+// 导入更改语言的函数
+import selectedLocale from '@/config/storage/lang-storage'
+import changeLanguage from '@/config/storage/lang-storage'
 
 /*
  * 设置面板显示切换
diff --git a/src/config/storage/lang-storage.ts b/src/config/storage/lang-storage.ts
new file mode 100644
index 00000000..a6a6b38e
--- /dev/null
+++ b/src/config/storage/lang-storage.ts
@@ -0,0 +1,39 @@
+/*
+ * 网站的语言设置
+ */
+
+// 导入 vue 函数
+import { ref, watch, onMounted } from 'vue'
+// 导入 i18n
+import { useI18n } from 'vue-i18n'
+
+const { locale } = useI18n({ useScope: 'global' })
+
+const selectedLocale = ref(locale.value)
+
+// 监听selectedLocale的变化，并更新Vue I18n的locale
+watch(selectedLocale, (newVal) => {
+  locale.value = newVal
+})
+
+// 在页面加载时从localStorage中读取保存的语言设置
+onMounted(() => {
+  const savedLocale = localStorage.getItem('KUNGalgame-locale')
+  if (savedLocale) {
+    selectedLocale.value = savedLocale
+  }
+})
+
+// 监听语言变化，并将语言设置保存到localStorage
+watch(locale, (newVal) => {
+  localStorage.setItem('KUNGalgame-locale', newVal)
+})
+
+const changeLanguage = () => {
+  locale.value = selectedLocale.value
+}
+
+export default {
+  selectedLocale,
+  changeLanguage,
+}
diff --git a/src/language/en.ts b/src/language/en.ts
index 4c2892bb..5662d708 100644
--- a/src/language/en.ts
+++ b/src/language/en.ts
@@ -2,4 +2,10 @@ export default {
   header: {
     name: 'KUNGalgame',
   },
+  mainPage: {
+    asideActive: {
+      hot: `Today's Hot Topic`,
+      new: `Today's New Topic`,
+    },
+  },
 }
diff --git a/src/language/zh.ts b/src/language/zh.ts
index ddb13dd8..5795cd66 100644
--- a/src/language/zh.ts
+++ b/src/language/zh.ts
@@ -2,4 +2,10 @@ export default {
   header: {
     name: '鲲Galgame',
   },
+  mainPage: {
+    asideActive: {
+      hot: `今日热门话题`,
+      new: `今日最新话题`,
+    },
+  },
 }
diff --git a/src/styles/color.scss b/src/styles/color.scss
index 11a45cbb..4c973721 100644
--- a/src/styles/color.scss
+++ b/src/styles/color.scss
@@ -187,6 +187,8 @@ $kungalgame-shadow-0: 5px 5px 7px $kungalgame-trans-gray-4,
   -5px -5px 7px $kungalgame-trans-white-1;
 $kungalgame-shadow-1: 2px 2px 4px $kungalgame-trans-gray-4,
   -2px -2px 4px $kungalgame-trans-white-1;
+$kungalgame-shadow-2: inset 1px 1px 2px $kungalgame-gray-3,
+  inset -1px -1px 2px $kungalgame-white;
 
 :export {
   shadow: $shadow;
diff --git a/src/utils/cache/cookies.ts b/src/utils/cache/cookies.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/Home/content/aside/components/Aside.vue b/src/views/Home/content/aside/components/Aside.vue
index 94b49e12..c9886995 100644
--- a/src/views/Home/content/aside/components/Aside.vue
+++ b/src/views/Home/content/aside/components/Aside.vue
@@ -22,12 +22,9 @@ import asideItem from '../aside-item'
   span {
     width: 100%;
     height: 100%;
-    flex-grow: 1;
-    display: flex;
-    justify-content: center;
     font-size: 18px;
-    /* 文字竖直显示 */
-    word-wrap: break-word;
+    display: grid;
+    grid-auto-rows: minmax(0, 1fr); /* 控制行高度自适应 */
     border-top: 1px solid $kungalgame-blue-4;
     &:first-child {
       border-top: none;
@@ -37,7 +34,8 @@ import asideItem from '../aside-item'
       background-color: $kungalgame-trans-blue-2;
     }
     a {
-      width: 1px;
+      writing-mode: vertical-rl;
+      text-orientation: upright;
       height: 100%;
       display: flex;
       justify-content: center;
diff --git a/src/views/Home/content/aside/components/AsideActive.vue b/src/views/Home/content/aside/components/AsideActive.vue
index ec1598d0..c700e65a 100644
--- a/src/views/Home/content/aside/components/AsideActive.vue
+++ b/src/views/Home/content/aside/components/AsideActive.vue
@@ -26,7 +26,7 @@ const isActive = toRefs(props.isActive)
     </div>
   </div>
   <!-- 热门帖子板块 -->
-  <Topic v-show="isActive" :isHotTopic="true"/>
+  <Topic v-show="isActive" :isHotTopic="true" />
   <!-- 这个 style 使侧边栏和内容区等高 -->
   <!-- <Topic v-show="isActive" /> -->
   <!-- 新帖子板块 -->
@@ -93,6 +93,7 @@ const isActive = toRefs(props.isActive)
     height: 100%;
     width: 100%;
     color: $kungalgame-font-color-2;
+    border-radius: 5px;
     /* 设置六个功能（模式、排行、背景等）的 hover */
     &:hover {
       color: $kungalgame-font-color-3;
diff --git a/src/views/Home/content/aside/topic/Topic.vue b/src/views/Home/content/aside/topic/Topic.vue
index 718aa5af..539e9f61 100644
--- a/src/views/Home/content/aside/topic/Topic.vue
+++ b/src/views/Home/content/aside/topic/Topic.vue
@@ -8,40 +8,35 @@ const props = defineProps(['isHotTopic'])
 
 const isHotTopic = props.isHotTopic
 
-if (isHotTopic) {
-}
+let titleName = isHotTopic ? 'hot' : 'new'
 </script>
 
 <template>
   <!-- 侧边栏动态推送今日热度帖子 -->
   <div class="topic-wrap">
     <!-- 今日热度帖子的标题名 -->
-    <div class="title">今日热门话题</div>
+    <!-- 这里调用全局注册的 i18n 函数 $t 对名字进行渲染 -->
+    <div class="title" :class="titleName">
+      {{ $t(`mainPage.asideActive['${titleName}']`) }}
+    </div>
     <!-- 热门帖子的目录 -->
-    <!-- 这里使用了父组件传过来的 isHotTopic 数据， -->
+    <!-- 这里使用了父组件传过来的 isHotTopic 数据 -->
     <template v-for="kun in singleTopic" :key="kun.index">
-      <span class="topic-content" v-if="isHotTopic">
-        <SingleTopic
-          :data="kun.data"
-          :to="{ path: kun.router }"
-          :isHotTopic="isHotTopic"
-        />
+      <span class="topic-content" v-if="isHotTopic" :class="`hot-bg`">
+        <router-link :to="{ path: kun.router }">
+          <SingleTopic :data="kun.data" :isHotTopic="isHotTopic" />
+        </router-link>
       </span>
-      <span class="topic-content" v-if="!isHotTopic">
-        <SingleTopic
-          :data="kun.data"
-          :to="{ path: kun.router }"
-          :isHotTopic="isHotTopic"
-        />
+      <span class="topic-content" v-if="!isHotTopic" :class="`new-bg`">
+        <router-link :to="{ path: kun.router }">
+          <SingleTopic :data="kun.data" :isHotTopic="isHotTopic" />
+        </router-link>
       </span>
     </template>
   </div>
 </template>
 
 <style lang="scss" scoped>
-$hot-color: $kungalgame-trans-pink-1;
-$new-color: $kungalgame-trans-blue-1;
-// $color: v-bind(topicColor);
 /* 侧边栏动态推送帖子的总容器 */
 .topic-wrap {
   width: 100%;
@@ -55,8 +50,6 @@ $new-color: $kungalgame-trans-blue-1;
 /* 标题六个字的样式 */
 .title {
   height: 100%;
-  border: 3px dashed $kungalgame-trans-blue-1;
-  border-bottom: none;
   /* 设置（今日热门话题）居中 */
   display: flex;
   justify-content: center;
@@ -69,9 +62,28 @@ $new-color: $kungalgame-trans-blue-1;
 /* 展示热门帖子的区域 */
 .topic-content {
   height: 100%;
-  background-color: $kungalgame-trans-blue-1;
+
   /* 热门帖子标题部分为弹性盒 */
   display: flex;
   flex-direction: column;
+  a {
+    display: block;
+    height: 100%;
+    width: 100%;
+  }
+}
+.hot {
+  border: 3px dashed $kungalgame-trans-blue-1;
+  border-bottom: none;
+}
+.new {
+  border: 3px dashed $kungalgame-trans-pink-1;
+  border-bottom: none;
+}
+.hot-bg {
+  background-color: $kungalgame-trans-blue-1;
+}
+.new-bg {
+  background-color: $kungalgame-trans-pink-1;
 }
 </style>
diff --git a/src/views/Home/content/aside/topic/components/SingleTopic.vue b/src/views/Home/content/aside/topic/components/SingleTopic.vue
index b546504e..16ba72a4 100644
--- a/src/views/Home/content/aside/topic/components/SingleTopic.vue
+++ b/src/views/Home/content/aside/topic/components/SingleTopic.vue
@@ -12,14 +12,14 @@ const isHotTopic = props.isHotTopic
     <!-- 热门帖子的标题 -->
     <div class="title">{{ title }}</div>
     <!-- 热门帖子的热度值 -->
-    <div class="new" v-if="isHotTopic">
+    <div class="new" v-if="!isHotTopic">
       <Icon icon="svg-spinners:clock" />
-      <span>{{ value }}</span>
-    </div>
-    <div class="hot" v-if="!isHotTopic">
-      <Icon icon="bi:fire" />
       <span>{{ time }}</span>
     </div>
+    <div class="hot" v-if="isHotTopic">
+      <Icon icon="bi:fire" />
+      <span>{{ value }}</span>
+    </div>
   </div>
 </template>
 
@@ -36,11 +36,10 @@ const isHotTopic = props.isHotTopic
   cursor: pointer;
   /* 单个新帖子的 hover */
   &:hover {
-    box-shadow: -2px -2px 5px $kungalgame-white, 2px 2px 5px $kungalgame-gray-3;
+    box-shadow: $kungalgame-shadow-1;
   }
   &:active {
-    box-shadow: inset 1px 1px 2px $kungalgame-gray-3,
-      inset -1px -1px 2px $kungalgame-white;
+    box-shadow: $kungalgame-shadow-2;
   }
 }
 /* 单个帖子的标题样式 */
diff --git a/src/views/contacts/Contacts.vue b/src/views/contacts/Contacts.vue
index 91a0a6ce..11386924 100644
--- a/src/views/contacts/Contacts.vue
+++ b/src/views/contacts/Contacts.vue
@@ -1,10 +1,6 @@
 <script setup lang="ts">
-import { Icon } from '@iconify/vue'
-import router from '@/router'
-
-const handleClick = () => {
-  router.push('/')
-}
+// Vue 中不允许在 template 中用 '<' 这个符号，换成 msg
+const msg = '< 返回主页'
 </script>
 
 <template>
@@ -32,11 +28,12 @@ const handleClick = () => {
           <i class="fa-brands fa-bilibili"></i>
         </div>
       </div>
-      <!-- 返回主页 -->
-      <div class="return" @click="handleClick">
-        <!-- 这里 Vue 不让用 < 这个符号，换成图标字体 -->
-        <span><Icon icon="line-md:arrow-small-left" />返回主页</span>
-      </div>
+      <router-link to="/">
+        <!-- 返回主页 -->
+        <div class="return">
+          <span>{{ msg }}</span>
+        </div>
+      </router-link>
       <!-- 版权 -->
       <div class="copyright">
         <span>Copyright © 2023 KUNgalgame</span>
diff --git a/src/views/rank/Rank.vue b/src/views/rank/Rank.vue
index a21b8e8c..77105bd1 100644
--- a/src/views/rank/Rank.vue
+++ b/src/views/rank/Rank.vue
@@ -942,7 +942,7 @@ import KUNGalgameTopBar from '@/components/KUNGalgameTopBar.vue'
   height: 100vh;
   display: flex;
   flex-direction: column;
-  background-image: url(../img/bg/bg1.png);
+  background-image: url('@/assets/images/bg/bg5.png');
   /* background-image: url(./img/bg/bg2.png; */
   background-repeat: no-repeat;
   background-position: center;