diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml index a4243e8c..d5751380 100644 --- a/.github/workflows/continuous-deployment.yml +++ b/.github/workflows/continuous-deployment.yml @@ -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 diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..726a201e --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20.11.1 \ No newline at end of file diff --git a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.2-ba0aa88b93-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.2-ba0aa88b93-8.zip deleted file mode 100644 index 1d582f1d..00000000 Binary files a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.2-ba0aa88b93-8.zip and /dev/null differ diff --git a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.3-68d0bab047-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.3-68d0bab047-8.zip deleted file mode 100644 index b27b1600..00000000 Binary files a/.yarn/cache/@lmdb-lmdb-darwin-arm64-npm-2.5.3-68d0bab047-8.zip and /dev/null differ diff --git a/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.2-237e0d1098-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.2-237e0d1098-8.zip new file mode 100644 index 00000000..9e99c17c Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.2-237e0d1098-8.zip differ diff --git a/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.3-a26c1cd243-8.zip b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.3-a26c1cd243-8.zip new file mode 100644 index 00000000..7f22c22f Binary files /dev/null and b/.yarn/cache/@lmdb-lmdb-darwin-x64-npm-2.5.3-a26c1cd243-8.zip differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip deleted file mode 100644 index 06cbbf0c..00000000 Binary files a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-arm64-npm-3.0.2-18ac236cc4-8.zip and /dev/null differ diff --git a/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip new file mode 100644 index 00000000..110c9561 Binary files /dev/null and b/.yarn/cache/@msgpackr-extract-msgpackr-extract-darwin-x64-npm-3.0.2-39dd07082a-8.zip differ diff --git a/.yarn/cache/@parcel-watcher-darwin-arm64-npm-2.3.0-b75954f53c-8.zip b/.yarn/cache/@parcel-watcher-darwin-arm64-npm-2.3.0-b75954f53c-8.zip deleted file mode 100644 index 20223fea..00000000 Binary files a/.yarn/cache/@parcel-watcher-darwin-arm64-npm-2.3.0-b75954f53c-8.zip and /dev/null differ diff --git a/.yarn/cache/@parcel-watcher-darwin-x64-npm-2.3.0-2d8304cd3f-8.zip b/.yarn/cache/@parcel-watcher-darwin-x64-npm-2.3.0-2d8304cd3f-8.zip new file mode 100644 index 00000000..875a8888 Binary files /dev/null and b/.yarn/cache/@parcel-watcher-darwin-x64-npm-2.3.0-2d8304cd3f-8.zip differ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 04c99cc8..f2abd7f6 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/src/components/apply-button/apply-button.module.scss b/src/components/apply-button/apply-button.module.scss index bccd22dc..888b1b6b 100644 --- a/src/components/apply-button/apply-button.module.scss +++ b/src/components/apply-button/apply-button.module.scss @@ -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); } diff --git a/src/components/carousel-slider/carousel-slider.module.scss b/src/components/carousel-slider/carousel-slider.module.scss index 0b5b8f32..3e86e453 100644 --- a/src/components/carousel-slider/carousel-slider.module.scss +++ b/src/components/carousel-slider/carousel-slider.module.scss @@ -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; + } } } diff --git a/src/constants/data.ts b/src/constants/data.ts index d1b92a02..e7914ffe 100644 --- a/src/constants/data.ts +++ b/src/constants/data.ts @@ -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 { @@ -26,23 +26,22 @@ export type RecruitMentType = { buttonText: string } - // apply button export const RecruitStatus: Record = { 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', }, } @@ -56,7 +55,7 @@ export const RecruitMent: Record = { Recruiting: { title: '🔈CMC 16기 챌린저를\n찾습니다', description: 'CMC 16기를 모집중이에요.\nCMC의 여정에 합류하고 싶은 분들은\n지원을 서둘러주세요!', - buttonText: '16기 지원하기', + buttonText: '16기 추가모집 지원하기', }, AfterRecruiting: { title: 'CMC 16기 다음 여정에\n참여해주세요', diff --git a/src/views/about/components/activity-section/activity-section.module.scss b/src/views/about/components/activity-section/activity-section.module.scss index b66eed80..24d397fb 100644 --- a/src/views/about/components/activity-section/activity-section.module.scss +++ b/src/views/about/components/activity-section/activity-section.module.scss @@ -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; diff --git a/src/views/about/components/activity-section/activity-section.tsx b/src/views/about/components/activity-section/activity-section.tsx index abe5c49f..9a8178ab 100644 --- a/src/views/about/components/activity-section/activity-section.tsx +++ b/src/views/about/components/activity-section/activity-section.tsx @@ -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 diff --git a/src/views/about/components/apply-section/apply-section.module.scss b/src/views/about/components/apply-section/apply-section.module.scss index c14a8faa..a07f8fb2 100644 --- a/src/views/about/components/apply-section/apply-section.module.scss +++ b/src/views/about/components/apply-section/apply-section.module.scss @@ -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; diff --git a/src/views/about/components/apply-section/apply-section.tsx b/src/views/about/components/apply-section/apply-section.tsx index d849bba5..7bf09f7a 100644 --- a/src/views/about/components/apply-section/apply-section.tsx +++ b/src/views/about/components/apply-section/apply-section.tsx @@ -6,9 +6,9 @@ export const ApplySection = () => { return (
-

현재 지원 기간이 아닙니다. 다음 기수 모집이 시작될 때까지 조금만 기다려 주세요.

+ {/*

현재 지원 기간이 아닙니다. 다음 기수 모집이 시작될 때까지 조금만 기다려 주세요.

*/} - CMC 16기 지원 알림받기 + CMC 17기 지원 알림받기
diff --git a/src/views/about/components/challenger-section/challenger-section.module.scss b/src/views/about/components/challenger-section/challenger-section.module.scss index 28b496e0..1e6d48a6 100644 --- a/src/views/about/components/challenger-section/challenger-section.module.scss +++ b/src/views/about/components/challenger-section/challenger-section.module.scss @@ -31,7 +31,10 @@ .button_active { background-color: color(blue-500); color: white; - border-radius: 12px; + + @include mobile { + border-radius: 12px; + } } .client_card { diff --git a/src/views/about/components/identity-section/identity-section.module.scss b/src/views/about/components/identity-section/identity-section.module.scss index 6056625f..6c5797cf 100644 --- a/src/views/about/components/identity-section/identity-section.module.scss +++ b/src/views/about/components/identity-section/identity-section.module.scss @@ -14,6 +14,7 @@ @include mobile { width: rem(330px); + display: none; } .title { @@ -24,6 +25,7 @@ @include mobile { font-size: rem(24px); line-height: rem(30px); + display: none; } @include desktop { @@ -41,6 +43,7 @@ @include mobile { font-size: rem(17px); line-height: rem(22px); + display: none; } @include desktop { @@ -103,6 +106,7 @@ @include mobile { // display: none; // 모바일에서는 데스크탑 이미지를 숨김 height: 0; + width: 0; } } @@ -118,6 +122,7 @@ @include desktop { // display: none; // 데스크탑에서는 모바일 이미지를 숨김 height: 0; + width: 0; } // 모바일 diff --git a/src/views/about/components/identity-section/identity-section.tsx b/src/views/about/components/identity-section/identity-section.tsx index e9cebaae..44c327e0 100644 --- a/src/views/about/components/identity-section/identity-section.tsx +++ b/src/views/about/components/identity-section/identity-section.tsx @@ -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' @@ -38,13 +36,6 @@ export const IdentitySection = () => {
- - } title="직장인이신가요?" @@ -56,6 +47,13 @@ export const IdentitySection = () => { } /> + + } title="대학생 & 취준생이신가요?" diff --git a/src/views/faq/faq.module.scss b/src/views/faq/faq.module.scss index bf8b7a9a..8e76f07d 100644 --- a/src/views/faq/faq.module.scss +++ b/src/views/faq/faq.module.scss @@ -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; @@ -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; @@ -183,7 +181,7 @@ height: 30px; } } - + .sns_icon_kakao { @include mobile { display: none; @@ -206,7 +204,6 @@ } } - .sns_icon_kakao_mobile { @include mobile { width: 22px; @@ -217,7 +214,6 @@ display: none; } } - } } } diff --git a/src/views/recruit/components/plan-card/plan-card.tsx b/src/views/recruit/components/plan-card/plan-card.tsx index 53f424b3..087ca20d 100644 --- a/src/views/recruit/components/plan-card/plan-card.tsx +++ b/src/views/recruit/components/plan-card/plan-card.tsx @@ -31,7 +31,7 @@ export const PlanCard = ({ title, plans, showButton = false }: RenderCardProps)

{title}

    {renderPlans(plans)}
{showButton && ( - + CMC 16기 지원하러 가기 )} diff --git a/src/views/recruit/constants/data.ts b/src/views/recruit/constants/data.ts index 386e13ef..8c46d66d 100644 --- a/src/views/recruit/constants/data.ts +++ b/src/views/recruit/constants/data.ts @@ -1,19 +1,19 @@ export const RecruitPlans: Record = { 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', }, } @@ -24,7 +24,7 @@ export const SessionPlans: Record = { }, Hackaton: { name: '해커톤', - date: '24.11.30 ~ 24.12.01', + date: '24.11.23 ~ 24.11.24', }, Study: { name: '파트별 스터디', @@ -48,6 +48,6 @@ export const SessionPlans: Record = { }, Demo: { name: '데모데이', - date: '24.03.01', + date: '25.03.01', }, } diff --git a/src/views/recruit/recruit.tsx b/src/views/recruit/recruit.tsx index 0e08f48b..1f727629 100644 --- a/src/views/recruit/recruit.tsx +++ b/src/views/recruit/recruit.tsx @@ -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' @@ -12,7 +12,6 @@ const RecruitPage = () => {
-