16기 마무리 push

Central-MakeUs · Nov 12, 2024 · 1bd9dd4 · 1bd9dd4
1 parent 3e414f2
commit 1bd9dd4
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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 {
@@ -36,12 +36,12 @@ export const RecruitStatus: Record<RecruitStatusEnum, RecruitStatusType> = {
   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',
   },
 }
 
@@ -55,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참여해주세요',

diff --git 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
@@ -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
@@ -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
@@ -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>

diff --git 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
@@ -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
@@ -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 = () => {
     <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="직장인이신가요?"
@@ -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="대학생 & 취준생이신가요?"

diff --git 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
@@ -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>
       )}

diff --git a/src/views/recruit/constants/data.ts b/src/views/recruit/constants/data.ts
@@ -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',
   },
 }
 
@@ -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: '파트별 스터디',
@@ -48,6 +48,6 @@ export const SessionPlans: Record<string, { name: string; date: string }> = {
   },
   Demo: {
     name: '데모데이',
-    date: '24.03.01',
+    date: '25.03.01',
   },
 }
diff --git 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 = () => {
     <Main className={css.main}>
       <ScrollRevealContainer>
         <Section className={css.section}>
-
           <AuraEffect />
 
           <Section.Head title="Join Us!" description="16기 일정을 소개합니다" />