Skip to content

Commit

Permalink
[Refactor] QA 반영 (#421)
Browse files Browse the repository at this point in the history
* chore: blank로 새로운 탭에서 링크 접속

* chore: 14 -> 16시 ?

* chore: behance link 추가

* feat: behance optional type 추가

* feat: behance property 유무에 따른 아이콘 렌더링
  • Loading branch information
wuzoo authored Sep 7, 2024
1 parent 979b209 commit 0c52d9c
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 17 deletions.
12 changes: 12 additions & 0 deletions src/assets/icons/ic_behance.svg
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/lib/api/mock/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
description: '동아리, 그 이상의 가치',
imageSrc: '/images/members/1.png',
gmail: '[email protected]',
linkedin: '건-정-4aa699303/?trk=public-profile-join-page',
},
{
id: 12,
Expand All @@ -66,7 +67,6 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
description: '빛나는 열정을 펼칠 수 있도록',
imageSrc: '/images/members/12.png',
gmail: '[email protected]',
github: 'sjk4618',
},
{
id: 2,
Expand Down Expand Up @@ -124,6 +124,7 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
description: '세상을 바꾸는 디자이너들',
imageSrc: '/images/members/7.png',
gmail: '[email protected]',
behance: '208a08e8',
},
{
id: 8,
Expand Down
1 change: 1 addition & 0 deletions src/lib/types/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface MemberType {
gmail?: string;
linkedin?: string;
github?: string;
behance?: string;
}

export type PositionType =
Expand Down
28 changes: 13 additions & 15 deletions src/views/AboutPage/components/Member/Card/index.tsx
Original file line number Diff line number Diff line change
@@ -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<MemberType, 'id'>;

const MemberCard = ({
name,
Expand All @@ -25,7 +17,8 @@ const MemberCard = ({
gmail,
linkedin,
github,
}: MeberCardProps) => {
behance,
}: MemberCardProps) => {
return (
<St.Card>
<St.ImageWrapper>
Expand All @@ -44,20 +37,25 @@ const MemberCard = ({
<St.Desc>{description || '-'}</St.Desc>
<St.LinkWrapper>
{gmail && (
<St.AnchorIconWrapper href={`mailto:${gmail}`}>
<St.AnchorIconWrapper href={`mailto:${gmail}`} target="_blank">
<IcMail />
</St.AnchorIconWrapper>
)}
{linkedin && (
<St.AnchorIconWrapper href={`https://www.linkedin.com/in/${linkedin}`}>
<St.AnchorIconWrapper href={`https://www.linkedin.com/in/${linkedin}`} target="_blank">
<IcLinkedin />
</St.AnchorIconWrapper>
)}
{github && (
<St.AnchorIconWrapper href={`https://github.com/${github}`}>
<St.AnchorIconWrapper href={`https://github.com/${github}`} target="_blank">
<IcGithub />
</St.AnchorIconWrapper>
)}
{behance && (
<St.AnchorIconWrapper href={`https://www.behance.net/${behance}`} target="_blank">
<IcBehance />
</St.AnchorIconWrapper>
)}
</St.LinkWrapper>
</St.Card>
);
Expand Down
2 changes: 2 additions & 0 deletions src/views/AboutPage/components/Member/Section/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const MemberSection = ({ generation, members }: MemberSectionProps) => {
gmail,
linkedin,
github,
behance,
}) => (
<MemberCard
key={id}
Expand All @@ -52,6 +53,7 @@ const MemberSection = ({ generation, members }: MemberSectionProps) => {
gmail={gmail}
linkedin={linkedin}
github={github}
behance={behance}
/>
),
)}
Expand Down
2 changes: 1 addition & 1 deletion src/views/RecruitPage/components/Schedule/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Schedule = () => {
</S.EvenText>
<S.OddText>YB 서류 결과 발표</S.OddText>
<S.EvenText>
9월 19일 <S.Highlight>14시</S.Highlight>
9월 19일 <S.Highlight>16시</S.Highlight>
</S.EvenText>
<S.OddText>YB 면접</S.OddText>
<S.EvenText>9월 21일 - 9월 22일</S.EvenText>
Expand Down

0 comments on commit 0c52d9c

Please sign in to comment.