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

Main #79

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

Main #79

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 .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: latest
node-version: '20.11.1'

- name: Install dependencies
run: yarn install --immutable
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20.11.1
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified .yarn/install-state.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions src/components/apply-button/apply-button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@

.button_disabled {
pointer-events: none;
background-color: color(fill-assistive);
color: color(text-assistive);
background-color: color(blue-800);
color: color(gray-300);
}
5 changes: 5 additions & 0 deletions src/components/carousel-slider/carousel-slider.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ $gap: 8px;
width: var(--slide-item-width);
aspect-ratio: 416 / 280;
border-radius: 8px;

@include mobile {
height: 90px;
object-fit: contain;
}
}
}

Expand Down
11 changes: 5 additions & 6 deletions src/constants/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export type RecruitDateType = {

export const RecruitDate: RecruitDateType = {
startDate: new Date('2024-10-28T00:00:00'),
endDate: new Date('2024-11-05T23:59:59'),
endDate: new Date('2024-11-10T23:59:59'),
}

export enum RecruitStatusEnum {
Expand All @@ -26,23 +26,22 @@ export type RecruitMentType = {
buttonText: string
}


// apply button
export const RecruitStatus: Record<RecruitStatusEnum, RecruitStatusType> = {
BeforeRecruiting: {
title: '16기 모집 시작까지',
buttonText: '알림 받기',
link: 'https://forms.gle/LWfsozJbsrhkpyCr5',
link: 'https://forms.gle/8kCz1TVyjxQtEhLV6',
},
Recruiting: {
title: '16기 모집 마감까지',
buttonText: '지원하기',
link: 'https://docs.google.com/forms/d/e/1FAIpQLSeCU77v4eBRO64n0-PjtB04CPXaTH-p-_9Dr9KaQLPYiUTs6A/viewform',
link: 'https://docs.google.com/forms/d/e/1FAIpQLSfIzz5r6IDdDg6t9iGGFh6H5qIovAmrPmQfwzsKRmjo_HaDsA/viewform',
},
AfterRecruiting: {
title: '16기 지원이 마감되었어요!',
buttonText: '17기 사전예약 하기',
link: 'https://forms.gle/8kCz1TVyjxQtEhLV6',
link: 'https://forms.gle/hCUqiYbDUkLbt8Bx8',
},
}

Expand All @@ -56,7 +55,7 @@ export const RecruitMent: Record<RecruitStatusEnum, RecruitMentType> = {
Recruiting: {
title: '🔈CMC 16기 챌린저를\n찾습니다',
description: 'CMC 16기를 모집중이에요.\nCMC의 여정에 합류하고 싶은 분들은\n지원을 서둘러주세요!',
buttonText: '16기 지원하기',
buttonText: '16기 추가모집 지원하기',
},
AfterRecruiting: {
title: 'CMC 16기 다음 여정에\n참여해주세요',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
position: relative;
color: white;
padding-top: 90px;
@include mobile {
background-color: rgba(0, 0, 0, 0.5);
}

.card_name {
// position: absolute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import { Section } from '@/components'
import * as css from './activity-section.module.scss'
import { Cards, Tab } from './constants'

import img1 from './images/img1.png'

interface ButtonProps {
isActive: boolean
label: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
display: flex;
justify-content: center;
position: relative;
background-color: color(blue-500);
color: white;
// background-color: color(blue-500);
// color: white;
border-radius: 12px;
@include mobile {
margin-top: 20px;
Expand Down
4 changes: 2 additions & 2 deletions src/views/about/components/apply-section/apply-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export const ApplySection = () => {
return (
<Section>
<Section.Head title="CMC와 함께 도전하세요" />
<p className={css.alert}>현재 지원 기간이 아닙니다. 다음 기수 모집이 시작될 때까지 조금만 기다려 주세요.</p>
{/* <p className={css.alert}>현재 지원 기간이 아닙니다. 다음 기수 모집이 시작될 때까지 조금만 기다려 주세요.</p> */}
<ApplyButton availableDisabled className={css.button}>
CMC 16기 지원 알림받기
CMC 17기 지원 알림받기
<div className={css.button_effect} />
</ApplyButton>
</Section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
.button_active {
background-color: color(blue-500);
color: white;
border-radius: 12px;

@include mobile {
border-radius: 12px;
}
}

.client_card {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

@include mobile {
width: rem(330px);
display: none;
}

.title {
Expand All @@ -24,6 +25,7 @@
@include mobile {
font-size: rem(24px);
line-height: rem(30px);
display: none;
}

@include desktop {
Expand All @@ -41,6 +43,7 @@
@include mobile {
font-size: rem(17px);
line-height: rem(22px);
display: none;
}

@include desktop {
Expand Down Expand Up @@ -103,6 +106,7 @@
@include mobile {
// display: none; // 모바일에서는 데스크탑 이미지를 숨김
height: 0;
width: 0;
}
}

Expand All @@ -118,6 +122,7 @@
@include desktop {
// display: none; // 데스크탑에서는 모바일 이미지를 숨김
height: 0;
width: 0;
}

// 모바일
Expand Down
16 changes: 7 additions & 9 deletions src/views/about/components/identity-section/identity-section.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { StaticImage } from 'gatsby-plugin-image'
import { ReactElement, ReactNode } from 'react'
import background_desktop from './images/background_desktop.png'
import background_mobile from './images/background_mobile.png'

import { Br, Section } from '@/components'

Expand Down Expand Up @@ -38,13 +36,6 @@ export const IdentitySection = () => {
<Section>
<Section.Head title={Title} />
<div className={css.cards}>
<StaticImage
className={css.backgroundImg}
src="./images/background_desktop.png"
alt=""
style={{ position: 'absolute' }}
></StaticImage>
<StaticImage className={css.backgroundImgMobile} src="./images/background_mobile.png" alt=""></StaticImage>
<Card
icon={<StaticImage src="./images/light-worker.png" alt="" className={css.icon} />}
title="직장인이신가요?"
Expand All @@ -56,6 +47,13 @@ export const IdentitySection = () => {
</>
}
/>
<StaticImage
className={css.backgroundImg}
src="./images/background_desktop.png"
alt=""
style={{ position: 'absolute' }}
></StaticImage>
<StaticImage className={css.backgroundImgMobile} src="./images/background_mobile.png" alt=""></StaticImage>
<Card
icon={<StaticImage src="./images/light-student.png" alt="" className={css.icon} />}
title="대학생 & 취준생이신가요?"
Expand Down
12 changes: 4 additions & 8 deletions src/views/faq/faq.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@
background-color: color(blue-500);
}


.main {
.section {

.main_buttons {
position: relative;
z-index: 5;
display: flex;
border-radius: 30px;

@include mobile {
flex-wrap: wrap;
justify-content: center;
Expand Down Expand Up @@ -151,12 +149,12 @@
}

&:active {
background-color: color(primary-assistive);
background-color: color(primary-strong);
}

@include mobile {
font-weight: 600;
background-color:#EDF1FF;
background-color: #edf1ff;
color: color(blue-500);
border-radius: 16px;
padding: 23px 16px;
Expand All @@ -183,7 +181,7 @@
height: 30px;
}
}

.sns_icon_kakao {
@include mobile {
display: none;
Expand All @@ -206,7 +204,6 @@
}
}


.sns_icon_kakao_mobile {
@include mobile {
width: 22px;
Expand All @@ -217,7 +214,6 @@
display: none;
}
}

}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/views/recruit/components/plan-card/plan-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const PlanCard = ({ title, plans, showButton = false }: RenderCardProps)
<h3 className={css.card_title}>{title}</h3>
<ul>{renderPlans(plans)}</ul>
{showButton && (
<ApplyButton className={css.card_button}>
<ApplyButton className={css.card_button} availableDisabled>
CMC 16기 지원하러 가기
</ApplyButton>
)}
Expand Down
12 changes: 6 additions & 6 deletions src/views/recruit/constants/data.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
export const RecruitPlans: Record<string, { name: string; date: string }> = {
Application: {
name: '접수 기간',
date: '24.10.28 ~ 24.11.05',
date: '24.10.28 ~ 24.11.10',
},
Document: {
name: '서류 전형',
date: '24.11.07',
date: '24.11.10',
},
Interview: {
name: 'CMC 핏 인터뷰',
date: '24.11.09 ~ 24.11.10',
date: '24.11.13 ~ 24.11.14',
},
Joining: {
name: 'CMC 합류 안내',
date: '24.11.13',
date: '24.11.15',
},
}

Expand All @@ -24,7 +24,7 @@ export const SessionPlans: Record<string, { name: string; date: string }> = {
},
Hackaton: {
name: '해커톤',
date: '24.11.30 ~ 24.12.01',
date: '24.11.23 ~ 24.11.24',
},
Study: {
name: '파트별 스터디',
Expand All @@ -48,6 +48,6 @@ export const SessionPlans: Record<string, { name: string; date: string }> = {
},
Demo: {
name: '데모데이',
date: '24.03.01',
date: '25.03.01',
},
}
3 changes: 1 addition & 2 deletions src/views/recruit/recruit.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { HeadProps } from 'gatsby'

import { ScrollRevealContainer, Section, Seo } from '@/components'
import { ScrollRevealContainer, Section, Seo } from '@/components'
import { Main } from '@/layouts'

import { AuraEffect, PlanCard } from './components'
Expand All @@ -12,7 +12,6 @@ const RecruitPage = () => {
<Main className={css.main}>
<ScrollRevealContainer>
<Section className={css.section}>

<AuraEffect />

<Section.Head title="Join Us!" description="16기 일정을 소개합니다" />
Expand Down