Skip to content

Commit

Permalink
Adjust hidden page when it disappear'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ntut-xuan
ntut-xuan committed Jul 7, 2024
1 parent 130f5cf commit 86eacab
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 80 deletions.
10 changes: 7 additions & 3 deletions src/member/2023/Uriah.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@ export const UriahMemberPage = () => {
const certificates: MemberCertificateType[] = []
const raceExperiences: MemberRaceExperienceType[] = []
const participates: MemberParticipateType[] = []
const internExperiences: MemberInternType[] = []
const internExperiences: MemberInternType[] = [{
company: "財團法人電腦技能基金會",
info: "擔任實習工程師，維護 CodeJudger 專案與 TQC+ 轉骨計畫新網站全端，引入 PR 機制與 CI/CD 開發流程，協助修復 CVSS 高嚴重漏洞。",
datetime: "2023.07-2024.02"
}]
const journals: MemberArticleType[] = []
const conferences: MemberArticleType[] = []
const techConfs: MemberArticleType[] = []
return (
<Sample
zhName="黃漢軒"
enName="Uriah"
enName="Huang, Han-Xuan"
avatar={Uriah}
institutes={["國立臺北科技大學 資訊工程系 資訊安全實驗室", "國立陽明交通大學 資訊安全研究所 網路與系統實驗室"]}
institutes={["國立臺北科技大學 資訊工程系 資訊安全實驗室顧問", "國立陽明交通大學 資訊安全研究所 網路與系統實驗室"]}
bio={bio}
experiences={raceExperiences}
certificates={certificates}
Expand Down
169 changes: 93 additions & 76 deletions src/member/Sample.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,89 +117,106 @@ export const Sample = (props: {
}
</div>
</div>
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">比賽經歷</h5>
</div>
<div className="p-3 w-100">
<Table columns={experienceColumns} dataSource={props.experiences} bordered pagination={false}></Table>
</div>
{ props.experiences.length > 0 &&
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>

<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">比賽經歷</h5>
</div>
<div className="p-3 w-100">
<Table columns={experienceColumns} dataSource={props.experiences} bordered pagination={false}></Table>
</div>
</div>
</div>
</div>
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">資安證照／檢定</h5>
</div>
<div className="p-3 w-100">
<Table columns={titleDateTimeColumns} dataSource={props.certificates} bordered pagination={false}></Table>
</div>
}
{ props.certificates.length > 0 &&
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">資安證照／檢定</h5>
</div>
<div className="p-3 w-100">
<Table columns={titleDateTimeColumns} dataSource={props.certificates} bordered pagination={false}></Table>
</div>
</div>
</div>
</div>
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">活動參與</h5>
</div>
<div className="p-3 w-100">
<Table columns={titleDateTimeColumns} dataSource={props.participates} bordered pagination={false}></Table>
</div>
}
{ props.participates.length > 0 &&
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">活動參與</h5>
</div>
<div className="p-3 w-100">
<Table columns={titleDateTimeColumns} dataSource={props.participates} bordered pagination={false}></Table>
</div>
</div>
</div>
</div>
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">實習經歷</h5>
</div>
<div className="p-3 w-100">
<Table columns={internColumns} dataSource={props.intern} bordered pagination={false}></Table>
}
{ props.intern.length > 0 &&
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">實習經歷</h5>
</div>
<div className="p-3 w-100">
<Table columns={internColumns} dataSource={props.intern} bordered pagination={false}></Table>
</div>
</div>
</div>
</div>
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">論文發表</h5>
</div>
<div className="p-3 w-100">
<h5 className="text-center">期刊論文</h5>
<ol>
{ props.journals.map((journal) => {
return (
<li>
<Article authors={journal.authors} title={journal.title} target={journal.target} details={journal.details} doi={journal.doi} />
</li>
)
})}
</ol>
</div>
<div className="p-3 w-100">
<h5 className="text-center">會議論文</h5>
<ol>
{ props.conferences.map((conference) => {
return (
<li>
<Article authors={conference.authors} title={conference.title} target={conference.target} details={conference.details} doi={conference.doi} />
</li>
)
})}
</ol>
</div>
<div className="p-3 w-100">
<h5 className="text-center">技術會議</h5>
<ol>
{ props.techConfs.map((conference) => {
return (
<li>
<Article authors={conference.authors} title={conference.title} target={conference.target} details={conference.details} doi={conference.doi} />
</li>
)
})}
</ol>
}
{ props.journals.length > 0 || props.conferences.length > 0 || props.techConfs.length > 0 &&
<div className="w-100 d-flex flex-row" style={{gap: "3rem"}}>
<div className="w-100">
<div className="p-3 w-100" style={{backgroundColor: "#7a1b1b"}}>
<h5 className="fw-bold text-white m-0">論文發表</h5>
</div>
{ props.journals.length > 0 &&
<div className="p-3 w-100">
<h5 className="text-center">期刊論文</h5>
<ol>
{ props.journals.map((journal) => {
return (
<li>
<Article authors={journal.authors} title={journal.title} target={journal.target} details={journal.details} doi={journal.doi} />
</li>
)
})}
</ol>
</div>
}
{ props.conferences.length > 0 &&
<div className="p-3 w-100">
<h5 className="text-center">會議論文</h5>
<ol>
{ props.conferences.map((conference) => {
return (
<li>
<Article authors={conference.authors} title={conference.title} target={conference.target} details={conference.details} doi={conference.doi} />
</li>
)
})}
</ol>
</div>
}
{ props.techConfs.length > 0 &&
<div className="p-3 w-100">
<h5 className="text-center">技術會議</h5>
<ol>
{ props.techConfs.map((conference) => {
return (
<li>
<Article authors={conference.authors} title={conference.title} target={conference.target} details={conference.details} doi={conference.doi} />
</li>
)
})}
</ol>
</div>
}
</div>
</div>
</div>
}
</div>
)
}
2 changes: 1 addition & 1 deletion src/page/Member.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export function Member(){
ability: "系統安全、程式能力、物件導向程式設計 TA",
experience: "前中華民國電腦技能基金會實習生",
certificate: "",
website: "https://ntut-xuan.github.io"
website: "/#/Member/2023/Uriah"
},
{
key: '3',
Expand Down

0 comments on commit 86eacab

Please sign in to comment.