From b496ca985370a3e8831fd21a8946b430046b57c5 Mon Sep 17 00:00:00 2001
From: mehm8128 <mehm8128@gmail.com>
Date: Mon, 8 Jan 2024 11:37:12 +0900
Subject: [PATCH 1/2] =?UTF-8?q?use=E5=86=85=E3=81=AE=E3=82=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=92lib=E3=81=B8=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Index/PageInfoPanel.vue        |  2 +-
 src/components/Index/PageInfoPanels.vue       |  2 +-
 .../NavigationBar/NavigationLinks.vue         |  2 +-
 .../NavigationBar/NavigationLinksItem.vue     |  2 +-
 src/components/UI/FormInput.vue               |  2 +-
 src/{use => lib}/param.ts                     |  0
 src/{use => lib}/query.ts                     |  0
 src/{use => lib}/routeInfo.ts                 |  0
 src/{use => lib}/validate.ts                  |  0
 src/pages/Contest.vue                         |  2 +-
 src/pages/ContestEdit.vue                     |  4 ++--
 src/pages/ContestNew.vue                      |  2 +-
 src/pages/ContestTeamEdit.vue                 |  4 ++--
 src/pages/ContestTeamNew.vue                  |  4 ++--
 src/pages/Event.vue                           |  2 +-
 src/pages/Project.vue                         |  4 ++--
 src/pages/ProjectNew.vue                      |  2 +-
 src/pages/UserAccountEdit.vue                 |  4 ++--
 src/pages/UserAccountNew.vue                  |  2 +-
 src/use/fetcher.ts                            | 22 -------------------
 20 files changed, 20 insertions(+), 42 deletions(-)
 rename src/{use => lib}/param.ts (100%)
 rename src/{use => lib}/query.ts (100%)
 rename src/{use => lib}/routeInfo.ts (100%)
 rename src/{use => lib}/validate.ts (100%)
 delete mode 100644 src/use/fetcher.ts

diff --git a/src/components/Index/PageInfoPanel.vue b/src/components/Index/PageInfoPanel.vue
index d38e5da4..6a907a96 100644
--- a/src/components/Index/PageInfoPanel.vue
+++ b/src/components/Index/PageInfoPanel.vue
@@ -14,7 +14,7 @@
 <script lang="ts">
 import { defineComponent, toRef } from 'vue'
 import Icon from '/@/components/UI/Icon.vue'
-import useRouteInfo from '/@/use/routeInfo'
+import useRouteInfo from '/@/lib/routeInfo'
 export default defineComponent({
   name: 'PageInfoPanel',
   components: {
diff --git a/src/components/Index/PageInfoPanels.vue b/src/components/Index/PageInfoPanels.vue
index 7406ff52..455143f8 100644
--- a/src/components/Index/PageInfoPanels.vue
+++ b/src/components/Index/PageInfoPanels.vue
@@ -12,7 +12,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import PageInfoPanel from '/@/components/Index/PageInfoPanel.vue'
-import { routes } from '/@/use/routeInfo'
+import { routes } from '/@/lib/routeInfo'
 
 export default defineComponent({
   name: 'PageInfoPanels',
diff --git a/src/components/NavigationBar/NavigationLinks.vue b/src/components/NavigationBar/NavigationLinks.vue
index 06b5f777..20641ba3 100644
--- a/src/components/NavigationBar/NavigationLinks.vue
+++ b/src/components/NavigationBar/NavigationLinks.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import NavigationLinksItem from './NavigationLinksItem.vue'
-import { routes } from '/@/use/routeInfo'
+import { routes } from '/@/lib/routeInfo'
 </script>
 
 <template>
diff --git a/src/components/NavigationBar/NavigationLinksItem.vue b/src/components/NavigationBar/NavigationLinksItem.vue
index eee80eaf..0aee8cdc 100644
--- a/src/components/NavigationBar/NavigationLinksItem.vue
+++ b/src/components/NavigationBar/NavigationLinksItem.vue
@@ -2,7 +2,7 @@
 import { computed, toRef } from 'vue'
 import { useRoute } from 'vue-router'
 import Icon from '/@/components/UI/Icon.vue'
-import useRouteInfo from '/@/use/routeInfo'
+import useRouteInfo from '/@/lib/routeInfo'
 
 interface Props {
   name: string
diff --git a/src/components/UI/FormInput.vue b/src/components/UI/FormInput.vue
index 26e9d5c0..5bb60ff0 100644
--- a/src/components/UI/FormInput.vue
+++ b/src/components/UI/FormInput.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import Icon from '/@/components/UI/Icon.vue'
-import { isValidUrl } from '/@/use/validate'
+import { isValidUrl } from '/@/lib/validate'
 
 interface Props {
   modelValue: string
diff --git a/src/use/param.ts b/src/lib/param.ts
similarity index 100%
rename from src/use/param.ts
rename to src/lib/param.ts
diff --git a/src/use/query.ts b/src/lib/query.ts
similarity index 100%
rename from src/use/query.ts
rename to src/lib/query.ts
diff --git a/src/use/routeInfo.ts b/src/lib/routeInfo.ts
similarity index 100%
rename from src/use/routeInfo.ts
rename to src/lib/routeInfo.ts
diff --git a/src/use/validate.ts b/src/lib/validate.ts
similarity index 100%
rename from src/use/validate.ts
rename to src/lib/validate.ts
diff --git a/src/pages/Contest.vue b/src/pages/Contest.vue
index 15d27d62..576af586 100644
--- a/src/pages/Contest.vue
+++ b/src/pages/Contest.vue
@@ -7,7 +7,7 @@ import apis, { ContestDetail, ContestTeam } from '/@/lib/apis'
 import { RouterLink } from 'vue-router'
 import { getDisplayDuration } from '/@/lib/date'
 import Icon from '/@/components/UI/Icon.vue'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import ContestTeamsComponent from '/@/components/Contest/ContestTeams.vue'
 
 const contestId = useParam('contestId')
diff --git a/src/pages/ContestEdit.vue b/src/pages/ContestEdit.vue
index f755bb15..0b730b22 100644
--- a/src/pages/ContestEdit.vue
+++ b/src/pages/ContestEdit.vue
@@ -5,7 +5,7 @@ import BaseButton from '/@/components/UI/BaseButton.vue'
 import apis, { EditContestRequest } from '/@/lib/apis'
 import type { ContestDetail } from '/@/lib/apis'
 import { RouterLink, useRouter } from 'vue-router'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
@@ -16,7 +16,7 @@ import {
   isValidDuration,
   isValidLength,
   isValidOptionalUrl
-} from '/@/use/validate'
+} from '/@/lib/validate'
 import useModal from '/@/components/UI/composables/useModal'
 import ConfirmModal from '/@/components/UI/ConfirmModal.vue'
 import { useContestStore } from '/@/store/contest'
diff --git a/src/pages/ContestNew.vue b/src/pages/ContestNew.vue
index df4839ae..82129bad 100644
--- a/src/pages/ContestNew.vue
+++ b/src/pages/ContestNew.vue
@@ -9,7 +9,7 @@ import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormDuration from '/@/components/UI/FormDuration.vue'
-import { isValidDuration, isValidLength, isValidOptionalUrl} from '/@/use/validate'
+import { isValidDuration, isValidLength, isValidOptionalUrl} from '/@/lib/validate'
 import { useToast } from 'vue-toastification'
 import { useContestStore } from '/@/store/contest'
 
diff --git a/src/pages/ContestTeamEdit.vue b/src/pages/ContestTeamEdit.vue
index 56600066..f4e49320 100644
--- a/src/pages/ContestTeamEdit.vue
+++ b/src/pages/ContestTeamEdit.vue
@@ -5,14 +5,14 @@ import BaseButton from '/@/components/UI/BaseButton.vue'
 import apis, { ContestTeamDetail, EditContestTeamRequest } from '/@/lib/apis'
 import type { ContestDetail, User } from '/@/lib/apis'
 import { RouterLink, useRouter } from 'vue-router'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import MemberInput from '/@/components/UI/MemberInput.vue'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import DeleteForm from '/@/components/Form/DeleteForm.vue'
-import { isValidLength, isValidOptionalUrl } from '/@/use/validate'
+import { isValidLength, isValidOptionalUrl } from '/@/lib/validate'
 import useModal from '/@/components/UI/composables/useModal'
 import ConfirmModal from '/@/components/UI/ConfirmModal.vue'
 import { useToast } from 'vue-toastification'
diff --git a/src/pages/ContestTeamNew.vue b/src/pages/ContestTeamNew.vue
index 01cca2f6..c3cf0155 100644
--- a/src/pages/ContestTeamNew.vue
+++ b/src/pages/ContestTeamNew.vue
@@ -5,13 +5,13 @@ import BaseButton from '/@/components/UI/BaseButton.vue'
 import apis from '/@/lib/apis'
 import type { AddContestTeamRequest, ContestDetail, User } from '/@/lib/apis'
 import { RouterLink, useRouter } from 'vue-router'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import MemberInput from '/@/components/UI/MemberInput.vue'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
-import { isValidLength, isValidOptionalUrl } from '/@/use/validate'
+import { isValidLength, isValidOptionalUrl } from '/@/lib/validate'
 import { useToast } from 'vue-toastification'
 import { useUserStore } from '/@/store/user'
 
diff --git a/src/pages/Event.vue b/src/pages/Event.vue
index 8f4cc294..d9cdf5e1 100644
--- a/src/pages/Event.vue
+++ b/src/pages/Event.vue
@@ -7,7 +7,7 @@ import EventHostItem from '/@/components/Event/EventHostItem.vue'
 import apis, { EditEventRequest, EventDetail } from '/@/lib/apis'
 import { RouterLink, useRouter } from 'vue-router'
 import { getDisplayDuration } from '/@/lib/date'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import { ref } from 'vue'
 import { useToast } from 'vue-toastification'
 import RadioButton from '/@/components/UI/RadioButton.vue'
diff --git a/src/pages/Project.vue b/src/pages/Project.vue
index 1fe7fcce..0ec621c4 100644
--- a/src/pages/Project.vue
+++ b/src/pages/Project.vue
@@ -5,7 +5,7 @@ import BaseButton from '/@/components/UI/BaseButton.vue'
 import apis, { ProjectMember as ProjectMemberType } from '/@/lib/apis'
 import type { EditProjectRequest, ProjectDetail } from '/@/lib/apis'
 import { RouterLink, useRouter } from 'vue-router'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import FormTextArea from '/@/components/UI/FormTextArea.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import { computed, ref } from 'vue'
@@ -15,7 +15,7 @@ import {
   isValidLength,
   isValidOptionalUrl,
   isValidYearWithSemesterDuration
-} from '/@/use/validate'
+} from '/@/lib/validate'
 import { useToast } from 'vue-toastification'
 import FormProjectDuration from '/@/components/UI/FormProjectDuration.vue'
 import { useProjectStore } from '/@/store/project'
diff --git a/src/pages/ProjectNew.vue b/src/pages/ProjectNew.vue
index dc9eca18..c8812491 100644
--- a/src/pages/ProjectNew.vue
+++ b/src/pages/ProjectNew.vue
@@ -20,7 +20,7 @@ import {
   isValidLength,
   isValidOptionalUrl,
   isValidYearWithSemesterDuration
-} from '/@/use/validate'
+} from '/@/lib/validate'
 import { useProjectStore } from '/@/store/project'
 
 const toast = useToast()
diff --git a/src/pages/UserAccountEdit.vue b/src/pages/UserAccountEdit.vue
index 8ec94033..94bb8a05 100644
--- a/src/pages/UserAccountEdit.vue
+++ b/src/pages/UserAccountEdit.vue
@@ -8,11 +8,11 @@ import { computed, ref } from 'vue'
 import LabeledForm from '/@/components/Form/LabeledForm.vue'
 import FormInput from '/@/components/UI/FormInput.vue'
 import ToggleSwitch from '/@/components/UI/ToggleSwitch.vue'
-import useParam from '/@/use/param'
+import useParam from '/@/lib/param'
 import ServiceAccordion from '/@/components/UI/ServiceAccordion.vue'
 import DeleteForm from '/@/components/Form/DeleteForm.vue'
 import { hasIdService, hasAtmarkService } from '/@/consts/services'
-import { isValidLength, isValidUrl } from '/@/use/validate'
+import { isValidLength, isValidUrl } from '/@/lib/validate'
 import useModal from '/@/components/UI/composables/useModal'
 import ConfirmModal from '/@/components/UI/ConfirmModal.vue'
 import { useToast } from 'vue-toastification'
diff --git a/src/pages/UserAccountNew.vue b/src/pages/UserAccountNew.vue
index 309dc695..fdfba28c 100644
--- a/src/pages/UserAccountNew.vue
+++ b/src/pages/UserAccountNew.vue
@@ -10,7 +10,7 @@ import FormInput from '/@/components/UI/FormInput.vue'
 import ToggleSwitch from '/@/components/UI/ToggleSwitch.vue'
 import ServiceAccordion from '/@/components/UI/ServiceAccordion.vue'
 import { hasAtmarkService, hasIdService } from '/@/consts/services'
-import { isValidLength, isValidUrl } from '/@/use/validate'
+import { isValidLength, isValidUrl } from '/@/lib/validate'
 import { useToast } from 'vue-toastification'
 
 const router = useRouter()
diff --git a/src/use/fetcher.ts b/src/use/fetcher.ts
deleted file mode 100644
index 134af835..00000000
--- a/src/use/fetcher.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { AxiosResponse } from 'axios'
-import { ref, Ref, watchEffect } from 'vue'
-
-export type FetcherState = 'loading' | 'loaded' | 'error'
-
-export const useDataFetcher = <T>(
-  fetch: () => Promise<AxiosResponse<T>>
-): { data: Ref<T | undefined>; fetcherState: Ref<FetcherState> } => {
-  const data = ref<T>()
-  const state = ref<FetcherState>('loading')
-  watchEffect(async () => {
-    try {
-      data.value = (await fetch()).data
-      state.value = 'loaded'
-    } catch (e) {
-      state.value = 'error'
-      // eslint-disable-next-line no-console
-      console.error(e)
-    }
-  })
-  return { data: data, fetcherState: state }
-}

From 21b5b8927766ef9241bef00e983d35f031992109 Mon Sep 17 00:00:00 2001
From: mehm8128 <mehm8128@gmail.com>
Date: Mon, 8 Jan 2024 11:42:53 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=81=A4=E3=81=84=E3=81=A7=E3=81=ABscript?=
 =?UTF-8?q?=20setup=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Index/PageInfoPanel.vue  | 34 +++++++++----------------
 src/components/Index/PageInfoPanels.vue | 22 +++++-----------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/src/components/Index/PageInfoPanel.vue b/src/components/Index/PageInfoPanel.vue
index 6a907a96..9f43f660 100644
--- a/src/components/Index/PageInfoPanel.vue
+++ b/src/components/Index/PageInfoPanel.vue
@@ -11,30 +11,20 @@
     </router-link>
   </li>
 </template>
-<script lang="ts">
-import { defineComponent, toRef } from 'vue'
+
+<script lang="ts" setup>
+import { toRef } from 'vue'
 import Icon from '/@/components/UI/Icon.vue'
 import useRouteInfo from '/@/lib/routeInfo'
-export default defineComponent({
-  name: 'PageInfoPanel',
-  components: {
-    Icon
-  },
-  props: {
-    name: {
-      type: String,
-      required: true
-    },
-    path: {
-      type: String,
-      required: true
-    }
-  },
-  setup(props) {
-    const routeInfo = useRouteInfo(toRef(props, 'name'))
-    return { routeInfo }
-  }
-})
+
+interface Props {
+  name: string
+  path: string
+}
+
+const props = defineProps<Props>()
+
+const routeInfo = useRouteInfo(toRef(props.name))
 </script>
 
 <style lang="scss" module>
diff --git a/src/components/Index/PageInfoPanels.vue b/src/components/Index/PageInfoPanels.vue
index 455143f8..1a6da2f6 100644
--- a/src/components/Index/PageInfoPanels.vue
+++ b/src/components/Index/PageInfoPanels.vue
@@ -1,3 +1,10 @@
+<script lang="ts" setup>
+import PageInfoPanel from '/@/components/Index/PageInfoPanel.vue'
+import { routes } from '/@/lib/routeInfo'
+
+const pages = routes.filter(route => route.name != 'Top')
+</script>
+
 <template>
   <ul :class="$style.list">
     <page-info-panel
@@ -9,21 +16,6 @@
   </ul>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
-import PageInfoPanel from '/@/components/Index/PageInfoPanel.vue'
-import { routes } from '/@/lib/routeInfo'
-
-export default defineComponent({
-  name: 'PageInfoPanels',
-  components: { PageInfoPanel },
-  setup() {
-    const pages = routes.filter(route => route.name != 'Top')
-    return { pages }
-  }
-})
-</script>
-
 <style lang="scss" module>
 .list {
   display: flex;