From bcbec0671613a540167fdb39e33a0b0824df142d Mon Sep 17 00:00:00 2001 From: HyeongKyeom Kim <97586683+Brokyeom@users.noreply.github.com> Date: Sun, 17 Sep 2023 19:24:32 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20NoticeButton=20=ED=8D=BC=EB=B8=94?= =?UTF-8?q?=EB=A6=AC=EC=8B=B1=20(#68)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/NoticeButton.tsx | 50 +++++++++++++++++++ .../components/mainpage/floating/Footer.tsx | 4 +- .../components/mainpage/greeting/Intro.tsx | 6 ++- .../mainpage/recruit/RecruitSection.tsx | 7 ++- apps/web/tailwind.config.js | 2 + 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 apps/web/src/components/common/NoticeButton.tsx diff --git a/apps/web/src/components/common/NoticeButton.tsx b/apps/web/src/components/common/NoticeButton.tsx new file mode 100644 index 0000000..bd7c3e4 --- /dev/null +++ b/apps/web/src/components/common/NoticeButton.tsx @@ -0,0 +1,50 @@ +'use Client'; + +import Link from 'next/link'; +import React from 'react'; + +export default function NoticeButton() { + return ( +
+ +

+ + 4기 모집 알림 신청 +

+ + +

+ + 3기 모집글 보기 (마감) +

+ +
+ ); +} + +function NoticeIcon(props: React.SVGProps) { + return ( + + + + ); +} + +function ArrowIcon(props: React.SVGProps) { + return ( + + + + ); +} diff --git a/apps/web/src/components/mainpage/floating/Footer.tsx b/apps/web/src/components/mainpage/floating/Footer.tsx index 5a786b8..9edf480 100644 --- a/apps/web/src/components/mainpage/floating/Footer.tsx +++ b/apps/web/src/components/mainpage/floating/Footer.tsx @@ -4,10 +4,10 @@ import { RightArrowIcon } from '../../common/RightArrowIcon'; export default function Footer() { return ( - + diff --git a/apps/web/src/components/mainpage/greeting/Intro.tsx b/apps/web/src/components/mainpage/greeting/Intro.tsx index 5e04f4a..e0db03a 100644 --- a/apps/web/src/components/mainpage/greeting/Intro.tsx +++ b/apps/web/src/components/mainpage/greeting/Intro.tsx @@ -2,7 +2,8 @@ import clsx from 'clsx'; import { m, useScroll, useTransform } from 'framer-motion'; import { SVGProps, useRef } from 'react'; -import RecruitButton from '@/components/common/RecruitButton'; +import NoticeButton from '@/components/common/NoticeButton'; +// import RecruitButton from '@/components/common/RecruitButton'; interface GreetingProps { className?: string; @@ -29,7 +30,8 @@ export default function Intro({ className }: GreetingProps) { SOPT에 없던 새로운 가치를
프로덕트를 통해 만들어 갑니다. - + {/* */} + diff --git a/apps/web/src/components/mainpage/recruit/RecruitSection.tsx b/apps/web/src/components/mainpage/recruit/RecruitSection.tsx index becdda5..6dda2f9 100644 --- a/apps/web/src/components/mainpage/recruit/RecruitSection.tsx +++ b/apps/web/src/components/mainpage/recruit/RecruitSection.tsx @@ -3,7 +3,9 @@ import { m, useInView } from 'framer-motion'; import { useRef } from 'react'; -import RecruitButton from '../../common/RecruitButton'; +import NoticeButton from '@/components/common/NoticeButton'; + +// import RecruitButton from '../../common/RecruitButton'; export default function RecruitSection() { const ref = useRef(null); @@ -29,7 +31,8 @@ export default function RecruitSection() {
메이커스에 합류하세요 - + {/* */} + diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js index 216680d..8d5f4f3 100644 --- a/apps/web/tailwind.config.js +++ b/apps/web/tailwind.config.js @@ -47,8 +47,10 @@ module.exports = { '32-regular': ['3.2rem', { lineHeight: '160%', letterSpacing: '-0.064rem', fontWeight: 400 }], '28-regular': ['2.8rem', { lineHeight: '160%', letterSpacing: '-0.064rem', fontWeight: 400 }], '24-semibold': ['2.4rem', { lineHeight: '150%', letterSpacing: '-0.048rem', fontWeight: 600 }], + '18-bold': ['1.8rem', { lineHeight: '140%', letterSpacing: '-0.036rem', fontWeight: 700 }], '18-semibold': ['1.8rem', { lineHeight: '150%', letterSpacing: '-0.036rem', fontWeight: 600 }], '18-regular': ['1.8rem', { lineHeight: '150%', letterSpacing: '-0.036rem', fontWeight: 400 }], + '16-bold': ['1.6rem', { lineHeight: '140%', letterSpacing: '-0.036rem', fontWeight: 700 }], '16-regular': ['1.6rem', { lineHeight: '130%', letterSpacing: '-0.036rem', fontWeight: 400 }], '16-regular-desc': ['1.6rem', { lineHeight: '160%', letterSpacing: '-0.128rem', fontWeight: 400 }], },