Skip to content

Feat/main for 4th #115

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

Merged
ProdMoon merged 4 commits into from
Mar 10, 2025
Merged

Feat/main for 4th #115

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf9cce5
chore: 4기 모집 일정에 맞게 상수 수정
ProdMoon Mar 9, 2025
eff3d45
chore: 동아리 summaryData에 최신 현황 반영
ProdMoon Mar 9, 2025
c3c60d6
chore: 모집 타이머가 어떤 시간을 의미하는지에 대한 설명 추가
ProdMoon Mar 9, 2025
ceda54b
fix: resolved CLS issue at the main page RecruitmentStatus
ProdMoon Mar 10, 2025
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
12 changes: 12 additions & 0 deletions src/components/organisms/home/RecruitmentSummary/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.timerWrapper {
display: flex;
flex-direction: column;
align-items: center;
gap: 1rem;

.timerDescription {
font-size: 1.4rem;
font-weight: 500;
color: #fff;
}
}
21 changes: 14 additions & 7 deletions src/components/organisms/home/RecruitmentSummary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import SummaryCard from '@/components/organisms/home/SummaryCards';
import useTimer from '@/hook/useTimer';
import { displayApplication } from '@/libs/utils/recruit';

import styles from './index.module.scss';

type Props = {
currentStatus: 'before' | 'ongoing' | 'after';
};
Expand All @@ -21,13 +23,18 @@ function RecruitmentSummary({ currentStatus }: Props) {
{currentStatus === 'after' ? (
<SummaryCard />
) : (
<Timer
dates={dates}
hours={hours}
minutes={minutes}
seconds={seconds}
isRecruiting={isRecruiting}
/>
<div className={styles.timerWrapper}>
Copy link
Contributor

@froggy1014 froggy1014 Mar 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CLS 잡아주세요.

Dynamic Import는 main같이 중요한 페이지에서는 굳이 안해도 될 것 같아요.

ScreenRecording2025-03-10at03 29 06-ezgif com-video-to-gif-converter

Copy link
Contributor Author

@ProdMoon ProdMoon Mar 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

히스토리를 보니 hydration issue가 있어서 dynamic import를 한 것으로 보이는데, 제거해도 별 문제 없이 돌아가서 제거했습니다!

<div className={styles.timerDescription}>
{currentStatus === 'before' ? '모집 시작까지' : '모집 마감까지'}
</div>
<Timer
dates={dates}
hours={hours}
minutes={minutes}
seconds={seconds}
isRecruiting={isRecruiting}
/>
</div>
)}
</>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/organisms/home/SummaryCards/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import styles from './index.module.scss';

const summaryData = [
{ title: '누적 지원자 수', value: '400+' },
{ title: '총 참여자 수', value: '60+' },
{ title: '누적 미션 수', value: '30+' },
{ title: '총 참여자 수', value: '101' },
{ title: '누적 미션 수', value: '51' },
];

function SummaryCards() {
Expand Down
12 changes: 6 additions & 6 deletions src/libs/constants/recruit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export const CURRENT_GENERATION = 3;
export const APPLICATION_START_DATE = new Date('2024-09-08 00:00:00');
export const APPLICATION_DUE_DATE = new Date('2024-09-22 23:59:59');
export const CURRENT_GENERATION = 4;
export const APPLICATION_START_DATE = new Date('2025-03-11 00:00:00');
export const APPLICATION_DUE_DATE = new Date('2025-03-23 23:59:59');

export const JOIN_FORM_URL = 'https://forms.gle/D1ZsAb48whk1HB8J7';
export const JOIN_ALARM_FORM_URL = 'https://forms.gle/K2DiBkmJbhSM7MAx9';
export const JOIN_NEXT_ALARM_FORM_URL = 'https://forms.gle/vgvMiG2pkoJvWfbZA';
export const JOIN_FORM_URL = 'https://forms.gle/SPM3xXTVrnvupcLDA';
export const JOIN_ALARM_FORM_URL = 'https://forms.gle/q9wdvKhEyZmTZGS97';
export const JOIN_NEXT_ALARM_FORM_URL = 'https://forms.gle/VS7Ap4xfSyf2qYqQ6';

export const Applicants = [
{
Expand Down