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.

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

[SP0] 추가 QA - /recruit 문의하기 모바일 레이아웃 수정 #369

Merged
merged 6 commits into from
Mar 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/hooks/useCheckTime.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useEffect, useState } from 'react';

export default function useCheckTime() {
const START_DATE = new Date('2024-03-02 15:00:00');
const START_DATE = new Date('2024-03-03 00:00:00');
const [timeDiff, setTimeDiff] = useState<number>(START_DATE.getTime() - Date.now());

useEffect(()=>{
setTimeDiff(START_DATE.getTime() - Date.now());
}, []);

Check warning on line 9 in src/hooks/useCheckTime.ts

View workflow job for this annotation

GitHub Actions / continuous-integration

React Hook useEffect has a missing dependency: 'START_DATE'. Either include it or remove the dependency array

return timeDiff<=0 ;
}
6 changes: 3 additions & 3 deletions src/lib/api/mock/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
description: '솝트의 지금, 여러분과 함께',
imageSrc: '/images/members/1.png',
gmail: 'president@sopt.org',
linkedin: 'https://www.linkedin.com/in/seungwoo-cho-7a5676236/',
linkedin: 'seungwoo-cho-7a5676236',
},
{
id: 2,
Expand All @@ -72,7 +72,7 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
imageSrc: '/images/members/2.png',
gmail: 'manager@sopt.org',
github: 'seeunplayer',
linkedin: 'https://www.linkedin.com/in/tina-park-755ab8230/?locale=ko_KR',
linkedin: 'tina-park-755ab8230',
},
{
id: 3,
Expand All @@ -83,7 +83,7 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
imageSrc: '/images/members/3.png',
gmail: 'makers@sopt.org',
github: 'yummygyudon',
linkedin:'https://www.linkedin.com/in/yummygyudon/',
linkedin:'yummygyudon',
},
{
id: 4,
Expand Down
1 change: 0 additions & 1 deletion src/views/MainPage/components/TopBanner/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ export const Timer = styled.div`
align-items: center;

/* 아이콘 위치 이동 방지*/
width: 128px;
gap: 10px;
justify-content: flex-start;

Expand Down
34 changes: 18 additions & 16 deletions src/views/RecruitPage/components/ActivityReview/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ export const CardWrapper = styled.div`
height: 300px;
padding: 38px 34px;
@media (max-width: 765.9px) {
min-width: 194px;
height: 139px;
padding: 20px;
min-width: 232px;
height: 218px;
padding: 40px 26px;
}
@media (max-width: 1299px) and (min-width: 766px) {
min-width: 320px;
height: 300px;
padding: 38px 34px;
min-width: 310px;
height: 250px;
padding: 40px 28px;
}
`;

Expand All @@ -131,12 +131,13 @@ export const CardTitle = styled.div`
font-size: 25px;
line-height: 40px;
@media (max-width: 765.9px) {
font-size: 12px;
line-height: 20px;
font-size: 16px;
line-height: 25px;
letter-spacing: -0.32px;
}
@media (max-width: 1299px) and (min-width: 766px) {
font-size: 25px;
line-height: 40px;
font-size: 18px;
line-height: 29px;
}
`;

Expand All @@ -147,17 +148,18 @@ export const DescWrapper = styled.div`
`;

export const Desc = styled.div`
color: #c8c8c8;
color: #848484;
font-weight: 500;
font-size: 25px;
line-height: 40px;
font-size: 22px;
line-height: 32px;
white-space: pre-wrap;
@media (max-width: 765.9px) {
font-size: 12px;
font-size: 14px;
line-height: 22px;
}
@media (max-width: 1299px) and (min-width: 766px) {
font-size: 25px;
line-height: 40px;
font-size: 16px;
line-height: 23px;
white-space: pre-wrap;
}
`;
Expand Down
27 changes: 18 additions & 9 deletions src/views/RecruitPage/components/Contact/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { contactInDisplayOrder, contactMap } from './constant';

const Contact = () => {
return (
<div>
<Wrapper>
<Wrapper>
<SectionWrapper>
<SectionTitleWrapper>
<SectionTitleTranslate>Inquiry</SectionTitleTranslate>
<SectionTitle>문의하기</SectionTitle>
</SectionTitleWrapper>
<SectionSubTitle>SOPT 지원에 대해 궁금한 것이 더 있나요?</SectionSubTitle>
</Wrapper>
</SectionWrapper>
<GridWrapper>
{contactInDisplayOrder.map((contact) => {
const contactItem = contactMap[contact];
Expand Down Expand Up @@ -48,11 +48,18 @@ const Contact = () => {
);
})}
</GridWrapper>
</div>
</Wrapper>
);
};

const Wrapper = styled.div`
display: flex;
flex-direction: column;
width: 100%;
align-items: center;
`;

const SectionWrapper = styled.div`
display: flex;
flex-direction: column;
gap: 8px;
Expand All @@ -76,7 +83,7 @@ const ItemWrapper = styled.div`
}
/* 모바일 뷰 */
@media (max-width: 765.9px) {
gap: 36px;
gap: 16px;
}
`;

Expand All @@ -100,17 +107,19 @@ const GridWrapper = styled.div`
grid-template-columns: auto auto;
justify-content: space-between;
row-gap: 80px;
column-gap: 160px;
margin-top: 80px;
/* 태블릿 뷰 */
@media (max-width: 1299px) and (min-width: 766px) {
row-gap: 50px;
margin-top: 40px;
grid-template-columns: 1fr;
row-gap: 60px;
margin-top: 48px;
}
/* 모바일 뷰 */
@media (max-width: 765.9px) {
grid-template-columns: 1fr;
row-gap: 20px;
margin-top: 20px;
row-gap: 40px;
margin-top: 30px;
}
`;

Expand Down
Loading