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

모집 기간이 아님을 알리는 Dialog 추가 기능 배포 #282

Merged
merged 4 commits into from
Mar 13, 2024
Merged

모집 기간이 아님을 알리는 Dialog 추가 기능 배포 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24b483a
Feat: index페이지에 모집기간이 아니라는 Dialog를 렌더링한다
HaJunRyu Mar 11, 2024
190d578
Feat: recruit head title의 Mash-Up 철자를 다른곳과 일관되게 변경한다
HaJunRyu Mar 11, 2024
c5f87fb
Merge pull request #280 from mash-up-kr/feature/not-recruit-period
HaJunRyu Mar 13, 2024
83f6686
Merge pull request #281 from mash-up-kr/feature/head-title
HaJunRyu Mar 13, 2024
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
7 changes: 7 additions & 0 deletions pages/index.tsx
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions src/components/home/NotRecruitmentPeriod/NotRecruitmentPeriod.component.tsx
View file
Open in desktop
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
View file
Open in desktop
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
Loading