From 62b6defcb376a181a20715b59ba39c33f47bec43 Mon Sep 17 00:00:00 2001 From: wuzoo Date: Sat, 7 Sep 2024 16:02:03 +0900 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20blank=EB=A1=9C=20=EC=83=88?= =?UTF-8?q?=EB=A1=9C=EC=9A=B4=20=ED=83=AD=EC=97=90=EC=84=9C=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=A0=91=EC=86=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/AboutPage/components/Member/Card/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/AboutPage/components/Member/Card/index.tsx b/src/views/AboutPage/components/Member/Card/index.tsx index 64f6ae36..fa9eae85 100644 --- a/src/views/AboutPage/components/Member/Card/index.tsx +++ b/src/views/AboutPage/components/Member/Card/index.tsx @@ -44,17 +44,17 @@ const MemberCard = ({ {description || '-'} {gmail && ( - + )} {linkedin && ( - + )} {github && ( - + )} From 6c146053a3075bb576fee27c1669f10689375b8b Mon Sep 17 00:00:00 2001 From: wuzoo Date: Sat, 7 Sep 2024 16:02:21 +0900 Subject: [PATCH 2/5] =?UTF-8?q?chore:=2014=20->=2016=EC=8B=9C=20=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/RecruitPage/components/Schedule/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/RecruitPage/components/Schedule/index.tsx b/src/views/RecruitPage/components/Schedule/index.tsx index 97d34113..53f8d163 100644 --- a/src/views/RecruitPage/components/Schedule/index.tsx +++ b/src/views/RecruitPage/components/Schedule/index.tsx @@ -15,7 +15,7 @@ const Schedule = () => { YB 서류 결과 발표 - 9월 19일 14시 + 9월 19일 16시 YB 면접 9월 21일 - 9월 22일 From 48e3ccc41d0b9ba97cc61b060cb2ba860f65e98a Mon Sep 17 00:00:00 2001 From: wuzoo Date: Sat, 7 Sep 2024 20:49:11 +0900 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20behance=20link=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 --- src/lib/api/mock/about.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/api/mock/about.ts b/src/lib/api/mock/about.ts index d4c714d8..c89f9436 100644 --- a/src/lib/api/mock/about.ts +++ b/src/lib/api/mock/about.ts @@ -57,6 +57,7 @@ const getMemberInfo = async (): Promise => ({ description: '동아리, 그 이상의 가치', imageSrc: '/images/members/1.png', gmail: 'president@sopt.org', + linkedin: '건-정-4aa699303/?trk=public-profile-join-page', }, { id: 12, @@ -66,7 +67,6 @@ const getMemberInfo = async (): Promise => ({ description: '빛나는 열정을 펼칠 수 있도록', imageSrc: '/images/members/12.png', gmail: 'v_president@sopt.org', - github: 'sjk4618', }, { id: 2, @@ -124,6 +124,7 @@ const getMemberInfo = async (): Promise => ({ description: '세상을 바꾸는 디자이너들', imageSrc: '/images/members/7.png', gmail: 'design@sopt.org', + behance: '208a08e8', }, { id: 8, From 0e5b0367cbdabedb9fee53c4209fa5521cc932ac Mon Sep 17 00:00:00 2001 From: wuzoo Date: Sat, 7 Sep 2024 20:49:40 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20behance=20optional=20type=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/types/about.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/types/about.ts b/src/lib/types/about.ts index 438fa6df..5b1aee29 100644 --- a/src/lib/types/about.ts +++ b/src/lib/types/about.ts @@ -16,6 +16,7 @@ export interface MemberType { gmail?: string; linkedin?: string; github?: string; + behance?: string; } export type PositionType = From c1fed6848b2542f8da2a650497c7da6bd79eafd7 Mon Sep 17 00:00:00 2001 From: wuzoo Date: Sat, 7 Sep 2024 20:50:47 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20behance=20property=20=EC=9C=A0?= =?UTF-8?q?=EB=AC=B4=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EB=A0=8C=EB=8D=94=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/ic_behance.svg | 12 ++++++++++ .../components/Member/Card/index.tsx | 22 +++++++++---------- .../components/Member/Section/index.tsx | 2 ++ 3 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/assets/icons/ic_behance.svg diff --git a/src/assets/icons/ic_behance.svg b/src/assets/icons/ic_behance.svg new file mode 100644 index 00000000..236ecc68 --- /dev/null +++ b/src/assets/icons/ic_behance.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/views/AboutPage/components/Member/Card/index.tsx b/src/views/AboutPage/components/Member/Card/index.tsx index fa9eae85..0fa03527 100644 --- a/src/views/AboutPage/components/Member/Card/index.tsx +++ b/src/views/AboutPage/components/Member/Card/index.tsx @@ -1,20 +1,12 @@ +import { ReactComponent as IcBehance } from '@src/assets/icons/ic_behance.svg'; import { ReactComponent as IcGithub } from '@src/assets/icons/ic_github.svg'; import { ReactComponent as IcLinkedin } from '@src/assets/icons/ic_linkedin.svg'; import { ReactComponent as IcMail } from '@src/assets/icons/mail.svg'; import NullImage from '@src/assets/images/null_image.png'; -import { PositionType } from '@src/lib/types/about'; +import { MemberType } from '@src/lib/types/about'; import * as St from './style'; -type MeberCardProps = { - name: string; - position: PositionType; - description?: string; - currentProject: string; - imageSrc?: string; - gmail?: string; - linkedin?: string; - github?: string; -}; +type MemberCardProps = Omit; const MemberCard = ({ name, @@ -25,7 +17,8 @@ const MemberCard = ({ gmail, linkedin, github, -}: MeberCardProps) => { + behance, +}: MemberCardProps) => { return ( @@ -58,6 +51,11 @@ const MemberCard = ({ )} + {behance && ( + + + + )} ); diff --git a/src/views/AboutPage/components/Member/Section/index.tsx b/src/views/AboutPage/components/Member/Section/index.tsx index 41a9e625..6e0bc04a 100644 --- a/src/views/AboutPage/components/Member/Section/index.tsx +++ b/src/views/AboutPage/components/Member/Section/index.tsx @@ -41,6 +41,7 @@ const MemberSection = ({ generation, members }: MemberSectionProps) => { gmail, linkedin, github, + behance, }) => ( { gmail={gmail} linkedin={linkedin} github={github} + behance={behance} /> ), )}