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.

Sign up for GitHub

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

Qa morgan/#499 mainpage qa #514

Merged
merged 3 commits into from
Aug 21, 2023
+101 โˆ’19
Merged

Qa morgan/#499 mainpage qa #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4027988
style: ๋™์˜์ƒ ํฌ๊ธฐ ์ˆ˜์ •
gunom Aug 19, 2023
62c8731
style: font ์ˆ˜์ •
gunom Aug 20, 2023
2872052
style: font ์ถ”๊ฐ€
gunom Aug 20, 2023
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
6 changes: 3 additions & 3 deletions src/common/SideMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
`,

Expand Down Expand Up @@ -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};
`,

Expand All @@ -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};
`,
};
Expand Down
2 changes: 1 addition & 1 deletion src/common/SideMenuUserInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
`,
};
Expand Down
18 changes: 10 additions & 8 deletions src/common/UserInfoSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ const UserInfoSection = () => {
!loading && (
<St.SideMenuUserInfoSection>
<St.SideMenuUserName>
{response?.name}
{response?.homeUserInfo.name}
<span>๋‹˜</span>
</St.SideMenuUserName>
<St.SideMenuUserPointWrapper>
<St.SideMenuUserPointTitle>๋ณด์œ  ํฌ์ธํŠธ</St.SideMenuUserPointTitle>
<St.SideMenuUserPointTextWrapper>
<St.SideMenuUserPoint>{response?.point.toLocaleString()}</St.SideMenuUserPoint>
<St.SideMenuUserPoint>
{response?.homeUserInfo.point.toLocaleString()}
</St.SideMenuUserPoint>
<span>P</span>
</St.SideMenuUserPointTextWrapper>
<St.SideMenuUserPointChargeButton onClick={handleClickChargeBtn}>
Expand All @@ -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};
}
`,
Expand All @@ -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};
`,

Expand All @@ -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};
`,
};
Expand Down
11 changes: 6 additions & 5 deletions src/components/MainPage/MainBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions src/libs/hooks/useGetUserProfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 7 additions & 0 deletions src/styles/style.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,26 @@ 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;
title_extrabold_24: SerializedStyles;
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;
};
}
}
70 changes: 70 additions & 0 deletions src/styles/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down