Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/participant/resources/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ export default function ResourcePage() {
src="/svgs/resources/pinkSquiggly.svg"
alt="Pink Squiggly"
fill
className="pointer-events-none opacity-0 md:mt-[540px] md:opacity-100 lg:mt-[600px] xl:mt-[400px] 2xl:mt-52"
className="pointer-events-none opacity-0 md:mt-[540px] md:opacity-100 lg:mt-[600px] xl:mt-[400px] 2xl:mt-64"
/>
<Image
src="/svgs/resources/orangeSquiggly.svg"
alt="Orange Squiggly"
fill
className="pointer-events-none rotate-180 opacity-0 md:mt-[800px] md:opacity-100 lg:mt-[900px] xl:mt-[680px] 2xl:mt-[430px]"
className="pointer-events-none rotate-180 opacity-0 md:mt-[800px] md:opacity-100 lg:mt-[900px] xl:mt-[680px] 2xl:mt-[390px]"
/>
<div className="z-10 flex flex-col gap-12 bg-light-grey py-10">
<div className="mt-2 flex flex-row justify-center text-center">
Expand Down
3 changes: 1 addition & 2 deletions src/components/Dashboard/UserBasedNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const navigationMap: Record<string, NavItem[]> = {
{ name: "Dashboard", route: "/participant" },
{ name: "Food Ticket", route: "/participant/profile/food-ticket" },
{ name: "Important Information", route: "/participant/important-info" },
// ADD RESOURCES BACK IN NEAR THE HACKATHON DATE
// { name: "Resources", route: "/participant/resources" },
{ name: "Resources", route: "/participant/resources" },
],
};

Expand Down
3 changes: 0 additions & 3 deletions src/components/LandingPage/JudgeShowcase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ export default async function JudgeShowcase() {
</div>
))}
</div>
<p className="mt-12 text-center text-2xl font-semibold text-gray-600 md:text-3xl">
Full List Coming Soon!
</p>
</div>
);
}
30 changes: 12 additions & 18 deletions src/components/resources/eventsMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,28 @@ import MemberCards from "./memberCards";

export default function EventsMembers() {
const eventsMembers = [
{ name: "Simar Kandola", discord: "coming soon", role: "VP Events" },
{ name: "Tanvi Mahal", discord: "coming soon", role: "Jr VP Events" },
{ name: "May Liu", discord: "coming soon", role: "Events Commissioner" },
{ name: "Simar Kandola", discord: "_the_real_ninja", role: "VP Events" },
{ name: "Tanvi Mahal", discord: "tm.88", role: "Jr VP Events" },
{ name: "May Liu", discord: "pickupmay", role: "Event Coordinator" },
{
name: "Adithya Sagar",
discord: "coming soon",
role: "Events Commissioner",
discord: "adithyasagar778",
role: "Event Coordinator",
},
{
name: "Anthony Chan",
discord: "coming soon",
role: "Events Commissioner",
discord: "anthonyych4n",
role: "Event Coordinator",
},
{
name: "Sebastian Nieto",
discord: "coming soon",
role: "Events Commissioner",
name: "Hira Asad",
discord: "purplebarney84",
role: "Event Coordinator",
},
{ name: "Hira Asad", discord: "coming soon", role: "Events Commissioner" },
{
name: "Abudllah Yousaf",
discord: "coming soon",
role: "Events Commissioner",
},
{
name: "Ana DuCristea",
discord: "coming soon",
role: "Events Commissioner",
discord: "nicetrylilbro",
role: "Event Coordinator",
},
];

Expand Down
15 changes: 10 additions & 5 deletions src/components/resources/generalMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ import MemberCards from "./memberCards";

export default function GeneralMembers() {
const generalMembers = [
{ name: "Fiona Truong", discord: "coming soon", role: "Co-President" },
{ name: "Nathan Phan", discord: "coming soon", role: "Co-President" },
{ name: "Victoria Wong", discord: "coming soon", role: "VP Design" },
{ name: "Ryan Obiar", discord: "coming soon", role: "VP Marketing" },
{ name: "Grace Ilori", discord: "coming soon", role: "VP External" },
{ name: "Fiona Truong", discord: ".fionaaa", role: "Co-President" },
{ name: "Nathan Phan", discord: "natphaan", role: "Co-President" },
{ name: "Victoria Wong", discord: "shib3", role: "VP Design" },
{ name: "Ryan Obiar", discord: "", role: "VP Marketing" },
{ name: "Grace Ilori", discord: "g542_542", role: "VP External" },
{
name: "Hanna Cho",
discord: "hannagracec",
role: "Marketing Commissioner",
},
];

const generalBackground = "bg-pastel-pink";
Expand Down
32 changes: 30 additions & 2 deletions src/components/resources/industryMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,36 @@ import MemberCards from "./memberCards";

export default function IndustryMembers() {
const industryMembers = [
{ name: "Kevin", discord: "KevinTheKeycap", role: "Organizer" },
{ name: "Kevin", discord: "KevinTheKeycap", role: "Organizer" },
{
name: "Alexandru Parcioaga",
discord: "alexandrumentor_87981_83719",
role: "Arcurve",
},
{ name: "Karam Baroud", discord: "yeezy.yeezus", role: "ZeroKey" },
{
name: "Sankar Achary Jankoti",
discord: "sankarjankoti_38615",
role: "Infosys Limited",
},
{ name: "Anthony Dam", discord: "anthony.cs", role: "Prev @ IBM" },
{
name: "Sidrah Abdullah",
discord: "degr8sid",
role: "University of Calgary",
},
{
name: "Farnaz Sheikhi",
discord: "",
role: "University of Calgary",
},
{
name: "Miti Mazmudar",
discord: "dettanym",
role: "University of Calgary",
},
{ name: "Burton Jong", discord: "j05ng", role: "Pason" },
{ name: "Anthony Chan", discord: "anthonyych4n", role: "Cisco" },
{ name: "Matthew Liu", discord: "degr8sid", role: "Enbridge" },
];

const industryBackground = "bg-medium-grey";
Expand Down
2 changes: 1 addition & 1 deletion src/components/resources/memberCards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function MemberCards({
}: memberProps) {
return (
<div
className={`flex h-28 w-52 flex-col justify-center gap-2 rounded-xl text-center text-white lg:h-32 lg:w-56 ${background}`}
className={`flex h-28 w-52 flex-col justify-center gap-2 rounded-xl text-center text-white lg:h-32 lg:w-60 ${background}`}
>
<h1 className="text-xl font-bold lg:text-2xl">{name}</h1>
<div className="flex flex-row items-center justify-center gap-4 text-base lg:text-lg">
Expand Down
6 changes: 3 additions & 3 deletions src/components/resources/mentors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import IndustryMembers from "./industryMembers";
import TechMembers from "./techMembers";

export default function Mentors() {
const roles = ["events", "tech", "general", "industry"];
const [isSelected, setIsSelected] = useState<string>("events");
const roles = ["event", "tech", "general", "industry"];
const [isSelected, setIsSelected] = useState<string>("event");

return (
<div className="z-10 flex flex-col items-center justify-center gap-5">
Expand All @@ -24,7 +24,7 @@ export default function Mentors() {
</div>
))}
</div>
{isSelected === "events" && <EventsMembers />}
{isSelected === "event" && <EventsMembers />}
{isSelected === "tech" && <TechMembers />}
{isSelected === "general" && <GeneralMembers />}
{isSelected === "industry" && <IndustryMembers />}
Expand Down
18 changes: 10 additions & 8 deletions src/components/resources/techMembers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import MemberCards from "./memberCards";

export default function TechMembers() {
const techMembers = [
{ name: "Burton Jong", discord: "coming soon", role: "VP Tech" },
{ name: "Fisayo Adabs", discord: "coming soon", role: "Tech Lead" },
{ name: "Justin Pham", discord: "coming soon", role: "Developer" },
{ name: "Anthony Chan", discord: "coming soon", role: "Developer" },
{ name: "Ajay Sallh", discord: "coming soon", role: "Developer" },
{ name: "Hooriya Khan", discord: "coming soon", role: "Developer" },
{ name: "Simar Kandola", discord: "coming soon", role: "Developer" },
{ name: "Fiona Truong", discord: "coming soon", role: "Developer" },
{ name: "Burton Jong", discord: "j05ng", role: "VP Tech" },
{
name: "Simar Kandola",
discord: "_the_real_ninja",
role: "HTC Developer",
},
{ name: "Fiona Truong", discord: ".fionaaa", role: "HTC Developer" },
{ name: "Matthew Liu", discord: "degr8sid", role: "Tech Lead" },
{ name: "Yahya Asmara", discord: "aphva", role: "Developer" },
{ name: "Jason Duong", discord: "plehhelp", role: "Developer" },
];

const techBackground = "bg-fuzzy-peach";
Expand Down
Loading