Skip to content

Commit

Permalink
Merge pull request #54 from sitcon-tw/feature/staff-list
Browse files Browse the repository at this point in the history
feature/staff list
  • Loading branch information
kevin0216 authored Jan 4, 2025
2 parents 5ad22b2 + 6a78ee6 commit 84a0987
Show file tree
Hide file tree
Showing 6 changed files with 161 additions and 31 deletions.
98 changes: 97 additions & 1 deletion app/(website)/staff/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,99 @@
"use client";

import TableOfContent from "@/app/cfp/(submission)/_components/table-of-content";
// import TableOfContentMobile from "@/app/cfp/(submission)/_components/table-of-content-mobile";
import staffJson from "./staff.json";
import Link from "next/link";
import { motion } from "framer-motion";

export default function Page() {
return <p>SITCON 團隊</p>;
const sections = staffJson.map((group) => ({
id: group.group,
title: group.group,
}));

return (
<div className="flex items-start gap-8 py-8 text-normal-mobile md:text-normal">
<div className="w-[95%]">
<h1 className="mb-2 text-h1-mobile font-bold md:mb-4 md:text-h1">
SITCON 團隊
</h1>
<p className="-mt-[60px] mb-3 space-y-4 pt-[80px] leading-[200%] md:mb-8">
SITCON
年會每年皆是許多志工奉獻時間與精神所舉辦,沒有大家的付出,就不可能會有如此內容豐富且高品質的年會,
希望大家在參加之餘,也不要忘記背後工作人員的付出。
<br />
若你對參與 SITCON 年會的籌備有興趣,歡迎填寫跳坑表單或是關注 SITCON
的郵件論壇,明年的籌備開始時,你就會收到相關的資訊!
</p>
<div className="mb-4 flex flex-row gap-6">
<Link
className="flex h-[60px] w-[190px] items-center justify-center self-center rounded-full bg-primary text-black transition hover:bg-foreground max-[1024px]:active:scale-95 max-sm:px-3 md:mb-10 md:w-[153px] md:self-start min-[1024px]:active:bg-primary"
href="https://forms.gle/rr93tuxJ9m9uStDf9"
target="_blank"
>
跳坑表單
</Link>
<Link
className="flex h-[60px] w-[190px] items-center justify-center self-center rounded-full bg-primary text-black transition hover:bg-foreground max-[1024px]:active:scale-95 max-sm:px-3 md:mb-10 md:w-[153px] md:self-start min-[1024px]:active:bg-primary"
href="https://groups.google.com/g/sitcon"
target="_blank"
>
郵件論壇
</Link>
</div>
{/* <TableOfContentMobile theme="light" sections={sections} submitUrl="" /> */}
{staffJson.map((group) => (
<motion.div
key={group.group}
initial={{ opacity: 0, filter: "blur(0.5em)" }}
whileInView={{
opacity: 1,
filter: "blur(0)",
transition: { duration: 0.25 },
}}
viewport={{ once: true }}
>
<section id={group.group} key={group.group} className="mb-8">
<h2 className="text-h2-mobile font-bold md:text-h2">
{group.group}
</h2>
<p>{group.description}</p>
<div className="mt-6 grid grid-cols-[repeat(auto-fill,minmax(78px,1fr))] gap-6 md:gap-12 md:gap-y-8">
{group.staff.map((member) => (
<div key={member.name}>
<div className="flex flex-col items-center gap-4 text-center">
<motion.img
initial={{
scale: 1,
filter:
"drop-shadow(0px 0px 0px rgba(201,235,255,70))",
}}
whileHover={{
scale: 1.2,
filter:
"drop-shadow(0px 0px 5px rgba(201,235,255,70))",
}}
src={`https://gravatar.com/avatar/${member.email}?s=512&d=https://sitcon.org/2022/imgs/deafult_avatar.jpg&r=g`}
className="h-20 w-20 rounded-full"
/>
<div>
<h3 className="text-[16px] font-bold md:text-[19px]">
{member.name}
</h3>
<p className="text-[12px] md:text-[14px]">
{member.role}
</p>
</div>
</div>
</div>
))}
</div>
</section>
</motion.div>
))}
</div>
<TableOfContent theme="light" sections={sections} submitUrl="" />
</div>
);
}
1 change: 1 addition & 0 deletions app/(website)/staff/staff.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions app/(website)/tickets/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Page() {
</button>
{/* ticket 1 */}
<div className="box-border flex w-full flex-col items-center justify-between rounded-xl border-white bg-background-light py-10 md:flex-row md:rounded-none md:border md:py-0">
<div className="aspect-1/2 z-10 ml-[-1px] box-border hidden rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="z-10 ml-[-1px] box-border hidden aspect-1/2 rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="flex flex-col items-center justify-center md:w-3/12 md:py-10">
<Image
src="/2025/website/ticket.svg"
Expand Down Expand Up @@ -53,11 +53,11 @@ export default function Page() {
KKTIX 報名連結
</button>
</div>
<div className="aspect-1/2 right-0 z-10 mr-[-1px] box-border hidden rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
<div className="right-0 z-10 mr-[-1px] box-border hidden aspect-1/2 rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
</div>
{/* ticket 2 */}
<div className="box-border flex w-full flex-col items-center justify-between rounded-xl border-white bg-background-light py-10 md:flex-row md:rounded-none md:border md:py-0">
<div className="aspect-1/2 z-10 ml-[-1px] box-border hidden rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="z-10 ml-[-1px] box-border hidden aspect-1/2 rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="flex flex-col items-center md:w-3/12 md:py-10">
<span className="material-symbols-outlined mt-16 scale-[600%] text-[#ffffff]">
flight
Expand Down Expand Up @@ -88,11 +88,11 @@ export default function Page() {
</button>
</div>

<div className="aspect-1/2 right-0 z-10 mr-[-1px] box-border hidden rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
<div className="right-0 z-10 mr-[-1px] box-border hidden aspect-1/2 rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
</div>
{/* ticket 3 */}
<div className="box-border flex w-full flex-col items-center justify-between rounded-xl border-white bg-background-light py-10 md:flex-row md:rounded-none md:border md:py-0">
<div className="aspect-1/2 z-10 ml-[-1px] box-border hidden rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="z-10 ml-[-1px] box-border hidden aspect-1/2 rounded-br-full rounded-tr-full border border-l-transparent border-r-white bg-background md:block md:w-1/12" />
<div className="flex flex-col items-center justify-center md:w-3/12 md:py-10">
<span className="material-symbols-outlined mt-16 scale-[600%] text-[#ffffff]">
crowdsource
Expand Down Expand Up @@ -125,7 +125,7 @@ export default function Page() {
</button>
</div>

<div className="aspect-1/2 right-0 z-10 mr-[-1px] box-border hidden rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
<div className="right-0 z-10 mr-[-1px] box-border hidden aspect-1/2 rounded-bl-full rounded-tl-full border border-l-white border-r-background bg-background md:block md:w-1/12" />
</div>
</section>
<section
Expand Down
18 changes: 10 additions & 8 deletions app/cfp/(submission)/_components/table-of-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useState, useEffect } from "react";

export default function TableOfContent({
sections = [],
submitUrl,
submitUrl = "",
}: {
theme: "red" | "light";
sections: { id: string; title: string }[];
Expand Down Expand Up @@ -35,13 +35,15 @@ export default function TableOfContent({
<>
{/* pc & tablet */}
<nav className="sticky right-5 top-[100px] hidden w-min max-w-[200px] self-start md:block lg:w-[200px]">
<Link
href={submitUrl}
target="_blank"
className="tableContentItem block w-full rounded-md bg-primary px-4 py-2 text-center font-bold text-black hover:bg-foreground max-[1024px]:active:scale-95 min-[1024px]:active:bg-primary"
>
立即投稿
</Link>
{submitUrl.length == 0 ? null : (
<Link
href={submitUrl}
target="_blank"
className="tableContentItem block w-full rounded-md bg-primary px-4 py-2 text-center font-bold text-black hover:bg-foreground max-[1024px]:active:scale-95 min-[1024px]:active:bg-primary"
>
立即投稿
</Link>
)}
<h2 className="mb-3 text-h3 font-extrabold text-foreground">
本頁目錄
</h2>
Expand Down
60 changes: 45 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
"@fortawesome/free-solid-svg-icons": "^6.7.1",
"@fortawesome/react-fontawesome": "^0.2.2",
"@next/third-parties": "^15.0.3",
"framer-motion": "^11.11.13",
"framer-motion": "^11.15.0",
"next": "14.2.15",
"node": "^23.5.0",
"react": "^18",
"react-dom": "^18"
},
Expand Down

0 comments on commit 84a0987

Please sign in to comment.