Skip to content

Commit a60d908

Browse files
derekxu04derekxu04
committed
remove pfps, add execs, fix scrollbar
1 parent 5c5423d commit a60d908

File tree

6 files changed

+69
-64
lines changed

6 files changed

+69
-64
lines changed

Diff for: ‎frontend/public/data/execs.ts

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// TODO: Combine with portfolios.ts
2+
3+
export type Exec = {
4+
name: string,
5+
role: string,
6+
};
7+
8+
export const EXECS: Exec[] = [
9+
{
10+
name: "Elizabeth Zhu Chan",
11+
role: "Co-President",
12+
},
13+
{
14+
name: "Lesley Lu",
15+
role: "Co-President",
16+
},
17+
{
18+
name: "Ivan Chan",
19+
role: "Secretary",
20+
},
21+
{
22+
name: "Justin Son",
23+
role: "Treasurer",
24+
},
25+
{
26+
name: "Sophie Khov",
27+
role: "Arc Delegate",
28+
},
29+
{
30+
name: "Catherine Kim",
31+
role: "Grievance, Equity, Diversity and Inclusion Officer",
32+
},
33+
{
34+
name: "Amy Liu",
35+
role: "Vice President (Internals)",
36+
},
37+
{
38+
name: "Nicole Jiang",
39+
role: "Vice President (Externals)",
40+
},
41+
{
42+
name: "Matthew Lim",
43+
role: "Vice President (Technicals)",
44+
},
45+
];

Diff for: ‎frontend/public/data/portfolios.ts

-40
Original file line numberDiff line numberDiff line change
@@ -156,46 +156,6 @@ export const PORTFOLIOS: PortfolioData[] = [
156156
role: PortfolioRole.DIRECTOR,
157157
imageUrl: "/images/members/blank-pfp.png",
158158
},
159-
{
160-
name: "Chris Yoo",
161-
role: PortfolioRole.SUBCOM,
162-
imageUrl: "/images/members/2024/chris-yoo.png",
163-
},
164-
{
165-
name: "John Doe",
166-
role: PortfolioRole.SUBCOM,
167-
imageUrl: "/images/members/blank-pfp.png",
168-
},
169-
{
170-
name: "John Doe",
171-
role: PortfolioRole.SUBCOM,
172-
imageUrl: "/images/members/blank-pfp.png",
173-
},
174-
{
175-
name: "John Doe",
176-
role: PortfolioRole.SUBCOM,
177-
imageUrl: "/images/members/blank-pfp.png",
178-
},
179-
{
180-
name: "John Doe",
181-
role: PortfolioRole.SUBCOM,
182-
imageUrl: "/images/members/blank-pfp.png",
183-
},
184-
{
185-
name: "John Doe",
186-
role: PortfolioRole.SUBCOM,
187-
imageUrl: "/images/members/blank-pfp.png",
188-
},
189-
{
190-
name: "John Doe",
191-
role: PortfolioRole.SUBCOM,
192-
imageUrl: "/images/members/blank-pfp.png",
193-
},
194-
{
195-
name: "John Doe",
196-
role: PortfolioRole.SUBCOM,
197-
imageUrl: "/images/members/blank-pfp.png",
198-
},
199159
],
200160
},
201161
{

Diff for: ‎frontend/src/components/About/PortfolioCard.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import Image from 'next/image';
2-
import { PortfolioData } from "../../../public/data/portfolios";
1+
// import Image from 'next/image';
2+
import { PortfolioData } from "@/../public/data/portfolios";
33

44
interface PortfolioCardProps {
55
portfolio: PortfolioData,
66
}
77

8+
// NOTE: Profile pictures can be added in the future
89
const PortfolioCard = ({ portfolio }: PortfolioCardProps) => {
910
return (
1011
<div>
@@ -15,12 +16,12 @@ const PortfolioCard = ({ portfolio }: PortfolioCardProps) => {
1516
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
1617
{portfolio.members.map(member => (
1718
<div>
18-
<Image
19+
{/* <Image
1920
src={member.imageUrl}
2021
alt={`${member.name} portrait`}
2122
width={150}
2223
height={150}
23-
/>
24+
/> */}
2425

2526
<div>
2627
<p>{member.name}</p>

Diff for: ‎frontend/src/components/About/PortfolioDisplay.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useState } from "react";
22
import PortfolioCard from "./PortfolioCard";
3-
import { PORTFOLIOS } from "../../../public/data/portfolios";
3+
import { PORTFOLIOS } from "@/../public/data/portfolios";
44

55
const PortfolioDisplay = () => {
66
const [selectedPortfolio, setSelectedPortfolio] = useState("Careers");
@@ -9,7 +9,7 @@ const PortfolioDisplay = () => {
99

1010
return (
1111
<div>
12-
<div className="flex justify-between max-w-full h-10 my-6 snap-x snap-mandatory overflow-scroll hide-scrollbar">
12+
<div className="flex justify-between max-w-full h-10 my-6 snap-x snap-mandatory overflow-auto hide-scrollbar">
1313
{names.map((name) => (
1414
<button
1515
className={`grow text-center border border-white ${name === selectedPortfolio ? "bg-blue-400" : "bg-blue-700"} p-2`}

Diff for: ‎frontend/src/components/Footer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { socialLinks } from '@/../public/data/socialInfos';
55
const Footer = () => {
66
return (
77
<section>
8-
<div className="sm:flex justify-between pb-10">
8+
<div className="sm:flex justify-between py-10">
99
<div className="flex flex-col gap-10">
1010
<div className="flex items-center">
1111
<Link href="/" className="flex">

Diff for: ‎frontend/src/pages/about/execs-directors-subcoms.tsx

+16-17
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import PortfolioDisplay from "@/components/About/PortfolioDisplay";
22
import Layout from "@/components/Layout";
33
import PageBody from "@/components/PageBody";
44
import PageTitle from "@/components/PageTitle";
5+
import { EXECS } from "@/../public/data/execs";
56

67
const ExecsDirectorsSubcommitteesPage = () => {
78
return (
@@ -22,29 +23,27 @@ const ExecsDirectorsSubcommitteesPage = () => {
2223
</div>
2324
</div>
2425

25-
<div className="my-5 text-center">
26-
<h2 className="text-xl font-bold mb-2">Execs</h2>
27-
<div className="flex justify-center">
28-
<ul className="mx-4">
29-
<li>Elizabeth Zhu Chan - Co-President</li>
30-
<li>Lesley Lu - Co-President</li>
31-
<li>Ivan Chan - Secretary</li>
32-
<li>Justin Son - Treasurer</li>
33-
<li>Sophie Khov - Arc Delegate</li>
34-
<li>Catherine Kim - Grievance, Equity, Diversity and Inclusion Officer</li>
35-
<li>Amy Liu - Vice President (Internals)</li>
36-
<li>Nicole Jiang - Vice President (Externals)</li>
37-
<li>Matthew Lim - Vice President (Technicals)</li>
38-
</ul>
39-
</div>
26+
{/* EXECS */}
27+
<div className="my-5">
28+
<h2 className="text-xl font-bold mb-2">Execs</h2>
29+
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
30+
{EXECS.map(exec => (
31+
<div>
32+
<div>
33+
<p>{exec.name}</p>
34+
<p className="text-gray-500">{exec.role}</p>
35+
</div>
36+
</div>
37+
))}
38+
</div>
4039
</div>
4140

42-
<div className="border-t border-gray-300 my-5"></div>
41+
<div className="border-t border-gray-300 my-10"></div>
4342

4443
{/* PORTFOLIOS */}
4544
<div className="space-y-6">
4645
<div>
47-
<h2 className="text-xl font-semibold mb-2">Subcommitees</h2>
46+
<h2 className="text-xl font-semibold mb-2">Directors & Subcommitees</h2>
4847
<p className="text-lg">
4948
Subcommittees are the teams led by Directors that run CSESoc and its events to the benefit of all UNSW Computing students. Click to see the members of each!
5049
</p>

0 commit comments

Comments
 (0)