Merge pull request #332 from h8570rg/refactor/directory

refactor: directory

app/(auth)/(routes)/login/page.tsx → 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: "ログイン",

app/(auth)/(routes)/register/page.tsx → 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: "ユーザー情報登録",

app/(auth)/(routes)/sign-up/page.tsx → 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: "新規登録",

app/(lp)/(components)/FAQ.tsx → 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 }[];

app/(lp)/page.tsx

@@ -5,8 +5,8 @@ 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 { FAQ } from "./(components)/FAQ";
+import match from "./_assets/match.png";
+import { Faq } from "./_components/Faq";
 
 const features = [
   {
@@ -156,7 +156,7 @@ export default function LandingPage() {
         <section className="">
           <div className="container mx-auto">
             <h2 className="mb-12 text-center text-large">よくある質問</h2>
-            <FAQ faqs={faqs} />
+            <Faq faqs={faqs} />
           </div>
         </section>
       </div>

app/(main)/(routes)/friends/page.tsx → 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();

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 (

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Form/index.tsx → 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 = {

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/ModalController/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/ChipModal/(components)/Trigger/index.tsx → 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,

app/(main)/matches/[matchId]/_components/ChipModal/index.tsx

@@ -0,0 +1,2 @@
+export { ChipModalRoot as ChipModal } from "./Root";
+export { ChipModalTrigger } from "./Trigger";

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/ModalController/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/DataModal/(components)/Trigger/index.tsx → 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,

app/(main)/matches/[matchId]/_components/DataModal/index.tsx

@@ -0,0 +1,2 @@
+export { DataModalRoot as DataModal } from "./Root";
+export { DataModalTrigger } from "./Trigger";

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Form/index.tsx → 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 = {

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/ModalController/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/GameModal/(components)/Trigger/index.tsx → 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,

app/(main)/matches/[matchId]/_components/GameModal/index.tsx

@@ -0,0 +1,2 @@
+export { GameModalRoot as GameModal } from "./Root";
+export { GameModalTrigger } from "./Trigger";

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/AddGameButton/index.tsx → 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();

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameUpdateModal/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx → 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;

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Content/index.tsx → 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({

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/ModalController/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/PlayersModal/(components)/Trigger/index.tsx → 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,

app/(main)/matches/[matchId]/_components/PlayersModal/index.tsx

@@ -0,0 +1,2 @@
+export { PlayersModalRoot as PlayersModal } from "./Root";
+export { PlayersModalTrigger } from "./Trigger";

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/ModalController/index.tsx → 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,

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/RuleModal/(components)/Trigger/index.tsx → 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,

app/(main)/matches/[matchId]/_components/RuleModal/index.tsx

@@ -0,0 +1,2 @@
+export { RuleModalRoot as RuleModal } from "./Root";
+export { RuleModalTrigger } from "./Trigger";

app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx → 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,

app/(main)/(routes)/matches/(components)/MatchCard/index.tsx → 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;

app/(main)/(routes)/matches/page.tsx → 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();