Skip to content

Commit 495dd4c

Browse files
committed
feat: added headshots uploading page
1 parent 9626f3d commit 495dd4c

File tree

6 files changed

+29
-22
lines changed

6 files changed

+29
-22
lines changed

pages/headshots/components/DisplaySection.tsx renamed to components/headshots/DisplaySection.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { Member, TEAMS } from "../constants";
2+
import { Member, TEAMS } from "../../constants/headshot-constants";
33

44
interface DisplaySectionProps {
55
headshot: Member;

pages/headshots/components/HeadshotCard.tsx renamed to components/headshots/HeadshotCard.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import React, { useState, useEffect } from "react";
2-
import { DEFAULT_PHOTO, TEAMS, Member } from "../constants";
2+
import {
3+
DEFAULT_PHOTO,
4+
TEAMS,
5+
Member,
6+
} from "../../constants/headshot-constants";
37
import InputSection from "./InputSection";
48
import DisplaySection from "./DisplaySection";
59

pages/headshots/components/InputSection.tsx renamed to components/headshots/InputSection.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { Member } from "../constants";
2+
import { Member } from "../../constants/headshot-constants";
33

44
interface InputSectionProps {
55
imageUrl: string;
@@ -72,9 +72,7 @@ const InputSection: React.FC<InputSectionProps> = ({
7272
{getTeamNamesForDisplay(existingMember.teams)}
7373
</div>
7474
)}
75-
<div className="text-xs">
76-
{existingMember.term}
77-
</div>
75+
<div className="text-xs">{existingMember.term}</div>
7876
</div>
7977
</div>
8078
</div>
Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import members from "../../constants/members.json";
1+
import members from "./members.json";
22

33
// TYPE & CONSTANT EXPORTS ============================================
44

@@ -16,7 +16,7 @@ export const DEFAULT_PHOTO =
1616

1717
export const teamsMap = {
1818
// EXEC TEAM ROLES
19-
"president": ["pres", "president"],
19+
president: ["pres", "president"],
2020
"co-president": ["co-pres", "co-president"],
2121
"director lead": ["dl", "director lead"],
2222
"internal director": ["id", "internal director"],
@@ -31,26 +31,26 @@ export const teamsMap = {
3131
"vp finance": ["vpf", "vp finance"],
3232
"finance coordinator": ["fc", "finance coordinator"],
3333
"vp talent": ["vpt", "vp talent"],
34-
34+
3535
// CLUB SUPPORT ROLES
3636
"graphic designer": ["gd", "graphic designer"],
3737
"content strategist": ["content strategist", "content"],
3838
"user researcher": ["ur", "user researcher"],
3939
"internal operations lead": ["iol", "internal operations lead"],
4040
"design system": ["ds", "design system"],
41-
41+
4242
// PROJECT TEAM ROLES
4343
"technical lead": ["pl", "project lead"],
4444
"product manager": ["pm", "product manager"],
4545
"project mentor": ["mentor", "project mentor"],
46-
"designer": ["designer", "design"],
46+
designer: ["designer", "design"],
4747
"design mentor": ["dm", "design mentor"],
48-
"developer": ["dev", "developer"],
48+
developer: ["dev", "developer"],
4949
"developer mentor": ["dev mentor", "developer mentor"],
5050
};
5151
// MEMBR EXPORTS ======================================================
5252

53-
export const sort_members = (members: Member[]) => {
53+
export const sort_members = (members: Member[]): Member[] => {
5454
// by term number
5555
return members.sort((a, b) => {
5656
if (a.term !== b.term) {
@@ -66,14 +66,14 @@ export const sort_members = (members: Member[]) => {
6666
};
6767

6868
// get members of the current term
69-
export const get_current_members = (curr_term: number) => {
69+
export const get_current_members = (curr_term: number): Member[] => {
7070
return sort_members(
7171
members.members.filter((member) => member.term === curr_term),
7272
);
7373
};
7474

7575
// previosou 2 terms
76-
export const get_previous_members = (curr_term: number) => {
76+
export const get_previous_members = (curr_term: number): Member[] => {
7777
const previousTerm1 = curr_term - 1;
7878
const previousTerm2 = curr_term - 2;
7979
return members.members.filter(
@@ -82,7 +82,10 @@ export const get_previous_members = (curr_term: number) => {
8282
};
8383

8484
// old ass people
85-
export const get_old_members = (curr_members: Member[], curr_term: number) => {
85+
export const get_old_members = (
86+
curr_members: Member[],
87+
curr_term: number,
88+
): Member[] => {
8689
const oldMembers = members.members.filter((member) => {
8790
if (member.term < curr_term - 2) {
8891
return true;
@@ -94,7 +97,7 @@ export const get_old_members = (curr_members: Member[], curr_term: number) => {
9497
return oldMembers;
9598
};
9699

97-
export const get_term = () => {
100+
export const get_term = (): number => {
98101
return members.term;
99102
};
100103

@@ -160,12 +163,15 @@ export const doesMemberExist = (
160163
);
161164
};
162165

163-
export const findExistingMember = (name: string, previousMembers: Member[]): Member | null => {
166+
export const findExistingMember = (
167+
name: string,
168+
previousMembers: Member[],
169+
): Member | null => {
164170
if (!name.trim()) return null;
165171
const trimmedName = name.trim().toLowerCase();
166172
return (
167173
previousMembers.find(
168174
(member) => member.name.toLowerCase() === trimmedName,
169175
) || null
170176
);
171-
};
177+
};

pages/headshots/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState } from "react";
2-
import HeadshotCard from "./components/HeadshotCard";
2+
import HeadshotCard from "../../components/headshots/HeadshotCard";
33
import {
44
get_current_members,
55
get_previous_members,
@@ -12,7 +12,7 @@ import {
1212
TEAMS,
1313
DEFAULT_PHOTO,
1414
Member,
15-
} from "./constants";
15+
} from "../../constants/headshot-constants";
1616

1717
const Headshots: React.FC = () => {
1818
const [currentTerm, setCurrentTerm] = useState(get_term());

pages/students.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ type PageProps = {
1818
teams: Team[];
1919
};
2020

21-
2221
export default function Students({ teams }: PageProps): JSX.Element {
2322
return (
2423
<Layout title={`UW Blueprint | Students`}>

0 commit comments

Comments
 (0)