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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ So you don't need to worry about deployment of your code: As long as your change

## Contributing

Thank you for considering contributing to the .devClub website.
Please read the [Contributing Guide](CONTRIBUTING.md) before opening a pull request.
2 changes: 1 addition & 1 deletion src/components/PeopleList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Select from "@mui/material/Select";
import MenuItem from "@mui/material/MenuItem";

import teamConfig from "@/resources/data/teamConfig";
import { ITeamMember } from "@/resources/data/types";
import { ITeamMember } from "@/types/types";

function PersonCard({ personData }: { personData: ITeamMember }) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/championsList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IChampion } from "@/resources/data/types";
import { IChampion } from "@/types/types";
import "@/styles/PeopleList.scss";

import Box from "@mui/material/Box";
Expand Down
2 changes: 1 addition & 1 deletion src/resources/data/champions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import graham from "@/resources/images/champions/graham.jpg";
import joshua from "@/resources/images/champions/joshua.jpg";
import brooklynn from "@/resources/images/champions/brooklynn.png";
import jacob from "@/resources/images/champions/jacob.jpg";
import { IChampion } from "./types";
import { IChampion } from "@/types/team";

const champions: IChampion[] = [
{
Expand Down
16 changes: 5 additions & 11 deletions src/resources/data/devHacksArchive/HackathonYearSponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,11 @@ import Ubisoft2023 from "@/resources/images/devhacks/2023/devHacksSponsors/Ubiso
import GreenUmbrella from "@/resources/images/devhacks/2023/devHacksSponsors/greenUmbrella.webp";
import PayWorks from "@/resources/images/devhacks/2023/devHacksSponsors/payWorks.jpg";

type HackathonYearSponsorsProps = { year: string | number };

type Tier =
| "platinum"
| "gold"
| "silver"
| "bronze"
| "inkind"
| "schoolSponsor"; //size not implemented in devHacksSponsors.scss
type Sponsor = { name: string; logo: string };
type YearSponsors = Partial<Record<Tier, Sponsor[]>>;
import type {
HackathonYearSponsorsProps,
Tier,
YearSponsors,
} from "@/types/hackathon/sponsors";

const TIER_LABEL: Record<Tier, string> = {
platinum: "Platinum",
Expand Down
5 changes: 2 additions & 3 deletions src/resources/data/events.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EventData } from "./types";
import type { EventData } from "@/types/events";
import workshop from "@/resources/images/events/workshop.jpg";
import devgames from "@/resources/images/events/devgames.jpg";
import battlesnake from "@/resources/images/events/battlesnakes.jpg";
Expand All @@ -12,9 +12,8 @@ import labtours from "@/resources/images/events/Labtours.jpg";
import codingKickoff from "@/resources/images/events/Coding Kickoff.png";

//add upcoming image imports here
import devhacks2026 from "@/resources/images/devhacks/2026/devhacks2026.png";

export { TERMS_ORDER } from "./types";
export { TERMS_ORDER } from "@/types/events";

//if you want to add an upcoming event
//add the fields: upcomingTitle, upcomingDescription, upcomingImage,location, date in the format 026-01-13T18:00:00 and rsvp to the relevant event object below
Expand Down
8 changes: 0 additions & 8 deletions src/resources/data/forms.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/resources/data/hackathonInfoConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HackathonInfo } from "./types";
import { HackathonInfo } from "../../types/types";

const hackathonInfoConfig: HackathonInfo = {
"2026": {
Expand Down
2 changes: 1 addition & 1 deletion src/resources/data/hackathonThemeConfig.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { hexToRgb } from "@mui/material";
import { HackathonTheme } from "./types";
import { HackathonTheme } from "../../types/types";

const hackathonThemeConfig: HackathonTheme = {
"2026": [
Expand Down
9 changes: 3 additions & 6 deletions src/resources/data/hackathonWinners.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
export type HackathonWinner = {
prizeIndex: number;
projectName: string;
teamMembers: string[];
projectUrl?: string;
};
import { HackathonWinner } from "@/types/hackathon/winner";

//prize index is the prize category index from its respective year

const hackathonWinners: Record<string, HackathonWinner[]> = {
"2026": [
Expand Down
2 changes: 1 addition & 1 deletion src/resources/data/teamConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ITeam } from "./types";
import { ITeam } from "@/types/team";

//Please limit social medias to 3 per exec
const teamConfig: ITeam = {
Expand Down
69 changes: 0 additions & 69 deletions src/resources/data/types.ts

This file was deleted.

102 changes: 101 additions & 1 deletion src/resources/images/clubs/logo-cusec.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/routes/Events.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useMemo, useState } from "react";
import { EVENTS } from "@/resources/data/events";
import type { Term } from "@/resources/data/types";
import type { Term } from "@/types/events";
import "@/styles/Events.scss";

const TERMS: Term[] = ["Summer", "Fall", "Winter"];
Expand Down
14 changes: 0 additions & 14 deletions src/routes/FormRedirect.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/routes/hackathon/Hackathon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function Hackathon() {
{/* <h1 className="hackathon-sponsors heading">Our Sponsors</h1>
<HackathonYearSponsors year={2026} /> */}

<h1 className="hackathon-sponsors heading">Event Pictures</h1>
<h1 className="hackathon-sponsors heading">Pictures</h1>
<GalleryScroller images={picturesGeneralImages} />

<h1 className="hackathon-sponsors heading">Go Back in Time</h1>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/hackathon/HackathonArchive.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import HackathonWinners from "@/routes/hackathon/hackathonWinners";
import HackathonYearPictures from "@/resources/data/devHacksArchive/HackathonYearPictures";
import HackathonYearSponsors from "@/resources/data/devHacksArchive/HackathonYearSponsors";

import { HackathonInfo } from "@/resources/data/types";
import { HackathonInfo } from "@/types/hackathon/hackathon";

function HackathonArchive() {
const { data } = useLoaderData() as HackathonInfo;
Expand Down
8 changes: 1 addition & 7 deletions src/routes/hackathon/HackathonArchiveCards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ import scheduleBg2026 from "@/resources/images/devhacks/2026/schedule_bg_2026.pn

import scheduleBg2023 from "@/resources/images/devhacks/2023/devhacks2023-schedule-bg.png";

export type HackathonArchiveCard = {
year: number;
title: string;
subtitle: string;
route: string;
image: string;
};
import { HackathonArchiveCard } from "@/types/hackathon/hackathon";

export const HackathonArchiveCards: HackathonArchiveCard[] = [
{
Expand Down
4 changes: 2 additions & 2 deletions src/routes/hackathon/HackathonSchedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Devhacks2024Schedule from "@/resources/data/devHacksArchive/devHacks2024/
import Devhacks2025Schedule from "@/resources/data/devHacksArchive/devHacks2025/Schedule2025";
import Devhacks2026Schedule from "@/resources/data/devHacksArchive/devHacks2026/Schedule2026";

import { HackathonConfig } from "@/resources/data/types";
import { HackathonInfo } from "@/types/hackathon/hackathon";

const scheduleMap = {
"2024": Devhacks2024Schedule,
Expand All @@ -15,7 +15,7 @@ const scheduleMap = {
type YearKey = keyof typeof scheduleMap;

function HackathonSchedule() {
const { data } = useLoaderData() as HackathonConfig;
const { data } = useLoaderData() as HackathonInfo;

const ScheduleComponent = scheduleMap[data.year as YearKey];

Expand Down
2 changes: 1 addition & 1 deletion src/routes/hackathon/HackathonThemes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useLoaderData } from "react-router-dom";
import { memo, useMemo, ReactNode } from "react";

import "@/styles/PrizeCategories.scss";
import { HackathonTheme } from "@/resources/data/types";
import { HackathonTheme } from "@/types/types";

type ThemeDetail = {
header?: string;
Expand Down
19 changes: 19 additions & 0 deletions src/types/events.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export type Term = "Summer" | "Fall" | "Winter";

export interface EventData {
id: string;
title: string;
term?: Term[];
description: string;
image: string;
path?: string;
recurring?: boolean;
//use this for upcoming events in Events.ts, can be array or just string to setup multiple events of the same thing
upcomingTitle?: string | string[];
upcomingDescription?: string | string[];
upcomingImage?: string | string[];
date?: string | string[];
location?: string | string[];
rsvp?: string | string[];
}
export const TERMS_ORDER: Term[] = ["Summer", "Fall", "Winter"];
34 changes: 34 additions & 0 deletions src/types/hackathon/hackathon.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
export type HackathonTheme = {
[key: string]: {
title: string;
description: string | string[];
details?: {
header?: string;
content?: string[];
}[];
body?: string;
}[];
};

export type HackathonInfo = {
[key: string]: {
year: string;
title: string;
subtitle: string;
location: string;
date: string;
description: string;
links: {
text: string;
path: string;
}[];
};
};

export type HackathonArchiveCard = {
year: number;
title: string;
subtitle: string;
route: string;
image: string;
};
18 changes: 18 additions & 0 deletions src/types/hackathon/sponsors.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export type Tier =
| "platinum"
| "gold"
| "silver"
| "bronze"
| "inkind"
| "schoolSponsor";

export type Sponsor = {
name: string;
logo: string;
};

export type YearSponsors = Partial<Record<Tier, Sponsor[]>>;

export type HackathonYearSponsorsProps = {
year: string | number;
};
6 changes: 6 additions & 0 deletions src/types/hackathon/winner.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export type HackathonWinner = {
prizeIndex: number;
projectName: string;
teamMembers: string[];
projectUrl?: string;
};
24 changes: 24 additions & 0 deletions src/types/team.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
export interface ITeamMember {
firstName: string;
middleName?: string;
lastName: string;
role: string;
image: string;
linkedin?: string;
github?: string;
website?: string;
instagram?: string;
discord?: string;
}

export interface ITeam {
[year: string]: ITeamMember[];
}

//devchamp winners
export interface IChampion {
name: string;
challenge: string;
image: string;
bio: string;
}
Loading