Skip to content

Commit

Permalink
fix: 빌드 에러 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
eugene028 committed Dec 29, 2023
1 parent ddf39d4 commit e01b617
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/components/friends/PresentRecommend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -106,7 +106,7 @@ function PresentRecommend() {
setSelectedTags([
{
name: selectedOption.name as SubCategoryName,
value: selectedOption.value as CategoryNameType,
value: selectedOption.value as SubCategoryValueType,
},
])
} else {
Expand Down
20 changes: 8 additions & 12 deletions src/components/layouts/AppBarTemplate.tsx
Original file line number Diff line number Diff line change
@@ -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<RightChildrenVariant> & {
type AppBarTemplateProps = AppBarPropsType<RightChildrenVariantType> & {
children: ReactNode
hasNav: boolean
}
Expand All @@ -19,8 +18,7 @@ const AppBarTemplate = ({
label,
variant,
beforeUrl,
onClickOption1,
onClickOption2,
onClickOption,
rightChildren,
rightChildrenIcon,
customHandler,
Expand Down Expand Up @@ -51,8 +49,7 @@ const AppBarTemplate = ({
label={label}
variant={variant}
beforeUrl={beforeUrl}
onClickOption1={onClickOption1}
onClickOption2={onClickOption2}
onClickOption={onClickOption}
customHandler={customHandler}
isLabelAlignCenter={isLabelAlignCenter}
rightChildren="actionButton"
Expand All @@ -63,8 +60,7 @@ const AppBarTemplate = ({
label={label}
variant={variant}
beforeUrl={beforeUrl}
onClickOption1={onClickOption1}
onClickOption2={onClickOption2}
onClickOption={onClickOption}
customHandler={customHandler}
isLabelAlignCenter={isLabelAlignCenter}
rightChildren={rightChildren}
Expand Down
2 changes: 1 addition & 1 deletion src/components/onboarding/FashionFavor.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/components/onboarding/HobbyFavor.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
5 changes: 3 additions & 2 deletions src/components/profile/UserTagDataListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -75,7 +76,7 @@ export const UserTagDataListItem = ({
tagData.answer ? (
<Tag
key={index}
colorIndex={(index % 3) as ColorIndexVariant}
colorIndex={(index % 3) as ColorIndexVariantType}
iconIndex={tagData.number}
children={tagData.answer}
smallCategory={tagData.smallCategory}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/store/date.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { atom } from 'recoil'
import { TodayKeyType } from '@components/atoms/DayWeek/WeekGroup'
import { TodayKeyType } from '@models/components/atoms/DayWeek'

export interface WeeklyDate {
today: TodayKeyType
Expand Down
4 changes: 2 additions & 2 deletions src/libs/store/friend.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CategoryNameType } from '@components/atoms/Category'
import { SubCategoryValueType } from '@models/favor'
import { atom } from 'recoil'

export type FriendState = {
Expand All @@ -9,7 +9,7 @@ export type FriendState = {
isCutOffMenuOpen: boolean
isBlockMenuOpen: boolean
isCancelBlockMenuOpen: boolean
presentRecommendFilterValue: CategoryNameType | ''
presentRecommendFilterValue: SubCategoryValueType | ''
}

const initialState: FriendState = {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/store/profile.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TodayCategoryValueType } from '@components/atoms/TodayCategoryList'
import { TodayCategoryValueType } from '@models/components/atoms/TodayCategory'
import { atom } from 'recoil'

export type ProfileState = {
Expand Down
2 changes: 1 addition & 1 deletion src/models/components/atoms/Text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ export interface TextPropsType extends HTMLAttributes<HTMLSpanElement> {
as?: 'span' | 'p' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'div'
typo: TextType['typo']
color?: TextType['color']
children: string
children: any
}
2 changes: 1 addition & 1 deletion src/pages/profile/editfavorBox/EditBeautyFavor.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/pages/settingPage/index.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion src/pages/weekly/index.tsx
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/utils/apis/user/UserApi.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/utils/apis/user/UserType.ts
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down Expand Up @@ -63,7 +63,7 @@ export type SelectedProps = {
id: number
active: boolean
name: SubCategoryName
value: CategoryNameType
value: SubCategoryValueType
count?: number
}[]

Expand Down

0 comments on commit e01b617

Please sign in to comment.