Skip to content
This repository was archived by the owner on Jan 3, 2025. It is now read-only.

Commit 051522d

Browse files
committed
formatting and adding organizers
1 parent 05650c9 commit 051522d

File tree

5 files changed

+58
-57
lines changed

5 files changed

+58
-57
lines changed

app/page.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ export default function Home() {
5858
<Footer />
5959

6060
<div
61-
className={`${showHighlightDot ? "fixed top-32 right-3.5 block" : "opacity-0"} w-12 h-12 z-[5] bg-white border-[6px] border-hackrpi-primary-blue rounded-full transition-opacity duration-500`}
61+
className={`${
62+
showHighlightDot ? "fixed top-32 right-3.5 block" : "opacity-0"
63+
} w-12 h-12 z-[5] bg-white border-[6px] border-hackrpi-primary-blue rounded-full transition-opacity duration-500`}
6264
></div>
6365

6466
<div

app/resources/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ export default function page() {
9494
</HackRPILink>
9595
<p>
9696
This URL will take you to a sign-in page and prompt you to log in using your Wolfram ID. If you don&apos;t
97-
already have a Wolfram ID, you&apos;ll be prompted to create one using an active email address. Once logged in,
98-
you will see in the Downloads section which platforms of the software you have access to, with their
97+
already have a Wolfram ID, you&apos;ll be prompted to create one using an active email address. Once logged
98+
in, you will see in the Downloads section which platforms of the software you have access to, with their
9999
accompanying activation keys. Please download the desktop version to your machine, boot up the application
100100
and use the associated activation key when prompted. This will grant you full access for 30 days from your
101101
activation date.

components/team/team.tsx

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React, { useCallback, useEffect, useState } from "react";
44
import HackRPILink from "../themed-components/hackrpi-link";
55
import { Director, team } from "../../data/members";
6-
// import { teamColors } from "../../data/members";
6+
import { teamColors } from "../../data/members";
77
import { executive } from "../../data/members";
88
import Image from "next/image";
99

@@ -13,14 +13,14 @@ export default function TeamComponent() {
1313
offset: 0,
1414
hover: false,
1515
});
16-
// const [organizersAnim, setOrganizersAnim] = useState({
17-
// organizers: team.organizers,
18-
// offset: 0,
19-
// hover: false,
20-
// });
16+
const [organizersAnim, setOrganizersAnim] = useState({
17+
organizers: team.organizers,
18+
offset: 0,
19+
hover: false,
20+
});
2121

2222
const DIRECTOR_DX_PERCENT = 0.5;
23-
// const ORGANIZER_DX_PERCENT = 1.25;
23+
const ORGANIZER_DX_PERCENT = 1.25;
2424

2525
const animate_directors = useCallback(() => {
2626
setDirectorsAnim((prev) => {
@@ -33,29 +33,26 @@ export default function TeamComponent() {
3333
requestAnimationFrame(animate_directors);
3434
}, []);
3535

36-
// const animate_organizers = useCallback(() => {
37-
// setOrganizersAnim((prev) => {
38-
// if (prev.hover) return prev;
39-
// if (prev.offset <= -105) {
40-
// return { organizers: [...prev.organizers.slice(1), prev.organizers[0]], offset: 11.5, hover: prev.hover };
41-
// }
42-
// return { organizers: prev.organizers, offset: prev.offset - ORGANIZER_DX_PERCENT, hover: prev.hover };
43-
// });
44-
// requestAnimationFrame(animate_organizers);
45-
// }, []);
36+
const animate_organizers = useCallback(() => {
37+
setOrganizersAnim((prev) => {
38+
if (prev.hover) return prev;
39+
if (prev.offset <= -111.5) {
40+
return { organizers: [...prev.organizers.slice(1), prev.organizers[0]], offset: 11.5, hover: prev.hover };
41+
}
42+
return { organizers: prev.organizers, offset: prev.offset - ORGANIZER_DX_PERCENT, hover: prev.hover };
43+
});
44+
requestAnimationFrame(animate_organizers);
45+
}, []);
4646

4747
useEffect(() => {
4848
const animID = requestAnimationFrame(animate_directors);
49-
// const animID2 = requestAnimationFrame(animate_organizers);
49+
const animID2 = requestAnimationFrame(animate_organizers);
5050

5151
return () => {
5252
cancelAnimationFrame(animID);
53-
// cancelAnimationFrame(animID2);
53+
cancelAnimationFrame(animID2);
5454
};
55-
}, [
56-
animate_directors,
57-
//animate_organizers
58-
]);
55+
}, [animate_directors, animate_organizers]);
5956

6057
return (
6158
<div className="w-full flex items-center justify-center mb-4 desktop:pl-0">
@@ -107,7 +104,7 @@ export default function TeamComponent() {
107104
return DirectorCard(director, directorsAnim.offset);
108105
})}
109106
</div>
110-
{/*<h2 className="text-2xl font-bold text-white">Thank You to All of our Organizers</h2>
107+
<h2 className="text-2xl font-bold text-white">Thank You to All of our Organizers</h2>
111108
<div
112109
className="w-full h-fit overflow-hidden flex text-nowrap py-4"
113110
onMouseEnter={() => {
@@ -129,7 +126,7 @@ export default function TeamComponent() {
129126
style={{ transform: `translate(${organizersAnim.offset}%, 0%)` }}
130127
>
131128
<div
132-
className="w-fit h-fit rounded-full flex items-center justify-center px-8 "
129+
className="w-32 aspect-square rounded-full flex items-center justify-center px-8 "
133130
style={{ backgroundColor: teamColors[organizer.team].bg }}
134131
>
135132
<div className="my-2 w-full rounded-full flex items-center justify-center flex-col text-white text-center">
@@ -140,7 +137,7 @@ export default function TeamComponent() {
140137
</div>
141138
);
142139
})}
143-
</div>*/}
140+
</div>
144141
</div>
145142
</div>
146143
);

components/themed-components/hackrpi-button.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@ export default function HackRPIButton(props: HackRPIButtonProps) {
1212
onClick={props.onClick}
1313
aria-label={props.ariaLabel}
1414
aria-pressed={props.active}
15-
className={`${props.className} ${props.active ? "bg-hackrpi-secondary-yellow text-hackrpi-secondary-dark-blue border-hackrpi-secondary-yellow" : "border-hackrpi-secondary-yellow text-white"} flex group border-2 hover:bg-hackrpi-secondary-yellow hover:text-hackrpi-secondary-dark-blue transition-colors duration-200 font-sans font-medium ring-hackrpi-secondary-yellow relative pr-4`}
15+
className={`${props.className} ${
16+
props.active
17+
? "bg-hackrpi-secondary-yellow text-hackrpi-secondary-dark-blue border-hackrpi-secondary-yellow"
18+
: "border-hackrpi-secondary-yellow text-white"
19+
} flex group border-2 hover:bg-hackrpi-secondary-yellow hover:text-hackrpi-secondary-dark-blue transition-colors duration-200 font-sans font-medium ring-hackrpi-secondary-yellow relative pr-4`}
1620
>
1721
<div className="p-2 w-full">{props.children}</div>
1822
<svg
19-
className={`absolute top-1 right-1 group-hover:fill-hackrpi-secondary-dark-blue ${props.active ? "fill-hackrpi-secondary-dark-blue" : "fill-hackrpi-secondary-yellow"} transition-colors duration-200`}
23+
className={`absolute top-1 right-1 group-hover:fill-hackrpi-secondary-dark-blue ${
24+
props.active ? "fill-hackrpi-secondary-dark-blue" : "fill-hackrpi-secondary-yellow"
25+
} transition-colors duration-200`}
2026
xmlns="http://www.w3.org/2000/svg"
2127
width="15"
2228
height="15"

data/members.ts

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -195,56 +195,52 @@ export const team: Team = {
195195
],
196196
organizers: [
197197
{
198-
name: "Test Organizer",
199-
team: "Technology",
200-
},
201-
{
202-
name: "Test Organizer",
203-
team: "Logistics",
198+
name: "Iain",
199+
team: "Sponsorship",
204200
},
205201
{
206-
name: "Test Organizer",
207-
team: "Marketing",
202+
name: "Brian Witanowski",
203+
team: "Sponsorship",
208204
},
209205
{
210-
name: "Test Organizer",
211-
team: "Outreach",
206+
name: "Jackson Baimel",
207+
team: "Sponsorship",
212208
},
213209
{
214-
name: "Test Organizer",
215-
team: "Finance",
210+
name: "Christian Marinkovich",
211+
team: "Technology",
216212
},
217213
{
218-
name: "Test Organizer",
214+
name: "Peter Ermishkin",
219215
team: "Sponsorship",
220216
},
221217
{
222-
name: "Test Organizer",
223-
team: "Sponsorship",
218+
name: "Anthony Smith",
219+
team: "Technology",
224220
},
225221
{
226-
name: "Test Organizer",
227-
team: "Sponsorship",
222+
name: "Devan Patel",
223+
team: "Finance",
228224
},
229225
{
230-
name: "Test Organizer",
231-
team: "Sponsorship",
226+
name: "Tobias Manayath",
227+
team: "Logistics",
232228
},
233229
{
234-
name: "Test Organizer",
235-
team: "Sponsorship",
230+
name: "Matthew Treanor",
231+
team: "Technology",
236232
},
237233
{
238-
name: "Test Organizer",
239-
team: "Sponsorship",
234+
name: "Olivia Lee",
235+
team: "Marketing",
240236
},
241237
{
242-
name: "Test Organizer",
238+
name: "Mrunal Athaley",
243239
team: "Sponsorship",
244240
},
245241
{
246-
name: "Test Organizer",
247-
team: "Sponsorship",
242+
name: "Evan Chen",
243+
team: "Logistics",
248244
},
249245
],
250246
};

0 commit comments

Comments
 (0)