Merge pull request #141 from traPtitech/refactor/files-structure

mumumu6 · web-flow · commit 99ffed634f83 · 2025-10-03T10:48:29.000+09:00
chore : utilityディレクトリの整理
diff --git a/src/components/event/EventDialog.vue b/src/components/event/EventDialog.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue'
 import MarkdownPreview from '@/components/markdown/MarkdownPreview.vue'
 import UserIcon from '@/components/generic/UserIcon.vue'
-import { getTimeStringNoPad } from '@/utility/date'
+import { getTimeStringNoPad } from '@/utils/date'
 import type { components } from '@/api/schema'
 import { useCampStore } from '@/store'
 import { useRoute } from 'vue-router'
diff --git a/src/components/event/EventEditor.vue b/src/components/event/EventEditor.vue
@@ -8,8 +8,8 @@ import { apiClient } from '@/api/apiClient'
 import { useCampStore, useUserStore } from '@/store'
 import { useRoute } from 'vue-router'
 import type { components } from '@/api/schema'
-import { dateToText, dateDiffInDaysJST, getJSTDate } from '@/utility/date'
-import { EVENT_COLORS } from '@/utility/eventColors'
+import { dateToText, dateDiffInDaysJST, getJSTDate } from '@/utils/date'
+import { EVENT_COLORS } from '@/components/event/utils/eventColors'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
 
 import { qk } from '@/api/queries/keys'
diff --git a/src/components/event/EventEditorSettings.vue b/src/components/event/EventEditorSettings.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import { ref, computed, watch, onMounted } from 'vue'
-import { getDayStringNoPad } from '@/utility/date'
+import { getDayStringNoPad } from '@/utils/date'
 import EventTimePick from './EventTimePick.vue'
 import EventDeleteDialog from './EventDeleteDialog.vue'
 import type { components } from '@/api/schema'
 import { apiClient } from '@/api/apiClient'
 import UserIcon from '@/components/generic/UserIcon.vue'
-import { EVENT_COLORS } from '@/utility/eventColors'
+import { EVENT_COLORS } from '@/components/event/utils/eventColors'
 
 type DurationEvent = components['schemas']['DurationEventResponse']
 type Camp = components['schemas']['CampResponse']
diff --git a/src/components/event/ScheduleContent.vue b/src/components/event/ScheduleContent.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { getDayStringNoPad } from '@/utility/date'
-import { getLayout } from '@/utility/eventLayout'
+import { getDayStringNoPad } from '@/utils/date'
+import { getLayout } from '@/components/event/utils/eventLayout'
 import EventBlock from '@/components/event/EventBlock.vue'
 import type { components } from '@/api/schema'
-import type { EventGroup, DurationEventPos } from '@/utility/eventGrid'
+import type { EventGroup, DurationEventPos } from '@/components/event/utils/eventGrid'
 import EventEditor from './EventEditor.vue'
 import ScheduleRow from './ScheduleRow.vue'
 
diff --git a/src/components/event/ScheduleRow.vue b/src/components/event/ScheduleRow.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import EventDialog from './EventDialog.vue'
-import type { GridRow } from '@/utility/eventGrid'
-import { getTimeStringNoPad } from '@/utility/date'
+import type { GridRow } from '@/components/event/utils/eventGrid'
+import { getTimeStringNoPad } from '@/utils/date'
 import { computed } from 'vue'
 
 const props = defineProps<{
diff --git a/src/components/event/utils/eventColors.ts b/src/components/event/utils/eventColors.ts
diff --git a/src/components/event/utils/eventGrid.ts b/src/components/event/utils/eventGrid.ts
@@ -1,5 +1,5 @@
 import type { components } from '@/api/schema'
-import { getStartTime, getEndTime } from '@/utility/eventLib'
+import { getStartTime, getEndTime } from '@/components/event/utils/eventLib'
 
 type MomentEvent = components['schemas']['MomentEventResponse']
 type DurationEvent = components['schemas']['DurationEventResponse']
diff --git a/src/components/event/utils/eventLayout.ts b/src/components/event/utils/eventLayout.ts
@@ -1,7 +1,7 @@
 import type { components } from '@/api/schema'
-import { DayEventGrid, type EventGroup } from '@/utility/eventGrid'
-import { getStartTime, getEndTime } from '@/utility/eventLib'
-import { getJSTDate } from '@/utility/date'
+import { DayEventGrid, type EventGroup } from '@/components/event/utils/eventGrid'
+import { getStartTime, getEndTime } from '@/components/event/utils/eventLib'
+import { getJSTDate } from '@/utils/date'
 
 type Camp = components['schemas']['CampResponse']
 type MomentEvent = components['schemas']['MomentEventResponse']
diff --git a/src/components/event/utils/eventLib.ts b/src/components/event/utils/eventLib.ts
@@ -10,3 +10,4 @@ export const getStartTime = (event: CampEvent) => {
 export const getEndTime = (event: CampEvent) => {
   return event.type === 'moment' ? new Date(event.time) : new Date(event.timeEnd)
 }
+
diff --git a/src/components/information/QuestionGroupEditor.vue b/src/components/information/QuestionGroupEditor.vue
@@ -4,7 +4,7 @@ import QuestionEditField from '@/components/information/QuestionEditField.vue'
 import MarkdownPreview from '@/components/markdown/MarkdownPreview.vue'
 import AnswersDialog from '@/components/information/AnswersDialog.vue'
 import { computed } from 'vue'
-import { getDayString } from '@/utility/date'
+import { getDayString } from '@/utils/date'
 
 type QuestionGroup = components['schemas']['QuestionGroupResponse']
 type Question = components['schemas']['QuestionResponse']
diff --git a/src/components/markdown/MarkdownEditor.vue b/src/components/markdown/MarkdownEditor.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { onMounted, ref, watch, nextTick } from 'vue'
-import { decorated } from '@/utility/editorParse'
+import { decorated } from '@/components/markdown/utils/editorParse'
 const text = defineModel<string>('text')
 
 const props = defineProps<{ color?: string | undefined }>()
diff --git a/src/components/markdown/utils/editorParse.ts b/src/components/markdown/utils/editorParse.ts
diff --git a/src/components/rollcall/rollCallStream.ts b/src/components/rollcall/rollCallStream.ts
diff --git a/src/utils/date.ts b/src/utils/date.ts
diff --git a/src/views/RegistrationView.vue b/src/views/RegistrationView.vue
@@ -2,7 +2,7 @@
 import { useCampStore, useTimeStore } from '@/store'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
-import { getDayStringNoPad } from '@/utility/date'
+import { getDayStringNoPad } from '@/utils/date'
 import MarkdownPreview from '@/components/markdown/MarkdownPreview.vue'
 import { useRouter } from 'vue-router'
 import type { components } from '@/api/schema'
diff --git a/src/views/RollCallView.vue b/src/views/RollCallView.vue
@@ -6,7 +6,7 @@ import { apiClient } from '@/api/apiClient'
 import type { components } from '@/api/schema'
 import BackgroundPattern from '@/components/generic/BackgroundPattern.vue'
 import UserResponse from '@/components/rollcall/UserResponse.vue'
-import { useRollCallStream } from '@/lib/rollCallStream'
+import { useRollCallStream } from '@/components/rollcall/rollCallStream'
 
 type RollCall = components['schemas']['RollCallResponse']
 

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@ export const getStartTime = (event: CampEvent) => {`
`10`	`10`	`export const getEndTime = (event: CampEvent) => {`
`11`	`11`	`return event.type === 'moment' ? new Date(event.time) : new Date(event.timeEnd)`
`12`	`12`	`}`
	`13`	`+`