From a86dcf7d7a62c94e9267cd3b7f5009d5abf2511d Mon Sep 17 00:00:00 2001 From: h8570rg Date: Thu, 30 Jan 2025 01:07:03 +0900 Subject: [PATCH 1/2] refactor: directory --- .../{(routes) => }/auth-code-error/page.tsx | 0 .../_components}/LoginForm/actions.ts | 0 .../_components}/LoginForm/index.tsx | 0 .../_components}/SocialProviders/index.tsx | 0 app/(auth)/{(routes) => }/login/page.tsx | 4 ++-- .../_components}/RegisterForm/actions.ts | 0 .../_components}/RegisterForm/index.tsx | 0 app/(auth)/{(routes) => }/register/page.tsx | 4 ++-- .../_components}/SignUpForm/actions.ts | 0 .../_components}/SignUpForm/index.tsx | 0 app/(auth)/{(routes) => }/sign-up/page.tsx | 2 +- app/(lp)/{(assets) => _assets}/match.png | Bin .../FAQ.tsx => _components/Faq.tsx} | 2 +- app/(lp)/page.tsx | 4 ++-- .../[matchId]/(components)/ChipModal/index.tsx | 2 -- .../[matchId]/(components)/DataModal/index.tsx | 2 -- .../[matchId]/(components)/GameModal/index.tsx | 2 -- .../(components)/PlayersModal/index.tsx | 2 -- .../[matchId]/(components)/RuleModal/index.tsx | 2 -- .../Appbar/Avatar/Menu/actions.ts | 0 .../Appbar/Avatar/Menu/index.tsx | 0 .../Appbar/Avatar/index.tsx | 0 .../Appbar/index.tsx | 0 .../ReleaseNotes/ReleaseNotesModal/index.tsx | 0 .../ReleaseNotesModal/versions/0_1_0.tsx | 0 .../ReleaseNotesModal/versions/0_1_1.tsx | 0 .../ReleaseNotesModal/versions/index.ts | 0 .../ReleaseNotes/index.tsx | 0 .../_components}/AddButton/actions.ts | 0 .../_components}/AddButton/index.tsx | 0 .../_components}/FriendMenu/actions.ts | 0 .../_components}/FriendMenu/index.tsx | 0 app/(main)/{(routes) => }/friends/loading.tsx | 0 app/(main)/{(routes) => }/friends/page.tsx | 4 ++-- app/(main)/layout.tsx | 4 ++-- .../_components/ChipModal}/Form/actions.ts | 0 .../_components/ChipModal}/Form/index.tsx | 2 +- .../ChipModal}/ModalController/index.tsx | 2 +- .../_components/ChipModal}/Root/index.tsx | 0 .../_components/ChipModal}/Trigger/index.tsx | 2 +- .../[matchId]/_components/ChipModal/index.tsx | 2 ++ .../_components}/ContextProvider/index.tsx | 0 .../_components/DataModal}/Chart/index.tsx | 0 .../DataModal}/ModalController/index.tsx | 2 +- .../_components/DataModal}/Root/index.tsx | 0 .../_components/DataModal}/Summary/index.tsx | 0 .../_components/DataModal}/Trigger/index.tsx | 2 +- .../[matchId]/_components/DataModal/index.tsx | 2 ++ .../_components/GameModal}/Form/actions.ts | 0 .../_components/GameModal}/Form/index.tsx | 2 +- .../GameModal}/ModalController/index.tsx | 2 +- .../_components/GameModal}/Root/index.tsx | 0 .../_components/GameModal}/Trigger/index.tsx | 2 +- .../[matchId]/_components/GameModal/index.tsx | 2 ++ .../MatchTable}/AddGameButton/index.tsx | 2 +- .../_components/MatchTable}/GameRow/index.tsx | 0 .../GameDeleteConfirmDialog/actions.ts | 0 .../GameDeleteConfirmDialog/index.tsx | 0 .../MatchTable}/GameUpdateModal/index.tsx | 2 +- .../[matchId]/_components}/MatchTable/index.tsx | 2 +- .../Content}/ProfileCreateModal/actions.ts | 0 .../Content}/ProfileCreateModal/index.tsx | 0 .../_components/PlayersModal}/Content/actions.ts | 0 .../_components/PlayersModal}/Content/index.tsx | 2 +- .../PlayersModal}/ModalController/index.tsx | 2 +- .../_components/PlayersModal}/Root/index.tsx | 0 .../_components/PlayersModal}/Trigger/index.tsx | 2 +- .../[matchId]/_components/PlayersModal/index.tsx | 2 ++ .../_components/RuleModal}/Content/index.tsx | 0 .../RuleModal}/ModalController/index.tsx | 2 +- .../_components/RuleModal}/Root/index.tsx | 0 .../_components/RuleModal}/Trigger/index.tsx | 2 +- .../[matchId]/_components/RuleModal/index.tsx | 2 ++ .../(routes) => matches}/[matchId]/context.ts | 0 .../(routes) => matches}/[matchId]/loading.tsx | 0 .../(routes) => matches}/[matchId]/page.tsx | 14 +++++++------- .../_components}/CreateMatchButton/actions.ts | 0 .../_components}/CreateMatchButton/index.tsx | 0 .../_components/MatchCard}/Card/index.tsx | 0 .../_components}/MatchCard/index.tsx | 2 +- app/(main)/{(routes) => }/matches/loading.tsx | 0 app/(main)/{(routes) => }/matches/page.tsx | 4 ++-- .../{(routes) => }/maintenance/page.tsx | 0 app/.DS_Store | Bin 0 -> 6148 bytes 84 files changed, 48 insertions(+), 48 deletions(-) rename app/(auth)/{(routes) => }/auth-code-error/page.tsx (100%) rename app/(auth)/{(routes)/login/(components) => login/_components}/LoginForm/actions.ts (100%) rename app/(auth)/{(routes)/login/(components) => login/_components}/LoginForm/index.tsx (100%) rename app/(auth)/{(routes)/login/(components) => login/_components}/SocialProviders/index.tsx (100%) rename app/(auth)/{(routes) => }/login/page.tsx (85%) rename app/(auth)/{(routes)/register/(components) => register/_components}/RegisterForm/actions.ts (100%) rename app/(auth)/{(routes)/register/(components) => register/_components}/RegisterForm/index.tsx (100%) rename app/(auth)/{(routes) => }/register/page.tsx (90%) rename app/(auth)/{(routes)/sign-up/(components) => sign-up/_components}/SignUpForm/actions.ts (100%) rename app/(auth)/{(routes)/sign-up/(components) => sign-up/_components}/SignUpForm/index.tsx (100%) rename app/(auth)/{(routes) => }/sign-up/page.tsx (89%) rename app/(lp)/{(assets) => _assets}/match.png (100%) rename app/(lp)/{(components)/FAQ.tsx => _components/Faq.tsx} (95%) delete mode 100644 app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/index.tsx delete mode 100644 app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/index.tsx delete mode 100644 app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/index.tsx delete mode 100644 app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/index.tsx delete mode 100644 app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/index.tsx rename app/(main)/{(components) => _components}/Appbar/Avatar/Menu/actions.ts (100%) rename app/(main)/{(components) => _components}/Appbar/Avatar/Menu/index.tsx (100%) rename app/(main)/{(components) => _components}/Appbar/Avatar/index.tsx (100%) rename app/(main)/{(components) => _components}/Appbar/index.tsx (100%) rename app/(main)/{(components) => _components}/ReleaseNotes/ReleaseNotesModal/index.tsx (100%) rename app/(main)/{(components) => _components}/ReleaseNotes/ReleaseNotesModal/versions/0_1_0.tsx (100%) rename app/(main)/{(components) => _components}/ReleaseNotes/ReleaseNotesModal/versions/0_1_1.tsx (100%) rename app/(main)/{(components) => _components}/ReleaseNotes/ReleaseNotesModal/versions/index.ts (100%) rename app/(main)/{(components) => _components}/ReleaseNotes/index.tsx (100%) rename app/(main)/{(routes)/friends/(components) => friends/_components}/AddButton/actions.ts (100%) rename app/(main)/{(routes)/friends/(components) => friends/_components}/AddButton/index.tsx (100%) rename app/(main)/{(routes)/friends/(components) => friends/_components}/FriendMenu/actions.ts (100%) rename app/(main)/{(routes)/friends/(components) => friends/_components}/FriendMenu/index.tsx (100%) rename app/(main)/{(routes) => }/friends/loading.tsx (100%) rename app/(main)/{(routes) => }/friends/page.tsx (86%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components) => matches/[matchId]/_components/ChipModal}/Form/actions.ts (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components) => matches/[matchId]/_components/ChipModal}/Form/index.tsx (98%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components) => matches/[matchId]/_components/ChipModal}/ModalController/index.tsx (89%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components) => matches/[matchId]/_components/ChipModal}/Root/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components) => matches/[matchId]/_components/ChipModal}/Trigger/index.tsx (88%) create mode 100644 app/(main)/matches/[matchId]/_components/ChipModal/index.tsx rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components) => matches/[matchId]/_components}/ContextProvider/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components) => matches/[matchId]/_components/DataModal}/Chart/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components) => matches/[matchId]/_components/DataModal}/ModalController/index.tsx (88%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components) => matches/[matchId]/_components/DataModal}/Root/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components) => matches/[matchId]/_components/DataModal}/Summary/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components) => matches/[matchId]/_components/DataModal}/Trigger/index.tsx (88%) create mode 100644 app/(main)/matches/[matchId]/_components/DataModal/index.tsx rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components) => matches/[matchId]/_components/GameModal}/Form/actions.ts (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components) => matches/[matchId]/_components/GameModal}/Form/index.tsx (99%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components) => matches/[matchId]/_components/GameModal}/ModalController/index.tsx (89%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components) => matches/[matchId]/_components/GameModal}/Root/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components) => matches/[matchId]/_components/GameModal}/Trigger/index.tsx (92%) create mode 100644 app/(main)/matches/[matchId]/_components/GameModal/index.tsx rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components) => matches/[matchId]/_components/MatchTable}/AddGameButton/index.tsx (91%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components) => matches/[matchId]/_components/MatchTable}/GameRow/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components) => matches/[matchId]/_components/MatchTable/GameUpdateModal}/GameDeleteConfirmDialog/actions.ts (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components) => matches/[matchId]/_components/MatchTable/GameUpdateModal}/GameDeleteConfirmDialog/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components) => matches/[matchId]/_components/MatchTable}/GameUpdateModal/index.tsx (96%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components) => matches/[matchId]/_components}/MatchTable/index.tsx (99%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components) => matches/[matchId]/_components/PlayersModal/Content}/ProfileCreateModal/actions.ts (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components) => matches/[matchId]/_components/PlayersModal/Content}/ProfileCreateModal/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components) => matches/[matchId]/_components/PlayersModal}/Content/actions.ts (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components) => matches/[matchId]/_components/PlayersModal}/Content/index.tsx (99%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components) => matches/[matchId]/_components/PlayersModal}/ModalController/index.tsx (90%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components) => matches/[matchId]/_components/PlayersModal}/Root/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components) => matches/[matchId]/_components/PlayersModal}/Trigger/index.tsx (88%) create mode 100644 app/(main)/matches/[matchId]/_components/PlayersModal/index.tsx rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components) => matches/[matchId]/_components/RuleModal}/Content/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components) => matches/[matchId]/_components/RuleModal}/ModalController/index.tsx (84%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components) => matches/[matchId]/_components/RuleModal}/Root/index.tsx (100%) rename app/(main)/{(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components) => matches/[matchId]/_components/RuleModal}/Trigger/index.tsx (88%) create mode 100644 app/(main)/matches/[matchId]/_components/RuleModal/index.tsx rename app/(main)/{(routes)/matches/(routes) => matches}/[matchId]/context.ts (100%) rename app/(main)/{(routes)/matches/(routes) => matches}/[matchId]/loading.tsx (100%) rename app/(main)/{(routes)/matches/(routes) => matches}/[matchId]/page.tsx (82%) rename app/(main)/{(routes)/matches/(components) => matches/_components}/CreateMatchButton/actions.ts (100%) rename app/(main)/{(routes)/matches/(components) => matches/_components}/CreateMatchButton/index.tsx (100%) rename app/(main)/{(routes)/matches/(components)/MatchCard/(components) => matches/_components/MatchCard}/Card/index.tsx (100%) rename app/(main)/{(routes)/matches/(components) => matches/_components}/MatchCard/index.tsx (97%) rename app/(main)/{(routes) => }/matches/loading.tsx (100%) rename app/(main)/{(routes) => }/matches/page.tsx (89%) rename app/(maintenance)/{(routes) => }/maintenance/page.tsx (100%) create mode 100644 app/.DS_Store diff --git a/app/(auth)/(routes)/auth-code-error/page.tsx b/app/(auth)/auth-code-error/page.tsx similarity index 100% rename from app/(auth)/(routes)/auth-code-error/page.tsx rename to app/(auth)/auth-code-error/page.tsx diff --git a/app/(auth)/(routes)/login/(components)/LoginForm/actions.ts b/app/(auth)/login/_components/LoginForm/actions.ts similarity index 100% rename from app/(auth)/(routes)/login/(components)/LoginForm/actions.ts rename to app/(auth)/login/_components/LoginForm/actions.ts diff --git a/app/(auth)/(routes)/login/(components)/LoginForm/index.tsx b/app/(auth)/login/_components/LoginForm/index.tsx similarity index 100% rename from app/(auth)/(routes)/login/(components)/LoginForm/index.tsx rename to app/(auth)/login/_components/LoginForm/index.tsx diff --git a/app/(auth)/(routes)/login/(components)/SocialProviders/index.tsx b/app/(auth)/login/_components/SocialProviders/index.tsx similarity index 100% rename from app/(auth)/(routes)/login/(components)/SocialProviders/index.tsx rename to app/(auth)/login/_components/SocialProviders/index.tsx diff --git a/app/(auth)/(routes)/login/page.tsx b/app/(auth)/login/page.tsx similarity index 85% rename from app/(auth)/(routes)/login/page.tsx rename to app/(auth)/login/page.tsx index 2fa9df5..7584de8 100644 --- a/app/(auth)/(routes)/login/page.tsx +++ b/app/(auth)/login/page.tsx @@ -1,8 +1,8 @@ import { Metadata } from "next"; import Link from "next/link"; import { Divider } from "@/components/Divider"; -import { LoginForm } from "./(components)/LoginForm"; -import { SocialProviders } from "./(components)/SocialProviders"; +import { LoginForm } from "./_components/LoginForm"; +import { SocialProviders } from "./_components/SocialProviders"; export const metadata: Metadata = { title: "ログイン", diff --git a/app/(auth)/(routes)/register/(components)/RegisterForm/actions.ts b/app/(auth)/register/_components/RegisterForm/actions.ts similarity index 100% rename from app/(auth)/(routes)/register/(components)/RegisterForm/actions.ts rename to app/(auth)/register/_components/RegisterForm/actions.ts diff --git a/app/(auth)/(routes)/register/(components)/RegisterForm/index.tsx b/app/(auth)/register/_components/RegisterForm/index.tsx similarity index 100% rename from app/(auth)/(routes)/register/(components)/RegisterForm/index.tsx rename to app/(auth)/register/_components/RegisterForm/index.tsx diff --git a/app/(auth)/(routes)/register/page.tsx b/app/(auth)/register/page.tsx similarity index 90% rename from app/(auth)/(routes)/register/page.tsx rename to app/(auth)/register/page.tsx index 1a7c911..3f95fed 100644 --- a/app/(auth)/(routes)/register/page.tsx +++ b/app/(auth)/register/page.tsx @@ -2,8 +2,8 @@ import { Metadata } from "next"; import { redirect } from "next/navigation"; import { Button } from "@/components/Button"; import { serverServices } from "@/lib/services/server"; -import { RegisterForm } from "./(components)/RegisterForm"; -import { signOut } from "./(components)/RegisterForm/actions"; +import { RegisterForm } from "./_components/RegisterForm"; +import { signOut } from "./_components/RegisterForm/actions"; export const metadata: Metadata = { title: "ユーザー情報登録", diff --git a/app/(auth)/(routes)/sign-up/(components)/SignUpForm/actions.ts b/app/(auth)/sign-up/_components/SignUpForm/actions.ts similarity index 100% rename from app/(auth)/(routes)/sign-up/(components)/SignUpForm/actions.ts rename to app/(auth)/sign-up/_components/SignUpForm/actions.ts diff --git a/app/(auth)/(routes)/sign-up/(components)/SignUpForm/index.tsx b/app/(auth)/sign-up/_components/SignUpForm/index.tsx similarity index 100% rename from app/(auth)/(routes)/sign-up/(components)/SignUpForm/index.tsx rename to app/(auth)/sign-up/_components/SignUpForm/index.tsx diff --git a/app/(auth)/(routes)/sign-up/page.tsx b/app/(auth)/sign-up/page.tsx similarity index 89% rename from app/(auth)/(routes)/sign-up/page.tsx rename to app/(auth)/sign-up/page.tsx index 4ba5d87..522b7d8 100644 --- a/app/(auth)/(routes)/sign-up/page.tsx +++ b/app/(auth)/sign-up/page.tsx @@ -1,6 +1,6 @@ import { Metadata } from "next"; import Link from "next/link"; -import { SignUpForm } from "./(components)/SignUpForm"; +import { SignUpForm } from "./_components/SignUpForm"; export const metadata: Metadata = { title: "新規登録", diff --git a/app/(lp)/(assets)/match.png b/app/(lp)/_assets/match.png similarity index 100% rename from app/(lp)/(assets)/match.png rename to app/(lp)/_assets/match.png diff --git a/app/(lp)/(components)/FAQ.tsx b/app/(lp)/_components/Faq.tsx similarity index 95% rename from app/(lp)/(components)/FAQ.tsx rename to app/(lp)/_components/Faq.tsx index 79a934d..f720cfd 100644 --- a/app/(lp)/(components)/FAQ.tsx +++ b/app/(lp)/_components/Faq.tsx @@ -2,7 +2,7 @@ import { Accordion, AccordionItem } from "@/components/Accordion"; -export function FAQ({ +export function Faq({ faqs, }: { faqs: { question: string; answer: string }[]; diff --git a/app/(lp)/page.tsx b/app/(lp)/page.tsx index e42c2d6..9368c19 100644 --- a/app/(lp)/page.tsx +++ b/app/(lp)/page.tsx @@ -6,7 +6,7 @@ import { Card, CardBody } from "@/components/Card"; import Logo from "@/components/Logo"; import { SERVICE_NAME } from "@/lib/config"; import match from "./(assets)/match.png"; -import { FAQ } from "./(components)/FAQ"; +import { Faq } from "./_components/Faq"; const features = [ { @@ -156,7 +156,7 @@ export default function LandingPage() {

よくある質問

- +
diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/index.tsx deleted file mode 100644 index 9f6b6b8..0000000 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { ChipModalRoot as ChipModal } from "./(components)/Root"; -export { ChipModalTrigger } from "./(components)/Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/index.tsx deleted file mode 100644 index 10b40f5..0000000 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { DataModalRoot as DataModal } from "./(components)/Root"; -export { DataModalTrigger } from "./(components)/Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/index.tsx deleted file mode 100644 index c0e708f..0000000 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { GameModalRoot as GameModal } from "./(components)/Root"; -export { GameModalTrigger } from "./(components)/Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/index.tsx deleted file mode 100644 index cd69a7e..0000000 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { PlayersModalRoot as PlayersModal } from "./(components)/Root"; -export { PlayersModalTrigger } from "./(components)/Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/index.tsx deleted file mode 100644 index bc358b3..0000000 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/index.tsx +++ /dev/null @@ -1,2 +0,0 @@ -export { RuleModalRoot as RuleModal } from "./(components)/Root"; -export { RuleModalTrigger } from "./(components)/Trigger"; diff --git a/app/(main)/(components)/Appbar/Avatar/Menu/actions.ts b/app/(main)/_components/Appbar/Avatar/Menu/actions.ts similarity index 100% rename from app/(main)/(components)/Appbar/Avatar/Menu/actions.ts rename to app/(main)/_components/Appbar/Avatar/Menu/actions.ts diff --git a/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx b/app/(main)/_components/Appbar/Avatar/Menu/index.tsx similarity index 100% rename from app/(main)/(components)/Appbar/Avatar/Menu/index.tsx rename to app/(main)/_components/Appbar/Avatar/Menu/index.tsx diff --git a/app/(main)/(components)/Appbar/Avatar/index.tsx b/app/(main)/_components/Appbar/Avatar/index.tsx similarity index 100% rename from app/(main)/(components)/Appbar/Avatar/index.tsx rename to app/(main)/_components/Appbar/Avatar/index.tsx diff --git a/app/(main)/(components)/Appbar/index.tsx b/app/(main)/_components/Appbar/index.tsx similarity index 100% rename from app/(main)/(components)/Appbar/index.tsx rename to app/(main)/_components/Appbar/index.tsx diff --git a/app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/index.tsx b/app/(main)/_components/ReleaseNotes/ReleaseNotesModal/index.tsx similarity index 100% rename from app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/index.tsx rename to app/(main)/_components/ReleaseNotes/ReleaseNotesModal/index.tsx diff --git a/app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/0_1_0.tsx b/app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/0_1_0.tsx similarity index 100% rename from app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/0_1_0.tsx rename to app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/0_1_0.tsx diff --git a/app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/0_1_1.tsx b/app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/0_1_1.tsx similarity index 100% rename from app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/0_1_1.tsx rename to app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/0_1_1.tsx diff --git a/app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/index.ts b/app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/index.ts similarity index 100% rename from app/(main)/(components)/ReleaseNotes/ReleaseNotesModal/versions/index.ts rename to app/(main)/_components/ReleaseNotes/ReleaseNotesModal/versions/index.ts diff --git a/app/(main)/(components)/ReleaseNotes/index.tsx b/app/(main)/_components/ReleaseNotes/index.tsx similarity index 100% rename from app/(main)/(components)/ReleaseNotes/index.tsx rename to app/(main)/_components/ReleaseNotes/index.tsx diff --git a/app/(main)/(routes)/friends/(components)/AddButton/actions.ts b/app/(main)/friends/_components/AddButton/actions.ts similarity index 100% rename from app/(main)/(routes)/friends/(components)/AddButton/actions.ts rename to app/(main)/friends/_components/AddButton/actions.ts diff --git a/app/(main)/(routes)/friends/(components)/AddButton/index.tsx b/app/(main)/friends/_components/AddButton/index.tsx similarity index 100% rename from app/(main)/(routes)/friends/(components)/AddButton/index.tsx rename to app/(main)/friends/_components/AddButton/index.tsx diff --git a/app/(main)/(routes)/friends/(components)/FriendMenu/actions.ts b/app/(main)/friends/_components/FriendMenu/actions.ts similarity index 100% rename from app/(main)/(routes)/friends/(components)/FriendMenu/actions.ts rename to app/(main)/friends/_components/FriendMenu/actions.ts diff --git a/app/(main)/(routes)/friends/(components)/FriendMenu/index.tsx b/app/(main)/friends/_components/FriendMenu/index.tsx similarity index 100% rename from app/(main)/(routes)/friends/(components)/FriendMenu/index.tsx rename to app/(main)/friends/_components/FriendMenu/index.tsx diff --git a/app/(main)/(routes)/friends/loading.tsx b/app/(main)/friends/loading.tsx similarity index 100% rename from app/(main)/(routes)/friends/loading.tsx rename to app/(main)/friends/loading.tsx diff --git a/app/(main)/(routes)/friends/page.tsx b/app/(main)/friends/page.tsx similarity index 86% rename from app/(main)/(routes)/friends/page.tsx rename to app/(main)/friends/page.tsx index 58a5c4a..4428d0c 100644 --- a/app/(main)/(routes)/friends/page.tsx +++ b/app/(main)/friends/page.tsx @@ -1,7 +1,7 @@ import { User } from "@/components/User"; import { serverServices } from "@/lib/services/server"; -import { AddButton } from "./(components)/AddButton"; -import { FriendMenu } from "./(components)/FriendMenu"; +import { AddButton } from "./_components/AddButton"; +import { FriendMenu } from "./_components/FriendMenu"; export default async function FriendsPage() { const { getFriends } = await serverServices(); diff --git a/app/(main)/layout.tsx b/app/(main)/layout.tsx index 0693f28..4ffeb10 100644 --- a/app/(main)/layout.tsx +++ b/app/(main)/layout.tsx @@ -1,5 +1,5 @@ -import Appbar from "./(components)/Appbar"; -import { ReleaseNotes } from "./(components)/ReleaseNotes"; +import Appbar from "./_components/Appbar"; +import { ReleaseNotes } from "./_components/ReleaseNotes"; export default function AppLayout({ children }: { children: React.ReactNode }) { return ( diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/actions.ts b/app/(main)/matches/[matchId]/_components/ChipModal/Form/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/actions.ts rename to app/(main)/matches/[matchId]/_components/ChipModal/Form/actions.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/index.tsx b/app/(main)/matches/[matchId]/_components/ChipModal/Form/index.tsx similarity index 98% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/index.tsx rename to app/(main)/matches/[matchId]/_components/ChipModal/Form/index.tsx index 9074c47..c8b74ac 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/index.tsx +++ b/app/(main)/matches/[matchId]/_components/ChipModal/Form/index.tsx @@ -6,7 +6,7 @@ import { Button } from "@/components/Button"; import { Input } from "@/components/Input"; import { ModalBody, ModalFooter } from "@/components/Modal"; import { Match } from "@/lib/type"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; import { addChip } from "./actions"; type Schema = { diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/ModalController/index.tsx b/app/(main)/matches/[matchId]/_components/ChipModal/ModalController/index.tsx similarity index 89% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/ModalController/index.tsx rename to app/(main)/matches/[matchId]/_components/ChipModal/ModalController/index.tsx index 262aabb..44b7179 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/ModalController/index.tsx +++ b/app/(main)/matches/[matchId]/_components/ChipModal/ModalController/index.tsx @@ -1,7 +1,7 @@ "use client"; import { Modal, ModalContent } from "@/components/Modal"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function ChipModalController({ children, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Root/index.tsx b/app/(main)/matches/[matchId]/_components/ChipModal/Root/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Root/index.tsx rename to app/(main)/matches/[matchId]/_components/ChipModal/Root/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Trigger/index.tsx b/app/(main)/matches/[matchId]/_components/ChipModal/Trigger/index.tsx similarity index 88% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Trigger/index.tsx rename to app/(main)/matches/[matchId]/_components/ChipModal/Trigger/index.tsx index 9aba9d0..7ea1374 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Trigger/index.tsx +++ b/app/(main)/matches/[matchId]/_components/ChipModal/Trigger/index.tsx @@ -1,7 +1,7 @@ "use client"; import { forwardRef } from "react"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export const ChipModalTrigger = forwardRef< HTMLButtonElement, diff --git a/app/(main)/matches/[matchId]/_components/ChipModal/index.tsx b/app/(main)/matches/[matchId]/_components/ChipModal/index.tsx new file mode 100644 index 0000000..f92918a --- /dev/null +++ b/app/(main)/matches/[matchId]/_components/ChipModal/index.tsx @@ -0,0 +1,2 @@ +export { ChipModalRoot as ChipModal } from "./Root"; +export { ChipModalTrigger } from "./Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ContextProvider/index.tsx b/app/(main)/matches/[matchId]/_components/ContextProvider/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ContextProvider/index.tsx rename to app/(main)/matches/[matchId]/_components/ContextProvider/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Chart/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/Chart/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Chart/index.tsx rename to app/(main)/matches/[matchId]/_components/DataModal/Chart/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/ModalController/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/ModalController/index.tsx similarity index 88% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/ModalController/index.tsx rename to app/(main)/matches/[matchId]/_components/DataModal/ModalController/index.tsx index dc3fbba..eeabccd 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/ModalController/index.tsx +++ b/app/(main)/matches/[matchId]/_components/DataModal/ModalController/index.tsx @@ -1,7 +1,7 @@ "use client"; import { Modal, ModalContent } from "@/components/Modal"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function DataModalController({ children, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Root/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/Root/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Root/index.tsx rename to app/(main)/matches/[matchId]/_components/DataModal/Root/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Summary/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/Summary/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Summary/index.tsx rename to app/(main)/matches/[matchId]/_components/DataModal/Summary/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Trigger/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/Trigger/index.tsx similarity index 88% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Trigger/index.tsx rename to app/(main)/matches/[matchId]/_components/DataModal/Trigger/index.tsx index 88d95b9..a670966 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Trigger/index.tsx +++ b/app/(main)/matches/[matchId]/_components/DataModal/Trigger/index.tsx @@ -1,7 +1,7 @@ "use client"; import { forwardRef } from "react"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export const DataModalTrigger = forwardRef< HTMLButtonElement, diff --git a/app/(main)/matches/[matchId]/_components/DataModal/index.tsx b/app/(main)/matches/[matchId]/_components/DataModal/index.tsx new file mode 100644 index 0000000..d80f936 --- /dev/null +++ b/app/(main)/matches/[matchId]/_components/DataModal/index.tsx @@ -0,0 +1,2 @@ +export { DataModalRoot as DataModal } from "./Root"; +export { DataModalTrigger } from "./Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/actions.ts b/app/(main)/matches/[matchId]/_components/GameModal/Form/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/actions.ts rename to app/(main)/matches/[matchId]/_components/GameModal/Form/actions.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/index.tsx b/app/(main)/matches/[matchId]/_components/GameModal/Form/index.tsx similarity index 99% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/index.tsx rename to app/(main)/matches/[matchId]/_components/GameModal/Form/index.tsx index 079674e..6cb8024 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/index.tsx +++ b/app/(main)/matches/[matchId]/_components/GameModal/Form/index.tsx @@ -12,7 +12,7 @@ import { Input } from "@/components/Input"; import { ModalBody, ModalFooter } from "@/components/Modal"; import { Select, SelectItem } from "@/components/Select"; import { Match } from "@/lib/type"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; import { addGame } from "./actions"; type Schema = { diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/ModalController/index.tsx b/app/(main)/matches/[matchId]/_components/GameModal/ModalController/index.tsx similarity index 89% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/ModalController/index.tsx rename to app/(main)/matches/[matchId]/_components/GameModal/ModalController/index.tsx index 71cd7bd..ec53d17 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/ModalController/index.tsx +++ b/app/(main)/matches/[matchId]/_components/GameModal/ModalController/index.tsx @@ -1,7 +1,7 @@ "use client"; import { Modal, ModalContent } from "@/components/Modal"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function GameModalController({ children, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Root/index.tsx b/app/(main)/matches/[matchId]/_components/GameModal/Root/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Root/index.tsx rename to app/(main)/matches/[matchId]/_components/GameModal/Root/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Trigger/index.tsx b/app/(main)/matches/[matchId]/_components/GameModal/Trigger/index.tsx similarity index 92% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Trigger/index.tsx rename to app/(main)/matches/[matchId]/_components/GameModal/Trigger/index.tsx index f2529e0..c5f06df 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Trigger/index.tsx +++ b/app/(main)/matches/[matchId]/_components/GameModal/Trigger/index.tsx @@ -2,7 +2,7 @@ import { forwardRef } from "react"; import { Button, ButtonProps } from "@/components/Button"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export const GameModalTrigger = forwardRef< HTMLButtonElement, diff --git a/app/(main)/matches/[matchId]/_components/GameModal/index.tsx b/app/(main)/matches/[matchId]/_components/GameModal/index.tsx new file mode 100644 index 0000000..099237a --- /dev/null +++ b/app/(main)/matches/[matchId]/_components/GameModal/index.tsx @@ -0,0 +1,2 @@ +export { GameModalRoot as GameModal } from "./Root"; +export { GameModalTrigger } from "./Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/AddGameButton/index.tsx b/app/(main)/matches/[matchId]/_components/MatchTable/AddGameButton/index.tsx similarity index 91% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/AddGameButton/index.tsx rename to app/(main)/matches/[matchId]/_components/MatchTable/AddGameButton/index.tsx index 336bc2d..48b8a9a 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/AddGameButton/index.tsx +++ b/app/(main)/matches/[matchId]/_components/MatchTable/AddGameButton/index.tsx @@ -2,7 +2,7 @@ import { Button } from "@/components/Button"; import { Icon } from "@/components/Icon"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function AddGameButton({ isPlayersShort }: { isPlayersShort: boolean }) { const { gameModal } = useMatchContext(); diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx b/app/(main)/matches/[matchId]/_components/MatchTable/GameRow/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx rename to app/(main)/matches/[matchId]/_components/MatchTable/GameRow/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components)/GameDeleteConfirmDialog/actions.ts b/app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/GameDeleteConfirmDialog/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components)/GameDeleteConfirmDialog/actions.ts rename to app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/GameDeleteConfirmDialog/actions.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components)/GameDeleteConfirmDialog/index.tsx b/app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/GameDeleteConfirmDialog/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/(components)/GameDeleteConfirmDialog/index.tsx rename to app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/GameDeleteConfirmDialog/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/index.tsx b/app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/index.tsx similarity index 96% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/index.tsx rename to app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/index.tsx index b67195d..a635374 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/index.tsx +++ b/app/(main)/matches/[matchId]/_components/MatchTable/GameUpdateModal/index.tsx @@ -12,7 +12,7 @@ import { import { GameDeleteConfirmDialog, useGameDeleteConfirmDialog, -} from "./(components)/GameDeleteConfirmDialog"; +} from "./GameDeleteConfirmDialog"; export function GameUpdateModal({ matchId, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx b/app/(main)/matches/[matchId]/_components/MatchTable/index.tsx similarity index 99% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx rename to app/(main)/matches/[matchId]/_components/MatchTable/index.tsx index 6cc34fd..22d58f9 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx +++ b/app/(main)/matches/[matchId]/_components/MatchTable/index.tsx @@ -6,7 +6,7 @@ import { MatchPlayer } from "@/lib/type"; import { ChipModalTrigger } from "../ChipModal"; import { GameModalTrigger } from "../GameModal"; import { PlayersModalTrigger } from "../PlayersModal"; -import { GameRow } from "./(components)/GameRow"; +import { GameRow } from "./GameRow"; type Column = { id: string; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components)/ProfileCreateModal/actions.ts b/app/(main)/matches/[matchId]/_components/PlayersModal/Content/ProfileCreateModal/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components)/ProfileCreateModal/actions.ts rename to app/(main)/matches/[matchId]/_components/PlayersModal/Content/ProfileCreateModal/actions.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components)/ProfileCreateModal/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/Content/ProfileCreateModal/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/(components)/ProfileCreateModal/index.tsx rename to app/(main)/matches/[matchId]/_components/PlayersModal/Content/ProfileCreateModal/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/actions.ts b/app/(main)/matches/[matchId]/_components/PlayersModal/Content/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/actions.ts rename to app/(main)/matches/[matchId]/_components/PlayersModal/Content/actions.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/Content/index.tsx similarity index 99% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/index.tsx rename to app/(main)/matches/[matchId]/_components/PlayersModal/Content/index.tsx index 7c0e135..378839b 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/index.tsx +++ b/app/(main)/matches/[matchId]/_components/PlayersModal/Content/index.tsx @@ -18,7 +18,7 @@ import { import { ScrollShadow } from "@/components/ScrollShadow"; import { User } from "@/components/User"; import { Profile } from "@/lib/type"; -import { ProfileCreateModal } from "./(components)/ProfileCreateModal"; +import { ProfileCreateModal } from "./ProfileCreateModal"; import { searchProfiles, updateMatchPlayers } from "./actions"; export function PlayersModalContent({ diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/ModalController/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/ModalController/index.tsx similarity index 90% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/ModalController/index.tsx rename to app/(main)/matches/[matchId]/_components/PlayersModal/ModalController/index.tsx index 6e21949..1adc9a1 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/ModalController/index.tsx +++ b/app/(main)/matches/[matchId]/_components/PlayersModal/ModalController/index.tsx @@ -2,7 +2,7 @@ import { useEffect } from "react"; import { Modal } from "@/components/Modal"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function PlayersModalController({ children, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Root/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/Root/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Root/index.tsx rename to app/(main)/matches/[matchId]/_components/PlayersModal/Root/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Trigger/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/Trigger/index.tsx similarity index 88% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Trigger/index.tsx rename to app/(main)/matches/[matchId]/_components/PlayersModal/Trigger/index.tsx index 62d2010..ee3f073 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Trigger/index.tsx +++ b/app/(main)/matches/[matchId]/_components/PlayersModal/Trigger/index.tsx @@ -1,7 +1,7 @@ "use client"; import { forwardRef } from "react"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export const PlayersModalTrigger = forwardRef< HTMLButtonElement, diff --git a/app/(main)/matches/[matchId]/_components/PlayersModal/index.tsx b/app/(main)/matches/[matchId]/_components/PlayersModal/index.tsx new file mode 100644 index 0000000..2731223 --- /dev/null +++ b/app/(main)/matches/[matchId]/_components/PlayersModal/index.tsx @@ -0,0 +1,2 @@ +export { PlayersModalRoot as PlayersModal } from "./Root"; +export { PlayersModalTrigger } from "./Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Content/index.tsx b/app/(main)/matches/[matchId]/_components/RuleModal/Content/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Content/index.tsx rename to app/(main)/matches/[matchId]/_components/RuleModal/Content/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/ModalController/index.tsx b/app/(main)/matches/[matchId]/_components/RuleModal/ModalController/index.tsx similarity index 84% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/ModalController/index.tsx rename to app/(main)/matches/[matchId]/_components/RuleModal/ModalController/index.tsx index 5bad3ce..ab81c84 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/ModalController/index.tsx +++ b/app/(main)/matches/[matchId]/_components/RuleModal/ModalController/index.tsx @@ -1,7 +1,7 @@ "use client"; import { Modal } from "@/components/Modal"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export function RuleModalController({ children, diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Root/index.tsx b/app/(main)/matches/[matchId]/_components/RuleModal/Root/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Root/index.tsx rename to app/(main)/matches/[matchId]/_components/RuleModal/Root/index.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Trigger/index.tsx b/app/(main)/matches/[matchId]/_components/RuleModal/Trigger/index.tsx similarity index 88% rename from app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Trigger/index.tsx rename to app/(main)/matches/[matchId]/_components/RuleModal/Trigger/index.tsx index 9f05b11..47f9e39 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Trigger/index.tsx +++ b/app/(main)/matches/[matchId]/_components/RuleModal/Trigger/index.tsx @@ -1,7 +1,7 @@ "use client"; import { forwardRef } from "react"; -import { useMatchContext } from "../../../../context"; +import { useMatchContext } from "../../../context"; export const RuleModalTrigger = forwardRef< HTMLButtonElement, diff --git a/app/(main)/matches/[matchId]/_components/RuleModal/index.tsx b/app/(main)/matches/[matchId]/_components/RuleModal/index.tsx new file mode 100644 index 0000000..2d73a7d --- /dev/null +++ b/app/(main)/matches/[matchId]/_components/RuleModal/index.tsx @@ -0,0 +1,2 @@ +export { RuleModalRoot as RuleModal } from "./Root"; +export { RuleModalTrigger } from "./Trigger"; diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/context.ts b/app/(main)/matches/[matchId]/context.ts similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/context.ts rename to app/(main)/matches/[matchId]/context.ts diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/loading.tsx b/app/(main)/matches/[matchId]/loading.tsx similarity index 100% rename from app/(main)/(routes)/matches/(routes)/[matchId]/loading.tsx rename to app/(main)/matches/[matchId]/loading.tsx diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx b/app/(main)/matches/[matchId]/page.tsx similarity index 82% rename from app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx rename to app/(main)/matches/[matchId]/page.tsx index 78b40af..84c4c3f 100644 --- a/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx +++ b/app/(main)/matches/[matchId]/page.tsx @@ -2,13 +2,13 @@ import Link from "next/link"; import { Suspense } from "react"; import { Button } from "@/components/Button"; import { Icon } from "@/components/Icon"; -import { ChipModal, ChipModalTrigger } from "./(components)/ChipModal"; -import { MatchContextProvider } from "./(components)/ContextProvider"; -import { DataModal, DataModalTrigger } from "./(components)/DataModal"; -import { GameModal } from "./(components)/GameModal"; -import { MatchTable } from "./(components)/MatchTable"; -import { PlayersModal, PlayersModalTrigger } from "./(components)/PlayersModal"; -import { RuleModal, RuleModalTrigger } from "./(components)/RuleModal"; +import { ChipModal, ChipModalTrigger } from "./_components/ChipModal"; +import { MatchContextProvider } from "./_components/ContextProvider"; +import { DataModal, DataModalTrigger } from "./_components/DataModal"; +import { GameModal } from "./_components/GameModal"; +import { MatchTable } from "./_components/MatchTable"; +import { PlayersModal, PlayersModalTrigger } from "./_components/PlayersModal"; +import { RuleModal, RuleModalTrigger } from "./_components/RuleModal"; export default async function Match({ params, diff --git a/app/(main)/(routes)/matches/(components)/CreateMatchButton/actions.ts b/app/(main)/matches/_components/CreateMatchButton/actions.ts similarity index 100% rename from app/(main)/(routes)/matches/(components)/CreateMatchButton/actions.ts rename to app/(main)/matches/_components/CreateMatchButton/actions.ts diff --git a/app/(main)/(routes)/matches/(components)/CreateMatchButton/index.tsx b/app/(main)/matches/_components/CreateMatchButton/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(components)/CreateMatchButton/index.tsx rename to app/(main)/matches/_components/CreateMatchButton/index.tsx diff --git a/app/(main)/(routes)/matches/(components)/MatchCard/(components)/Card/index.tsx b/app/(main)/matches/_components/MatchCard/Card/index.tsx similarity index 100% rename from app/(main)/(routes)/matches/(components)/MatchCard/(components)/Card/index.tsx rename to app/(main)/matches/_components/MatchCard/Card/index.tsx diff --git a/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx b/app/(main)/matches/_components/MatchCard/index.tsx similarity index 97% rename from app/(main)/(routes)/matches/(components)/MatchCard/index.tsx rename to app/(main)/matches/_components/MatchCard/index.tsx index 0350e6b..d51ac38 100644 --- a/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx +++ b/app/(main)/matches/_components/MatchCard/index.tsx @@ -3,7 +3,7 @@ import { CardBody, CardHeader } from "@/components/Card"; import { Divider } from "@/components/Divider"; import { Match } from "@/lib/type"; import { dayjs } from "@/lib/utils/date"; -import { NavigationCard } from "./(components)/Card"; +import { NavigationCard } from "./Card"; export function MatchCard({ match, userId }: { match: Match; userId: string }) { const { createdAt } = match; diff --git a/app/(main)/(routes)/matches/loading.tsx b/app/(main)/matches/loading.tsx similarity index 100% rename from app/(main)/(routes)/matches/loading.tsx rename to app/(main)/matches/loading.tsx diff --git a/app/(main)/(routes)/matches/page.tsx b/app/(main)/matches/page.tsx similarity index 89% rename from app/(main)/(routes)/matches/page.tsx rename to app/(main)/matches/page.tsx index 9c17af6..c678e29 100644 --- a/app/(main)/(routes)/matches/page.tsx +++ b/app/(main)/matches/page.tsx @@ -1,6 +1,6 @@ import { serverServices } from "@/lib/services/server"; -import { CreateMatchButton } from "./(components)/CreateMatchButton"; -import { MatchCard } from "./(components)/MatchCard"; +import { CreateMatchButton } from "./_components/CreateMatchButton"; +import { MatchCard } from "./_components/MatchCard"; export default async function Matches() { const { getMatches, getUser } = await serverServices(); diff --git a/app/(maintenance)/(routes)/maintenance/page.tsx b/app/(maintenance)/maintenance/page.tsx similarity index 100% rename from app/(maintenance)/(routes)/maintenance/page.tsx rename to app/(maintenance)/maintenance/page.tsx diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b67c2d2f56f4ed7879873aec863d9cfe12d025bd GIT binary patch literal 6148 zcmeHKyKciU3?!Q%FwiAqMvcvwKM;cC3;Y8KP@o+O2MFTMp88$=v>qRe<916I;|NeE zQ9KE{!8Aog_xphrpnVX7izWvu1~)eml-Do-SGgIZ^>CFjim@ z%eB@2Bm9s4e@xv3I;F7KrhEwSUKK! cQsfnzW4|U2flf!<=|KJrm@YIb@ZSpj0G!ek+W-In literal 0 HcmV?d00001 From d526b6c8cc673cc79690344282794b4e196e84a7 Mon Sep 17 00:00:00 2001 From: h8570rg Date: Thu, 30 Jan 2025 01:11:10 +0900 Subject: [PATCH 2/2] fix: assets import --- app/(lp)/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(lp)/page.tsx b/app/(lp)/page.tsx index 9368c19..d4fd8f5 100644 --- a/app/(lp)/page.tsx +++ b/app/(lp)/page.tsx @@ -5,7 +5,7 @@ import { Button } from "@/components/Button"; import { Card, CardBody } from "@/components/Card"; import Logo from "@/components/Logo"; import { SERVICE_NAME } from "@/lib/config"; -import match from "./(assets)/match.png"; +import match from "./_assets/match.png"; import { Faq } from "./_components/Faq"; const features = [