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.

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

[1.0.3] 페이지 전환 효과 추가 #943

Merged
merged 4 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/app/about/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
7 changes: 7 additions & 0 deletions src/app/my-page/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
1 change: 1 addition & 0 deletions src/app/panel/MuiThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ const MuiThemeProvider = ({ children }: { children: React.ReactNode }) => {
padding: '0px',
borderRadius: '4px',
height: 'auto',
minHeight: '32px',
backgroundColor: theme.palette.background.tertiary,
color: theme.palette.text.normal,
lineHeight: '150%',
Expand Down
6 changes: 5 additions & 1 deletion src/app/signup/panel/PasswordField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ const PasswordField = ({
showPassword={showPassword}
setShowPassword={setShowPassword}
/>
<IconButton onClick={deletePassword} size="small">
<IconButton
onClick={deletePassword}
size="small"
sx={{ paddingY: 0 }}
>
<HighlightOffIcon sx={{ color: 'text.alternative' }} />
</IconButton>
</>
Expand Down
6 changes: 4 additions & 2 deletions src/app/team-list/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const TeamsLayout = ({ children }: { children: ReactNode }) => {
sx={style.stack}
>
<Sidebar />
<Stack>
<Stack sx={style.contentBox}>
<Stack direction={'row'}>
<Typography fontWeight={'bold'} my={'1rem'}>
{showTeams === TeamStatus.RECRUITING
Expand All @@ -42,7 +42,9 @@ const TeamsLayout = ({ children }: { children: ReactNode }) => {
content={<TeamListTutorial />}
/>
</Stack>
<Box sx={style.contentBox}>{children}</Box>
<Box key={showTeams} className="layout-container">
{children}
</Box>
</Stack>
</Stack>
</Container>
Expand Down
1 change: 1 addition & 0 deletions src/app/teams/[id]/board/@setting/page.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ export const mobilePage = {
export const inputContainer = {
background: (theme: Theme) => theme.palette.background.tertiary,
padding: '0rem 0.75rem',
alignItems: 'center',
}
11 changes: 10 additions & 1 deletion src/app/teams/[id]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Stack, Container, Box, useMediaQuery } from '@mui/material'
import useTeamPageState from '@/states/useTeamPageState'
import TeamSidebar from './panel/NavBar'
import * as style from '@/components/NavBarLayout.style'
import useMedia from '@/hook/useMedia'

const TeamLayout = ({
params,
Expand All @@ -24,6 +25,7 @@ const TeamLayout = ({
}, [])

const isFourRow = useMediaQuery('(min-width:997px)')
const { isPc } = useMedia()

if (layout === 'FULLPAGE') {
return (
Expand All @@ -42,7 +44,14 @@ const TeamLayout = ({
sx={style.stack}
>
<TeamSidebar id={id} />
<Box sx={style.contentBox}>{children}</Box>
<Box
sx={{
...style.contentBox,
width: isFourRow ? undefined : isPc ? '70%' : '100%',
}}
>
{children}
</Box>
</Stack>
</Container>
)
Expand Down
7 changes: 7 additions & 0 deletions src/app/teams/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
14 changes: 14 additions & 0 deletions src/app/template.style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(20px);
}
to {
opacity: 1;
transform: translateY(0);
}
}

.layout-container {
animation: fadeInUp 0.4s ease-out forwards;
}
8 changes: 8 additions & 0 deletions src/app/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react'
import './template.style.css'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
1 change: 1 addition & 0 deletions src/components/EyeIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const EyeIcon = ({
onClick={() => {
setShowPassword(showPassword === 'password' ? 'text' : 'password')
}}
sx={{ paddingY: 0 }}
>
{showPassword === 'password' ? (
<VisibilityIcon sx={{ color: 'text.alternative' }} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/ListPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const ListPageContainer = ({ children }: IChildrenProps) => {
const { isPc } = useMedia()
return (
<Stack
sx={{ ...style.ListPageContainer, padding: isPc ? '2rem' : '0' }}
sx={{ ...style.ListPageContainer, padding: isPc ? '2rem' : '1rem' }}
spacing={'2rem'}
>
{children}
Expand Down
Loading