Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

レイアウト周りのバグを一部修正 Feature/#59 small fix #60

Merged
merged 5 commits into from
Oct 7, 2024
Merged

レイアウト周りのバグを一部修正 Feature/#59 small fix #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83722ab
fix: Link in sports/create
1nayu Oct 7, 2024
cb7c45b
fix: Image list button color
1nayu Oct 7, 2024
e163a51
fix: typo
1nayu Oct 7, 2024
f59f99c
fix: unable to scroll page when navigate via drawer
1nayu Oct 7, 2024
575c17c
fix: tiny change
1nayu Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/(authenticated)/images/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default async function ImagesPage() {
<Typography color="text.primary">画像管理</Typography>
</Breadcrumbs>
<CardBackground
title={"すべてのタグ"}
title={"すべての画像"}
button={"作成"}
link={"/images/create"}
>
Expand All @@ -33,6 +33,7 @@ export default async function ImagesPage() {
href={`/images/${image.id}`}
component={NextLink}
key={image.id}
color={"secondary"}
>
<Stack direction={"row"} spacing={2} alignItems={"center"} sx={{width:"100%"}}>
<Avatar src={`${process.env.NEXT_PUBLIC_API_URL}/images/${image.id}/file`}/>
Expand Down
2 changes: 1 addition & 1 deletion app/(authenticated)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function RootLayout({
<CssBaseline/>
<Box sx={{ display: 'flex' }}>
<Navigation/>
<Stack minHeight="100lvh-8" width="100%" mt={8}>
<Stack minHeight="100lvh-8" width="100%" mt={8} overflow={"scrollable"}>
{children}
</Stack>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion app/(authenticated)/sports/create/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default async function CreateSport() {
<Link
underline="hover"
color="inherit"
href="../../sports"
href="/sports"
component={NextLink}
>
競技管理
Expand Down
18 changes: 8 additions & 10 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ export default function RootLayout({
}) {
return (
<html lang="ja">
<body className={noto.className}>

<AppRouterCacheProvider>
<ColorModeProvider>
<CssBaseline/>
{children}
</ColorModeProvider>
</AppRouterCacheProvider>

</body>
<body className={noto.className}>
<AppRouterCacheProvider>
<ColorModeProvider>
<CssBaseline/>
{children}
</ColorModeProvider>
</AppRouterCacheProvider>
</body>
</html>
)
}
14 changes: 8 additions & 6 deletions components/layout/navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -48,7 +50,7 @@ export const Navigation = () => {
sx={{py: buttonPadding, width: "100%", fontWeight: "600"}}
component={NextLink}
href={"/"}
onClick={handleDrawerToggle}
onClick={handleDrawerClose}
>
<Stack spacing={1} mx={1} width={"100%"} direction={"row"} justifyContent={"flex-start"}
alignItems="center">
Expand All @@ -65,7 +67,7 @@ export const Navigation = () => {
sx={{py: buttonPadding, width: "100%", fontWeight: "600"}}
component={NextLink}
href={"/"}
onClick={handleDrawerToggle}
onClick={handleDrawerClose}
>
<Stack spacing={1} mx={1} width={"100%"} direction={"row"} justifyContent={"flex-start"}
alignItems="center">
Expand Down Expand Up @@ -102,7 +104,7 @@ export const Navigation = () => {
sx={{py: buttonPadding, width: "100%", fontWeight: "600"}}
component={NextLink}
href={"/sports"}
onClick={handleDrawerToggle}
onClick={handleDrawerClose}
>
<Stack spacing={1} mx={1} width={"100%"} direction={"row"} justifyContent={"flex-start"}
alignItems="center">
Expand Down Expand Up @@ -170,7 +172,7 @@ export const Navigation = () => {
sx={{py: buttonPadding, width: "100%", fontWeight: "600"}}
component={NextLink}
href={"/roles"}
onClick={handleDrawerToggle}
onClick={handleDrawerClose}
>
<Stack spacing={1} mx={1} width={"100%"} direction={"row"} justifyContent={"flex-start"}
alignItems="center">
Expand Down
29 changes: 15 additions & 14 deletions components/match/matchEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,21 +216,22 @@ export default function MatchEditor(props: MatchEditorProps) {
<Stack mx={2} my={2} spacing={2} direction={"column"}>

<Stack
direction={"row"} spacing={1}
sx={{overflow:"auto"}}
sx={{width:"100%", overflow:"auto"}}
>
<Chip
label={`審判：${judgeTeamName}`}
avatar={<Avatar><HiFlag/></Avatar>} color={"secondary"}
/>
<Chip
label={`試合場所：${locationName}`}
avatar={<Avatar><HiMapPin/></Avatar>} color={"secondary"}
/>
<Chip
label={`試合開始：${formattedDate}`}
avatar={<Avatar><HiClock/></Avatar>} color={"secondary"}
/>
<Stack width={"100%"} direction={"row"} >
<Chip
label={`審判：${judgeTeamName}`}
avatar={<Avatar><HiFlag/></Avatar>} color={"secondary"}
/>
<Chip
label={`試合場所：${locationName}`}
avatar={<Avatar><HiMapPin/></Avatar>} color={"secondary"}
/>
<Chip
label={`試合開始：${formattedDate}`}
avatar={<Avatar><HiClock/></Avatar>} color={"secondary"}
/>
</Stack>
</Stack>

<Divider/>
Expand Down
4 changes: 2 additions & 2 deletions components/theme/colorModeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
Loading