From 83722ab14c89b5ce8f0dadc73db24bf2b3b742db Mon Sep 17 00:00:00 2001 From: 1nayu Date: Mon, 7 Oct 2024 22:38:12 +0900 Subject: [PATCH 1/5] fix: Link in sports/create --- app/(authenticated)/sports/create/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(authenticated)/sports/create/page.tsx b/app/(authenticated)/sports/create/page.tsx index c588f5c..56315f2 100644 --- a/app/(authenticated)/sports/create/page.tsx +++ b/app/(authenticated)/sports/create/page.tsx @@ -18,7 +18,7 @@ export default async function CreateSport() { 競技管理 From cb7c45bce5be6322553ffb067bbc6bac9c15748a Mon Sep 17 00:00:00 2001 From: 1nayu Date: Mon, 7 Oct 2024 22:38:34 +0900 Subject: [PATCH 2/5] fix: Image list button color --- app/(authenticated)/images/page.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/(authenticated)/images/page.tsx b/app/(authenticated)/images/page.tsx index ac18d70..4efbaf4 100644 --- a/app/(authenticated)/images/page.tsx +++ b/app/(authenticated)/images/page.tsx @@ -21,7 +21,7 @@ export default async function ImagesPage() { 画像管理 @@ -33,6 +33,7 @@ export default async function ImagesPage() { href={`/images/${image.id}`} component={NextLink} key={image.id} + color={"secondary"} > From e163a5136e4c4d0b6c606f77ccf71e98ed427dae Mon Sep 17 00:00:00 2001 From: 1nayu Date: Mon, 7 Oct 2024 23:14:14 +0900 Subject: [PATCH 3/5] fix: typo --- app/layout.tsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index 73f7b17..54f8ae4 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -21,16 +21,14 @@ export default function RootLayout({ }) { return ( - - - - - - {children} - - - - + + + + + {children} + + + ) } From f59f99c003b80904e25ad94e262a61a15bed7cfe Mon Sep 17 00:00:00 2001 From: 1nayu Date: Mon, 7 Oct 2024 23:15:56 +0900 Subject: [PATCH 4/5] fix: unable to scroll page when navigate via drawer --- app/(authenticated)/layout.tsx | 2 +- components/layout/navigation.tsx | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/(authenticated)/layout.tsx b/app/(authenticated)/layout.tsx index fef78b4..e26b7fd 100644 --- a/app/(authenticated)/layout.tsx +++ b/app/(authenticated)/layout.tsx @@ -16,7 +16,7 @@ export default function RootLayout({ - + {children} diff --git a/components/layout/navigation.tsx b/components/layout/navigation.tsx index 2e3d0e6..9898c68 100644 --- a/components/layout/navigation.tsx +++ b/components/layout/navigation.tsx @@ -26,8 +26,10 @@ export const Navigation = () => { const [isClosing, setIsClosing] = React.useState(false); const handleDrawerClose = () => { - setIsClosing(true); - setMobileOpen(false); + if (mobileOpen) { + setIsClosing(true); + setMobileOpen(false); + } } const handleDrawerTransitionEnd = () => { setIsClosing(false); @@ -48,7 +50,7 @@ export const Navigation = () => { sx={{py: buttonPadding, width: "100%", fontWeight: "600"}} component={NextLink} href={"/"} - onClick={handleDrawerToggle} + onClick={handleDrawerClose} > @@ -65,7 +67,7 @@ export const Navigation = () => { sx={{py: buttonPadding, width: "100%", fontWeight: "600"}} component={NextLink} href={"/"} - onClick={handleDrawerToggle} + onClick={handleDrawerClose} > @@ -102,7 +104,7 @@ export const Navigation = () => { sx={{py: buttonPadding, width: "100%", fontWeight: "600"}} component={NextLink} href={"/sports"} - onClick={handleDrawerToggle} + onClick={handleDrawerClose} > @@ -170,7 +172,7 @@ export const Navigation = () => { sx={{py: buttonPadding, width: "100%", fontWeight: "600"}} component={NextLink} href={"/roles"} - onClick={handleDrawerToggle} + onClick={handleDrawerClose} > From 575c17c179a3ba306120436e8247e6f58a671275 Mon Sep 17 00:00:00 2001 From: 1nayu Date: Mon, 7 Oct 2024 23:36:34 +0900 Subject: [PATCH 5/5] fix: tiny change --- components/match/matchEditor.tsx | 29 +++++++++++++------------- components/theme/colorModeProvider.tsx | 4 ++-- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/components/match/matchEditor.tsx b/components/match/matchEditor.tsx index e6e458d..2f73976 100644 --- a/components/match/matchEditor.tsx +++ b/components/match/matchEditor.tsx @@ -216,21 +216,22 @@ export default function MatchEditor(props: MatchEditorProps) { - } color={"secondary"} - /> - } color={"secondary"} - /> - } color={"secondary"} - /> + + } color={"secondary"} + /> + } color={"secondary"} + /> + } color={"secondary"} + /> + diff --git a/components/theme/colorModeProvider.tsx b/components/theme/colorModeProvider.tsx index dee8449..b6a3030 100644 --- a/components/theme/colorModeProvider.tsx +++ b/components/theme/colorModeProvider.tsx @@ -45,11 +45,11 @@ const baseTheme = { }, 'body::-webkit-scrollbar': { width: '5px', - height: '8px' + height: '10px' }, '::-webkit-scrollbar': { width: '5px', - height: '3px' + height: '7px' }, '::-webkit-scrollbar-track': { background: "rgba(47,57,118,0)",