Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
emscb committed Oct 23, 2024
2 parents 8ea0cf6 + 95a2c87 commit 1018f0b
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 2 deletions.
Binary file added public/images/organizingTeam/김순태.jpeg
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/organizingTeam/윤준기.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/components/Nav/menus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ const Menus: MenuType = {
name: "파이콘 한국 준비위원회",
path: "/about/organizing-team",
},
{
name: "자원봉사자",
path: "/about/volunteer",
},
{
name: "건강 관련 안내",
path: "/about/health",
Expand Down
27 changes: 25 additions & 2 deletions src/pages/About/organizingTeam.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,18 @@ const OrganizingTeam = () => {
imageFileName: "권혁민.jpg",
},
{ name: "박성흠" },
{ name: "김순태" },
{
name: "김순태",
comment: (
<>
파이썬으로 개발합니다.{" "}
<a href="https://www.linkedin.com/in/kst6294/" target="_blank" rel="noreferrer">
https://www.linkedin.com/in/kst6294/
</a>
</>
),
imageFileName: "김순태.jpeg",
},
{
name: "김강민",
displayName: "김강민/KLOU",
Expand Down Expand Up @@ -94,7 +105,19 @@ const OrganizingTeam = () => {
},
{ name: "김민정" },
{ name: "강나영" },
{ name: "윤준기" },
{
name: "윤준기",
comment: (
<>
안녕하세요, 23년도에는 파이콘 스피커로
<br />
24년도에는 파준위로 활동하고 있는 윤준기 입니다.
<br />
개발이나 다양한 주제로 이야기 하는 것을 좋아합니다 :)
</>
),
imageFileName: "윤준기.jpeg",
},
{
name: "송지헌",
displayName: "송지헌 / Honey",
Expand Down
28 changes: 28 additions & 0 deletions src/pages/About/volunteer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import Page from "components/common/Page";
import React from "react";

import useTranslation from "utils/hooks/useTranslation";

const Volunteer = () => {
const t = useTranslation();

return (
<Page>
<h1>{t("자원봉사자")}</h1>
<p>
{t(
"파이콘 한국 2024에서 행사 진행을 위해 기여해주신 분들입니다. 파이콘 한국에 기여해주셔서 감사합니다."
)}
<br />
{t("(가나다순)")}
</p>
<p>
{["윤우섭", "노관옥", "주환석", "차보경", "주예은", "조준형", "김혜린", "김준우"]
.sort()
.join(", ")}
</p>
</Page>
);
};

export default Volunteer;
2 changes: 2 additions & 0 deletions src/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import PosterSession from "pages/PosterSession";
import { HowToGetThere } from "pages/About/howToGetThere";
import OrganizingTeam from "pages/About/organizingTeam";
import FinancialAid from "pages/FinancialAid";
import Volunteer from "pages/About/volunteer";

const Router = () => {
return (
Expand All @@ -34,6 +35,7 @@ const Router = () => {
<Route path="/about/health" element={<Health />} />
<Route path="/about/place" element={<HowToGetThere />} />
<Route path="/about/organizing-team" element={<OrganizingTeam />} />
<Route path="/about/volunteer" element={<Volunteer />} />
<Route path="/poster-session" element={<PosterSession />} />
<Route path="/fa" element={<FinancialAid />} />
<Route path="/sponsoring/sponsor/prospectus" element={<SponsorPage />} />
Expand Down

0 comments on commit 1018f0b

Please sign in to comment.