From 73a1287f27422a0a1834b890cb806a7101389864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=84=EC=98=81=EB=AF=BC?= Date: Sun, 22 Sep 2024 02:08:00 +0900 Subject: [PATCH 1/3] [hotfix]: Some type and added next generation recurit link --- components/home/AnimatedTextSection/index.tsx | 10 +++++++--- components/recruit/RecruitBanner/index.tsx | 5 ++++- database/projects/24th/mafoo.json | 6 +++--- database/projects/24th/trouble_painter.json | 1 + database/projects/24th/wespot.json | 2 +- database/recruit.ts | 3 +++ 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/components/home/AnimatedTextSection/index.tsx b/components/home/AnimatedTextSection/index.tsx index d1832b9..ad75e25 100644 --- a/components/home/AnimatedTextSection/index.tsx +++ b/components/home/AnimatedTextSection/index.tsx @@ -3,6 +3,7 @@ import { SectionTemplate } from 'components/home'; import Path from 'constants/path'; import { IS_RECRUITING, + NEXT_GENERATION_RECRUIT_LINK, RECRUIT_BANNER, RECRUIT_BANNER_ACTIVE, } from 'database/recruit'; @@ -17,9 +18,7 @@ function AnimatedTextSection(): ReactElement { const animatedTextRef = useRef(null); const BannerInfo = IS_RECRUITING ? RECRUIT_BANNER_ACTIVE : RECRUIT_BANNER; const { buttonName } = BannerInfo; - const buttonParams = IS_RECRUITING - ? { width: 168 } - : { disabled: true, width: 190 }; + const buttonParams = IS_RECRUITING ? { width: 168 } : { width: 190 }; const router = useRouter(); useEffect(() => { @@ -42,6 +41,11 @@ function AnimatedTextSection(): ReactElement { className="recruitButton" buttonText={buttonName} onClick={() => { + if (!IS_RECRUITING) { + window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank'); + return; + } + router.push(Path.Recruit); }} {...buttonParams} diff --git a/components/recruit/RecruitBanner/index.tsx b/components/recruit/RecruitBanner/index.tsx index 53eabf3..df81c3f 100644 --- a/components/recruit/RecruitBanner/index.tsx +++ b/components/recruit/RecruitBanner/index.tsx @@ -3,6 +3,7 @@ import Breakpoints from 'constants/breakpoints'; import Yapp from 'constants/yapp'; import { IS_RECRUITING, + NEXT_GENERATION_RECRUIT_LINK, RECRUIT_BANNER, RECRUIT_BANNER_ACTIVE, } from 'database/recruit'; @@ -34,7 +35,9 @@ function RecruitBanner() { fontColor="white" buttonColor="grey_850" borderColor="lightGrey" - disabled={!IS_RECRUITING} + onClick={() => { + window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank'); + }} > {IS_RECRUITING ? '모든 공고 보기' : '지원마감'} diff --git a/database/projects/24th/mafoo.json b/database/projects/24th/mafoo.json index 57fbcd7..96069ad 100644 --- a/database/projects/24th/mafoo.json +++ b/database/projects/24th/mafoo.json @@ -39,17 +39,17 @@ }, { "name": "김경민", - "field": "iOS", + "field": "Server", "content": "간만에 굉장히 신선하고 즐거웠던 프로젝트였습니다! 길다면 길고 짧다면 짧은 기간이었지만 팀원들에게 모두 너무 고생 많았다고 말해주고 싶어요 :)" }, { "name": "송영민", - "field": "iOS", + "field": "Server", "content": "좋은 분들과 짧은 기간동안 함께 멋진 프로덕트를 만들 수 있어서 행복했어요 🍀🍀" }, { "name": "박민수", - "field": "iOS", + "field": "Web", "content": "인생에 있어서 좋은 도전이었고, 좋은 경험이었습니다." } ], diff --git a/database/projects/24th/trouble_painter.json b/database/projects/24th/trouble_painter.json index 254dfaa..0d91352 100644 --- a/database/projects/24th/trouble_painter.json +++ b/database/projects/24th/trouble_painter.json @@ -23,6 +23,7 @@ "program": [ "Figma", "Dart", + "Flutter", "Kotlin", "Spring", "Boot", diff --git a/database/projects/24th/wespot.json b/database/projects/24th/wespot.json index 758a0c5..c3c1f0a 100644 --- a/database/projects/24th/wespot.json +++ b/database/projects/24th/wespot.json @@ -35,7 +35,7 @@ }, { "name": "김재연", - "field": "Backend", + "field": "Server", "content": "YAPP이라는 IT 연합 동아리에 운 좋게 들어오고, 운 좋게 지금의 Wespot 팀원들을 만날 수 있었기에, 좋은 경험을 많이 할 수 있었습니다. 아키텍처, 언어, 복잡한 로직, 새로운 기술 학습 및 적용 등등의 다양한 기술적인 도전뿐만 아니라, 팀원들과의 교우 활동까지 모든 것이 재미있고 뜻 깊었습니다. 지금은 쉽게 마지막이 될 수도 있는 순간이지만, YAPP이라는 좋은 매개체 속에서 다양한 순간들이 우리를 연결해주었듯, 쉽게 마지막을 맞이하지 않고, 앞으로도 계속해서 서비스를 발전시키며 행복하게 협업할 수 있었으면 좋겠습니다. 또 다른 시작이 처음의 시작보다 더 뜻 깊었으면 좋겠고, 지금처럼 계속해서 좋은 경험을 만들어갈 수 있었으면 좋겠습니다." }, { diff --git a/database/recruit.ts b/database/recruit.ts index ecd809a..7429a52 100644 --- a/database/recruit.ts +++ b/database/recruit.ts @@ -25,6 +25,9 @@ export const RECRUIT_BANNER_ACTIVE = { buttonName: `${Yapp.YAPP_GENERATION}기 지원하기`, }; +export const NEXT_GENERATION_RECRUIT_LINK = + 'https://docs.google.com/forms/d/1Pz_bPLk7olNj45XnakQIB6LNGE9MnaZenzowIQ-mPQ8/viewform?pli=1&pli=1&pli=1&edit_requested=true'; + /** 모집 개요 */ export const RECRUIT_OVERVIEW = { title: '모집 개요', From b1344cd867ec3c418ba68830eda6f4f7bb0c6fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=84=EC=98=81=EB=AF=BC?= Date: Sun, 22 Sep 2024 02:10:58 +0900 Subject: [PATCH 2/3] minor --- components/recruit/RecruitBanner/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/recruit/RecruitBanner/index.tsx b/components/recruit/RecruitBanner/index.tsx index df81c3f..8b88467 100644 --- a/components/recruit/RecruitBanner/index.tsx +++ b/components/recruit/RecruitBanner/index.tsx @@ -36,7 +36,9 @@ function RecruitBanner() { buttonColor="grey_850" borderColor="lightGrey" onClick={() => { - window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank'); + if (!IS_RECRUITING) { + window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank'); + } }} > {IS_RECRUITING ? '모든 공고 보기' : '지원마감'} From b59681827e705c8cd38e140e75814cab0b60054f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=84=EC=98=81=EB=AF=BC?= Date: Sun, 22 Sep 2024 02:12:30 +0900 Subject: [PATCH 3/3] minor --- components/recruit/RecruitBanner/index.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/components/recruit/RecruitBanner/index.tsx b/components/recruit/RecruitBanner/index.tsx index 8b88467..9ce265c 100644 --- a/components/recruit/RecruitBanner/index.tsx +++ b/components/recruit/RecruitBanner/index.tsx @@ -26,7 +26,9 @@ function RecruitBanner() { /> { - if (!IS_RECRUITING) { - window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank'); - } - }} > {IS_RECRUITING ? '모든 공고 보기' : '지원마감'}