Skip to content

Commit

Permalink
Merge pull request #78 from Central-MakeUs/dev
Browse files Browse the repository at this point in the history
16기 배포
  • Loading branch information
YoungEun-Choi930 authored Oct 26, 2024
2 parents 8c5eec4 + 96dfe90 commit 629292f
Show file tree
Hide file tree
Showing 129 changed files with 1,752 additions and 603 deletions.
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 @@ -2,9 +2,9 @@
@use '@/styles/utils' as *;

.button {
background-color: color(primary-normal);
background-color: color(blue-500);
border-radius: 99px;
color: #f5f1f8;
color: white;
font-weight: 700;
text-align: center;

Expand Down
2 changes: 1 addition & 1 deletion src/components/aura-circle/aura-circle.module.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.round {
background: radial-gradient(46.86% 46.86% at 50% 53.14%, rgba(229, 48, 232, 0.8) 0%, #f4ebff00 100%);
background: radial-gradient(#84A1FF 0%, #FFFFFF 70%);
border-radius: 100%;
}
4 changes: 2 additions & 2 deletions src/components/aura-circle/aura-circle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { CSSProperties } from 'react'
import * as css from './aura-circle.module.scss'

interface Props {
size: string
size?: string
top?: string
left?: string
opacity?: number
}

export const AuraCircle = ({ size, top = '50%', left = '50%', opacity = 0.4 }: Props) => {
export const AuraCircle = ({ size = '60%', top = '0%', left = '20%', opacity = 0.2 }: Props) => {
const style: CSSProperties = {
width: size,
aspectRatio: '1',
Expand Down
27 changes: 27 additions & 0 deletions src/components/aura-effect/aura-effect.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@use '@/styles/abstracts' as *;
@use '@/styles/utils' as *;


.desktop {
@include desktop {
z-index: 0;
display: block;
max-width: 1200px;
}

@include mobile {
display: none;
}
}

.mobile {
@include desktop {
display: none;
}

@include mobile {
z-index: 0;
display: block;
max-width: 600px;
}
}
17 changes: 17 additions & 0 deletions src/components/aura-effect/aura-effect.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { AuraCircle } from '@/components'

import * as css from './aura-effect.module.scss'

export const AuraEffect = () => {
return (
<>
<div className={css.desktop}>
<AuraCircle size="60%" top="90px" left="20%" opacity={0.2} />
</div>

<div className={css.mobile}>
<AuraCircle size="180%" top="0" left="-40%" opacity={0.2} />
</div>
</>
)
}
1 change: 1 addition & 0 deletions src/components/aura-effect/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './aura-effect'
2 changes: 1 addition & 1 deletion src/components/carousel-slider/carousel-slider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface Props {
* <Carousel logos={imageArr} /> // 순방향
* <Carousel logos={imageArr} reverse /> // 역방향
*/
export const CarouselSlider = ({ logos, width = '10%', reverse = false }: Props) => {
export const CarouselSlider = ({ logos, width = '8%', reverse = false }: Props) => {
const extendSlideItems = [...logos, ...logos.slice(0, 4)] // 끊김 없는 루프 효과를 위해 시야에 보이는 개수인 4개의 항목을 끝에 추가합니다.
const carouselRef = useRef<HTMLDivElement>(null)

Expand Down
Binary file modified src/components/floating-button/images/top-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/components/glass-card/glass-card.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
@use '@/styles/utils' as *;

.card {
background: linear-gradient(180deg, rgb(255, 255, 255, 0.25) 0%, rgb(255, 255, 255, 0.7 * 0.25) 100%);
// background: linear-gradient(180deg, rgb(255, 255, 255, 0.25) 0%, rgb(255, 255, 255, 0.7 * 0.25) 100%);
background: white;
backdrop-filter: blur(8px);
border: 1px solid color(semantic-white);

Expand Down
1 change: 1 addition & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from './apply-button'
export * from './aura-circle'
export * from './aura-effect'
export * from './br'
export * from './carousel-slider'
export * from './floating-button'
Expand Down
Binary file modified src/components/section/images/star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 14 additions & 6 deletions src/components/section/section.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}

@include desktop {
padding: 80px 40px;
padding: 80px 0px;
}
}

Expand All @@ -26,38 +26,46 @@
@include desktop {
width: 44px;
height: 44px;
margin-bottom: 20px;
margin-bottom: 28px;
}
}

.head {
z-index: 1;
color: color(black-100);
text-align: center;
font-family: 'Trap', 'Pretendard';

@include mobile {
font-size: rem(24px);
line-height: rem(30px);
margin-bottom: 12px;
}

@include desktop {
@include typo(display1);
font-size: rem(35px);
line-height: rem(45px);
margin-bottom: 16px;
}

span {
color: #b36afb;
color: color(blue-500);
}
}

.desc {
z-index: 1;
font-weight: 500;
color: #efeaf5;
text-align: center;
color: color(black-100);

@include mobile {
font-size: rem(14px);
line-height: rem(19px);
}

@include desktop {
font-size: rem(26px);
font-size: rem(22px);
line-height: rem(32px);
}
}
1 change: 1 addition & 0 deletions src/components/section/tempCodeRunnerFile.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
100
41 changes: 34 additions & 7 deletions src/constants/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export type RecruitDateType = {
}

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

export enum RecruitStatusEnum {
Expand All @@ -20,20 +20,47 @@ export type RecruitStatusType = {
link: string
}

export type RecruitMentType = {
title: string
description: string
buttonText: string
}


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

// 메인화면 card
export const RecruitMent: Record<RecruitStatusEnum, RecruitMentType> = {
BeforeRecruiting: {
title: 'CMC 16기 모집이\n곧 시작돼요!',
description: '아직 모집기간이 아니에요!\n알림 설정을 해주시면\n16기 모집 알림을 전달드릴게요!',
buttonText: '16기 모집알림 신청하기',
},
Recruiting: {
title: '🔈CMC 16기 챌린저를\n찾습니다',
description: 'CMC 16기를 모집중이에요.\nCMC의 여정에 합류하고 싶은 분들은\n지원을 서둘러주세요!',
buttonText: '16기에 지원하기',
},
AfterRecruiting: {
title: 'CMC 16기 다음 여정에\n참여해주세요',
description: '16기 모집이 끝났어요.\nCMC의 다음여정에 함께해요!\n17기 모집알림을 보내드릴게요.',
buttonText: '17기 모집알림 신청하기',
},
}
5 changes: 5 additions & 0 deletions src/custom.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ declare module '*.svg' {
const content: any
export default content
}

declare module '*.mp4' {
const content: any
export default content
}
88 changes: 88 additions & 0 deletions src/data/app.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,92 @@
[
{
"name": "B.Link",
"year": "15",
"description": "링크 아카이빙 서비스",
"link": {
"ios": "https://apps.apple.com/us/app/b-link/id6630368733",
"android": "https://play.google.com/store/apps/details?id=com.blinkapplication&hl=ko"
},
"logo": "./logo/15/b_link.jpg",
"rank": "1"
},
{
"name": "퓨리즘",
"year": "15",
"description": "감성 사진을 위한 필터 서비스",
"link": {
"ios": "https://apps.apple.com/kr/app/%ED%93%A8%EB%A6%AC%EC%A6%98/id6523427087",
"android": "https://play.google.com/store/apps/details?id=com.cmc.purithm&pcampaignid=web_share"
},
"logo": "./logo/15/purithm.png",
"rank": "2"
},
{
"name": "suppin",
"year": "15",
"description": "SNS 이벤트 관리/당첨자 선별 효율화를 지원하는 서비스",
"link": {
"ios": "https://apps.apple.com/kr/app/suppin-%EC%8D%A8%ED%95%80/id6648765679",
"android": " https://play.google.com/store/apps/details?id=com.suppin.app"
},
"logo": "./logo/15/supin.png",
"rank": "3"
},
{
"name": "프리뷰인슈",
"year": "15",
"description": "인생 보험 설계, 프리뷰인슈에서 내 보험을 그려보세요",
"link": {
"ios": "https://apps.apple.com/kr/app/%ED%94%84%EB%A6%AC%EB%B7%B0%EC%9D%B8%EC%8A%88/id6587559820",
"android": "https://play.google.com/store/apps/details?id=com.previewinsure.android"
},
"logo": "./logo/15/presue.png",
"rank": "4"
},
{
"name": "SNAPFIT",
"year": "15",
"description": "분위기 맞춤형 스냅사진 매칭 서비스",
"link": {
"ios": "https://apps.apple.com/kr/app/snapfit/id6642695481",
"android": "https://play.google.com/store/apps/details?id=memory.fabricators.snapfit&pli=1"
},
"logo": "./logo/15/snapfit.png",
"rank": "4"
},
{
"name": "PLUV",
"year": "15",
"description": "플레이리스트 통합 관리 서비스",
"link": {
"ios": "https://apps.apple.com/kr/app/pluv/id6645736556",
"android": "https://play.google.com/store/apps/details?id=com.cmc15th.pluv&hl=ko"
},
"logo": "./logo/15/pluv.jpg",
"rank": "4"
},
{
"name": "BinVoyage",
"year": "15",
"description": "더 이상 쓰레기통을 찾아 헤매지 마세요. BinVoyage와 함께해요!",
"link": {
"ios": "https://apps.apple.com/kr/app/binvoyage/id6624302211?",
"android": "https://play.google.com/store/apps/details?id=com.binvoyage"
},
"logo": "./logo/15/bin_voyage.png",
"rank": "4"
},
{
"name": "노피스-Noffice",
"year": "15",
"description": "공지사항 관리 서비스",
"link": {
"ios": "https://apps.apple.com/kr/app/noffice-노피스/id6529546973?l=en-GB",
"android": "https://play.google.com/store/apps/details?id=com.easyhz.noffice.release&pcampaignid=web_share"
},
"logo": "./logo/15/noffice.png",
"rank": "4"
},
{
"name": "Blue Club",
"year": "14",
Expand Down
Binary file added src/data/logo/15/b_link.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/bin_voyage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/noffice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/pluv.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/presue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/purithm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/snapfit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/data/logo/15/supin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/background1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/symbol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 629292f

Please sign in to comment.