From d5daa2a74d4c8317ce56b57760210cbee6446fb9 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 22 Mar 2023 02:10:26 +0800
Subject: [PATCH] fix: some style bugs * i18n: change the naming convention of
 keys * refactor(BewSelect):  using composition api

---
 src/_locales/cmn-CN.yml                  |  4 +-
 src/_locales/cmn-TW.yml                  |  4 +-
 src/_locales/en.yml                      |  4 +-
 src/_locales/jyut.yml                    |  4 +-
 src/components/BewSelect.vue             | 87 +++++++++++-------------
 src/components/Settings.vue              |  4 +-
 src/contentScripts/views/Anime/Anime.vue |  3 +-
 src/contentScripts/views/App.vue         |  4 +-
 8 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml
index f9c62f1b..c2e51a90 100644
--- a/src/_locales/cmn-CN.yml
+++ b/src/_locales/cmn-CN.yml
@@ -15,8 +15,8 @@ settings:
   select_language: 界面语文
   select_language_opt:
     english: 英文
-    Mandarin_CN: 官话
-    Mandarin_TW: 官話
+    mandarin_cn: 官话
+    mandarin_tw: 官話
     jyut: 廣東話
   authorize_app: 授权 BewlyBewly 使用 access key
   authorize_app_desc: |
diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml
index c2f0d4c5..16dd1b54 100644
--- a/src/_locales/cmn-TW.yml
+++ b/src/_locales/cmn-TW.yml
@@ -15,8 +15,8 @@ settings:
   select_language: 介面語文
   select_language_opt:
     english: 英文
-    Mandarin_CN: 官话
-    Mandarin_TW: 官話
+    mandarin_cn: 官话
+    mandarin_tw: 官話
     jyut: 廣東話
   authorize_app: 授權 BewlyBewly 使用 access key
   authorize_app_desc: |
diff --git a/src/_locales/en.yml b/src/_locales/en.yml
index 4ef1f0e6..c416d4bd 100644
--- a/src/_locales/en.yml
+++ b/src/_locales/en.yml
@@ -15,8 +15,8 @@ settings:
   select_language: Language
   select_language_opt:
     english: English
-    Mandarin_CN: Mandarin (Simplified Chinese)
-    Mandarin_TW: Mandarin (Traditional Chinese)
+    mandarin_cn: Mandarin - Simplified Chinese
+    mandarin_tw: Mandarin - Traditional Chinese
     jyut: Cantonese
   authorize_app: Authorize BewlyBewly to use access key
   authorize_app_desc: >
diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml
index 9ef9c0aa..9e97d28b 100644
--- a/src/_locales/jyut.yml
+++ b/src/_locales/jyut.yml
@@ -15,8 +15,8 @@ settings:
   select_language: 介面語文
   select_language_opt:
     english: 英文
-    Mandarin_CN: 官话
-    Mandarin_TW: 官話
+    mandarin_cn: 官话
+    mandarin_tw: 官話
     jyut: 廣東話
   authorize_app: 授權 BewlyBewly 使用 access key
   authorize_app_desc: |
diff --git a/src/components/BewSelect.vue b/src/components/BewSelect.vue
index 866cf054..f892c0b0 100644
--- a/src/components/BewSelect.vue
+++ b/src/components/BewSelect.vue
@@ -1,56 +1,51 @@
-<script lang="ts">
-// TODO: refactor to composition api
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
 
-// import { useI18n } from 'vue-i18n'
-// const { locale } = useI18n()
+const props = defineProps<{
+  options: OptionType[]
+  modelValue: string
+}>()
+
+const emit = defineEmits(['update:modelValue'])
+
+const { locale } = useI18n()
 
 interface OptionType {
   value: string
   label: string
 }
 
-export default defineComponent({
-  props: {
-    modelValue: String,
-    options: Array as () => OptionType[],
-  },
-  emits: ['update:modelValue'],
-  data() {
-    return {
-      label: '' as string,
-      showOptions: false as boolean,
-    }
-  },
-  // watch: {
-  //   locale(newValue) {
-  //     console.log(newValue)
-  //     this.$forceUpdate()
-  //   },
-  // },
-  created() {
-    if (!this.options)
-      return
-    this.label = `${this.options.find((item: OptionType) => item.value === this.modelValue)?.label}`
-  },
-  methods: {
-    onClickOption(val: { value: string; label: string }) {
-      window.removeEventListener('click', () => {})
-      this.label = val.label
-      this.$emit('update:modelValue', val.value)
-      this.showOptions = false
-    },
-    closeOptions() {
-      this.showOptions = false
-    },
-    /** when you click on it outside, the selection option will be turned off  */
-    onMouseLeave() {
-      window.addEventListener('click', this.closeOptions)
-    },
-    onMouseEnter() {
-      window.removeEventListener('click', this.closeOptions)
-    },
-  },
+const label = ref<string>('')
+const showOptions = ref<boolean>(false)
+
+watch(() => locale.value, (newValue, oldValue) => {
+
 })
+
+onMounted(() => {
+  if (props.options)
+    label.value = `${props.options.find((item: OptionType) => item.value === props.modelValue)?.label}`
+})
+
+function onClickOption(val: { value: string; label: string }) {
+  window.removeEventListener('click', () => {})
+  label.value = val.label
+  emit('update:modelValue', val.value)
+  showOptions.value = false
+}
+
+function closeOptions() {
+  showOptions.value = false
+}
+
+/** when you click on it outside, the selection option will be turned off  */
+function onMouseLeave() {
+  window.addEventListener('click', closeOptions)
+}
+
+function onMouseEnter() {
+  window.removeEventListener('click', closeOptions)
+}
 </script>
 
 <template>
@@ -72,7 +67,7 @@ export default defineComponent({
       @click="showOptions = !showOptions"
     >
       <div
-        text="space-nowrap overflow-ellipsis"
+        truncate
         overflow="hidden"
         m="r-2"
       >
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index a6526beb..b465fc10 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -19,11 +19,11 @@ const langs = computed(() => {
     },
     {
       value: 'cmn-CN',
-      label: t('settings.select_language_opt.Mandarin_CN'),
+      label: t('settings.select_language_opt.mandarin_cn'),
     },
     {
       value: 'cmn-TW',
-      label: t('settings.select_language_opt.Mandarin_TW'),
+      label: t('settings.select_language_opt.mandarin_tw'),
     },
     {
       value: 'jyut',
diff --git a/src/contentScripts/views/Anime/Anime.vue b/src/contentScripts/views/Anime/Anime.vue
index 5079409f..4089eaa0 100644
--- a/src/contentScripts/views/Anime/Anime.vue
+++ b/src/contentScripts/views/Anime/Anime.vue
@@ -334,6 +334,8 @@ function getPopularAnimeList() {
                   aspect="12/16"
                   transition="all duration-300"
                   bg="cover center"
+                  relative
+                  z-1
                   :style="{
                     backgroundImage: `url(${removeHttpFromUrl(
                       item.cover,
@@ -350,7 +352,6 @@ function getPopularAnimeList() {
                   transition="all duration-1000"
                   bg="cover center"
                   pos="absolute top-0 left-0"
-                  z--1
                   :style="{
                     backgroundImage: `url(${removeHttpFromUrl(
                       item.hover.img,
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 92e6ded9..b44b6d24 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -37,7 +37,9 @@ const mainApp = ref<HTMLElement>()
 watch(
   () => activatedPage.value,
   (newValue, oldValue) => {
-    window.scrollTo({ top: 0, behavior: 'smooth' })
+    setTimeout(() => {
+      window.scrollTo(0, 0)
+    }, 500)
   },
 )