Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat] 소개페이지 업데이트 #410

Merged
merged 8 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/images/members/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/members/12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/members/9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 49 additions & 44 deletions src/lib/api/mock/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,113 +51,118 @@ const getMemberInfo = async (): Promise<GetMembersInfoResponse> => ({
members: [
{
id: 1,
name: '조승우',
name: '정건',
position: '회장',
currentProject: '성균관대학교',
description: '솝트의 지금, 여러분과 함께',
currentProject: '건국대학교, 티키',
description: '동아리, 그 이상의 가치',
imageSrc: '/images/members/1.png',
gmail: '[email protected]',
linkedin: 'seungwoo-cho-7a5676236',
},
{
id: 12,
name: '김송이',
position: '부회장',
currentProject: '아주대학교',
description: '빛나는 열정을 펼칠 수 있도록',
imageSrc: '/images/members/12.png',
gmail: '[email protected]',
github: 'sjk4618',
},
{
id: 2,
name: '박세은',
name: '윤영서',
position: '총무',
currentProject: '한양대학교, doorip',
description: '나와 우리의 성장을 위해 파이팅!',
currentProject: '동국대학교, doorip',
description: '열정을 쏟을 이곳에서 동료들과',
imageSrc: '/images/members/2.png',
gmail: '[email protected]',
github: 'seeunplayer',
linkedin: 'tina-park-755ab8230',
github: '0seoYun',
},
{
id: 5,
name: '곽성준',
name: '이현진',
position: '운영 팀장',
currentProject: 'doorip',
description: '잊지 못할 추억을 드립니다.',
currentProject: '가톨릭대학교, dateroad',
description: '매 순간을 소중한 추억으로!',
imageSrc: '/images/members/5.png',
gmail: '[email protected]',
github: 'sjk4618',
github: '2hyunjinn',
},
{
id: 4,
name: '정채은',
name: '방민지',
position: '미디어 팀장',
currentProject: 'YELL:O, PINGLE',
description: '이상적인 기억을 기록합니다.',
currentProject: 'PINGLE',
description: '우리의 발자취를 기록하다.',
imageSrc: '/images/members/4.png',
gmail: '[email protected]',
github: 'chaentopia',
github: 'bangMinjI98',
},
{
id: 3,
name: '정동규',
name: '김가연',
position: '메이커스 팀장',
currentProject: 'palmspring',
description: '하고 싶은건 모두 도전합니다.',
currentProject: '이화여자대학교, OFFROAD',
description: 'SOPT다움을 찾아서',
imageSrc: '/images/members/3.png',
gmail: '[email protected]',
github: 'yummygyudon',
linkedin: 'yummygyudon',
},
{
id: 6,
name: '여민서',
name: '김소희',
position: '기획 파트장',
currentProject: 'YELL:O, 하면함',
description: '성장에 미쳐있는 사람',
currentProject: '성신여자대학교',
description: '함께라면, 어떤 꿈도 현실이 됩니다',
imageSrc: '/images/members/6.png',
gmail: '[email protected]',
},
{
id: 7,
name: '황현진',
name: '송예솔',
position: '디자인 파트장',
currentProject: 'growthook, doorip',
description: '디자인의 지니어스',
currentProject: 'Lecue, 선약',
description: '세상을 바꾸는 디자이너들',
imageSrc: '/images/members/7.png',
gmail: '[email protected]',
},
{
id: 8,
name: '곽의진',
name: '배지현',
position: '안드로이드 파트장',
currentProject: 'pophory, 하면함',
description: '인간 안드가 되어봅시다.',
currentProject: '건빵, PINGLE, dateroad',
description: '함께의 힘을 믿습니다.',
imageSrc: '/images/members/8.png',
gmail: '[email protected]',
github: 'KwakEuiJin',
github: 'jihyunniiii',
},
{
id: 9,
name: '류희재',
name: '한지석',
position: 'iOS 파트장',
currentProject: 'ZOOC',
description: '낭만 사과 꽃길 같이 걸어가요',
currentProject: '수원대학교, Recordy',
description: '나는 더 나은 미래를 위해 싸운다',
imageSrc: '/images/members/9.png',
gmail: '[email protected]',
github: 'HELLOHIDI',
github: 'sozohoy',
},
{
id: 10,
name: '이재훈',
name: '유태승',
position: '웹 파트장',
currentProject: 'ASAP, Mile',
description: '소속감에 미쳐있는 사람',
currentProject: '건국대학교, PICKPLE',
description: '저와 함께 도약할 준비 되셨나요?',
imageSrc: '/images/members/10.png',
gmail: '[email protected]',
github: 'ljh0608',
github: 'gudusol',
},
{
id: 11,
name: '도소현',
name: '계대환',
position: '서버 파트장',
currentProject: '이화여자대학교',
description: '단단한 서비스를 제공합니다.',
currentProject: 'smeem',
description: '부드럽고, 성실하고, 능숙하게',
imageSrc: '/images/members/11.png',
gmail: '[email protected]',
github: 'sohyundoh',
},
],
});
Expand Down
2 changes: 1 addition & 1 deletion src/lib/api/remote/about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const client = axios.create({
timeout: DEFAULT_TIMEOUT,
});

const CURRENT_GENERATION = 34;
const CURRENT_GENERATION = 35;

const getAboutInfo = async (): Promise<GetAboutInfoResponse> => {
const { data: dataCurrent } = await client.get(`/aboutsopt?generation=${CURRENT_GENERATION}`);
Expand Down
13 changes: 7 additions & 6 deletions src/views/AboutPage/components/CoreValue/Item/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export const ItemContainer = styled.div<{ src: string; isInView: boolean; order:

padding: min(35.98px, 5vw) 0 min(80.5px, 4.19vw) 0;
border-radius: 10px;
background: center bottom 0px no-repeat #181818 url(${({ src }) => src});
background-size: calc(170px + 7vw);
background: center bottom 20px no-repeat #181818 url(${({ src }) => src});
background-size: calc(120px + 7vw);

opacity: 0;

Expand All @@ -28,15 +28,16 @@ export const ItemContainer = styled.div<{ src: string; isInView: boolean; order:

/* 태블릿 뷰 */
@media (max-width: 48rem) {
background-size: 90%;
background-position: center bottom -20px;
background-size: 60%;
background-position: center bottom 14px;
}

/* 모바일 뷰 */
@media (max-width: 26.75rem) {
width: 269px;
height: 228px;
background-position: center bottom -20px;
background-size: 70%;
background-position: center bottom 0px;
}
`;

Expand Down Expand Up @@ -94,7 +95,7 @@ export const ValueNumber = styled.div`
width: 25.154px;
height: 25.154px;
border-radius: 6px;
background: #364536;
background: rgba(58, 81, 109, 1);

color: ${colors.white};
font-family: SUIT;
Expand Down
2 changes: 1 addition & 1 deletion src/views/AboutPage/components/Member/Section/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const MemberSection = ({ generation }: MemberSectionProps) => {
<SectionTop
engTitle="Executives"
korTitle={`${generation}기 임원진`}
description="200명의 활동 회원들이 열정을 외칠 수 있도록, 34기 NOW SOPT를 이끄는 임원진들이에요."
description="200명의 활동 회원들이 열정을 외칠 수 있도록, 35기 AND SOPT를 이끄는 임원진들이에요."
/>
{/* TODO : 서버에서 description을 받아오도록 수정 */}
<MemberContent />
Expand Down
Loading