Merge branch 'main' into feature/build-test-ci

Sports-day · Oct 29, 2024 · 94e57a3 · 94e57a3
2 parents 8c339e2 + 2897ddf
commit 94e57a3
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 35 deletions.
diff --git a/components/league/legacy/GameForm.tsx b/components/league/legacy/GameForm.tsx
@@ -1,7 +1,7 @@
 'use client'
 import {Game, gameFactory} from "@/src/models/GameModel";
-import {FormEvent, useRef, useState} from "react";
-import {Button, Stack, TextFieldProps} from "@mui/material";
+import React, {FormEvent, useRef, useState} from "react";
+import {Alert, Button, Snackbar, Stack, TextFieldProps} from "@mui/material";
 import {Tag} from "@/src/models/TagModel";
 import {useRouter} from "next/navigation";
 import GameEditFields from "@/components/league/legacy/GameEditFields";
@@ -22,6 +22,7 @@ export default function GameForm(props: GameFormProps) {
     const descriptionRef = useRef<TextFieldProps>(null)
     const wightRef = useRef<TextFieldProps>(null)
     //  state
+    const [snackOpen, setSnackOpen] = React.useState<boolean>(false)
     const [typeState, setTypeState] = useState<string>(props.game?.type ?? '')
     const [calculationTypeState, setCalculationTypeState] = useState<string>(props.game?.calculationType ?? '')
     const [tag, setTag] = useState<string>(props.game?.tagId?.toString() ?? '')
@@ -54,7 +55,6 @@ export default function GameForm(props: GameFormProps) {
         }
 
 
-
         if (props.formType === "create") {
             const result = await gameFactory().create({
                 name: nameRef.current?.value as string,
@@ -87,40 +87,61 @@ export default function GameForm(props: GameFormProps) {
 
         //  refresh list
         router.refresh()
+        setSnackOpen(true)
     }
 
+    const handleSnackClose = () => {
+        setSnackOpen(false)
+    }
 
     return (
-        <Stack
-            spacing={1}
-            direction={"column"}
-        >
-            <GameEditFields
-                nameRef={nameRef}
-                descriptionRef={descriptionRef}
-                wightRef={wightRef}
-                typeState={typeState}
-                setTypeState={setTypeState}
-                calculationTypeState={calculationTypeState}
-                setCalculationTypeState={setCalculationTypeState}
-                tags={props.tags}
-                tag={tag}
-                setTag={setTag}
-                game={props.game}
-            />
-
-
-            <Button
-                type={"submit"}
-                variant={"contained"}
-                onClick={handleSubmit}
+        <>
+            <Stack
+                spacing={1}
+                direction={"column"}
             >
-                {
-                    props.formType == "create" ?
-                        "作成" :
-                        "編集"
-                }
-            </Button>
-        </Stack>
+                <GameEditFields
+                    nameRef={nameRef}
+                    descriptionRef={descriptionRef}
+                    wightRef={wightRef}
+                    typeState={typeState}
+                    setTypeState={setTypeState}
+                    calculationTypeState={calculationTypeState}
+                    setCalculationTypeState={setCalculationTypeState}
+                    tags={props.tags}
+                    tag={tag}
+                    setTag={setTag}
+                    game={props.game}
+                />
+
+
+                <Button
+                    type={"submit"}
+                    variant={"contained"}
+                    onClick={handleSubmit}
+                >
+                    {
+                        props.formType == "create" ?
+                            "作成" :
+                            "編集"
+                    }
+                </Button>
+            </Stack>
+            <Snackbar
+                open={snackOpen}
+                autoHideDuration={6000}
+                onClose={handleSnackClose}
+                anchorOrigin={{vertical: 'bottom', horizontal: 'right'}}
+            >
+                <Alert
+                    onClose={handleSnackClose}
+                    severity="success"
+                    variant="filled"
+                    sx={{width: '100%'}}
+                >
+                    変更が保存されました
+                </Alert>
+            </Snackbar>
+        </>
     )
 }
diff --git a/components/match/matchEditor.tsx b/components/match/matchEditor.tsx
@@ -510,7 +510,7 @@ export default function MatchEditor(props: MatchEditorProps) {
                             variant={"contained"}
                             color={"info"}
                             component={NextLink}
-                            href={`/sports/${props.sport.id}/${props.game.id}`}
+                            href={`/sports/${props.sport.id}/games/${props.game.id}`}
                             sx={{border: "1px solid #5f6dc2", py: 2}}
                         >
                             リーグに戻る
@@ -542,7 +542,7 @@ export default function MatchEditor(props: MatchEditorProps) {
                             variant={"contained"}
                             color={"info"}
                             component={NextLink}
-                            href={`/sports/${props.sport.id}/${props.game.id}`}
+                            href={`/sports/${props.sport.id}/games/${props.game.id}`}
                             sx={{border: "1px solid #5f6dc2", py: 2}}
                         >
                             リーグに戻る