Merge branch 'main' into personal-website

src/main.tsx

@@ -21,9 +21,8 @@ import { RyanMemberPage } from './member/2022/Ryan.tsx'
 import { Adb2MemberPage } from './member/2024/Adb2.tsx'
 import { WIFIMemberPage } from './member/2024/WIFI.tsx'
 import { YPPMemberPage } from './member/2024/ypp.tsx'
-import { JasonMemberPage } from './member/2024/Jason.tsx'
 import { PaulWangMemberPage } from './member/2024/PaulWang.tsx'
-
+import { JoeMemberPage } from './member/2024/Joe.tsx'
 
 const router = createHashRouter(
   createRoutesFromElements(
@@ -37,6 +36,7 @@ const router = createHashRouter(
         <Route path='/Member/2024/ypp' element={<YPPMemberPage />}></Route>
         <Route path='/Member/2024/Jason' element={<JasonMemberPage />}></Route>
         <Route path='/Member/2024/PaulWang' element={<PaulWangMemberPage />}></Route>
+        <Route path='/Member/2024/Joe' element={<JoeMemberPage />}></Route>
         <Route path='/Alumni' element={<Alumni></Alumni>}></Route>
         <Route path='/Partner' element={<Partner></Partner>}></Route>
         <Route path='/Profile' element={<Profile></Profile>}></Route>

src/member/2023/Uriah.tsx

@@ -3,7 +3,10 @@ import Uriah from "../../assets/member/uriah.jpg"
 import { MemberArticleType, MemberCertificateType, MemberInternType, MemberParticipateType, MemberCompetitionExperienceType } from "../../type/MemberCertificateType"
 
 export const UriahMemberPage = () => {
-    const bio = "嗨，我是黃漢軒，目前就讀於國立陽明交通大學資訊安全研究所，並參與網路與系統實驗室的專案研究。在大學部時，我就讀國立臺北科技大學資訊工程系，並參與實驗室擔任顧問一職，嘗試開發了實驗室的論文排程系統、開發實驗室新靜態網站、參與兩項論文相關研究、並且擔任兩年的物件導向程式設計實習助教，歡迎認識我！"
+    const bio = <div className="d-flex flex-column gap-3">
+        <p>嗨，我是黃漢軒，目前就讀於國立陽明交通大學資訊安全研究所，並參與網路與系統實驗室的專案研究。在大學部時，我就讀國立臺北科技大學資訊工程系，並參與實驗室擔任顧問一職，嘗試開發了實驗室的論文排程系統、開發實驗室新靜態網站、參與兩項論文相關研究、並且擔任兩年的物件導向程式設計實習助教，歡迎認識我！</p>
+        <p>你可以在這裡找到我的個人網頁：<a href="https://ntut-xuan.github.io" target="_blank">https://ntut-xuan.github.io</a>。</p>
+    </div>
     const certificates: MemberCertificateType[] = []
     const competitionExperiences: MemberCompetitionExperienceType[] = [
         {

src/member/2024/Joe.tsx

@@ -0,0 +1,44 @@
+import { Sample } from "../Sample"
+
+import { MemberArticleType, MemberCertificateType, MemberInternType, MemberParticipateType, MemberCompetitionExperienceType } from "../../type/MemberCertificateType"
+
+export const JoeMemberPage = () => {
+    const bio = "嗨，各位好，我是楊閔恩，可以叫我Joe，目前就讀於國立臺北科技大學資訊工程學系碩士班，研究方向為資訊安全，目前專注於Web的部分，希望未來能在這個領域有所貢獻。"
+    const certificates: MemberCertificateType[] = []
+    const competitionExperiences: MemberCompetitionExperienceType[] = []
+    const participates: MemberParticipateType[] = [
+        {
+            title: "NISRA Enlightened 2021",
+            datetime: "2021.08.09"
+        },
+        {
+            title: "HITCON Carnival 2023",
+            datetime: "2023.11.14"
+        },
+        {
+            title: "CYBERSEC 2024",
+            datetime: "2024.05.14"
+        }
+    ]
+    const internExperiences: MemberInternType[] = []
+    const journals: MemberArticleType[] = []
+    const conferences: MemberArticleType[] = []
+    const techConfs: MemberArticleType[] = []
+    return (
+        <Sample
+            zhName="楊閔恩"
+            enName="Yang, Min-En"
+
+            institutes={["國立臺北科技大學 資訊工程所 碩零"]}
+            bio={bio}
+            experiences={competitionExperiences}
+            certificates={certificates}
+            participates={participates}
+            intern={internExperiences}
+            journals={journals}
+            conferences={conferences}
+            techConfs={techConfs}
+        ></Sample>
+    )
+}
+

src/member/Sample.tsx

@@ -57,7 +57,7 @@ export const Sample = (props: {
     zhName: string
     enName?: string | undefined
     avatar?: string | undefined
-    bio?: string
+    bio?: string | JSX.Element
     institutes: string[]
     experiences: MemberCompetitionExperienceType[]
     certificates: MemberCertificateType[]

src/page/Member.tsx

@@ -113,7 +113,8 @@ export function Member(){
             role: "碩零，資工碩士",
             coAdvisor: '',
             experience: "",
-            certificate: ""
+            certificate: "",
+            website: "/#/Member/2024/Joe"
         },
         {
             key: '12',