Merge pull request #38 from Sports-day/feature/refactor-game-routing

ゲーム配下のルーティングを一部修正
Sports-day · May 19, 2024 · 65fe29f · 65fe29f
2 parents 7ac2d75 + b02070e
commit 65fe29f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/...uthenticated)/sports/[id]/league/page.tsx → ...cated)/sports/[id]/create-league/page.tsx b/...uthenticated)/sports/[id]/league/page.tsx → ...cated)/sports/[id]/create-league/page.tsx
@@ -10,7 +10,7 @@ export default async function LeaguePage({params}: { params: { id: string } }) {
     return (
         <Stack spacing={2} mx={2} my={3}>
             <Breadcrumbs aria-label="breadcrumb" sx={{pl:2}}>
-                <Link underline="hover" color="inherit" href="/">
+                <Link underline="hover" color="inherit" href="/public">
                     管理者のダッシュボード
                 </Link>
                 <Link underline="hover" color="inherit" href={"/sports"}>

diff --git a/...nticated)/sports/[id]/tournament/page.tsx → ...d)/sports/[id]/create-tournament/page.tsx b/...nticated)/sports/[id]/tournament/page.tsx → ...d)/sports/[id]/create-tournament/page.tsx
diff --git a/...)/sports/[id]/[gameId]/[matchId]/page.tsx → ...games/[gameId]/matches/[matchId]/page.tsx b/...)/sports/[id]/[gameId]/[matchId]/page.tsx → ...games/[gameId]/matches/[matchId]/page.tsx
@@ -15,7 +15,7 @@ export default async function MatchPage({params}: { params: { matchId:string, ga
     return(
         <Stack spacing={1} mx={2} my={3}>
             <Breadcrumbs aria-label="breadcrumb" sx={{pl:2}}>
-                <Link underline="hover" color="inherit" href="/">
+                <Link underline="hover" color="inherit" href="/public">
                     管理者のダッシュボード
                 </Link>
                 <Link underline="hover" color="inherit" href={"/sports"}>
@@ -24,7 +24,7 @@ export default async function MatchPage({params}: { params: { matchId:string, ga
                 <Link underline="hover" color="inherit" href={`/sports/${sport.id}`}>
                     {sport.name}
                 </Link>
-                <Link underline="hover" color="inherit" href={`/sports/${sport.id}/${gameId}`}>
+                <Link underline="hover" color="inherit" href={`/sports/${sport.id}/games/${gameId}`}>
                     {game.name}(ID:{gameId})
                 </Link>
                 <Typography color="text.primary">試合(ID:{match.id})</Typography>

diff --git a/...henticated)/sports/[id]/[gameId]/page.tsx → ...ated)/sports/[id]/games/[gameId]/page.tsx b/...henticated)/sports/[id]/[gameId]/page.tsx → ...ated)/sports/[id]/games/[gameId]/page.tsx
diff --git a/app/(authenticated)/sports/[id]/page.tsx b/app/(authenticated)/sports/[id]/page.tsx
@@ -19,20 +19,20 @@ export default async function SportPage({params}: { params: { id: string } }) {
                 <Link underline="hover" color="inherit" href="/">
                     管理者のダッシュボード
                 </Link>
-                <Link underline="hover" color="inherit" href="../../sports">
+                <Link underline="hover" color="inherit" href={"/sports"}>
                     競技管理
                 </Link>
                 <Typography color="text.primary">{sport.name}</Typography>
             </Breadcrumbs>
             {gameType === "league" && (
-                <CardBackground title={"リーグ一覧"} button={"リーグを作成・編集"} link={`/sports/${sport.id}/league`}>
+                <CardBackground title={"リーグ一覧"} button={"リーグを作成・編集"} link={`/sports/${sport.id}/create-league`}>
                     <Grid container spacing={1}>
                         <LeagueList games={filteredGames} sportId={sportId}/>
                     </Grid>
                 </CardBackground>
             )}
             {gameType === "tournament" && (
-                <CardBackground title={"トーナメントビュー"} button={"トーナメントを作成・編集"} link={`/sports/${sport.id}/tournament`}>
+                <CardBackground title={"トーナメントビュー"} button={"トーナメントを作成・編集"} link={`/sports/${sport.id}/create-tournament`}>
                     <Grid container spacing={1}>
 
                     </Grid>

diff --git a/components/sports/leagueList.tsx b/components/sports/leagueList.tsx
@@ -16,7 +16,7 @@ export default function LeagueList(props: LeagueListProps) {
                 <ButtonLarge
                     key={game.id}
                     img={"a"}
-                    link={`/sports/${sportId}/${game.id}`}
+                    link={`/sports/${sportId}/games/${game.id}`}
                 >
                     {game.name}
                 </ButtonLarge>

diff --git a/middleware.ts b/middleware.ts
@@ -6,11 +6,10 @@ export function middleware(request: NextRequest) {
     if (!accessToken) {
         const protectedPaths: string[] = [
             '/sports',
-            '/tournament',
-            '/league',
             '/teams',
             '/users',
             '/roles',
+            '/locations',
         ]
 
         //  check if next path starts with any of the protected paths or root