Skip to content

Commit 384fabb

Browse files
authored
[27기] 프론트 자체 QA 진행 반영 (#195)
2 parents 5a8b5fc + cca9c03 commit 384fabb

File tree

9 files changed

+66
-38
lines changed

9 files changed

+66
-38
lines changed

components/common/AnimatedBox/index.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,25 @@ function AnimatedBox({
6464

6565
export default AnimatedBox;
6666

67-
const StyledBox = styled(Box)`
67+
const StyledBox = styled.section<{
68+
backgroundColor: PaletteKeyTypes;
69+
fontColor: PaletteKeyTypes;
70+
borderRadius: number;
71+
}>`
6872
display: flex;
6973
flex-direction: row;
7074
justify-content: space-between;
7175
align-items: center;
7276
padding: 20px 24px;
7377
width: auto;
78+
min-width: 195px;
79+
border-radius: ${({ borderRadius }) => borderRadius}px;
7480
background-color: ${({ theme, backgroundColor }) =>
7581
backgroundColor && theme.palette[backgroundColor]};
7682
color: ${({ theme, fontColor }) => fontColor && theme.palette[fontColor]};
7783
7884
${media.mobile} {
7985
width: auto;
86+
height: 175px;
8087
}
8188
`;

components/common/SectionTitle/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,22 @@ const StyledSubTitle = styled.span<{ subFontColor: PaletteKeyTypes }>`
4141
margin-top: 8px;
4242
color: ${({ theme, subFontColor }) => theme.palette[subFontColor]};
4343
${({ theme }) => theme.textStyleV2.resp.subtitle_md};
44-
white-space: pre;
44+
white-space: nowrap;
4545
4646
${media.mobile} {
4747
${({ theme }) => theme.textStyleV2.resp.subtitle_sm};
48+
white-space: break-spaces;
4849
}
4950
`;
5051

5152
const StyledTitle = styled.span<{ fontColor: PaletteKeyTypes }>`
5253
color: ${({ theme, fontColor }) => theme.palette[fontColor]};
5354
${({ theme }) => theme.textStyleV2.resp.title1_md};
54-
white-space: pre;
55+
white-space: nowrap;
5556
5657
${media.mobile} {
5758
${({ theme }) => theme.textStyleV2.resp.title1_sm};
59+
white-space: break-spaces;
5860
}
5961
`;
6062

components/home/NewsSection/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { useInView } from 'react-intersection-observer';
1010
import SectionTitle from 'components/common/SectionTitle';
1111
import { useRouter } from 'next/router';
1212
import Path from 'constants/path';
13+
import { NEWS_SECTION } from 'database/home';
1314

1415
const colors = [
1516
'circus_red',
@@ -19,6 +20,7 @@ const colors = [
1920
const fontColors = ['white_100', 'black_100', 'white_100'] as PaletteKeyTypes[];
2021

2122
function MainContainer({ data }: { data: Medium[] }): ReactElement {
23+
const { title, subTitle } = NEWS_SECTION;
2224
const router = useRouter();
2325
const loopData = [...data, ...data];
2426
const trackRef = useRef<HTMLDivElement>(null);
@@ -62,8 +64,8 @@ function MainContainer({ data }: { data: Medium[] }): ReactElement {
6264
<SectionTitle
6365
fontColor="black_100"
6466
subFontColor="black_60"
65-
title="YAPP 안의 사람들, 그리고 이야기"
66-
subTitle="야뿌들의 성장 과정, 활동 후기, 밋업 현장과 다양한 이야기를 담고 있어요."
67+
title={title}
68+
subTitle={subTitle}
6769
/>
6870
</PaddingSection>
6971

components/home/ProjectSection/index.tsx

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import styled from 'styled-components';
33
import Router from 'next/router';
44
import { SectionTemplate } from 'components/home';
55
import { Button, Carousel } from 'components/common';
6-
import { CAROUSEL_DATA } from 'database/home';
6+
import { CAROUSEL_DATA, PROJECT_SECTION } from 'database/home';
77
import media from 'styles/media';
88
import SectionTitle from 'components/common/SectionTitle';
99
import { motion } from 'framer-motion';
1010
import { useScrollAnimation } from 'hooks/useScrollAnimation';
1111

1212
function ProjectSection(): ReactElement {
13+
const { title, subTitle } = PROJECT_SECTION;
1314
const { ref, controls, containerVariants } = useScrollAnimation({
1415
containerVariants: {
1516
hidden: { opacity: 0, y: 40 },
@@ -32,13 +33,13 @@ function ProjectSection(): ReactElement {
3233
fontColor="black_100"
3334
subFontColor="black_60"
3435
align="center"
35-
title="YAPP의 서비스들"
36-
subTitle="YAPP에서 활동하는 구성원인 ‘야뿌’들이 만들어낸 프로젝트들이에요."
36+
title={title}
37+
subTitle={subTitle}
3738
/>
3839
<Carousel data={CAROUSEL_DATA} />
39-
<StyledButton variant="black" onClick={() => Router.push('/project')}>
40+
<Button variant="black" onClick={() => Router.push('/project')}>
4041
프로젝트 더보기
41-
</StyledButton>
42+
</Button>
4243
</ProjectContainer>
4344
);
4445
}
@@ -48,20 +49,6 @@ const ProjectContainer = styled(SectionTemplate)`
4849
display: flex;
4950
flex-direction: column;
5051
align-items: center;
51-
gap: 48px;
52-
`;
53-
54-
const StyledButton = styled(Button)`
55-
transition: background-color 0.5s;
56-
57-
&:hover {
58-
background-color: ${({ theme }) => theme.palette.grey_700};
59-
}
60-
61-
${media.mobile} {
62-
width: 162px;
63-
height: 56px;
64-
}
6552
`;
6653

6754
export default ProjectSection;

components/home/SponsorSection/index.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Yapp from 'constants/yapp';
2-
import { SPONSOR_DATA } from 'database/home';
2+
import { SPONSOR_DATA, SPONSOR_SECTION } from 'database/home';
33
import type { ReactElement } from 'react';
44
import styled from 'styled-components';
55
import media from 'styles/media';
@@ -11,6 +11,7 @@ import { motion } from 'framer-motion';
1111
import { useScrollAnimation } from 'hooks/useScrollAnimation';
1212

1313
function SponsorSection(): ReactElement {
14+
const { title, subTitle } = SPONSOR_SECTION;
1415
const { ref, controls, containerVariants, itemVariants } = useScrollAnimation(
1516
{
1617
threshold: 0.2,
@@ -31,8 +32,8 @@ function SponsorSection(): ReactElement {
3132
fontColor="black_100"
3233
subFontColor="black_60"
3334
align="left"
34-
title="YAPP의 후원사"
35-
subTitle="YAPP과 새로운 가치를 만들어갈 후원 및 협업 문의, 언제든 기다리고 있습니다."
35+
title={title}
36+
subTitle={subTitle}
3637
/>
3738
</motion.div>
3839

@@ -47,8 +48,7 @@ function SponsorSection(): ReactElement {
4748
<ButtonContainer variants={itemVariants}>
4849
<Button variant="black">
4950
<ButtonLinked
50-
href={`mailto:${Yapp.YAPP_OFFICIAL_EMAIL}`}
51-
rel="noreferrer"
51+
href={`https://mail.google.com/mail/?view=cm&fs=1&to=${Yapp.YAPP_OFFICIAL_EMAIL}&su=후원문의&body=안녕하세요, 후원 관련 문의드립니다.`}
5252
target="_blank"
5353
>
5454
후원 문의하기
@@ -113,6 +113,11 @@ const Sponsor = styled.li`
113113
width: 180px;
114114
height: 80px;
115115
}
116+
117+
${media.small} {
118+
width: 120px;
119+
height: 80px;
120+
}
116121
}
117122
`;
118123

components/project/ProjectContent/index.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,13 @@ const SubTitle = styled.div`
153153
const BodyText = styled.div`
154154
display: flex;
155155
flex: 1;
156-
${({ theme }) => theme.textStyleV2.fix.font_18};
157-
color: ${({ theme }) => theme.palette.black_70};
156+
${({ theme }) => theme.textStyleV2.resp.body_point_md};
157+
color: ${({ theme }) => theme.palette.black_50};
158158
flex-wrap: wrap;
159+
160+
${media.mobile} {
161+
${({ theme }) => theme.textStyleV2.resp.body_point_sm};
162+
}
159163
`;
160164

161165
const TextItem = styled.div`

components/story/MediumCard/index.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ const ImageContainer = styled.div`
6969
const MediumInfo = styled.section`
7070
width: 100%;
7171
margin: 0;
72+
73+
${media.small} {
74+
max-width: 260px;
75+
}
76+
77+
${media.xSmall} {
78+
max-width: 230px;
79+
}
7280
`;
7381

7482
const MediumTitle = styled.h3`

database/home.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,22 @@ export const NEWS_DATA = [
142142

143143
export const GRID_SECTION = {
144144
title: '지금 YAPP은 이렇게 움직여요',
145-
subTitle: '실무 기반 협업 시스템으로 운영되는 연합 기업형 IT 동아리',
145+
subTitle: `실무 기반 협업 시스템으로 운영되는\n연합 기업형 IT 동아리`,
146+
};
147+
148+
export const PROJECT_SECTION = {
149+
title: 'YAPP의 서비스들',
150+
subTitle: `YAPP에서 활동하는 구성원인 ‘야뿌’들이 만들어낸\n프로젝트들이에요.`,
151+
};
152+
153+
export const NEWS_SECTION = {
154+
title: 'YAPP 안의 사람들, 그리고 이야기',
155+
subTitle: `야뿌들의 성장 과정, 활동 후기,\n밋업 현장과 다양한 이야기를 담고 있어요.`,
156+
};
157+
158+
export const SPONSOR_SECTION = {
159+
title: 'YAPP의 후원사',
160+
subTitle: `YAPP과 새로운 가치를 만들어갈 후원 및 협업 문의,\n언제든 기다리고 있습니다.`,
146161
};
147162

148163
/** Sponsor 이미지 경로 */

pages/project/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,9 @@ function Project({ projects }: ProjectProps) {
112112
else return true;
113113
}).length > viewCardCount && (
114114
<ButtonWrapper>
115-
<StyledButton
116-
variant="black"
117-
borderRadius={99}
118-
onClick={handleMoreButtonClick}
119-
>
115+
<Button variant="black" onClick={handleMoreButtonClick}>
120116
프로젝트 더보기
121-
</StyledButton>
117+
</Button>
122118
</ButtonWrapper>
123119
)}
124120
</ProjectContainer>
@@ -167,6 +163,8 @@ const ProjectGridWrapper = styled.div`
167163
`;
168164

169165
const ButtonWrapper = styled.div`
166+
display: flex;
167+
justify-content: center;
170168
text-align: center;
171169
margin: 56px 0 80px 0;
172170
`;

0 commit comments

Comments
 (0)