Skip to content

Commit

Permalink
Merge pull request #282 from mash-up-kr/develop
Browse files Browse the repository at this point in the history
모집 기간이 아님을 알리는 Dialog 추가 기능 배포
  • Loading branch information
HaJunRyu authored Mar 13, 2024
2 parents 90fc8be + 83f6686 commit e7278ca
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
RecruitingOpenHero,
RecruitingPeriod,
RecruitingRemainder,
NotRecruitmentPeriod,
} from '@/components';
import { CURRENT_GENERATION } from '@/constants';

Expand All @@ -28,6 +29,8 @@ const Home = ({ recruitScheduleArray }: HomeProps) => {

const recruitSchedule = generateRecruitSchedule(recruitScheduleArray);

const [isOpenNotRecruitMentModal, setIsOpenNotRecruitmentModal] = useState(true);

const [recruitingProgressStatus, setRecruitingProgressStatus] = useState<
RecruitingProgressStatus | 'NOT_INITIALIZED'
>('NOT_INITIALIZED');
Expand All @@ -53,6 +56,10 @@ const Home = ({ recruitScheduleArray }: HomeProps) => {
<RecruitingPeriod recruitSchedule={recruitSchedule} />
<RecruitingProcess recruitSchedule={recruitSchedule} />
<RecruitingDetailNavigation />

{isOpenNotRecruitMentModal && (
<NotRecruitmentPeriod setIsOpenModal={setIsOpenNotRecruitmentModal} />
)}
</HomeLayout>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const NotRecruitmentPeriod = ({ setIsOpenModal }: NotRecruitmentPeriodProps) =>
<Styled.Dialog>
<Styled.Notify>지금은 모집 기간이 아니에요!</Styled.Notify>
<Styled.Paragraph>
다음 기수 모집 시작은{'\n'}24년 1분기로 예정되어 있습니다.
다음 기수 모집 시작은{'\n'}25년 1분기로 예정되어 있습니다.
</Styled.Paragraph>
<Styled.GoToOfficialPage href="https://mash-up.kr/">
공식 홈페이지 바로가기
Expand All @@ -35,7 +35,7 @@ const NotRecruitmentPeriod = ({ setIsOpenModal }: NotRecruitmentPeriodProps) =>
priority
/>
<Styled.SpeechBubble>
<Styled.Speech>현재 13기가 활발히 활동 중이에요</Styled.Speech>
<Styled.Speech>현재 14기가 활발히 활동 중이에요</Styled.Speech>
<Styled.SpeechDotBig />
<Styled.SpeechDotSmall />
</Styled.SpeechBubble>
Expand Down
2 changes: 1 addition & 1 deletion src/constants/seo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import favicon from 'public/favicon.ico';
import ogImage from '@/assets/images/open-graph-image.png';
import { DefaultSEOProps } from '@/components/seo/SEO';

export const titleTemplate = 'Mash-up Recruit | ';
export const titleTemplate = 'Mash-Up Recruit | ';

export const defaultSEOConfig: DefaultSEOProps = {
title: 'IT 연합 동아리',
Expand Down

0 comments on commit e7278ca

Please sign in to comment.