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

design: 1차 UI 수정 #253

Merged
merged 11 commits into from
Jan 29, 2024
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"axios": "^1.2.3",
"cookies-next": "^4.1.0",
"dayjs": "^1.11.10",
"lodash": "^4.17.21",
"next": "^13.4.8",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
8 changes: 3 additions & 5 deletions src/components/home/CategorySlider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,9 @@ const CategorySlider = (): ReactElement => {
})}`}>
<Styled.CategoryImgWrapper>
<Styled.CategoryImg
key={name}
alt={`category-${name}`}
height={58}
src={imageUrl}
width={58}
aria-label={code}
role="img"
url={imageUrl}
/>
</Styled.CategoryImgWrapper>
<Styled.CateGoryName>{name}</Styled.CateGoryName>
Expand Down
30 changes: 15 additions & 15 deletions src/components/home/CategorySlider/styled.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { css } from '@emotion/react'
import styled from '@emotion/styled'
import { IconButton } from '@offer-ui/react'
import Image from 'next/image'
import Link from 'next/link'
import type { CateGoryBoxWrapperProps } from './types'
import { theme } from '@styles'
Expand Down Expand Up @@ -35,6 +34,10 @@ export const CateGoryWrapper = styled.div`
`

export const CategoryLink = styled(Link)`
display: flex;
flex-direction: column;
align-items: center;

background: transparent;

color: ${({ theme }) => theme.colors.grayScale90};
Expand Down Expand Up @@ -139,43 +142,40 @@ export const CategoryItem = styled.button`
`

export const CategoryImgWrapper = styled.div`
display: flex;
align-items: center;
justify-content: center;

width: 108px;
height: 86px;

cursor: pointer;

${({ theme }) => css`
padding: 10px;
border-radius: ${theme.radius.round12};

background-color: ${theme.colors.grayScale05};

${theme.mediaQuery.tablet} {
width: 80px;
height: 80px;
padding: 8px;
}

${theme.mediaQuery.mobile} {
width: 60px;
height: 60px;
padding: 4px;
}
`};
`

export const CategoryImg = styled(Image)`
border-radius: 12px;
export const CategoryImg = styled.div<{ url: string }>`
${({ url }) => css`
width: 100%;
height: 100%;

${({ theme }): string => theme.mediaQuery.tablet} {
width: 52px;
height: 52px;
}
${({ theme }): string => theme.mediaQuery.mobile} {
width: 40px;
height: 40px;
}
background: url(${url}) center/contain no-repeat;
`}
`

export const CateGoryName = styled.div`
margin-top: 12px;

Expand Down
7 changes: 4 additions & 3 deletions src/components/home/ProductItem/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,28 @@ import { Image, ToggleButton } from '@offer-ui/react'
const Container = styled.div`
flex: 1 0 22%;

max-width: 22%;
max-width: 25%;

cursor: pointer;

${({ theme }) => theme.mediaQuery.mobile} {
flex: 1 0 44%;

max-width: 44%;
max-width: 48%;
}
`

const ProductImg = styled(Image)`
width: 100%;
max-width: none;
height: 276px;

${({ theme }): string => theme.mediaQuery.tablet} {
height: 166px;
}

${({ theme }): string => theme.mediaQuery.mobile} {
height: 200px;
height: 160px;
}
`

Expand Down
2 changes: 1 addition & 1 deletion src/components/home/ProductList/styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ProductListWrapper = styled.div`
margin-top: 20px;
}
${({ theme }): string => theme.mediaQuery.mobile} {
gap: 15px 50px;
gap: 8px 20px;

margin-top: 16px;
}
Expand Down
20 changes: 12 additions & 8 deletions src/hooks/usePreventLeavePage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,30 @@ const handleBeforeUnload = (e: BeforeUnloadEvent) => {
export const usePreventLeavePage = (isPrevent = true) => {
const router = useRouter()

useEffect(() => {
const handleBeforeChangeRoute = (url: string) => {
if (router.pathname !== url && !confirm(ALERT_MESSAGE.LEAVE_PAGE)) {
router.events.emit('routeChangeError')
const handleBeforePopState = () => {
const userConfirmed = confirm(ALERT_MESSAGE.LEAVE_PAGE)

window.history.pushState(null, '', router.asPath)

throw `사이트 변경 취소`
}
if (userConfirmed) {
router.beforePopState(() => true)
router.back()
}

return false
}

useEffect(() => {
if (!isPrevent) {
return
}

window.addEventListener('beforeunload', handleBeforeUnload)
router.events.on('routeChangeStart', handleBeforeChangeRoute)
router.beforePopState(handleBeforePopState)

// eslint-disable-next-line consistent-return
return () => {
window.removeEventListener('beforeunload', handleBeforeUnload)
router.events.off('routeChangeStart', handleBeforeChangeRoute)
}
}, [isPrevent])
}
2 changes: 1 addition & 1 deletion src/pages/post/[postId]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const Layout = styled.div`
width: 100%;
max-width: 1200px;
height: fit-content;
margin: 0 auto 15px;
margin: 0 auto 120px;
padding-top: 20px;

${({ theme }): SerializedStyles => css`
Expand Down
13 changes: 10 additions & 3 deletions src/pages/post/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@ const PostPage = ({ type, editPostId }: Props): ReactElement => {
const getCategoriesQuery = useGetCategoriesQuery()
const updatePostMutation = useUpdatePostMutation()

const initialPostForm: PostFormState = getPostQuery.data?.postForm || {}
const [postForm, setPostForm] = useState<PostFormState>({})
const hasChanged = !isEqual(initialPostForm, postForm)
const canPosting = hasChanged && isCompleteForm(postForm)
const [isLoading, setIsLoading] = useState(false)
const router = useRouter()

const { user } = useAuth()

const initialPostForm: PostFormState = getPostQuery.data?.postForm || {}
const hasChanged = !isEqual(initialPostForm, postForm)
const canPosting = hasChanged && isCompleteForm(postForm) && !isLoading

usePreventLeavePage(hasChanged)

const InputSize = useResponsive<InputProps, 'width'>({
Expand All @@ -107,6 +111,8 @@ const PostPage = ({ type, editPostId }: Props): ReactElement => {
return
}

setIsLoading(true)

const { imageInfos, price, ...post } = postForm
const imageFiles = imageInfos
.filter(({ file }) => Boolean(file))
Expand Down Expand Up @@ -145,6 +151,7 @@ const PostPage = ({ type, editPostId }: Props): ReactElement => {
}

router.replace(`/post/${postId}`)
setIsLoading(false)
}

useEffect(() => {
Expand Down