Skip to content

Commit 961726d

Browse files
authored
Merge branch 'develop' into feature/poster-session
2 parents 8fc9b6e + 0ee1a56 commit 961726d

File tree

10 files changed

+15783
-10991
lines changed

10 files changed

+15783
-10991
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
]
6161
},
6262
"devDependencies": {
63+
"@types/kakaomaps": "^1.1.5",
64+
"@types/navermaps": "^3.7.8",
6365
"@types/react-helmet": "^6.1.11",
6466
"@types/react-redux": "^7.1.33",
6567
"eslint-config-prettier": "^9.1.0",

public/images/place/suwon_bus.png

177 KB
Loading
161 KB
Loading

public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<meta name="description" content="Web site created using create-react-app" />
1818
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1919
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0" />
20+
<script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=d3945eccce7debf0942f885e90a71f97"></script>
2021
<!--
2122
manifest.json provides metadata used when your web app is installed on a
2223
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

src/components/Footer/SponsorTable.tsx

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ function SponsorTable({ max, levelName, sponsors, ...rest }: Props) {
1313
return (
1414
<SponsorCard>
1515
<H3>{levelName}</H3>
16-
<div style={{ gridTemplateColumns: `repeat(${max}, 1fr)` }}>
16+
<SponsorLogoList>
1717
{sponsors.map((sponsor) => (
1818
<Link to={`/sponsoring/sponsor/${sponsor.id}`} relative="path">
1919
<LogoImage image={sponsor.logo_image} />
2020
</Link>
2121
))}
22-
</div>
22+
</SponsorLogoList>
2323
</SponsorCard>
2424
);
2525
}
@@ -30,54 +30,63 @@ interface Image {
3030

3131
const H3 = styled.h3`
3232
color: #141414 !important;
33+
width: 120px;
3334
`;
3435

3536
const LogoImage = styled.div<Image>`
3637
display: inline-flex;
3738
justify-content: center;
3839
align-itmes: center;
3940
color: #141414;
40-
width: 320px;
4141
height: 200px;
4242
background-image: url(${(props) => props.image});
4343
background-size: contain;
4444
background-position: center;
4545
46-
& > img {
47-
height: 50%;
46+
@media only screen and (max-width: 480px) {
47+
width: 320px;
4848
}
4949
5050
@media only screen and (max-width: 810px) {
51-
width: 100%;
51+
width: 200px;
52+
}
53+
54+
@media only screen and (max-width: 1200px) {
55+
width: 240px;
56+
}
57+
58+
@media only screen and (min-width: 1200px) {
59+
width: 320px;
60+
}
61+
62+
@media only screen and (min-width: 1800px) {
63+
width: 360px;
5264
}
5365
`;
5466

67+
const SponsorLogoList = styled.div`
68+
display: flex;
69+
flex-wrap: wrap;
70+
column-gap: 3vw;
71+
justify-content: center;
72+
width: 100%;
73+
`;
74+
5575
const SponsorCard = styled.div`
5676
border: 1px solid #b0a8fe;
5777
border-radius: 16px;
5878
display: flex;
5979
padding: 1rem 1.5rem;
6080
align-items: center;
6181
background-color: #c2c7d0;
82+
min-width: 280px;
6283
6384
& > h3 {
6485
color: #b0a8fe;
6586
margin: 0;
66-
flex: 200px;
67-
}
68-
69-
& > div {
70-
width: 100%;
71-
display: grid;
72-
grid-gap: 1.5rem;
73-
flex: auto;
74-
75-
& > a {
76-
max-height: 20rem;
77-
}
7887
}
7988
80-
@media only screen and (max-width: 810px) {
89+
@media only screen and (max-width: 480px) {
8190
flex-direction: column;
8291
margin: 1rem;
8392
@@ -86,12 +95,6 @@ const SponsorCard = styled.div`
8695
margin: 0;
8796
flex: auto;
8897
}
89-
90-
& > div {
91-
display: flex;
92-
flex-wrap: wrap;
93-
flex-direction: column;
94-
}
9598
}
9699
`;
97100

src/components/Nav/menus.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { useDispatch } from "react-redux";
1+
import { useDispatch } from "react-redux"
22

3-
import { openGlobalDialog, setLanguage } from "store/Core";
4-
import { DIALOG_CONST_PROGRAM_NOT_HELD_ON_2024 } from "store/Core/dialog";
3+
import { setLanguage } from "store/Core"
54

65
export type MenuElementOnClickArgType = {
76
setOpenMenu: React.Dispatch<React.SetStateAction<boolean>>;
@@ -40,6 +39,10 @@ const Menus: MenuType = {
4039
name: "건강 관련 안내",
4140
path: "/about/health",
4241
},
42+
{
43+
name: "장소 안내",
44+
path: "/about/place",
45+
},
4346
// {
4447
// name: "파이콘 한국 준비위원회",
4548
// path: "/about/organizing-team",

src/locale/English/translation.ts

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const EnglishTranslation = {
5959
"결제 일시": "Payment date",
6060
금액: "Price",
6161
변경일: "Updated at",
62-
"수원 컨벤션 센터": "Suwon Convention Center",
62+
"수원컨벤션센터": "Suwon Convention Center",
6363
"2024.10.26": "October 26, 2024",
6464
"2024.10.27": "October 27, 2024",
6565
"10번째 파이콘 한국에": "Join us",
@@ -78,7 +78,7 @@ const EnglishTranslation = {
7878
"를 참고해보시는 것은 어떨까요?": "might be helpful.",
7979
"진행일정 및 장소": "Schedule and Venue",
8080
"일자: 2024년 10월 25일 금요일": "Date: Friday, October 25, 2024",
81-
"장소: 수원 컨벤션센터 3층": "Venue: 3rd Floor, Suwon Convention Center",
81+
"장소: 수원컨벤션센터 3층": "Venue: 3rd Floor, Suwon Convention Center",
8282
"진행자 모집 일정": "Recruitment Schedule for Instructors",
8383
"~ 2024년 07월 31일 수요일 23:59:59 (KST)": "~ Wednesday, July 31, 2024, 23:59:59 (KST)",
8484
"지난 튜토리얼": "Previous Tutorials",
@@ -286,6 +286,85 @@ const EnglishTranslation = {
286286
"일상 / 사회": "Daily life / Society",
287287
자동화: "Automation",
288288
"컴퓨터 비전": "Computer Vision",
289+
"건강 관련 안내": "Health Information",
290+
// About place
291+
"장소 안내": "Location",
292+
"카카오맵": "Kakaomap",
293+
"네이버 지도": "NAVER Map",
294+
"구글 지도": "Google Maps",
295+
"카카오맵에서 열기": "Open in Kakaomap",
296+
"네이버 지도에서 열기": "Open in NAVER Map",
297+
"구글 지도에서 열기": "Open in Google Maps",
298+
"도로명 주소": "Road Address",
299+
"도로명 주소 : 16514, 경기도 수원시 영통구 광교중앙로 140(하동)": "16514, 140, Gwanggyojungang-ro, Yeongtong-gu, Suwon-si, Gyeonggi-do, Republic of Korea",
300+
"지번 주소 : 16514, 경기도 수원시 영통구 하동 864-10": "",
301+
"대중교통": "Public Transportation",
302+
"지하철": "Subway",
303+
"버스": "Bus",
304+
"광교중앙역": "GwanggyoJungang Station",
305+
"신분당선 「광교중앙역」": "Shinbundang Line 「GwanggyoJungang Station」",
306+
"4번 출구에서 도보 10분": "10 minutes on foot from Exit 4",
307+
"광역급행버스 「광교중앙·아주대환승센터」 하차 시": "Get off at Gwanggyo Jungang (Ajou University) station (using WideArea Express Bus)",
308+
"서울역": "Seoul Station",
309+
"강남역": "Gangnam Station",
310+
"「광교중앙·아주대환승센터」 하차": "Get off at Gwanggyo Jungang (Ajou University) station",
311+
"시내버스 「수원컨벤션센터·롯데아울렛」 하차 시": "Get off at Suwon Convention Center (Lotte Outlet) station (using city bus)",
312+
"수원컨벤션센터·롯데아울렛 하차": "Get off at Suwon Convention Center (Lotte Outlet) station",
313+
"수원컨벤션센터·광교갤러리아 백화점": "Suwon Convention Center (Gwanggyo Galleria Department Store) station",
314+
"수원컨벤션센터·광교갤러리아 백화점 하차": "Get off at Suwon Convention Center (Gwanggyo Galleria Department Store) station",
315+
"공항 리무진": "Airport Shuttle Bus",
316+
"리무진 버스": "Airport Shuttle Bus",
317+
"시외버스": "Intercity Bus",
318+
"인천공항": "Incheon International Airport",
319+
"김포공항": "Gimpo International Airport",
320+
"인천공항 「한국민속촌」행": "Incheon International Airport to Korean Folk Village",
321+
"동수원": "East Suwon(Dongsuwon)",
322+
"동수원 하차": "Get off at East Suwon(Dongsuwon)",
323+
"김포공항 「동수원」행": "Gimpo International Airport to East Suwon(Dongsuwon)",
324+
"(택시 10분 또는 버스 30분)": "(10 minutes by taxi or 30 minutes by city bus)",
325+
"노선 세부정보": "Route Details",
326+
"운행시간": "Operating Hours",
327+
"소요시간": "Travel Time",
328+
"노선정보": "Route",
329+
"요금": "Fare",
330+
"탑승위치": "Boarding Location",
331+
"(공항행) 첫차 04:35, 막차 19:05": "(For Airport) The First Bus 04:35, The Last Bus 19:05",
332+
"(수원행) 첫차 T1 05:50, T2 05:30, 막차 T1 22:20, T2 22:00": "(For Suwon) The First Bus T1 05:50, T2 05:30, The Last Bus T1 22:20, T2 22:00",
333+
"75분 (73km)": "75 minutes (73km)",
334+
"30분 ~ 110분 배차 간격": "Interval 30min~110min",
335+
"제1터미널": "Terminal 1",
336+
"제2터미널": "Terminal 2",
337+
"(제1터미널) 1층 7번 게이트": "(Terminal 1) Gate 7 on the 1st floor",
338+
"(제2터미널) 교통센터 지하 1층 40번 게이트": "(Terminal 2) Gate 40 on 1st basement level, Transportation Center",
339+
"흥덕지구입구 ↔ 신갈(용인) ↔ 한국민속촌": "Heungdeok Zone Entrance ↔ Singal(Yongin) ↔ Korean Folk Village",
340+
341+
"(공항행) 첫차 05:05, 막차 20:20": "(For Airport) The First Bus 05:05, The Last Bus 20:20",
342+
"(수원행) 첫차 06:50, 막차 22:25": "(For Suwon) The First Bus 06:50, The Last Bus 22:25",
343+
"일반": "Normal",
344+
"급행": "Express",
345+
"(일반) 15분 ~ 30분 배차 간격 / (급행) 60분 ~ 130분 배차 간격": "(Normal Bus) Interval 15~30min, (Express Bus) Interval 60~130min",
346+
"(국제선) 2층 1번": "(International Terminal) No. 1 on the 2nd floor",
347+
"(국내선) 11-4번": "(Domestic Terminal) No. 11-4",
348+
"한일타운 ↔ 의왕(고천) ↔ 호계사거리 ↔ 안양(범계) ↔ 관악역 ↔ 김포공항": "Hanil Town ↔ Uiwang(Gocheon) ↔ Hogye Four Way ↔ Anyang(Beomgye) ↔ Gwanak Station ↔ Gimpo Airport",
349+
"수원역 ↔ 서수원터미널 ↔ 김포공항": "Suwon Station ↔ Seo Suwon Bus Terminal ↔ Gimpo Airport",
350+
351+
"주차 안내": "Parking Information",
352+
"주차장 주차요금표": "Parking Rate Table",
353+
"구분": "Classification",
354+
"1회 주차요금": "One-time parking Rate",
355+
"최초 30분까지": "First 30 minutes",
356+
"30분 초과 후 (10분마다)": "After 30 minutes (every 10 minutes)",
357+
"1일": "1 day",
358+
"승용 및 승합": "Sedan and Van",
359+
"※수원시주차장조례 1급지 적용": "",
360+
"위 표는 2024년 10월 5일 기준 수원컨벤션센터 홈페이지에 게시된 지하주차장 요금표입니다.": "This is based on the parking rate table posted on the Suwon Convention Center website as of October 5, 2024.",
361+
"카드결제만 가능합니다. (신용/체크/교통/삼성페이)": "Card payment only. (Credit/Debit/Transport/Samsung Wallet)",
362+
"15인승 이상 25인승 미만 승합자동차, 2.5톤 이상 4.5톤 미만 화물자동차 또는 크기가 이에 준하는 차량은 지하주차장 이용이 불가합니다.": "Vans with 15 to 25 seats, trucks with 2.5 to 4.5 tons, or vehicles of similar size are not allowed in the underground parking lot.",
363+
"출구 정산 기준 20분 이내 회차시간은 무료입니다. (※ 경과 시 20분을 포함한 정상요금 부과)": "If you return within 20 minutes of exiting, it's free. (※ If more than 20 minutes have passed, the normal rate will be charged.)",
364+
"주차요금 감면 등의 자세한 내용은": "For more information on parking fee reductions, please refer to the ",
365+
"수원컨벤션센터 주차안내 페이지": "Suwon Convention Center Parking Information page",
366+
"를 참고해주세요.": "",
367+
"https://www.scc.or.kr/parking-2/": "https://www.scc.or.kr/en/parking-2"
289368
};
290369

291370
export default EnglishTranslation;

0 commit comments

Comments
 (0)