diff --git a/src/common/SideMenu.tsx b/src/common/SideMenu.tsx index cc6566ee..99a93f98 100644 --- a/src/common/SideMenu.tsx +++ b/src/common/SideMenu.tsx @@ -161,7 +161,7 @@ const St = { SideMenuItemText: styled.span` margin-left: 0.8rem; - ${({ theme }) => theme.fonts.title_semibold_18}; + ${({ theme }) => theme.fonts.title_bold_18}; color: ${({ theme }) => theme.colors.gray8}; `, @@ -189,7 +189,7 @@ const St = { `, SideMenuCSButton: styled.button` - ${({ theme }) => theme.fonts.body_medium_14}; + ${({ theme }) => theme.fonts.body_bold_14}; color: ${({ theme }) => theme.colors.gray3}; `, @@ -200,7 +200,7 @@ const St = { `, SideMenuLogOutButton: styled.button` - ${({ theme }) => theme.fonts.body_medium_14}; + ${({ theme }) => theme.fonts.body_bold_14}; color: ${({ theme }) => theme.colors.gray3}; `, }; diff --git a/src/common/SideMenuUserInfo.tsx b/src/common/SideMenuUserInfo.tsx index 84948c8b..b68aab54 100644 --- a/src/common/SideMenuUserInfo.tsx +++ b/src/common/SideMenuUserInfo.tsx @@ -37,7 +37,7 @@ const St = { `, SideMenuAnoymousTitle: styled.h2` - font: ${({ theme }) => theme.fonts.title_semibold_16}; + ${({ theme }) => theme.fonts.title_bold_16}; color: ${({ theme }) => theme.colors.gray1}; `, }; diff --git a/src/common/UserInfoSection.tsx b/src/common/UserInfoSection.tsx index 7d154633..90f55830 100644 --- a/src/common/UserInfoSection.tsx +++ b/src/common/UserInfoSection.tsx @@ -22,13 +22,15 @@ const UserInfoSection = () => { !loading && ( - {response?.name} + {response?.homeUserInfo.name} 보유 포인트 - {response?.point.toLocaleString()} + + {response?.homeUserInfo.point.toLocaleString()} + P @@ -53,14 +55,14 @@ const St = { border-bottom: 0.1rem solid ${({ theme }) => theme.colors.gray7}; - font: ${({ theme }) => theme.fonts.title_semibold_20}; + ${({ theme }) => theme.fonts.title_bold_20}; color: ${({ theme }) => theme.colors.white}; & > span { display: inline-block; margin-left: 0.4rem; - font: ${({ theme }) => theme.fonts.body_medium_16}; + ${({ theme }) => theme.fonts.title_bold_16}; color: ${({ theme }) => theme.colors.gray2}; } `, @@ -81,18 +83,18 @@ const St = { & > span { margin-left: 0.4rem; - font: ${({ theme }) => theme.fonts.title_semibold_20}; + ${({ theme }) => theme.fonts.title_bold_20}; color: ${({ theme }) => theme.colors.gray2}; } `, SideMenuUserPointTitle: styled.h2` - font: ${({ theme }) => theme.fonts.detail_medium_12}; + ${({ theme }) => theme.fonts.detail_bold_12}; color: ${({ theme }) => theme.colors.gray2}; `, SideMenuUserPoint: styled.p` - font: ${({ theme }) => theme.fonts.title_semibold_24}; + ${({ theme }) => theme.fonts.title_bold_24}; color: ${({ theme }) => theme.colors.white}; `, @@ -105,7 +107,7 @@ const St = { background-color: ${({ theme }) => theme.colors.bg}; border-radius: 0.5rem; - font: ${({ theme }) => theme.fonts.title_semibold_16}; + ${({ theme }) => theme.fonts.title_bold_16}; color: ${({ theme }) => theme.colors.gray8}; `, }; diff --git a/src/components/MainPage/MainBanner.tsx b/src/components/MainPage/MainBanner.tsx index 33e03bf3..1829adc5 100644 --- a/src/components/MainPage/MainBanner.tsx +++ b/src/components/MainPage/MainBanner.tsx @@ -47,9 +47,10 @@ const St = { Video: styled.video` position: relative; - width: 37.5rem; - height: 34rem; + width: 100%; + height: 100%; margin-top: 7rem; + object-fit: fill; `, SubWrapper: styled.div` @@ -63,22 +64,22 @@ const St = { SmallCopy: styled.p` padding-top: 1.2rem; - ${({ theme }) => theme.fonts.body_medium_16}; + ${({ theme }) => theme.fonts.body_bold_16}; color: ${({ theme }) => theme.colors.white}; `, HomeButton: styled.button` display: flex; - justify-content: center; align-items: center; margin-top: 1rem; margin-bottom: 5.3rem; width: 11.1rem; height: 4.2rem; padding: 0; + padding-left: 1.5rem; background-color: ${({ theme }) => theme.colors.pink5}; - ${({ theme }) => theme.fonts.title_semibold_20}; + ${({ theme }) => theme.fonts.title_bold_20}; color: ${({ theme }) => theme.colors.gray9}; border-radius: 0.5rem; diff --git a/src/libs/hooks/useGetUserProfile.ts b/src/libs/hooks/useGetUserProfile.ts index bdb870e8..ecfd8450 100644 --- a/src/libs/hooks/useGetUserProfile.ts +++ b/src/libs/hooks/useGetUserProfile.ts @@ -3,8 +3,10 @@ import { useState, useEffect } from "react"; import { AxiosError } from "axios"; export interface UserProfileProps { - name: string; - point: number; + homeUserInfo: { + name: string; + point: number; + } } interface UserProfileResponse { diff --git a/src/styles/style.d.ts b/src/styles/style.d.ts index 5883161c..99ab86ef 100644 --- a/src/styles/style.d.ts +++ b/src/styles/style.d.ts @@ -35,12 +35,15 @@ declare module 'styled-components' { title_semibold_16: SerializedStyles; body_medium_16: SerializedStyles; body_semibold_14: SerializedStyles; + body_bold_14: SerializedStyles; + body_bold_16: SerializedStyles; body_medium_14: SerializedStyles; body_line_medium_14: SerializedStyles; body_underline_medium_14: SerializedStyles; body_line_medium_12: SerializedStyles; detail_medium_12: SerializedStyles; detail_semibold_12: SerializedStyles; + detail_bold_12: SerializedStyles; title_extrabold_16: SerializedStyles; title_extrabold_18: SerializedStyles; title_extrabold_22: SerializedStyles; @@ -48,6 +51,10 @@ declare module 'styled-components' { title_eng_bold_20: SerializedStyles; body_eng_bold_10: SerializedStyles; title_eng_bold_18: SerializedStyles; + title_bold_20: SerializedStyles; + title_bold_16: SerializedStyles; + title_bold_24: SerializedStyles; + title_bold_18: SerializedStyles; }; } } diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 3a811e4b..c9f1050f 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -266,6 +266,76 @@ const fonts = { line-height: 130%; letter-spacing: 0.054rem; `, + title_bold_20: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 2rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + title_bold_16: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 1.6rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + title_bold_24: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 2.4rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + detail_bold_12: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 1.2rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + title_bold_18: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 1.8rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + body_bold_14: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 1.4rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; + `, + body_bold_16: css` + font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI', + 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji', + 'Segoe UI Symbol', sans-serif; + font-size: 1.6rem; + font-style: normal; + font-weight: 700; + line-height: 130%; + letter-spacing: -0.01rem; +` }; const theme: DefaultTheme = {