From dadaba13f420cbcf8187e4999a6fc2f93f183a29 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Fri, 31 May 2024 11:46:55 -0400 Subject: [PATCH 1/5] Move "@/components/auto-mode-button" to "@/components/schedule/auto-mode/auto-mode-button" --- src/app/AppBar.vue | 2 +- .../auto-mode}/auto-mode-button/AutoModeButton.vue | 0 .../auto-mode}/auto-mode-button/modes/error/Button.vue | 0 .../auto-mode}/auto-mode-button/modes/error/Dialog.vue | 0 .../auto-mode}/auto-mode-button/modes/off/Button.vue | 0 .../auto-mode}/auto-mode-button/modes/off/Dialog.vue | 0 .../auto-mode}/auto-mode-button/modes/queue/Button.vue | 0 .../auto-mode}/auto-mode-button/modes/queue/Dialog.vue | 0 .../auto-mode}/auto-mode-button/modes/scheduler/Button.vue | 0 .../auto-mode}/auto-mode-button/modes/scheduler/Dialog.vue | 0 src/components/schedule/index.ts | 1 + 11 files changed, 2 insertions(+), 1 deletion(-) rename src/components/{ => schedule/auto-mode}/auto-mode-button/AutoModeButton.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/error/Button.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/error/Dialog.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/off/Button.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/off/Dialog.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/queue/Button.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/queue/Dialog.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/scheduler/Button.vue (100%) rename src/components/{ => schedule/auto-mode}/auto-mode-button/modes/scheduler/Dialog.vue (100%) create mode 100644 src/components/schedule/index.ts diff --git a/src/app/AppBar.vue b/src/app/AppBar.vue index ff3902a..31955af 100644 --- a/src/app/AppBar.vue +++ b/src/app/AppBar.vue @@ -32,7 +32,7 @@ import { useDisplay } from "vuetify"; import { useConfig } from "@/utils/config"; import ToggleDarkModeButton from "@/components/utils/ToggleDarkModeButtonWithTooltip.vue"; -import AutoModeButton from "@/components/auto-mode-button/AutoModeButton.vue"; +import { AutoModeButton } from "@/components/schedule"; import TabNavi from "./TabNavi.vue"; diff --git a/src/components/auto-mode-button/AutoModeButton.vue b/src/components/schedule/auto-mode/auto-mode-button/AutoModeButton.vue similarity index 100% rename from src/components/auto-mode-button/AutoModeButton.vue rename to src/components/schedule/auto-mode/auto-mode-button/AutoModeButton.vue diff --git a/src/components/auto-mode-button/modes/error/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/error/Button.vue similarity index 100% rename from src/components/auto-mode-button/modes/error/Button.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/error/Button.vue diff --git a/src/components/auto-mode-button/modes/error/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/error/Dialog.vue similarity index 100% rename from src/components/auto-mode-button/modes/error/Dialog.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/error/Dialog.vue diff --git a/src/components/auto-mode-button/modes/off/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/off/Button.vue similarity index 100% rename from src/components/auto-mode-button/modes/off/Button.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/off/Button.vue diff --git a/src/components/auto-mode-button/modes/off/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/off/Dialog.vue similarity index 100% rename from src/components/auto-mode-button/modes/off/Dialog.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/off/Dialog.vue diff --git a/src/components/auto-mode-button/modes/queue/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/queue/Button.vue similarity index 100% rename from src/components/auto-mode-button/modes/queue/Button.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/queue/Button.vue diff --git a/src/components/auto-mode-button/modes/queue/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/queue/Dialog.vue similarity index 100% rename from src/components/auto-mode-button/modes/queue/Dialog.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/queue/Dialog.vue diff --git a/src/components/auto-mode-button/modes/scheduler/Button.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Button.vue similarity index 100% rename from src/components/auto-mode-button/modes/scheduler/Button.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Button.vue diff --git a/src/components/auto-mode-button/modes/scheduler/Dialog.vue b/src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Dialog.vue similarity index 100% rename from src/components/auto-mode-button/modes/scheduler/Dialog.vue rename to src/components/schedule/auto-mode/auto-mode-button/modes/scheduler/Dialog.vue diff --git a/src/components/schedule/index.ts b/src/components/schedule/index.ts new file mode 100644 index 0000000..9abd25d --- /dev/null +++ b/src/components/schedule/index.ts @@ -0,0 +1 @@ +export { default as AutoModeButton } from "./auto-mode/auto-mode-button/AutoModeButton.vue"; From 54a512495c1b1d10294f2735ea09845eff6e4196 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Fri, 31 May 2024 13:36:05 -0400 Subject: [PATCH 2/5] Move "@/components/queue" to "@/components/schedule/queue" --- src/components/schedule/index.ts | 1 + src/components/{ => schedule}/queue/ErrorDialog.vue | 0 src/components/{ => schedule}/queue/LoadingIndicator.vue | 0 src/components/{ => schedule}/queue/QueueFrame.vue | 0 src/components/{ => schedule}/queue/TableFrame.vue | 0 src/components/{ => schedule}/queue/TopFrame.vue | 0 src/components/{ => schedule}/queue/add/AddDialog.vue | 0 .../{ => schedule}/queue/add/DiscardConfirmationDialog.vue | 0 src/components/{ => schedule}/queue/add/Editor.vue | 0 src/components/{ => schedule}/queue/add/ItemAdd.vue | 0 src/components/{ => schedule}/queue/items.ts | 0 src/components/{ => schedule}/queue/view/ContentFrame.vue | 0 .../{ => schedule}/queue/view/DeleteConfirmationDialog.vue | 0 src/components/{ => schedule}/queue/view/Editor.vue | 0 src/components/{ => schedule}/queue/view/TopFrame.vue | 0 src/components/{ => schedule}/queue/view/ViewDialog.vue | 0 src/views/QueueView.vue | 2 +- 17 files changed, 2 insertions(+), 1 deletion(-) rename src/components/{ => schedule}/queue/ErrorDialog.vue (100%) rename src/components/{ => schedule}/queue/LoadingIndicator.vue (100%) rename src/components/{ => schedule}/queue/QueueFrame.vue (100%) rename src/components/{ => schedule}/queue/TableFrame.vue (100%) rename src/components/{ => schedule}/queue/TopFrame.vue (100%) rename src/components/{ => schedule}/queue/add/AddDialog.vue (100%) rename src/components/{ => schedule}/queue/add/DiscardConfirmationDialog.vue (100%) rename src/components/{ => schedule}/queue/add/Editor.vue (100%) rename src/components/{ => schedule}/queue/add/ItemAdd.vue (100%) rename src/components/{ => schedule}/queue/items.ts (100%) rename src/components/{ => schedule}/queue/view/ContentFrame.vue (100%) rename src/components/{ => schedule}/queue/view/DeleteConfirmationDialog.vue (100%) rename src/components/{ => schedule}/queue/view/Editor.vue (100%) rename src/components/{ => schedule}/queue/view/TopFrame.vue (100%) rename src/components/{ => schedule}/queue/view/ViewDialog.vue (100%) diff --git a/src/components/schedule/index.ts b/src/components/schedule/index.ts index 9abd25d..933e5c1 100644 --- a/src/components/schedule/index.ts +++ b/src/components/schedule/index.ts @@ -1 +1,2 @@ export { default as AutoModeButton } from "./auto-mode/auto-mode-button/AutoModeButton.vue"; +export { default as QueueFrame } from "./queue/QueueFrame.vue"; diff --git a/src/components/queue/ErrorDialog.vue b/src/components/schedule/queue/ErrorDialog.vue similarity index 100% rename from src/components/queue/ErrorDialog.vue rename to src/components/schedule/queue/ErrorDialog.vue diff --git a/src/components/queue/LoadingIndicator.vue b/src/components/schedule/queue/LoadingIndicator.vue similarity index 100% rename from src/components/queue/LoadingIndicator.vue rename to src/components/schedule/queue/LoadingIndicator.vue diff --git a/src/components/queue/QueueFrame.vue b/src/components/schedule/queue/QueueFrame.vue similarity index 100% rename from src/components/queue/QueueFrame.vue rename to src/components/schedule/queue/QueueFrame.vue diff --git a/src/components/queue/TableFrame.vue b/src/components/schedule/queue/TableFrame.vue similarity index 100% rename from src/components/queue/TableFrame.vue rename to src/components/schedule/queue/TableFrame.vue diff --git a/src/components/queue/TopFrame.vue b/src/components/schedule/queue/TopFrame.vue similarity index 100% rename from src/components/queue/TopFrame.vue rename to src/components/schedule/queue/TopFrame.vue diff --git a/src/components/queue/add/AddDialog.vue b/src/components/schedule/queue/add/AddDialog.vue similarity index 100% rename from src/components/queue/add/AddDialog.vue rename to src/components/schedule/queue/add/AddDialog.vue diff --git a/src/components/queue/add/DiscardConfirmationDialog.vue b/src/components/schedule/queue/add/DiscardConfirmationDialog.vue similarity index 100% rename from src/components/queue/add/DiscardConfirmationDialog.vue rename to src/components/schedule/queue/add/DiscardConfirmationDialog.vue diff --git a/src/components/queue/add/Editor.vue b/src/components/schedule/queue/add/Editor.vue similarity index 100% rename from src/components/queue/add/Editor.vue rename to src/components/schedule/queue/add/Editor.vue diff --git a/src/components/queue/add/ItemAdd.vue b/src/components/schedule/queue/add/ItemAdd.vue similarity index 100% rename from src/components/queue/add/ItemAdd.vue rename to src/components/schedule/queue/add/ItemAdd.vue diff --git a/src/components/queue/items.ts b/src/components/schedule/queue/items.ts similarity index 100% rename from src/components/queue/items.ts rename to src/components/schedule/queue/items.ts diff --git a/src/components/queue/view/ContentFrame.vue b/src/components/schedule/queue/view/ContentFrame.vue similarity index 100% rename from src/components/queue/view/ContentFrame.vue rename to src/components/schedule/queue/view/ContentFrame.vue diff --git a/src/components/queue/view/DeleteConfirmationDialog.vue b/src/components/schedule/queue/view/DeleteConfirmationDialog.vue similarity index 100% rename from src/components/queue/view/DeleteConfirmationDialog.vue rename to src/components/schedule/queue/view/DeleteConfirmationDialog.vue diff --git a/src/components/queue/view/Editor.vue b/src/components/schedule/queue/view/Editor.vue similarity index 100% rename from src/components/queue/view/Editor.vue rename to src/components/schedule/queue/view/Editor.vue diff --git a/src/components/queue/view/TopFrame.vue b/src/components/schedule/queue/view/TopFrame.vue similarity index 100% rename from src/components/queue/view/TopFrame.vue rename to src/components/schedule/queue/view/TopFrame.vue diff --git a/src/components/queue/view/ViewDialog.vue b/src/components/schedule/queue/view/ViewDialog.vue similarity index 100% rename from src/components/queue/view/ViewDialog.vue rename to src/components/schedule/queue/view/ViewDialog.vue diff --git a/src/views/QueueView.vue b/src/views/QueueView.vue index 554924f..7affce5 100644 --- a/src/views/QueueView.vue +++ b/src/views/QueueView.vue @@ -3,5 +3,5 @@ From e9345054a0477dcd9328098c229fab63df6b7205 Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Fri, 31 May 2024 17:13:39 -0400 Subject: [PATCH 3/5] Rename "@/components/History" to "@/components/rdb" --- src/components/{History => rdb}/RunCard.vue | 0 src/views/db/RunView.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/components/{History => rdb}/RunCard.vue (100%) diff --git a/src/components/History/RunCard.vue b/src/components/rdb/RunCard.vue similarity index 100% rename from src/components/History/RunCard.vue rename to src/components/rdb/RunCard.vue diff --git a/src/views/db/RunView.vue b/src/views/db/RunView.vue index e81116a..2cf90d9 100644 --- a/src/views/db/RunView.vue +++ b/src/views/db/RunView.vue @@ -4,7 +4,7 @@ import { useRoute } from "vue-router"; import { useRdbRunQuery } from "@/graphql/codegen/generated"; -import RunCard from "@/components/History/RunCard.vue"; +import RunCard from "@/components/rdb/RunCard.vue"; const route = useRoute(); const runNo = Number(route.params.runNo); From 50126fb8303f79ff1b3bde348616be044fc7464d Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Fri, 31 May 2024 17:19:37 -0400 Subject: [PATCH 4/5] Move "@/views/db/*" to "@/components/rdb/" --- src/{views/db => components/rdb}/RefreshButton.vue | 0 src/{views/db => components/rdb}/RunView.vue | 2 +- src/{views/db => components/rdb}/RunsView.vue | 0 src/plugins/router.ts | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{views/db => components/rdb}/RefreshButton.vue (100%) rename src/{views/db => components/rdb}/RunView.vue (96%) rename src/{views/db => components/rdb}/RunsView.vue (100%) diff --git a/src/views/db/RefreshButton.vue b/src/components/rdb/RefreshButton.vue similarity index 100% rename from src/views/db/RefreshButton.vue rename to src/components/rdb/RefreshButton.vue diff --git a/src/views/db/RunView.vue b/src/components/rdb/RunView.vue similarity index 96% rename from src/views/db/RunView.vue rename to src/components/rdb/RunView.vue index 2cf90d9..1fc99a5 100644 --- a/src/views/db/RunView.vue +++ b/src/components/rdb/RunView.vue @@ -4,7 +4,7 @@ import { useRoute } from "vue-router"; import { useRdbRunQuery } from "@/graphql/codegen/generated"; -import RunCard from "@/components/rdb/RunCard.vue"; +import RunCard from "./RunCard.vue"; const route = useRoute(); const runNo = Number(route.params.runNo); diff --git a/src/views/db/RunsView.vue b/src/components/rdb/RunsView.vue similarity index 100% rename from src/views/db/RunsView.vue rename to src/components/rdb/RunsView.vue diff --git a/src/plugins/router.ts b/src/plugins/router.ts index 24cb841..640fcad 100644 --- a/src/plugins/router.ts +++ b/src/plugins/router.ts @@ -2,8 +2,8 @@ import { createRouter, createWebHistory } from "vue-router"; import type { RouteRecordRaw } from "vue-router"; import HomeView from "@/views/main/HomeView.vue"; -import RunsView from "@/views/db/RunsView.vue"; -import RunView from "@/views/db/RunView.vue"; +import RunsView from "@/components/rdb/RunsView.vue"; +import RunView from "@/components/rdb/RunView.vue"; const routes: RouteRecordRaw[] = [ { From 912d20a89aedf325063be3bc797ce57319fe4cfa Mon Sep 17 00:00:00 2001 From: Tai Sakuma Date: Fri, 31 May 2024 17:26:41 -0400 Subject: [PATCH 5/5] Move "@/view/QueueView.vue" to "@/components/schedule/queue/" --- src/components/schedule/index.ts | 1 - src/{views => components/schedule/queue}/QueueView.vue | 2 +- src/plugins/router.ts | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename src/{views => components/schedule/queue}/QueueView.vue (62%) diff --git a/src/components/schedule/index.ts b/src/components/schedule/index.ts index 933e5c1..9abd25d 100644 --- a/src/components/schedule/index.ts +++ b/src/components/schedule/index.ts @@ -1,2 +1 @@ export { default as AutoModeButton } from "./auto-mode/auto-mode-button/AutoModeButton.vue"; -export { default as QueueFrame } from "./queue/QueueFrame.vue"; diff --git a/src/views/QueueView.vue b/src/components/schedule/queue/QueueView.vue similarity index 62% rename from src/views/QueueView.vue rename to src/components/schedule/queue/QueueView.vue index 7affce5..f0b3a59 100644 --- a/src/views/QueueView.vue +++ b/src/components/schedule/queue/QueueView.vue @@ -3,5 +3,5 @@ diff --git a/src/plugins/router.ts b/src/plugins/router.ts index 640fcad..5ef1735 100644 --- a/src/plugins/router.ts +++ b/src/plugins/router.ts @@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [ { path: "/queue", name: "queue", - component: () => import("@/views/QueueView.vue"), + component: () => import("@/components/schedule/queue/QueueView.vue"), }, { path: "/db/runs",