Skip to content

Commit 799c7b4

Browse files
ArpaAPVillage-GG-Waterjamie2779
authored
fix: 컨플릭트 수정 (#93)
* fix: start service cd.yml * feat: 26기 운영진 정보 반영 * fix: 린트 경고 해결 --------- Co-authored-by: Yeonwoo Sea <62321953+Village-GG-Water@users.noreply.github.com> Co-authored-by: jamie2779 <jamie2779@naver.com>
1 parent 964d558 commit 799c7b4

File tree

9 files changed

+57
-24
lines changed

9 files changed

+57
-24
lines changed
-335 KB
Loading
1.62 MB
Loading
1.02 MB
Loading
215 KB
Loading
-118 KB
Loading
269 KB
Loading
221 KB
Loading
641 KB
Loading

src/pages/section/Section6.jsx

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import { Span } from '@components/typograph/Text';
44
import { ExecutiveProfile } from '@components/display/section/ExecutiveProfile';
55

66
import PresidentImage from '@/assets/executive_profile/president.png'; // 회장 이미지
7+
import VicePresidentImage from '@/assets/executive_profile/vice_president.png'; // 부회장 이미지
78
import FinancialManagerImage from '@/assets/executive_profile/affairs_manger.png'; // 총무부장 이미지
89
import TechnicalManagerImage from '@/assets/executive_profile/technic_director.png'; // 기술부장 이미지
910
import PromotionManagerImage from '@/assets/executive_profile/PR_director.png'; // 홍보부장 이미지
1011
import StutyManagerImage from '@/assets/executive_profile/study_director.png'; // 학술부장 이미지
12+
import ExternalImage from '@/assets/executive_profile/external.png'; // 학술부장 이미지
13+
import SupporterImage from '@/assets/executive_profile/supporter.png'; // 서포트 이미지
1114

1215
// MainPage 양식과 호환될 수 있도록 바탕 설정
1316
const Section = styled.section`
@@ -64,61 +67,91 @@ const ProfilesWrapper = styled.div`
6467
export default function Section6() {
6568
const executives = [
6669
{
67-
name: '박소현',
70+
name: '장기원',
6871
role: '회장',
69-
group_number: 24,
70-
major: '심화컴퓨터',
71-
student_id_year: 23,
72+
group_number: 25,
73+
major: '플랫폼소프트웨어',
74+
student_id_year: 24,
7275
description: 'KERT를 운영하며 전반적인 활동을 총괄해요.',
7376
image_url: PresidentImage,
7477
color: '#0047FF',
7578
},
7679
{
77-
name: '박규연',
80+
name: '박재민',
81+
role: '부회장',
82+
group_number: 25,
83+
major: '인공지능컴퓨팅',
84+
student_id_year: 24,
85+
description: 'KERT의 각종 행사를 기획하고 운영해요.',
86+
image_url: VicePresidentImage,
87+
color: '#5A00FF',
88+
},
89+
{
90+
name: '신찬규',
7891
role: '총무부장',
79-
group_number: 23,
92+
group_number: 21,
8093
major: '심화컴퓨터',
81-
student_id_year: 22,
82-
description: 'KERT의 각종 행사/재정을 계획하고 준비해요.',
94+
student_id_year: 20,
95+
description: 'KERT의 재정을 기록하고 관리해요.',
8396
image_url: FinancialManagerImage,
8497
color: '#FA00FF',
8598
},
8699
{
87-
name: '시연우',
100+
name: '김시연',
101+
role: '홍보부장',
102+
group_number: 25,
103+
major: '글로벌소프트웨어',
104+
student_id_year: 24,
105+
description: '활동 홍보 자료를 제작하고 업로드해요.',
106+
image_url: PromotionManagerImage,
107+
color: '#FFF500',
108+
},
109+
{
110+
name: '황부연',
88111
role: '기술부장',
89-
group_number: 23,
90-
major: '심화컴퓨터',
91-
student_id_year: 22,
112+
group_number: 25,
113+
major: '글로벌소프트웨어',
114+
student_id_year: 24,
92115
description: 'KERT의 웹사이트, 서버와 같은 IT 시스템을 관리해요.',
93116
image_url: TechnicalManagerImage,
94117
color: '#00FF0A',
95118
},
96119
{
97-
name: '조은정',
98-
role: '홍보부장',
99-
group_number: 23,
100-
major: '심화컴퓨터',
101-
student_id_year: 22,
102-
description: '활동 홍보 자료를 제작하고 업로드해요.',
103-
image_url: PromotionManagerImage,
104-
color: '#FFF500',
120+
name: '김경민',
121+
role: '대외부장',
122+
group_number: 25,
123+
major: '인공지능컴퓨팅',
124+
student_id_year: 24,
125+
description: 'KERT 외부 행사 및 교류를 총괄해요.',
126+
image_url: ExternalImage,
127+
color: '#00FFA2',
105128
},
106129
{
107-
name: '김수진',
130+
name: '권민서',
108131
role: '학술부장',
109-
group_number: 23,
132+
group_number: 25,
110133
major: '글로벌소프트웨어',
111-
student_id_year: 22,
134+
student_id_year: 24,
112135
description: '정기 세미나, 프로젝트 및 스터디를 관리해요.',
113136
image_url: StutyManagerImage,
114137
color: '#0094FF',
115138
},
139+
{
140+
name: '박소현',
141+
role: '대외/서포트',
142+
group_number: 24,
143+
major: '심화컴퓨터',
144+
student_id_year: 23,
145+
description: 'KERT의 전체적인 운영 및 관리에 도움을 줘요',
146+
image_url: SupporterImage,
147+
color: '#FF007A',
148+
},
116149
];
117150

118151
return (
119152
<Section id="executives">
120153
<Content>
121-
<Title>KERT 25기 임원진을 소개합니다</Title>
154+
<Title>KERT 26기 임원진을 소개합니다</Title>
122155
<ProfilesWrapper>
123156
{executives.map((executive, i) => (
124157
// 짝수일 때는 isReversed = true

0 commit comments

Comments
 (0)