Merge pull request #71 from HoraceHuang-ui/horace_dev

Horace dev
HoraceHuang-ui · Mar 12, 2024 · 33bdb4f · 33bdb4f
2 parents 7652f55 + 0fa3353
commit 33bdb4f
Show file tree

Hide file tree

Showing 46 changed files with 197 additions and 1,083 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -137,3 +137,9 @@ const needsUpdate = (latestStr: string) => {
   <TopHeader />
   <router-view></router-view>
 </template>
+
+<style>
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+</style>
diff --git a/src/components/CustomSwitch.vue b/src/components/CustomSwitch.vue
@@ -25,8 +25,4 @@ const valueChange = () => {
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/CustomUIDInput.vue b/src/components/CustomUIDInput.vue
@@ -25,8 +25,4 @@ defineEmits(['submit', 'update:modelValue'])
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/DialogListItem.vue b/src/components/DialogListItem.vue
@@ -18,8 +18,4 @@ const props = defineProps({
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/LauncherBanner.vue b/src/components/LauncherBanner.vue
@@ -27,8 +27,4 @@ const openLink = (url: string) => {
   </MyCarousel>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/LauncherPosts.vue b/src/components/LauncherPosts.vue
@@ -46,10 +46,6 @@ const openLink = (url: string) => {
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .truncated {
   @apply inline-block max-w-full overflow-ellipsis whitespace-nowrap overflow-hidden;
 }

diff --git a/src/components/LoadFailedBlock.vue b/src/components/LoadFailedBlock.vue
@@ -58,8 +58,4 @@ const refresh = () => {
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/LoadingIcon.vue b/src/components/LoadingIcon.vue
@@ -16,10 +16,6 @@ defineProps({
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .icon-loading {
   animation: 1s linear 0s infinite running rotate;
 }

diff --git a/src/components/MyCarousel.vue b/src/components/MyCarousel.vue
@@ -248,10 +248,6 @@ defineExpose({
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .indicator-selected {
   @apply w-7 bg-white;
 }

diff --git a/src/components/MyCheckbox.vue b/src/components/MyCheckbox.vue
@@ -37,8 +37,4 @@ const switchStatus = () => {
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/MyDropdown.vue b/src/components/MyDropdown.vue
@@ -114,10 +114,6 @@ const onMouseLeave = () => {
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .fade-enter-from,
 .fade-leave-to {
   opacity: 0;

diff --git a/src/components/MyTabs.vue b/src/components/MyTabs.vue
@@ -54,10 +54,6 @@ const selectTab = (idx: number) => {
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .tab-selected {
   @apply text-white bg-blue-600 cursor-default;
 }

diff --git a/src/components/MyTag.vue b/src/components/MyTag.vue
@@ -20,8 +20,4 @@ defineProps({
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/components/MyTooltip.vue b/src/components/MyTooltip.vue
@@ -89,10 +89,6 @@ const onMouseLeave = () => {
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .fade-enter-from,
 .fade-leave-to {
   opacity: 0;

diff --git a/src/components/ScrollWrapper.vue b/src/components/ScrollWrapper.vue
@@ -242,10 +242,6 @@ defineExpose({
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 ::-webkit-scrollbar {
   width: 0 !important;
 }

diff --git a/src/components/TemplateDialog.vue b/src/components/TemplateDialog.vue
@@ -60,10 +60,6 @@ defineExpose({
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .v-enter-active .outer {
   transition: opacity 0.5s ease;
 }

diff --git a/src/components/TopHeader.vue b/src/components/TopHeader.vue
@@ -22,15 +22,30 @@ const home = () => {
 }
 const genshin = () => {
   selection.value = 1
-  router.push('/gspage')
+  router.push({
+    name: 'tempPage',
+    query: {
+      from: 'gs',
+    },
+  })
 }
 const starRail = () => {
   selection.value = 2
-  router.push('/srpage')
+  router.push({
+    name: 'tempPage',
+    query: {
+      from: 'sr',
+    },
+  })
 }
 const honkai3 = () => {
   selection.value = 3
-  router.push('/hipage')
+  router.push({
+    name: 'tempPage',
+    query: {
+      from: 'hi3',
+    },
+  })
 }
 const settings = () => {
   selection.value = 4
@@ -116,10 +131,6 @@ const winMin = () => {
 </template>
 
 <style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
 .drag {
   -webkit-app-region: drag;
 }

diff --git a/src/components/UpdateDialogContent.vue b/src/components/UpdateDialogContent.vue
@@ -84,8 +84,4 @@ const offColor = computed(() => {
   </div>
 </template>
 
-<style scoped>
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-</style>
+<style scoped></style>
diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "Image",
   "mainpage_title": "miHoYo miXeD Launcher",
   "mainpage_buttonText": "Launch {game}",
-  "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=en-us&launcher_id=10",
+  "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=en-us&launcher_id=10",
   "gs_enkaLangCode": "en",
   "gs_emptyPlayerTip": "Player details will be displayed here",
   "gs_showcaseTip": "Player details unavailable, please enable 'Show Character Details' in game and try again.",

diff --git a/src/i18n/fr_FR.json b/src/i18n/fr_FR.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "Image",
   "mainpage_title": "miHoYo miXeD Launcher",
   "mainpage_buttonText": "Lancer {game}",
-  "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=fr-fr&launcher_id=10",
+  "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=fr-fr&launcher_id=10",
   "gs_enkaLangCode": "fr",
   "gs_emptyPlayerTip": "Les détails du joueur s'afficheront ici",
   "gs_showcaseTip": "Les détails du joueur ne sont pas disponibles, veuillez activer 'Afficher les détails du personnage' dans le jeu et réessayez.",

diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "画像",
   "mainpage_title": "miHoYo miXeD ランチャー",
   "mainpage_buttonText": "{game}を起動！",
-  "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ja-jp&launcher_id=10",
+  "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ja-jp&launcher_id=10",
   "gs_enkaLangCode": "ja",
   "gs_emptyPlayerTip": "キャラの詳細がここに表示されます",
   "gs_showcaseTip": "キャラの詳細情報が利用できません。ゲーム内で「キャラクターの詳細を表示」を有効にして、もう一度お試しください。",

diff --git a/src/i18n/ru_RU.json b/src/i18n/ru_RU.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "Изображение",
   "mainpage_title": "Запуск miHoYo miXeD",
   "mainpage_buttonText": "Запустить {game}",
-  "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ru-ru&launcher_id=10",
+  "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=ru-ru&launcher_id=10",
   "gs_enkaLangCode": "ru",
   "gs_emptyPlayerTip": "Информация о игроке будет отображена здесь",
   "gs_showcaseTip": "Информация о игроке недоступна. Включите 'Отображение деталей персонажей' в игре и попробуйте снова.",

diff --git a/src/i18n/zh_CN.json b/src/i18n/zh_CN.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "图片",
   "mainpage_title": "米哈游聚合启动器",
   "mainpage_buttonText": "{game}启动",
-  "genshin_launcherContentsUrl": "https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/content?filter_adv=false&key=eYd89JmJ&language=zh-cn&launcher_id=18",
+  "gs_launcherContentsUrl": "https://sdk-static.mihoyo.com/hk4e_cn/mdk/launcher/api/content?filter_adv=false&key=eYd89JmJ&language=zh-cn&launcher_id=18",
   "gs_enkaLangCode": "chs",
   "gs_emptyPlayerTip": "此处将显示角色的详细信息",
   "gs_showcaseTip": "当前暂无详细信息，请在游戏内打开“显示角色详情”后再试。",

diff --git a/src/i18n/zh_TW.json b/src/i18n/zh_TW.json
@@ -48,7 +48,7 @@
   "mainBgDialog_filter": "圖片",
   "mainpage_title": "米哈游聚合啓動器",
   "mainpage_buttonText": "{game}啓動",
-  "genshin_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=zh-tw&launcher_id=10",
+  "gs_launcherContentsUrl": "https://sdk-os-static.mihoyo.com/hk4e_global/mdk/launcher/api/content?filter_adv=false&key=gcStgarh&language=zh-tw&launcher_id=10",
   "gs_enkaLangCode": "cht",
   "gs_emptyPlayerTip": "此處將顯示角色的詳細信息",
   "gs_showcaseTip": "當前暫無詳細信息，請在游戲内打開”顯示角色詳情“后再試。",