From 21fb19fc893153dd870b563dfe874998fea940ca Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Thu, 28 Dec 2023 01:08:51 +0800
Subject: [PATCH] refactor: move contents from the src/models/apiModels to
 parent directory

---
 src/components/VideoCard/VideoCard.vue              |  2 +-
 src/contentScripts/views/Anime/Anime.vue            |  7 +++----
 src/contentScripts/views/Favorites/Favorites.vue    |  4 ++--
 src/contentScripts/views/History/History.vue        | 13 +++----------
 .../views/Home/components/Following.vue             |  3 +--
 src/contentScripts/views/Home/components/ForYou.vue |  4 ++--
 .../views/Home/components/Ranking.vue               |  5 ++---
 .../views/Home/components/SubscribedSeries.vue      |  2 +-
 .../views/Home/components/Trending.vue              |  3 +--
 src/contentScripts/views/WatchLater/WatchLater.vue  |  2 +-
 src/models/{apiModels => }/anime/popular.ts         |  0
 src/models/{apiModels => }/anime/recommendation.ts  |  0
 src/models/{apiModels => }/anime/timeTable.ts       |  0
 src/models/{apiModels => }/anime/watchList.ts       |  0
 src/models/{apiModels => }/moment/moment.ts         |  0
 src/models/{apiModels => }/video/appForYou.ts       |  0
 src/models/{apiModels => }/video/favorite.ts        |  0
 .../{apiModels => }/video/favoriteCategory.ts       |  0
 src/models/{apiModels => }/video/forYou.ts          |  0
 src/models/{apiModels => }/video/history.ts         |  0
 src/models/{apiModels => }/video/historySearch.ts   |  0
 src/models/{apiModels => }/video/ranking.ts         |  0
 src/models/{apiModels => }/video/rankingPgc.ts      |  0
 src/models/{apiModels => }/video/trending.ts        |  0
 src/models/{apiModels => }/video/videoPreview.ts    |  0
 src/models/{apiModels => }/video/watchLater.ts      |  0
 26 files changed, 17 insertions(+), 28 deletions(-)
 rename src/models/{apiModels => }/anime/popular.ts (100%)
 rename src/models/{apiModels => }/anime/recommendation.ts (100%)
 rename src/models/{apiModels => }/anime/timeTable.ts (100%)
 rename src/models/{apiModels => }/anime/watchList.ts (100%)
 rename src/models/{apiModels => }/moment/moment.ts (100%)
 rename src/models/{apiModels => }/video/appForYou.ts (100%)
 rename src/models/{apiModels => }/video/favorite.ts (100%)
 rename src/models/{apiModels => }/video/favoriteCategory.ts (100%)
 rename src/models/{apiModels => }/video/forYou.ts (100%)
 rename src/models/{apiModels => }/video/history.ts (100%)
 rename src/models/{apiModels => }/video/historySearch.ts (100%)
 rename src/models/{apiModels => }/video/ranking.ts (100%)
 rename src/models/{apiModels => }/video/rankingPgc.ts (100%)
 rename src/models/{apiModels => }/video/trending.ts (100%)
 rename src/models/{apiModels => }/video/videoPreview.ts (100%)
 rename src/models/{apiModels => }/video/watchLater.ts (100%)

diff --git a/src/components/VideoCard/VideoCard.vue b/src/components/VideoCard/VideoCard.vue
index b88acd29..3fab224b 100644
--- a/src/components/VideoCard/VideoCard.vue
+++ b/src/components/VideoCard/VideoCard.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { getCSRF, removeHttpFromUrl } from '~/utils/main'
 import { calcCurrentTime, calcTimeSince, numFormatter } from '~/utils/dataFormatter'
-import type { VideoPreviewResult } from '~/models/apiModels/video/videoPreview'
+import type { VideoPreviewResult } from '~/models/video/videoPreview'
 import { settings } from '~/logic'
 
 interface Props {
diff --git a/src/contentScripts/views/Anime/Anime.vue b/src/contentScripts/views/Anime/Anime.vue
index 88e27b28..ab0ec36f 100644
--- a/src/contentScripts/views/Anime/Anime.vue
+++ b/src/contentScripts/views/Anime/Anime.vue
@@ -3,9 +3,9 @@ import AnimeTimeTable from './components/AnimeTimeTable.vue'
 import { getUserID, openLinkToNewTab } from '~/utils/main'
 import { numFormatter } from '~/utils/dataFormatter'
 import emitter from '~/utils/mitt'
-import type { List as WatchListItem, WatchListResult } from '~/models/apiModels/anime/watchList'
-import type { List as PopularAnimeItem, PopularAnimeResult } from '~/models/apiModels/anime/popular'
-import type { ItemSubItem as RecommendationItem, RecommendationResult } from '~/models/apiModels/anime/recommendation'
+import type { List as WatchListItem, WatchListResult } from '~/models/anime/watchList'
+import type { List as PopularAnimeItem, PopularAnimeResult } from '~/models/anime/popular'
+import type { ItemSubItem as RecommendationItem, RecommendationResult } from '~/models/anime/recommendation'
 
 const animeWatchList = reactive<WatchListItem[]>([])
 const recommendAnimeList = reactive<RecommendationItem[]>([])
@@ -256,4 +256,3 @@ function getPopularAnimeList() {
   --at-apply: mb-8 mt-14 first:mt-0;
 }
 </style>
-~/models/apiModels/anime/watchList
diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue
index b69a8d88..b80380f7 100644
--- a/src/contentScripts/views/Favorites/Favorites.vue
+++ b/src/contentScripts/views/Favorites/Favorites.vue
@@ -4,8 +4,8 @@ import { getCSRF, getUserID, openLinkToNewTab, removeHttpFromUrl } from '~/utils
 import type { FavoriteCategory, FavoriteResource } from '~/components/Topbar/types'
 import emitter from '~/utils/mitt'
 import { settings } from '~/logic'
-import type { Media as FavoriteItem, FavoritesResult } from '~/models/apiModels/video/favorite'
-import type { List as CategoryItem, FavoritesCategoryResult } from '~/models/apiModels/video/favoriteCategory'
+import type { Media as FavoriteItem, FavoritesResult } from '~/models/video/favorite'
+import type { List as CategoryItem, FavoritesCategoryResult } from '~/models/video/favoriteCategory'
 
 const { t } = useI18n()
 
diff --git a/src/contentScripts/views/History/History.vue b/src/contentScripts/views/History/History.vue
index 56f2a842..50c9020a 100644
--- a/src/contentScripts/views/History/History.vue
+++ b/src/contentScripts/views/History/History.vue
@@ -6,9 +6,9 @@ import { useI18n } from 'vue-i18n'
 import { getCSRF, openLinkToNewTab, removeHttpFromUrl } from '~/utils/main'
 import { calcCurrentTime } from '~/utils/dataFormatter'
 import emitter from '~/utils/mitt'
-import { Business } from '~/models/apiModels/video/history'
-import type { List as HistoryItem, HistoryResult } from '~/models/apiModels/video/history'
-import type { List as HistorySearchItem, HistorySearchResult } from '~/models/apiModels/video/historySearch'
+import { Business } from '~/models/video/history'
+import type { List as HistoryItem, HistoryResult } from '~/models/video/history'
+import type { List as HistorySearchItem, HistorySearchResult } from '~/models/video/historySearch'
 
 const { t } = useI18n()
 
@@ -350,13 +350,6 @@ function jumpToLoginPage() {
                 >
                   Livestreaming
                 </template>
-                <template
-                  v-else-if="
-                    historyItem.history.business === HistoryBusiness.ARCHIVE
-                  "
-                >
-                  Article
-                </template>
                 <template
                   v-else-if="historyItem.history.business === HistoryBusiness.PGC"
                 >
diff --git a/src/contentScripts/views/Home/components/Following.vue b/src/contentScripts/views/Home/components/Following.vue
index f0d98ebd..45201fc1 100644
--- a/src/contentScripts/views/Home/components/Following.vue
+++ b/src/contentScripts/views/Home/components/Following.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Ref } from 'vue'
-import type { DataItem as MomentItem, MomentResult } from '~/models/apiModels/moment/moment'
+import type { DataItem as MomentItem, MomentResult } from '~/models/moment/moment'
 import emitter from '~/utils/mitt'
 
 const videoList = reactive<MomentItem[]>([])
@@ -124,4 +124,3 @@ function jumpToLoginPage() {
 
 <style lang="scss" scoped>
 </style>
-~/models/apiModels/moment/momentResult
diff --git a/src/contentScripts/views/Home/components/ForYou.vue b/src/contentScripts/views/Home/components/ForYou.vue
index 4776c8b8..a4a087fd 100644
--- a/src/contentScripts/views/Home/components/ForYou.vue
+++ b/src/contentScripts/views/Home/components/ForYou.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Ref } from 'vue'
-import type { AppForYouResult, Item as AppVideoItem } from '~/models/apiModels/video/appForYou'
-import type { Item as VideoItem, forYouResult } from '~/models/apiModels/video/forYou'
+import type { AppForYouResult, Item as AppVideoItem } from '~/models/video/appForYou'
+import type { Item as VideoItem, forYouResult } from '~/models/video/forYou'
 import emitter from '~/utils/mitt'
 import { accessKey, settings } from '~/logic'
 import { LanguageType } from '~/enums/appEnums'
diff --git a/src/contentScripts/views/Home/components/Ranking.vue b/src/contentScripts/views/Home/components/Ranking.vue
index ae50d809..14c441c6 100644
--- a/src/contentScripts/views/Home/components/Ranking.vue
+++ b/src/contentScripts/views/Home/components/Ranking.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
 import type { RankingType } from '../types'
-import type { RankingResult, List as RankingVideoItem } from '~/models/apiModels/video/ranking'
-import type { List as RankingPgcItem, RankingPgcResult } from '~/models/apiModels/video/rankingPgc'
+import type { RankingResult, List as RankingVideoItem } from '~/models/video/ranking'
+import type { List as RankingPgcItem, RankingPgcResult } from '~/models/video/rankingPgc'
 import { settings } from '~/logic'
 import emitter from '~/utils/mitt'
 
@@ -195,4 +195,3 @@ function getRankingPgc() {
   --at-apply: h-[calc(100vh-70)] translate-y--70px;
 }
 </style>
-~/models/apiModels/video/ranking
diff --git a/src/contentScripts/views/Home/components/SubscribedSeries.vue b/src/contentScripts/views/Home/components/SubscribedSeries.vue
index 70b973a9..a16c9373 100644
--- a/src/contentScripts/views/Home/components/SubscribedSeries.vue
+++ b/src/contentScripts/views/Home/components/SubscribedSeries.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Ref } from 'vue'
-import type { DataItem as MomentItem, MomentResult } from '~/models/apiModels/moment/moment'
+import type { DataItem as MomentItem, MomentResult } from '~/models/moment/moment'
 import emitter from '~/utils/mitt'
 
 const momentList = reactive<MomentItem[]>([])
diff --git a/src/contentScripts/views/Home/components/Trending.vue b/src/contentScripts/views/Home/components/Trending.vue
index 53af54b6..7bc87719 100644
--- a/src/contentScripts/views/Home/components/Trending.vue
+++ b/src/contentScripts/views/Home/components/Trending.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Ref } from 'vue'
-import type { TrendingResult, List as VideoItem } from '~/models/apiModels/video/trending'
+import type { TrendingResult, List as VideoItem } from '~/models/video/trending'
 import emitter from '~/utils/mitt'
 
 const videoList = reactive<VideoItem[]>([])
@@ -97,4 +97,3 @@ async function getTrendingVideos() {
 
 <style lang="scss" scoped>
 </style>
-~/models/apiModels/video/trendingResult
diff --git a/src/contentScripts/views/WatchLater/WatchLater.vue b/src/contentScripts/views/WatchLater/WatchLater.vue
index 555ab5e0..57d516db 100644
--- a/src/contentScripts/views/WatchLater/WatchLater.vue
+++ b/src/contentScripts/views/WatchLater/WatchLater.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'
 import { getCSRF, openLinkToNewTab, removeHttpFromUrl } from '~/utils/main'
 import { calcCurrentTime } from '~/utils/dataFormatter'
 import emitter from '~/utils/mitt'
-import type { List as VideoItem, WatchLaterResult } from '~/models/apiModels/video/watchLater'
+import type { List as VideoItem, WatchLaterResult } from '~/models/video/watchLater'
 
 const { t } = useI18n()
 
diff --git a/src/models/apiModels/anime/popular.ts b/src/models/anime/popular.ts
similarity index 100%
rename from src/models/apiModels/anime/popular.ts
rename to src/models/anime/popular.ts
diff --git a/src/models/apiModels/anime/recommendation.ts b/src/models/anime/recommendation.ts
similarity index 100%
rename from src/models/apiModels/anime/recommendation.ts
rename to src/models/anime/recommendation.ts
diff --git a/src/models/apiModels/anime/timeTable.ts b/src/models/anime/timeTable.ts
similarity index 100%
rename from src/models/apiModels/anime/timeTable.ts
rename to src/models/anime/timeTable.ts
diff --git a/src/models/apiModels/anime/watchList.ts b/src/models/anime/watchList.ts
similarity index 100%
rename from src/models/apiModels/anime/watchList.ts
rename to src/models/anime/watchList.ts
diff --git a/src/models/apiModels/moment/moment.ts b/src/models/moment/moment.ts
similarity index 100%
rename from src/models/apiModels/moment/moment.ts
rename to src/models/moment/moment.ts
diff --git a/src/models/apiModels/video/appForYou.ts b/src/models/video/appForYou.ts
similarity index 100%
rename from src/models/apiModels/video/appForYou.ts
rename to src/models/video/appForYou.ts
diff --git a/src/models/apiModels/video/favorite.ts b/src/models/video/favorite.ts
similarity index 100%
rename from src/models/apiModels/video/favorite.ts
rename to src/models/video/favorite.ts
diff --git a/src/models/apiModels/video/favoriteCategory.ts b/src/models/video/favoriteCategory.ts
similarity index 100%
rename from src/models/apiModels/video/favoriteCategory.ts
rename to src/models/video/favoriteCategory.ts
diff --git a/src/models/apiModels/video/forYou.ts b/src/models/video/forYou.ts
similarity index 100%
rename from src/models/apiModels/video/forYou.ts
rename to src/models/video/forYou.ts
diff --git a/src/models/apiModels/video/history.ts b/src/models/video/history.ts
similarity index 100%
rename from src/models/apiModels/video/history.ts
rename to src/models/video/history.ts
diff --git a/src/models/apiModels/video/historySearch.ts b/src/models/video/historySearch.ts
similarity index 100%
rename from src/models/apiModels/video/historySearch.ts
rename to src/models/video/historySearch.ts
diff --git a/src/models/apiModels/video/ranking.ts b/src/models/video/ranking.ts
similarity index 100%
rename from src/models/apiModels/video/ranking.ts
rename to src/models/video/ranking.ts
diff --git a/src/models/apiModels/video/rankingPgc.ts b/src/models/video/rankingPgc.ts
similarity index 100%
rename from src/models/apiModels/video/rankingPgc.ts
rename to src/models/video/rankingPgc.ts
diff --git a/src/models/apiModels/video/trending.ts b/src/models/video/trending.ts
similarity index 100%
rename from src/models/apiModels/video/trending.ts
rename to src/models/video/trending.ts
diff --git a/src/models/apiModels/video/videoPreview.ts b/src/models/video/videoPreview.ts
similarity index 100%
rename from src/models/apiModels/video/videoPreview.ts
rename to src/models/video/videoPreview.ts
diff --git a/src/models/apiModels/video/watchLater.ts b/src/models/video/watchLater.ts
similarity index 100%
rename from src/models/apiModels/video/watchLater.ts
rename to src/models/video/watchLater.ts