From 75a8cb5c0ef27798b87f474b17f6a5d9550fac20 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 02:47:34 +0900 Subject: [PATCH 1/6] =?UTF-8?q?design:=20strongText=EC=97=90=20makers=20co?= =?UTF-8?q?lor=20=EB=B0=B0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ResultPage/components/ScreeningResult.tsx | 2 +- src/views/ResultPage/components/style.css.ts | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/ResultPage/components/ScreeningResult.tsx b/src/views/ResultPage/components/ScreeningResult.tsx index 067a16a3..7c4bc498 100644 --- a/src/views/ResultPage/components/ScreeningResult.tsx +++ b/src/views/ResultPage/components/ScreeningResult.tsx @@ -47,7 +47,7 @@ const Content = ({ pass }: { pass?: boolean }) => { {pass ? (

{`안녕하세요. ${season}기 ${soptName} 입니다.\n\n`} - {`축하드립니다!`} + {`축하드립니다!`} {` 서류 검토 결과, ${name}님은 면접 대상자로 선정되셨습니다. diff --git a/src/views/ResultPage/components/style.css.ts b/src/views/ResultPage/components/style.css.ts index faecce45..b38e15fe 100644 --- a/src/views/ResultPage/components/style.css.ts +++ b/src/views/ResultPage/components/style.css.ts @@ -1,4 +1,5 @@ -import { keyframes, style } from '@vanilla-extract/css'; +import { colors } from '@sopt-makers/colors'; +import { keyframes, style, styleVariants } from '@vanilla-extract/css'; import { calc } from '@vanilla-extract/css-utils'; import { Z_INDEX } from '@constants/zIndex'; @@ -33,8 +34,13 @@ export const content = style({ zIndex: Z_INDEX.resultContent, }); -export const strongText = style({ - color: theme.color.primary, +export const strongText = styleVariants({ + sopt: { + color: theme.color.primary, + }, + makers: { + color: colors.secondary, + }, }); const animatedGradient = keyframes({ From ace61f74e0f7d7b172007c69ec2da5f79b0ad06a Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 03:09:12 +0900 Subject: [PATCH 2/6] =?UTF-8?q?design:=20backgroundGradient=EC=97=90=20mak?= =?UTF-8?q?ers=20=EB=B0=B0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ResultPage/components/style.css.ts | 41 +++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/src/views/ResultPage/components/style.css.ts b/src/views/ResultPage/components/style.css.ts index b38e15fe..1b0c868b 100644 --- a/src/views/ResultPage/components/style.css.ts +++ b/src/views/ResultPage/components/style.css.ts @@ -43,28 +43,41 @@ export const strongText = styleVariants({ }, }); -const animatedGradient = keyframes({ - '0%': { - width: '40%', - boxShadow: `0px 100px 100px 70px ${theme.color.primary}`, - }, - - '100%': { - width: '80%', - boxShadow: `0px 100px 100px 100px ${theme.color.primary}`, - }, -}); - -export const bottomAnimation = style({ +const bottomAnimationBase = style({ position: 'absolute', bottom: '-100px', left: '50%', transform: 'translateX(-50%)', height: 100, borderRadius: '100%', - animation: `${animatedGradient} ease-in-out 3s alternate infinite`, }); +const animatedGradient = (bgColor: string) => + keyframes({ + '0%': { + width: '40%', + boxShadow: `0px 100px 100px 70px ${bgColor}`, + }, + + '100%': { + width: '80%', + boxShadow: `0px 100px 100px 100px ${bgColor}`, + }, + }); + +export const bottomAnimation = styleVariants( + { + sopt: theme.color.primary, + makers: '#d8d8d8', + }, + (color) => [ + bottomAnimationBase, + { + animation: `${animatedGradient(color)} ease-in-out 3s alternate infinite`, + }, + ], +); + export const bottomImg = style({ position: 'absolute', bottom: 0, From 216d941758e6d64a6443286f3ff1b94f6ec27ac3 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 03:26:49 +0900 Subject: [PATCH 3/6] =?UTF-8?q?design:=20=EB=B0=B0=EA=B2=BD=20=EB=A1=9C?= =?UTF-8?q?=EA=B3=A0=20=EB=A9=94=EC=9D=B4=EC=BB=A4=EC=8A=A4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResultPage/assets/IconMakersLogo.tsx | 57 +++++++++++++++++++ .../ResultPage/components/ScreeningResult.tsx | 32 ++++++++--- src/views/ResultPage/components/style.css.ts | 8 +++ 3 files changed, 89 insertions(+), 8 deletions(-) create mode 100644 src/views/ResultPage/assets/IconMakersLogo.tsx diff --git a/src/views/ResultPage/assets/IconMakersLogo.tsx b/src/views/ResultPage/assets/IconMakersLogo.tsx new file mode 100644 index 00000000..4b207ab6 --- /dev/null +++ b/src/views/ResultPage/assets/IconMakersLogo.tsx @@ -0,0 +1,57 @@ +const IconMakersLogo = () => { + return ( + + + + + + + + + + + + + + + + + + + + ); +}; + +export default IconMakersLogo; diff --git a/src/views/ResultPage/components/ScreeningResult.tsx b/src/views/ResultPage/components/ScreeningResult.tsx index 7c4bc498..8e89accc 100644 --- a/src/views/ResultPage/components/ScreeningResult.tsx +++ b/src/views/ResultPage/components/ScreeningResult.tsx @@ -6,7 +6,17 @@ import Title from '@components/Title'; import { RecruitingInfoContext } from '@store/recruitingInfoContext'; import BigLoading from 'views/loadings/BigLoding'; -import { bottomAnimation, bottomImg, container, content, contentWrapper, link, strongText } from './style.css'; +import { + bottomAnimation, + bottomImg, + bottomSvg, + container, + content, + contentWrapper, + link, + strongText, +} from './style.css'; +import IconMakersLogo from '../assets/IconMakersLogo'; import imgMakersLogo from '../assets/imgMakersLogo.png'; import imgMakersLogoWebp from '../assets/imgMakersLogo.webp'; import imgSoptLogo from '../assets/imgSoptLogo.png'; @@ -44,7 +54,7 @@ const Content = ({ pass }: { pass?: boolean }) => { return ( <> - {pass ? ( + {!pass ? (

{`안녕하세요. ${season}기 ${soptName} 입니다.\n\n`} {`축하드립니다!`} @@ -116,13 +126,19 @@ const ScreeningResult = () => { 결과 확인 - {pass && ( + {!pass && ( <> -

- - - sopt-logo - +
+ {isMakers ? ( + + + + ) : ( + + + sopt-logo + + )} )} diff --git a/src/views/ResultPage/components/style.css.ts b/src/views/ResultPage/components/style.css.ts index 1b0c868b..e381b865 100644 --- a/src/views/ResultPage/components/style.css.ts +++ b/src/views/ResultPage/components/style.css.ts @@ -86,6 +86,14 @@ export const bottomImg = style({ // height: 556, }); +export const bottomSvg = style({ + position: 'absolute', + bottom: 0, + right: 0, + margin: '0px 130px 140px 0px', + width: 584, +}); + export const link = style({ borderBottom: '1px solid currentColor', }); From 04478e9119ee8c23ad07bc2d0adc439361c5d8ed Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 03:34:45 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=EC=B5=9C=EC=A2=85=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EB=8F=84=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=20=EB=B0=8F=20makers=20=EC=9E=84=EC=9D=98=20?= =?UTF-8?q?=EB=A1=9C=EA=B3=A0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ResultPage/assets/imgMakersLogo.png | Bin 9157 -> 0 bytes .../ResultPage/assets/imgMakersLogo.webp | Bin 3206 -> 0 bytes .../ResultPage/components/FinalResult.tsx | 31 ++++++++++-------- .../ResultPage/components/ScreeningResult.tsx | 9 ++--- 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 src/views/ResultPage/assets/imgMakersLogo.png delete mode 100644 src/views/ResultPage/assets/imgMakersLogo.webp diff --git a/src/views/ResultPage/assets/imgMakersLogo.png b/src/views/ResultPage/assets/imgMakersLogo.png deleted file mode 100644 index da5fe9d47c992134bb8a4132bd64c90776f7bea3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9157 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 LO!q(PC)@IWu2~8R diff --git a/src/views/ResultPage/assets/imgMakersLogo.webp b/src/views/ResultPage/assets/imgMakersLogo.webp deleted file mode 100644 index f7ef18e18da86584f5343c2c05c45e26c318238e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3206 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 { {pass ? (

{`안녕하세요. ${season}기 ${soptName} 입니다.\n\n`} - {`축하드립니다!`} + {`축하드립니다!`} {` ${name}님은 ${season}기 ${soptName} ${!isMakers ? group : ''} 신입회원 모집에 최종 합격하셨습니다. @@ -35,7 +34,10 @@ const Content = ({ pass }: { pass?: boolean }) => { 오늘 중으로 카카오톡 단체 대화방에 초대해드릴 예정이니 참고 부탁드립니다.\n `} - {`SOPT의 ${season}번째 열정이 되신 것을 축하드립니다!`} + {`SOPT의 ${season}번째 열정이 되신 것을 축하드립니다!`}

) : (

@@ -64,9 +66,6 @@ const FinalResult = () => { const { name, pass } = finalResult?.data || {}; - const imgLogo = isMakers ? imgMakersLogo : imgSoptLogo; - const imgLogoWebp = isMakers ? imgMakersLogoWebp : imgSoptLogoWebp; - useEffect(() => { handleSaveRecruitingInfo({ name, @@ -83,11 +82,17 @@ const FinalResult = () => {

{pass && ( <> -
- - - sopt-logo - +
+ {isMakers ? ( + + + + ) : ( + + + sopt-logo + + )} )} diff --git a/src/views/ResultPage/components/ScreeningResult.tsx b/src/views/ResultPage/components/ScreeningResult.tsx index 8e89accc..4d4ccb4d 100644 --- a/src/views/ResultPage/components/ScreeningResult.tsx +++ b/src/views/ResultPage/components/ScreeningResult.tsx @@ -17,8 +17,6 @@ import { strongText, } from './style.css'; import IconMakersLogo from '../assets/IconMakersLogo'; -import imgMakersLogo from '../assets/imgMakersLogo.png'; -import imgMakersLogoWebp from '../assets/imgMakersLogo.webp'; import imgSoptLogo from '../assets/imgSoptLogo.png'; import imgSoptLogoWebp from '../assets/imgSoptLogo.webp'; import useGetScreeningResult from '../hooks/useGetScreeningResult'; @@ -117,9 +115,6 @@ const ScreeningResult = () => { if (screeningResultIsLoading) return ; - const imgLogo = isMakers ? imgMakersLogo : imgSoptLogo; - const imgLogoWebp = isMakers ? imgMakersLogoWebp : imgSoptLogoWebp; - return (
@@ -135,8 +130,8 @@ const ScreeningResult = () => { ) : ( - - sopt-logo + + sopt-logo )} From ff76c6d7e34b9d25ed6e28c9954927510757a4d4 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 30 Jul 2024 03:35:05 +0900 Subject: [PATCH 5/6] =?UTF-8?q?design:=20makers=20dark=20mode=20header=20l?= =?UTF-8?q?ogo=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/assets/MakersDarkLogo.tsx | 21 +++++++++++++++++++ .../Layout/components/Header/index.tsx | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/common/assets/MakersDarkLogo.tsx diff --git a/src/common/assets/MakersDarkLogo.tsx b/src/common/assets/MakersDarkLogo.tsx new file mode 100644 index 00000000..d824e119 --- /dev/null +++ b/src/common/assets/MakersDarkLogo.tsx @@ -0,0 +1,21 @@ +const MakersDarkLogo = () => { + return ( + + + + + + + + + + + ); +}; + +export default MakersDarkLogo; diff --git a/src/common/components/Layout/components/Header/index.tsx b/src/common/components/Layout/components/Header/index.tsx index 2e63c12a..5f240162 100644 --- a/src/common/components/Layout/components/Header/index.tsx +++ b/src/common/components/Layout/components/Header/index.tsx @@ -2,9 +2,11 @@ import { reset, track } from '@amplitude/analytics-browser'; import { useContext } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; +import MakersDarkLogo from '@assets/MakersDarkLogo'; import MakersLogo from '@assets/MakersLogo'; import NowsoptLogo from '@assets/NowsoptLogo'; import { RecruitingInfoContext } from '@store/recruitingInfoContext'; +import { ThemeContext } from '@store/themeContext'; import { MENU_ITEMS, MENU_ITEMS_MAKERS } from './contants'; import MenuItem from './MenuItem'; @@ -18,6 +20,7 @@ const Header = () => { const { recruitingInfo: { name, isMakers }, } = useContext(RecruitingInfoContext); + const { isLight } = useContext(ThemeContext); const menuItems = isMakers ? MENU_ITEMS_MAKERS : MENU_ITEMS; @@ -37,7 +40,7 @@ const Header = () => { {isMakers != undefined && (
- {!pass && ( + {pass && ( <>
{isMakers ? (