From aa7d46effc6276011daa29845b84845699718e92 Mon Sep 17 00:00:00 2001
From: xuyue <517252939@qq.com>
Date: Tue, 21 Nov 2023 23:06:57 +0800
Subject: [PATCH] remove shared components.

---
 package.json                                        |  2 +-
 src/admin/contest/detail.vue                        |  2 +-
 src/admin/contest/list.vue                          |  6 +++---
 src/admin/problem/components/Modal.vue              |  2 +-
 src/admin/problem/detail.vue                        |  4 ++--
 src/admin/problem/list.vue                          |  2 +-
 src/admin/user/list.vue                             |  2 +-
 src/components.d.ts                                 |  1 -
 src/learn/index.vue                                 |  2 +-
 src/oj/contest/components/ContestInfo.vue           |  2 +-
 src/oj/contest/detail.vue                           |  3 ++-
 src/oj/contest/list.vue                             |  4 ++--
 src/oj/contest/pages/rank.vue                       |  2 +-
 src/oj/problem/components/Editor.vue                |  2 +-
 src/oj/problem/components/ProblemContent.vue        |  2 +-
 src/oj/problem/components/ProblemSubmission.vue     |  4 ++--
 src/oj/problem/components/Submit.vue                |  2 +-
 src/oj/problem/list.vue                             |  2 +-
 src/oj/rank/list.vue                                |  2 +-
 src/oj/submission/detail.vue                        |  2 +-
 src/oj/submission/list.vue                          |  4 ++--
 src/shared/{ => components}/CodeEditor.vue          |  6 +++---
 src/shared/{ => components}/ContestTitle.vue        |  0
 src/shared/{ => components}/ContestType.vue         |  0
 src/shared/{ => components}/Copy.vue                |  0
 src/shared/{ => components}/Header.vue              |  6 +++---
 src/shared/{ => components}/Login.vue               |  6 +++---
 src/shared/{ => components}/Pagination.vue          |  0
 src/shared/{ => components}/Signup.vue              |  6 +++---
 src/shared/{ => components}/SubmissionResultTag.vue |  0
 src/shared/{ => components}/TextEditor.vue          |  2 +-
 src/shared/icons/Lock.vue                           | 10 ++++++++++
 src/shared/layout/default.vue                       |  6 +++---
 33 files changed, 53 insertions(+), 43 deletions(-)
 rename src/shared/{ => components}/CodeEditor.vue (91%)
 rename src/shared/{ => components}/ContestTitle.vue (100%)
 rename src/shared/{ => components}/ContestType.vue (100%)
 rename src/shared/{ => components}/Copy.vue (100%)
 rename src/shared/{ => components}/Header.vue (97%)
 rename src/shared/{ => components}/Login.vue (93%)
 rename src/shared/{ => components}/Pagination.vue (100%)
 rename src/shared/{ => components}/Signup.vue (96%)
 rename src/shared/{ => components}/SubmissionResultTag.vue (100%)
 rename src/shared/{ => components}/TextEditor.vue (97%)
 create mode 100644 src/shared/icons/Lock.vue

diff --git a/package.json b/package.json
index 86fb2a7..a5f5016 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,6 @@
     "unplugin-vue-components": "^0.25.2",
     "vite": "^4.4.11",
     "unplugin-vue-markdown": "^0.24.3",
-    "vue-tsc": "^1.8.18"
+    "vue-tsc": "^1.8.22"
   }
 }
diff --git a/src/admin/contest/detail.vue b/src/admin/contest/detail.vue
index 0620a46..8d730b2 100644
--- a/src/admin/contest/detail.vue
+++ b/src/admin/contest/detail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { formatISO } from "date-fns"
-import TextEditor from "~/shared/TextEditor.vue"
+import TextEditor from "~/shared/components/TextEditor.vue"
 import { BlankContest } from "~/utils/types"
 import { createContest, editContest, getContest } from "../api"
 
diff --git a/src/admin/contest/list.vue b/src/admin/contest/list.vue
index f6157b9..751033f 100644
--- a/src/admin/contest/list.vue
+++ b/src/admin/contest/list.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { NSwitch, NTag } from "naive-ui"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { Contest } from "~/utils/types"
 import { getContestList } from "../api"
-import ContestType from "~/shared/ContestType.vue"
-import ContestTitle from "~/shared/ContestTitle.vue"
+import ContestType from "~/shared/components/ContestType.vue"
+import ContestTitle from "~/shared/components/ContestTitle.vue"
 import { CONTEST_STATUS } from "~/utils/constants"
 import Actions from "./components/Actions.vue"
 
diff --git a/src/admin/problem/components/Modal.vue b/src/admin/problem/components/Modal.vue
index 7bb6736..e326d67 100644
--- a/src/admin/problem/components/Modal.vue
+++ b/src/admin/problem/components/Modal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { getProblemList } from "~/admin/api"
 import { AdminProblemFiltered } from "~/utils/types"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import AddButton from "./AddButton.vue"
 
 interface Props {
diff --git a/src/admin/problem/detail.vue b/src/admin/problem/detail.vue
index 996bfd8..abc04e8 100644
--- a/src/admin/problem/detail.vue
+++ b/src/admin/problem/detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TextEditor from "~/shared/TextEditor.vue"
+import TextEditor from "~/shared/components/TextEditor.vue"
 import { unique } from "~/utils/functions"
 import { BlankProblem, LANGUAGE, Tag } from "~/utils/types"
 import { getProblemTagList } from "~/shared/api"
@@ -14,7 +14,7 @@ import {
   uploadTestcases,
 } from "../api"
 
-const CodeEditor = defineAsyncComponent(() => import("~/shared/CodeEditor.vue"))
+const CodeEditor = defineAsyncComponent(() => import("~/shared/components/CodeEditor.vue"))
 
 interface Props {
   problemID?: string
diff --git a/src/admin/problem/list.vue b/src/admin/problem/list.vue
index dbe7df8..8f3cc80 100644
--- a/src/admin/problem/list.vue
+++ b/src/admin/problem/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { getProblemList, getProblem, editProblem } from "../api"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { NSwitch } from "naive-ui"
 import { AdminProblemFiltered } from "~/utils/types"
 import { parseTime } from "~/utils/functions"
diff --git a/src/admin/user/list.vue b/src/admin/user/list.vue
index da97fe6..c796451 100644
--- a/src/admin/user/list.vue
+++ b/src/admin/user/list.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { DataTableRowKey, SelectOption } from "naive-ui"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { parseTime } from "~/utils/functions"
 import { User } from "~/utils/types"
 import { getUserList, deleteUsers, editUser } from "../api"
diff --git a/src/components.d.ts b/src/components.d.ts
index 8e38130..eb37b6c 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,7 +7,6 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    IEpArrowD: typeof import('~icons/ep/arrow-d')['default']
     IEpArrowDown: typeof import('~icons/ep/arrow-down')['default']
     IEpArrowRightBold: typeof import('~icons/ep/arrow-right-bold')['default']
     IEpArrowUp: typeof import('~icons/ep/arrow-up')['default']
diff --git a/src/learn/index.vue b/src/learn/index.vue
index 5deff03..bdc5e3d 100644
--- a/src/learn/index.vue
+++ b/src/learn/index.vue
@@ -3,7 +3,7 @@ import { isDesktop } from "~/shared/composables/breakpoints"
 import { code } from "~/shared/composables/learn"
 import { useLearnStore } from "./store"
 
-const CodeEditor = defineAsyncComponent(() => import("~/shared/CodeEditor.vue"))
+const CodeEditor = defineAsyncComponent(() => import("~/shared/components/CodeEditor.vue"))
 
 const route = useRoute()
 const router = useRouter()
diff --git a/src/oj/contest/components/ContestInfo.vue b/src/oj/contest/components/ContestInfo.vue
index ffa6cde..1fb926e 100644
--- a/src/oj/contest/components/ContestInfo.vue
+++ b/src/oj/contest/components/ContestInfo.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { parseTime } from "utils/functions"
 import { useContestStore } from "oj/store/contest"
-import ContestType from "~/shared/ContestType.vue"
+import ContestType from "~/shared/components/ContestType.vue"
 
 const contestStore = useContestStore()
 </script>
diff --git a/src/oj/contest/detail.vue b/src/oj/contest/detail.vue
index 05cf2ac..c1bb174 100644
--- a/src/oj/contest/detail.vue
+++ b/src/oj/contest/detail.vue
@@ -4,6 +4,7 @@ import { isDesktop } from "~/shared/composables/breakpoints"
 import { useContestStore } from "../store/contest"
 import ContestInfo from "./components/ContestInfo.vue"
 import ContestMenu from "./components/ContestMenu.vue"
+import Lock from "~/shared/icons/Lock.vue"
 
 const props = defineProps<{
   contestID: string
@@ -34,7 +35,7 @@ const passwordFormVisible = computed(
       <n-space align="center">
         <h2 class="contestTitle">{{ contestStore.contest.title }}</h2>
         <n-icon size="large" v-if="contestStore.isPrivate" class="lockIcon">
-          <i-ep-lock />
+          <Lock />
         </n-icon>
         <n-tag
           size="small"
diff --git a/src/oj/contest/list.vue b/src/oj/contest/list.vue
index baa218c..80311bf 100644
--- a/src/oj/contest/list.vue
+++ b/src/oj/contest/list.vue
@@ -4,8 +4,8 @@ import { getContestList } from "oj/api"
 import { filterEmptyValue, parseTime, duration } from "utils/functions"
 import { Contest } from "utils/types"
 import { ContestType, CONTEST_STATUS } from "~/utils/constants"
-import ContestTitle from "~/shared/ContestTitle.vue"
-import Pagination from "~/shared/Pagination.vue"
+import ContestTitle from "~/shared/components/ContestTitle.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { useUserStore } from "~/shared/store/user"
 import { toggleLogin } from "~/shared/composables/modal"
 
diff --git a/src/oj/contest/pages/rank.vue b/src/oj/contest/pages/rank.vue
index b52d544..5653d00 100644
--- a/src/oj/contest/pages/rank.vue
+++ b/src/oj/contest/pages/rank.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { NButton, NIcon } from "naive-ui"
 import { GoldMedal } from "@element-plus/icons-vue"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import AcAndSubmission from "../components/AcAndSubmission.vue"
 import { getContestProblems, getContestRank } from "oj/api"
 import { ContestRank, ProblemFiltered } from "~/utils/types"
diff --git a/src/oj/problem/components/Editor.vue b/src/oj/problem/components/Editor.vue
index caff344..3baef1f 100644
--- a/src/oj/problem/components/Editor.vue
+++ b/src/oj/problem/components/Editor.vue
@@ -6,7 +6,7 @@ import { problem } from "oj/composables/problem"
 import storage from "~/utils/storage"
 
 const Form = defineAsyncComponent(() => import("./Form.vue"))
-const CodeEditor = defineAsyncComponent(() => import("~/shared/CodeEditor.vue"))
+const CodeEditor = defineAsyncComponent(() => import("~/shared/components/CodeEditor.vue"))
 
 const route = useRoute()
 const contestID = !!route.params.contestID ? route.params.contestID : null
diff --git a/src/oj/problem/components/ProblemContent.vue b/src/oj/problem/components/ProblemContent.vue
index 1ac7ae3..8246958 100644
--- a/src/oj/problem/components/ProblemContent.vue
+++ b/src/oj/problem/components/ProblemContent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Copy from "~/shared/Copy.vue"
+import Copy from "~/shared/components/Copy.vue"
 import { code } from "oj/composables/code"
 import { problem } from "oj/composables/problem"
 import { Problem, ProblemStatus } from "utils/types"
diff --git a/src/oj/problem/components/ProblemSubmission.vue b/src/oj/problem/components/ProblemSubmission.vue
index bc62ad0..9ab36cf 100644
--- a/src/oj/problem/components/ProblemSubmission.vue
+++ b/src/oj/problem/components/ProblemSubmission.vue
@@ -5,8 +5,8 @@ import { parseTime } from "~/utils/functions"
 import { LANGUAGE_SHOW_VALUE } from "~/utils/constants"
 import { getSubmissions } from "~/oj/api"
 import { isDesktop } from "~/shared/composables/breakpoints"
-import SubmissionResultTag from "~/shared/SubmissionResultTag.vue"
-import Pagination from "~/shared/Pagination.vue"
+import SubmissionResultTag from "~/shared/components/SubmissionResultTag.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { NButton } from "naive-ui"
 
 const userStore = useUserStore()
diff --git a/src/oj/problem/components/Submit.vue b/src/oj/problem/components/Submit.vue
index 378ac4c..8513280 100644
--- a/src/oj/problem/components/Submit.vue
+++ b/src/oj/problem/components/Submit.vue
@@ -7,7 +7,7 @@ import { JUDGE_STATUS, SubmissionStatus } from "utils/constants"
 import { submissionMemoryFormat, submissionTimeFormat } from "utils/functions"
 import { Submission, SubmitCodePayload } from "utils/types"
 import { getSubmission, submitCode } from "oj/api"
-import SubmissionResultTag from "~/shared/SubmissionResultTag.vue"
+import SubmissionResultTag from "~/shared/components/SubmissionResultTag.vue"
 import { useUserStore } from "~/shared/store/user"
 
 const userStore = useUserStore()
diff --git a/src/oj/problem/list.vue b/src/oj/problem/list.vue
index 48d4347..aab086f 100644
--- a/src/oj/problem/list.vue
+++ b/src/oj/problem/list.vue
@@ -6,7 +6,7 @@ import { getProblemList, getRandomProblemID } from "oj/api"
 import ProblemStatus from "./components/ProblemStatus.vue"
 import { useUserStore } from "~/shared/store/user"
 import { getProblemTagList } from "~/shared/api"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { isDesktop } from "~/shared/composables/breakpoints"
 
 interface Tag {
diff --git a/src/oj/rank/list.vue b/src/oj/rank/list.vue
index fcc35eb..bb822d1 100644
--- a/src/oj/rank/list.vue
+++ b/src/oj/rank/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { NButton } from "naive-ui"
 import Chart from "./components/Chart.vue"
-import Pagination from "~/shared/Pagination.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import { Rank } from "utils/types"
 import { getRank } from "oj/api"
 import { getACRate } from "utils/functions"
diff --git a/src/oj/submission/detail.vue b/src/oj/submission/detail.vue
index a05d046..3e2f50e 100644
--- a/src/oj/submission/detail.vue
+++ b/src/oj/submission/detail.vue
@@ -8,7 +8,7 @@ import {
   submissionTimeFormat,
 } from "utils/functions"
 import copy from "copy-text-to-clipboard"
-import SubmissionResultTag from "~/shared/SubmissionResultTag.vue"
+import SubmissionResultTag from "~/shared/components/SubmissionResultTag.vue"
 
 const props = defineProps<{
   submissionID: string
diff --git a/src/oj/submission/list.vue b/src/oj/submission/list.vue
index 6996b6c..1e8b363 100644
--- a/src/oj/submission/list.vue
+++ b/src/oj/submission/list.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { NButton } from "naive-ui"
-import SubmissionResultTag from "~/shared/SubmissionResultTag.vue"
-import Pagination from "~/shared/Pagination.vue"
+import SubmissionResultTag from "~/shared/components/SubmissionResultTag.vue"
+import Pagination from "~/shared/components/Pagination.vue"
 import {
   submissionMemoryFormat,
   submissionTimeFormat,
diff --git a/src/shared/CodeEditor.vue b/src/shared/components/CodeEditor.vue
similarity index 91%
rename from src/shared/CodeEditor.vue
rename to src/shared/components/CodeEditor.vue
index a960e08..03c8b68 100644
--- a/src/shared/CodeEditor.vue
+++ b/src/shared/components/CodeEditor.vue
@@ -3,10 +3,10 @@ import { Codemirror } from "vue-codemirror"
 import { cpp } from "@codemirror/lang-cpp"
 import { python } from "@codemirror/lang-python"
 import { EditorView } from "@codemirror/view"
-import { oneDark } from "./themes/oneDark"
-import { smoothy } from "./themes/smoothy"
+import { oneDark } from "../themes/oneDark"
+import { smoothy } from "../themes/smoothy"
 import { LANGUAGE } from "~/utils/types"
-import { isDark } from "./composables/dark"
+import { isDark } from "../composables/dark"
 
 const styleTheme = EditorView.baseTheme({
   "& .cm-scroller": {
diff --git a/src/shared/ContestTitle.vue b/src/shared/components/ContestTitle.vue
similarity index 100%
rename from src/shared/ContestTitle.vue
rename to src/shared/components/ContestTitle.vue
diff --git a/src/shared/ContestType.vue b/src/shared/components/ContestType.vue
similarity index 100%
rename from src/shared/ContestType.vue
rename to src/shared/components/ContestType.vue
diff --git a/src/shared/Copy.vue b/src/shared/components/Copy.vue
similarity index 100%
rename from src/shared/Copy.vue
rename to src/shared/components/Copy.vue
diff --git a/src/shared/Header.vue b/src/shared/components/Header.vue
similarity index 97%
rename from src/shared/Header.vue
rename to src/shared/components/Header.vue
index 6afc909..2cedfb3 100644
--- a/src/shared/Header.vue
+++ b/src/shared/components/Header.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { logout } from "./api"
-import { useUserStore } from "./store/user"
-import { useConfigStore } from "./store/config"
+import { logout } from "../api"
+import { useUserStore } from "../store/user"
+import { useConfigStore } from "../store/config"
 import { isDark, toggleDark } from "~/shared/composables/dark"
 import { toggleLogin, toggleSignup } from "~/shared/composables/modal"
 import { RouterLink } from "vue-router"
diff --git a/src/shared/Login.vue b/src/shared/components/Login.vue
similarity index 93%
rename from src/shared/Login.vue
rename to src/shared/components/Login.vue
index 84265d0..7ed2f83 100644
--- a/src/shared/Login.vue
+++ b/src/shared/components/Login.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { login } from "./api"
-import { loginModal, toggleLogin, toggleSignup } from "./composables/modal"
-import { useUserStore } from "./store/user"
+import { login } from "../api"
+import { loginModal, toggleLogin, toggleSignup } from "../composables/modal"
+import { useUserStore } from "../store/user"
 
 const userStore = useUserStore()
 const loginRef = ref()
diff --git a/src/shared/Pagination.vue b/src/shared/components/Pagination.vue
similarity index 100%
rename from src/shared/Pagination.vue
rename to src/shared/components/Pagination.vue
diff --git a/src/shared/Signup.vue b/src/shared/components/Signup.vue
similarity index 96%
rename from src/shared/Signup.vue
rename to src/shared/components/Signup.vue
index 2d3cc6a..0083fd0 100644
--- a/src/shared/Signup.vue
+++ b/src/shared/components/Signup.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { getCaptcha, signup, login } from "./api"
-import { signupModal, toggleLogin, toggleSignup } from "./composables/modal"
-import { useUserStore } from "./store/user"
+import { getCaptcha, signup, login } from "../api"
+import { signupModal, toggleLogin, toggleSignup } from "../composables/modal"
+import { useUserStore } from "../store/user"
 
 const userStore = useUserStore()
 const signupRef = ref()
diff --git a/src/shared/SubmissionResultTag.vue b/src/shared/components/SubmissionResultTag.vue
similarity index 100%
rename from src/shared/SubmissionResultTag.vue
rename to src/shared/components/SubmissionResultTag.vue
diff --git a/src/shared/TextEditor.vue b/src/shared/components/TextEditor.vue
similarity index 97%
rename from src/shared/TextEditor.vue
rename to src/shared/components/TextEditor.vue
index 59f8b6e..82fa10d 100644
--- a/src/shared/TextEditor.vue
+++ b/src/shared/components/TextEditor.vue
@@ -2,7 +2,7 @@
 import "@wangeditor/editor/dist/css/style.css"
 import { IDomEditor, IEditorConfig, IToolbarConfig } from "@wangeditor/editor"
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue"
-import { uploadImage } from "../admin/api"
+import { uploadImage } from "../../admin/api"
 
 interface Props {
   value: string
diff --git a/src/shared/icons/Lock.vue b/src/shared/icons/Lock.vue
new file mode 100644
index 0000000..0cc9347
--- /dev/null
+++ b/src/shared/icons/Lock.vue
@@ -0,0 +1,10 @@
+
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M6 22q-.825 0-1.413-.588T4 20V10q0-.825.588-1.413T6 8h1V6q0-2.075 1.463-3.538T12 1q2.075 0 3.538 1.463T17 6v2h1q.825 0 1.413.588T20 10v10q0 .825-.588 1.413T18 22H6Zm0-2h12V10H6v10Zm6-3q.825 0 1.413-.588T14 15q0-.825-.588-1.413T12 13q-.825 0-1.413.588T10 15q0 .825.588 1.413T12 17ZM9 8h6V6q0-1.25-.875-2.125T12 3q-1.25 0-2.125.875T9 6v2ZM6 20V10v10Z"></path></svg>
+</template>
+
+<script lang="ts">
+export default {
+  name: 'MaterialSymbolsLockOutline'
+}
+</script>
\ No newline at end of file
diff --git a/src/shared/layout/default.vue b/src/shared/layout/default.vue
index 3119b6d..85ce042 100644
--- a/src/shared/layout/default.vue
+++ b/src/shared/layout/default.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import Login from "../Login.vue"
-import Signup from "../Signup.vue"
-import Header from "../Header.vue"
+import Login from "../components/Login.vue"
+import Signup from "../components/Signup.vue"
+import Header from "../components/Header.vue"
 </script>
 
 <template>