- Notifications
You must be signed in to change notification settings - Fork0
[I2-22]/history to tab#56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
nnnwa76 wants to merge14 commits intomasterChoose a base branch
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes fromall commits
Commits
Show all changes
14 commits Select commitHold shift + click to select a range
2b10823 extracted execs section into a separate component
nnnwa768299636 replaced image with tabs
nnnwa76db83bf8 combined execs and port data into single file
nnnwa765b06bf6 refactored display components to use combined data file
nnnwa76498e02c refactored history page to render data by selected year
nnnwa760e342f7 added 2020 data
nnnwa762d71cfb removed unnecessary data files
nnnwa76db5e675 fixed import issues
nnnwa7630bfb15 2 space indent
nnnwa76c509fcf added data for 2007-2019
nnnwa76d211ce3 fixed text overflow in portfolio tabs
nnnwa76999aa81 added head director role
nnnwa769117d6d removed port descriptions
nnnwa7618aca03 Merge branch 'master' into I2-22/history-to-tab
nnnwa76File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
45 changes: 0 additions & 45 deletionsfrontend/public/data/execs.ts
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
22 changes: 22 additions & 0 deletionsfrontend/public/data/members.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| export type Exec = { | ||
| name: string, | ||
| role: string, | ||
| }; | ||
| export type PortfolioData = { | ||
| name: string, | ||
| description: string, | ||
| members: PortfolioMember[], | ||
| }; | ||
| export type PortfolioMember = { | ||
| name: string, | ||
| role: PortfolioRole, | ||
| imageUrl: string; | ||
| } | ||
| export enum PortfolioRole { | ||
| DIRECTOR = "Director", | ||
| SUBCOM = "Subcommittee", | ||
| HEAD = "Head Director" | ||
| } |
132 changes: 0 additions & 132 deletionsfrontend/public/data/portfolios.ts
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
78 changes: 78 additions & 0 deletionsfrontend/public/data/years/2007.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| import { Exec, PortfolioData, PortfolioRole } from "../members"; | ||
| export const teamData = { | ||
| execs: [ | ||
| { | ||
| name: "Stephen Cossell", | ||
| role: "President", | ||
| }, | ||
| { | ||
| name: "Chris Macauley", | ||
| role: "Vice President", | ||
| }, | ||
| { | ||
| name: "Mitchell Reid", | ||
| role: "Treasurer", | ||
| }, | ||
| { | ||
| name: "Alex Kuptsov", | ||
| role: "Secretary", | ||
| }, | ||
| ] as Exec[], | ||
| portfolios: [ | ||
| { | ||
| name: "Computer Engineering", | ||
| description: "", | ||
| members: [ | ||
| { name: "Andrew Bastardo", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Computer Science", | ||
| description: "", | ||
| members: [ | ||
| { name: "Glen Trevor Kelley", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "First Year", | ||
| description: "", | ||
| members: [ | ||
| { name: "Charissa Upcroft", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "David Claridge", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Publicity", | ||
| description: "", | ||
| members: [ | ||
| { name: "Mervin Sayseng", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Social", | ||
| description: "", | ||
| members: [ | ||
| { name: "Fionnbharr Davies", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Rupert Shuttleworth", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Software Engineering", | ||
| description: "", | ||
| members: [ | ||
| { name: "Andrew John Clayphan", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Technical", | ||
| description: "", | ||
| members: [ | ||
| { name: "V. Ramana Kirubagaran", role: PortfolioRole.HEAD, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Suwandy Tjin", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Yose Widjaja", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| ] as PortfolioData[], | ||
| }; |
98 changes: 98 additions & 0 deletionsfrontend/public/data/years/2008.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import { Exec, PortfolioData, PortfolioRole } from "../members"; | ||
| export const teamData = { | ||
| execs: [ | ||
| { | ||
| name: "David Claridge", | ||
| role: "President", | ||
| }, | ||
| { | ||
| name: "Martin Mao", | ||
| role: "Vice President", | ||
| }, | ||
| { | ||
| name: "Rhys Schmidtke", | ||
| role: "Treasurer", | ||
| }, | ||
| { | ||
| name: "Elizabeth O'Loughlin", | ||
| role: "Secretary", | ||
| }, | ||
| { | ||
| name: "Chaitanya Manapragada", | ||
| role: "Arc Delegate", | ||
| }, | ||
| ] as Exec[], | ||
| portfolios: [ | ||
| { | ||
| name: "Computer Engineering", | ||
| description: "", | ||
| members: [ | ||
| { name: "Christopher Bailey", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Computer Science", | ||
| description: "", | ||
| members: [ | ||
| { name: "Matthew Conolly", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "First Year", | ||
| description: "", | ||
| members: [ | ||
| { name: "Luke Swithenbank", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Robert Massaioli", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Postgraduate", | ||
| description: "", | ||
| members: [ | ||
| { name: "Toby Rahilly", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Publicity", | ||
| description: "", | ||
| members: [ | ||
| { name: "Mervin Sayseng", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Social", | ||
| description: "", | ||
| members: [ | ||
| { name: "Anna Lyons", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Jayen Ashar", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Stuart Robinson", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Software Engineering", | ||
| description: "", | ||
| members: [ | ||
| { name: "Susan Shi", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "Technical", | ||
| description: "", | ||
| members: [ | ||
| { name: "V. Ramana Kirubagaran", role: PortfolioRole.HEAD, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Dean Berwick", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Prashant Varanasi", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| { | ||
| name: "The Switch", | ||
| description: "", | ||
| members: [ | ||
| { name: "Adam Brimo", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| { name: "Sam Gentle", role: PortfolioRole.DIRECTOR, imageUrl: "/images/members/blank-pfp.png" }, | ||
| ], | ||
| }, | ||
| ] as PortfolioData[], | ||
| }; |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.