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

[#278] filter 모달 skeleton ui 추가 #279

Merged
merged 1 commit into from
Sep 20, 2023
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
18 changes: 14 additions & 4 deletions packages/app/src/features/register/hooks/useMajorAutoComplete.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
import { OptionsType } from '@sms/shared'
import autocompleteApi from '@features/register/services/autocompleteApi'
import { useEffect } from 'react'
import { useToast } from '@features/toast'
import ErrorMapper from '@lib/ErrorMapper'
import errors from '@features/student/service/errors'
import { useDispatch } from 'react-redux'
import { close } from '@features/modal/stores/modalSlice'

const useMajorAutoComplete = () => {
const { data, isLoading, isError } = autocompleteApi.useMajorQuery()
const { data, isLoading, isError, error } = autocompleteApi.useMajorQuery()
const { addToast } = useToast()
const dispatch = useDispatch()

useEffect(() => {
if (isLoading) return
isError // TODO toast 띄우기
}, [isLoading])
if (!isError) return

addToast('error', ErrorMapper(error, errors))
dispatch(close())
}, [isError])

return {
major: data?.major.reduce((pre, cur) => {
pre[cur] = cur
return pre
}, {} as OptionsType),
majorList: data?.major,
isLoading,
}
}

Expand Down
39 changes: 39 additions & 0 deletions packages/app/src/features/student/atoms/MajorListSection/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { Checkbox, SkeletonText } from '@sms/shared'
import CheckboxSection from '@features/student/atoms/CheckboxSection'
import useMajorAutoComplete from '@features/register/hooks/useMajorAutoComplete'
import { UseFormWatch } from 'react-hook-form'

interface Props {
onClickMajor(major: string): void
watch: UseFormWatch<StudentParam>
}

const MajorListSection = ({ onClickMajor, watch }: Props) => {
const { majorList, isLoading } = useMajorAutoComplete()

return (
<CheckboxSection isShow={true} title='분야'>
{isLoading &&
Array(...Array(10)).map((_, i) => (
<Checkbox key={i}>
<SkeletonText width={`${i + 1}0%`} />
</Checkbox>
))}

{!isLoading &&
[...(majorList || []), '기타']?.map((major) => (
<Checkbox
key={major}
value={major}
onClick={() => onClickMajor(major)}
checked={watch('majors')?.includes(major)}
readOnly
>
{major}
</Checkbox>
))}
</CheckboxSection>
)
}

export default MajorListSection
17 changes: 2 additions & 15 deletions packages/app/src/features/student/molecules/FilterModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
import RangeSliderSection from '@features/student/atoms/RangeSliderSection'
import useStudentsFilter from '@features/student/hooks/useStudentsFilter'
import { useAutocomplete } from '@features/register/hooks'
import useMajorAutoComplete from '@features/register/hooks/useMajorAutoComplete'
import useLoggedIn from '@features/auth/hook/useLoggedIn'
import MajorListSection from '@features/student/atoms/MajorListSection'

import * as S from './style'

Expand All @@ -28,7 +28,6 @@ const FilterModal = () => {
onClickMajor,
} = useStudentsFilter()
const { onChange, dropdownList } = useAutocomplete()
const { majorList } = useMajorAutoComplete()
const { role } = useLoggedIn({})

return (
Expand Down Expand Up @@ -104,19 +103,7 @@ const FilterModal = () => {
</Checkbox>
</CheckboxSection>

<CheckboxSection isShow={true} title='분야'>
{[...(majorList || []), '기타']?.map((major) => (
<Checkbox
key={major}
value={major}
onClick={() => onClickMajor(major)}
checked={watch('majors')?.includes(major)}
readOnly
>
{major}
</Checkbox>
))}
</CheckboxSection>
<MajorListSection watch={watch} onClickMajor={onClickMajor} />

<CheckboxSection
isShow={role === 'ROLE_TEACHER'}
Expand Down
3 changes: 3 additions & 0 deletions packages/shared/src/atoms/Checkbox/style.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import styled from '@emotion/styled'

export const Wrapper = styled.label`
width: 100%;
display: inline-flex;
align-items: center;
gap: 0.5rem;
cursor: pointer;
border-radius: 0.25rem;
Expand Down Expand Up @@ -60,4 +62,5 @@ export const Checkbox = styled.label`

export const Label = styled.span`
${({ theme }) => theme.body2}
width: 100%;
`
2 changes: 0 additions & 2 deletions packages/shared/src/atoms/Skeleton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ export const SkeletonContent = styled.span`
display: block;
opacity: 0.7s;
animation: ${SkeletonAnimation} 1s linear infinite alternate;
width: 100%;
height: 100%;
border-radius: 0.25rem;
`

Expand Down