diff --git a/src/components/friends/PresentRecommend.tsx b/src/components/friends/PresentRecommend.tsx index 8f72c2dc..521e17fe 100644 --- a/src/components/friends/PresentRecommend.tsx +++ b/src/components/friends/PresentRecommend.tsx @@ -18,7 +18,7 @@ import { theme } from '@styles/theme' import BottomSheet from '@components/atoms/BottomSheet' import useBottomSheet from '@libs/hooks/useBottomSheet' import { friendState } from '@libs/store/friend' -import { CategoryNameType } from '@components/atoms/Category' +import { SubCategoryValueType } from '@models/favor' import { useInfiniteQueries } from '@libs/hooks' import PresentItem from './PresentItem' @@ -106,7 +106,7 @@ function PresentRecommend() { setSelectedTags([ { name: selectedOption.name as SubCategoryName, - value: selectedOption.value as CategoryNameType, + value: selectedOption.value as SubCategoryValueType, }, ]) } else { diff --git a/src/components/layouts/AppBarTemplate.tsx b/src/components/layouts/AppBarTemplate.tsx index f3c12029..bad63428 100644 --- a/src/components/layouts/AppBarTemplate.tsx +++ b/src/components/layouts/AppBarTemplate.tsx @@ -1,16 +1,15 @@ +import { AppBar } from '@components/atoms/AppBar' import { - AppBar, - AppBarProps, - RightChildrenVariant, -} from '@components/atoms/AppBar' + AppBarPropsType, + RightChildrenVariantType, +} from '@models/components/atoms/AppBar' import { ReactNode } from 'react' import { favorQuestionData } from '@libs/store/dummy' import { Navigationbar } from '@components/atoms/Navigationbar' import { TasteType } from '@utils/apis/favor/TasteType' import styled from '@emotion/styled' -import { Spacing } from '@components/atoms/Spacing' -type AppBarTemplateProps = AppBarProps & { +type AppBarTemplateProps = AppBarPropsType & { children: ReactNode hasNav: boolean } @@ -19,8 +18,7 @@ const AppBarTemplate = ({ label, variant, beforeUrl, - onClickOption1, - onClickOption2, + onClickOption, rightChildren, rightChildrenIcon, customHandler, @@ -51,8 +49,7 @@ const AppBarTemplate = ({ label={label} variant={variant} beforeUrl={beforeUrl} - onClickOption1={onClickOption1} - onClickOption2={onClickOption2} + onClickOption={onClickOption} customHandler={customHandler} isLabelAlignCenter={isLabelAlignCenter} rightChildren="actionButton" @@ -63,8 +60,7 @@ const AppBarTemplate = ({ label={label} variant={variant} beforeUrl={beforeUrl} - onClickOption1={onClickOption1} - onClickOption2={onClickOption2} + onClickOption={onClickOption} customHandler={customHandler} isLabelAlignCenter={isLabelAlignCenter} rightChildren={rightChildren} diff --git a/src/components/onboarding/FashionFavor.tsx b/src/components/onboarding/FashionFavor.tsx index f7dc0a2d..7ef8c44e 100644 --- a/src/components/onboarding/FashionFavor.tsx +++ b/src/components/onboarding/FashionFavor.tsx @@ -1,4 +1,4 @@ -import CubeButton, { cubeButtonVariant } from '@components/atoms/CubeButton' +import CubeButton from '@components/atoms/CubeButton' import { Spacing } from '@components/atoms/Spacing' import { Text } from '@components/atoms/Text' import { FlexBox } from '@components/layouts/FlexBox' diff --git a/src/components/onboarding/HobbyFavor.tsx b/src/components/onboarding/HobbyFavor.tsx index f8bce553..ecabda46 100644 --- a/src/components/onboarding/HobbyFavor.tsx +++ b/src/components/onboarding/HobbyFavor.tsx @@ -1,4 +1,4 @@ -import CubeButton, { cubeButtonVariant } from '@components/atoms/CubeButton' +import CubeButton from '@components/atoms/CubeButton' import { Spacing } from '@components/atoms/Spacing' import { Text } from '@components/atoms/Text' import { FlexBox } from '@components/layouts/FlexBox' diff --git a/src/components/profile/UserTagDataListItem.tsx b/src/components/profile/UserTagDataListItem.tsx index eb56abc8..e12d9943 100644 --- a/src/components/profile/UserTagDataListItem.tsx +++ b/src/components/profile/UserTagDataListItem.tsx @@ -2,7 +2,8 @@ import styled from '@emotion/styled' import { FlexBox } from '@components/layouts/FlexBox' import { Spacing } from '@components/atoms/Spacing' import { Category } from '@components/atoms/Category' -import { ColorIndexVariant, Tag } from '@components/atoms/Tag' +import { Tag } from '@components/atoms/Tag' +import { ColorIndexVariantType } from '@models/components/atoms/Tag' import { FilteredUserTag, SelectedProps, @@ -75,7 +76,7 @@ export const UserTagDataListItem = ({ tagData.answer ? ( { as?: 'span' | 'p' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'div' typo: TextType['typo'] color?: TextType['color'] - children: string + children: any } diff --git a/src/pages/profile/editfavorBox/EditBeautyFavor.tsx b/src/pages/profile/editfavorBox/EditBeautyFavor.tsx index c7bc6629..5dc9bcdd 100644 --- a/src/pages/profile/editfavorBox/EditBeautyFavor.tsx +++ b/src/pages/profile/editfavorBox/EditBeautyFavor.tsx @@ -1,4 +1,4 @@ -import CubeButton, { cubeButtonVariant } from '@components/atoms/CubeButton' +import CubeButton from '@components/atoms/CubeButton' import { Spacing } from '@components/atoms/Spacing' import { Text } from '@components/atoms/Text' import { FlexBox } from '@components/layouts/FlexBox' diff --git a/src/pages/settingPage/index.tsx b/src/pages/settingPage/index.tsx index ae04228c..6f5556ba 100644 --- a/src/pages/settingPage/index.tsx +++ b/src/pages/settingPage/index.tsx @@ -1,5 +1,4 @@ import { Route, Routes } from 'react-router-dom' -import AppBarTemplate from '@components/layouts/AppBarTemplate' import Setting from './Setting' import CustomerCenter from './CustomerCenter' import WriteForCustomer from './WriteForCustomer' diff --git a/src/pages/weekly/index.tsx b/src/pages/weekly/index.tsx index 2c5337b5..dfa02bc8 100644 --- a/src/pages/weekly/index.tsx +++ b/src/pages/weekly/index.tsx @@ -1,4 +1,3 @@ -import WeeklyMainQuestion from './WeeklyMainQuestion' import { Route, Routes, useNavigate } from 'react-router-dom' import AppBarTemplate from '@components/layouts/AppBarTemplate' import AnswerDailyQuestion from './AnswerDailyQuestion' diff --git a/src/utils/apis/user/UserApi.ts b/src/utils/apis/user/UserApi.ts index c7e3a4ed..3cb45ca9 100644 --- a/src/utils/apis/user/UserApi.ts +++ b/src/utils/apis/user/UserApi.ts @@ -1,4 +1,4 @@ -import { TodayCategoryValueType } from '@components/atoms/TodayCategoryList' +import { TodayCategoryValueType } from '@models/components/atoms/TodayCategory' import { axiosApi } from '@utils/apis/axios' import { FilteredUserTag, diff --git a/src/utils/apis/user/UserType.ts b/src/utils/apis/user/UserType.ts index c74a6250..5c86bafd 100644 --- a/src/utils/apis/user/UserType.ts +++ b/src/utils/apis/user/UserType.ts @@ -1,5 +1,5 @@ -import { TodayCategoryValueType } from '@components/atoms/TodayCategoryList' -import { CategoryNameType } from '@models/components/atoms/Category' +import { TodayCategoryValueType } from '@models/components/atoms/TodayCategory' +import { SubCategoryValueType } from '@models/favor' import { TasteBoxVariantType } from '../favor/TasteType' export type UserInfo = { @@ -63,7 +63,7 @@ export type SelectedProps = { id: number active: boolean name: SubCategoryName - value: CategoryNameType + value: SubCategoryValueType count?: number }[]