Skip to content

Commit 44582f7

Browse files
committed
chore(about): update names and add testers
1 parent 5f3724f commit 44582f7

File tree

5 files changed

+178
-121
lines changed

5 files changed

+178
-121
lines changed

.all-contributorsrc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,15 @@
121121
"infra"
122122
]
123123
},
124+
{
125+
"login": "chrisv09",
126+
"name": "Chris Valenzuela",
127+
"avatar_url": "https://avatars.githubusercontent.com/u/55444457?v=4",
128+
"profile": "https://github.com/chrisv09",
129+
"contributions": [
130+
"userTesting"
131+
]
132+
},
124133
{
125134
"login": "wjin-lee",
126135
"name": "Woo Jin Lee",
@@ -168,10 +177,10 @@
168177
]
169178
},
170179
{
171-
"login": "Kot6603",
180+
"login": "koutaroyumiba",
172181
"name": "Koutaro Yumiba",
173182
"avatar_url": "https://avatars.githubusercontent.com/u/89110272?v=4",
174-
"profile": "https://github.com/Kot6603",
183+
"profile": "https://github.com/koutaroyumiba",
175184
"contributions": [
176185
"code"
177186
]
@@ -430,4 +439,4 @@
430439
]
431440
}
432441
]
433-
}
442+
}

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,46 +51,47 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
5151
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Oculux314"><img src="https://avatars.githubusercontent.com/u/121474948?v=4?s=100" width="100px;" alt="Nate Williamson"/><br /><sub><b>Nate Williamson</b></sub></a><br /><a href="#infra-Oculux314" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
5252
</tr>
5353
<tr>
54+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/chrisv09"><img src="https://avatars.githubusercontent.com/u/55444457?v=4?s=100" width="100px;" alt="Chris Valenzuela"/><br /><sub><b>Chris Valenzuela</b></sub></a><br /><a href="#userTesting-chrisv09" title="User Testing">📓</a></td>
5455
<td align="center" valign="top" width="16.66%"><a href="https://github.com/wjin-lee"><img src="https://avatars.githubusercontent.com/u/100455176?v=4?s=100" width="100px;" alt="Woo Jin Lee"/><br /><sub><b>Woo Jin Lee</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=wjin-lee" title="Code">💻</a> <a href="#projectManagement-wjin-lee" title="Project Management">📆</a></td>
5556
<td align="center" valign="top" width="16.66%"><a href="https://github.com/JordanBlenn"><img src="https://avatars.githubusercontent.com/u/127293604?v=4?s=100" width="100px;" alt="Jordan Blenn"/><br /><sub><b>Jordan Blenn</b></sub></a><br /><a href="#projectManagement-JordanBlenn" title="Project Management">📆</a></td>
5657
<td align="center" valign="top" width="16.66%"><a href="https://github.com/itsatulbox"><img src="https://avatars.githubusercontent.com/u/161205868?v=4?s=100" width="100px;" alt="Atul Kodla"/><br /><sub><b>Atul Kodla</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=itsatulbox" title="Code">💻</a></td>
5758
<td align="center" valign="top" width="16.66%"><a href="https://github.com/laibatool792"><img src="https://avatars.githubusercontent.com/u/133545972?v=4?s=100" width="100px;" alt="Laiba Batool"/><br /><sub><b>Laiba Batool</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=laibatool792" title="Code">💻</a></td>
5859
<td align="center" valign="top" width="16.66%"><a href="https://github.com/sbeen56"><img src="https://avatars.githubusercontent.com/u/161543207?v=4?s=100" width="100px;" alt="Subeen Ban"/><br /><sub><b>Subeen Ban</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=sbeen56" title="Code">💻</a></td>
59-
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Kot6603"><img src="https://avatars.githubusercontent.com/u/89110272?v=4?s=100" width="100px;" alt="Koutaro Yumiba"/><br /><sub><b>Koutaro Yumiba</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=Kot6603" title="Code">💻</a></td>
6060
</tr>
6161
<tr>
62+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/koutaroyumiba"><img src="https://avatars.githubusercontent.com/u/89110272?v=4?s=100" width="100px;" alt="Koutaro Yumiba"/><br /><sub><b>Koutaro Yumiba</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=koutaroyumiba" title="Code">💻</a></td>
6263
<td align="center" valign="top" width="16.66%"><a href="https://github.com/xche529"><img src="https://avatars.githubusercontent.com/u/126313171?v=4?s=100" width="100px;" alt="Tommy Chen"/><br /><sub><b>Tommy Chen</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=xche529" title="Code">💻</a></td>
6364
<td align="center" valign="top" width="16.66%"><a href="https://github.com/codecreator127"><img src="https://avatars.githubusercontent.com/u/120153300?v=4?s=100" width="100px;" alt="John Lin"/><br /><sub><b>John Lin</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=codecreator127" title="Code">💻</a></td>
6465
<td align="center" valign="top" width="16.66%"><a href="https://github.com/jacobmathew105"><img src="https://avatars.githubusercontent.com/u/136278107?v=4?s=100" width="100px;" alt="Jacob Matthew"/><br /><sub><b>Jacob Matthew</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=jacobmathew105" title="Code">💻</a></td>
6566
<td align="center" valign="top" width="16.66%"><a href="https://github.com/nroh555"><img src="https://avatars.githubusercontent.com/u/100507962?v=4?s=100" width="100px;" alt="Naren Rohan"/><br /><sub><b>Naren Rohan</b></sub></a><br /><a href="#infra-nroh555" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
6667
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Ryuna001"><img src="https://avatars.githubusercontent.com/u/127585171?v=4?s=100" width="100px;" alt="Ryan In"/><br /><sub><b>Ryan In</b></sub></a><br /><a href="#projectManagement-Ryuna001" title="Project Management">📆</a></td>
67-
<td align="center" valign="top" width="16.66%"><a href="https://github.com/djos192"><img src="https://avatars.githubusercontent.com/u/100509811?v=4?s=100" width="100px;" alt="Dhruv Joshi"/><br /><sub><b>Dhruv Joshi</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=djos192" title="Code">💻</a> <a href="#projectManagement-djos192" title="Project Management">📆</a></td>
6868
</tr>
6969
<tr>
70+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/djos192"><img src="https://avatars.githubusercontent.com/u/100509811?v=4?s=100" width="100px;" alt="Dhruv Joshi"/><br /><sub><b>Dhruv Joshi</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=djos192" title="Code">💻</a> <a href="#projectManagement-djos192" title="Project Management">📆</a></td>
7071
<td align="center" valign="top" width="16.66%"><a href="https://john-moore-uoa.github.io/Profile-Website/"><img src="https://avatars.githubusercontent.com/u/126381092?v=4?s=100" width="100px;" alt="John Moore"/><br /><sub><b>John Moore</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=John-Moore-UOA" title="Code">💻</a></td>
7172
<td align="center" valign="top" width="16.66%"><a href="https://github.com/j-enn-y"><img src="https://avatars.githubusercontent.com/u/127184310?v=4?s=100" width="100px;" alt="Jenny Lu"/><br /><sub><b>Jenny Lu</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=j-enn-y" title="Code">💻</a></td>
7273
<td align="center" valign="top" width="16.66%"><a href="https://github.com/GodYazza"><img src="https://avatars.githubusercontent.com/u/30404287?v=4?s=100" width="100px;" alt="Yang Qian"/><br /><sub><b>Yang Qian</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=GodYazza" title="Code">💻</a></td>
7374
<td align="center" valign="top" width="16.66%"><a href="https://github.com/quirked-up"><img src="https://avatars.githubusercontent.com/u/115190871?v=4?s=100" width="100px;" alt="Lilith Wiegand"/><br /><sub><b>Lilith Wiegand</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=quirked-up" title="Code">💻</a></td>
7475
<td align="center" valign="top" width="16.66%"><a href="https://grow-run-archive.vercel.app/welcome"><img src="https://avatars.githubusercontent.com/u/78939786?v=4?s=100" width="100px;" alt="Arnav Shekaran"/><br /><sub><b>Arnav Shekaran</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=arnard76" title="Code">💻</a></td>
75-
<td align="center" valign="top" width="16.66%"><a href="https://www.nicholaskondal.com/"><img src="https://avatars.githubusercontent.com/u/49134354?v=4?s=100" width="100px;" alt="Nicholas Kondal"/><br /><sub><b>Nicholas Kondal</b></sub></a><br /><a href="#projectManagement-nicholas-kondal" title="Project Management">📆</a></td>
7676
</tr>
7777
<tr>
78+
<td align="center" valign="top" width="16.66%"><a href="https://www.nicholaskondal.com/"><img src="https://avatars.githubusercontent.com/u/49134354?v=4?s=100" width="100px;" alt="Nicholas Kondal"/><br /><sub><b>Nicholas Kondal</b></sub></a><br /><a href="#projectManagement-nicholas-kondal" title="Project Management">📆</a></td>
7879
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Harshal-D"><img src="https://avatars.githubusercontent.com/u/41532279?v=4?s=100" width="100px;" alt="Harshal Damania"/><br /><sub><b>Harshal Damania</b></sub></a><br /><a href="#projectManagement-Harshal-D" title="Project Management">📆</a></td>
7980
<td align="center" valign="top" width="16.66%"><a href="https://www.damongreenhalgh.com/"><img src="https://avatars.githubusercontent.com/u/59471444?v=4?s=100" width="100px;" alt="Damon Greenhalgh"/><br /><sub><b>Damon Greenhalgh</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=DamonGreenhalgh" title="Code">💻</a></td>
8081
<td align="center" valign="top" width="16.66%"><a href="https://github.com/aadenmann"><img src="https://avatars.githubusercontent.com/u/101456326?v=4?s=100" width="100px;" alt="Aden Ing"/><br /><sub><b>Aden Ing</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=aadenmann" title="Code">💻</a></td>
8182
<td align="center" valign="top" width="16.66%"><a href="https://github.com/KW781"><img src="https://avatars.githubusercontent.com/u/59013794?v=4?s=100" width="100px;" alt="Aarnob Guha"/><br /><sub><b>Aarnob Guha</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=KW781" title="Code">💻</a></td>
8283
<td align="center" valign="top" width="16.66%"><a href="https://github.com/lia-arroyo"><img src="https://avatars.githubusercontent.com/u/94775011?v=4?s=100" width="100px;" alt="Lia Arroyo"/><br /><sub><b>Lia Arroyo</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=lia-arroyo" title="Code">💻</a></td>
83-
<td align="center" valign="top" width="16.66%"><a href="https://github.com/retinfai"><img src="https://avatars.githubusercontent.com/u/79831813?v=4?s=100" width="100px;" alt="Afereti Pama"/><br /><sub><b>Afereti Pama</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=retinfai" title="Code">💻</a></td>
8484
</tr>
8585
<tr>
86+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/retinfai"><img src="https://avatars.githubusercontent.com/u/79831813?v=4?s=100" width="100px;" alt="Afereti Pama"/><br /><sub><b>Afereti Pama</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=retinfai" title="Code">💻</a></td>
8687
<td align="center" valign="top" width="16.66%"><a href="https://github.com/jfen445"><img src="https://avatars.githubusercontent.com/u/79815130?v=4?s=100" width="100px;" alt="Josh Feng"/><br /><sub><b>Josh Feng</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=jfen445" title="Code">💻</a></td>
8788
<td align="center" valign="top" width="16.66%"><a href="https://github.com/mlai962"><img src="https://avatars.githubusercontent.com/u/79812370?v=4?s=100" width="100px;" alt="Matthew Lai"/><br /><sub><b>Matthew Lai</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=mlai962" title="Code">💻</a></td>
8889
<td align="center" valign="top" width="16.66%"><a href="https://github.com/Ray-F"><img src="https://avatars.githubusercontent.com/u/19633284?v=4?s=100" width="100px;" alt="Raymond Feng"/><br /><sub><b>Raymond Feng</b></sub></a><br /><a href="#infra-Ray-F" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
8990
<td align="center" valign="top" width="16.66%"><a href="https://github.com/lucas2005gao"><img src="https://avatars.githubusercontent.com/u/48196609?v=4?s=100" width="100px;" alt="Lucas Gao"/><br /><sub><b>Lucas Gao</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=lucas2005gao" title="Code">💻</a></td>
9091
<td align="center" valign="top" width="16.66%"><a href="https://github.com/flexzy"><img src="https://avatars.githubusercontent.com/u/49087744?v=4?s=100" width="100px;" alt="Felix Yang"/><br /><sub><b>Felix Yang</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=flexzy" title="Code">💻</a></td>
91-
<td align="center" valign="top" width="16.66%"><a href="https://github.com/David-Xia0"><img src="https://avatars.githubusercontent.com/u/50573329?v=4?s=100" width="100px;" alt="David Xiao"/><br /><sub><b>David Xiao</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=David-Xia0" title="Code">💻</a></td>
9292
</tr>
9393
<tr>
94+
<td align="center" valign="top" width="16.66%"><a href="https://github.com/David-Xia0"><img src="https://avatars.githubusercontent.com/u/50573329?v=4?s=100" width="100px;" alt="David Xiao"/><br /><sub><b>David Xiao</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=David-Xia0" title="Code">💻</a></td>
9495
<td align="center" valign="top" width="16.66%"><a href="https://github.com/zyan225"><img src="https://avatars.githubusercontent.com/u/52368549?v=4?s=100" width="100px;" alt="Emily Yang"/><br /><sub><b>Emily Yang</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=zyan225" title="Code">💻</a></td>
9596
<td align="center" valign="top" width="16.66%"><a href="https://github.com/dongmeilim"><img src="https://avatars.githubusercontent.com/u/52555301?v=4?s=100" width="100px;" alt="Dong Mei Lim"/><br /><sub><b>Dong Mei Lim</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=dongmeilim" title="Code">💻</a></td>
9697
<td align="center" valign="top" width="16.66%"><a href="https://github.com/annithinggoes"><img src="https://avatars.githubusercontent.com/u/52563454?v=4?s=100" width="100px;" alt="Annie Chau"/><br /><sub><b>Annie Chau</b></sub></a><br /><a href="https://github.com/UoaWDCC/VPS/commits?author=annithinggoes" title="Code">💻</a></td>

frontend/src/features/aboutUs/AboutUsPage.jsx

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@ import CloseIcon from "@mui/icons-material/Close";
22
import { useHistory, useLocation } from "react-router-dom";
33
import FabMenu from "../../components/FabMenu";
44
import contributorsByYear from "./contributorsByYear";
5+
import testers from "./testers";
6+
7+
function titlecase(value) {
8+
const words = value.split(" ");
9+
return words.map((w) => w[0].toUpperCase() + w.slice(1)).join(" ");
10+
}
11+
12+
const descs = {
13+
2021: "the initial 761 project team",
14+
2022: "the first year with WDCC",
15+
2023: "the backend overhaul",
16+
2024: "the year of multiplayer",
17+
2025: "the state, authoring and ui overhaul",
18+
};
519

620
const AboutUsPage = () => {
721
const history = useHistory();
@@ -31,14 +45,14 @@ const AboutUsPage = () => {
3145
<span>Simulator</span>
3246
</div>
3347
</div>
34-
<div className="w-1/2 flex flex-col items-start px-12 overflow-y-auto pt-[12vh]">
35-
{contributorsByYear.map((group, idx) => (
36-
<div
37-
key={group.year}
38-
className={`mb-12 ${idx === 0 ? "mt-[16vh]" : ""} ${idx === contributorsByYear.length - 1 ? "pb-[15vh]" : ""}`}
39-
>
48+
<div className="w-1/2 flex flex-col items-start px-12 overflow-y-auto pt-[28vh] pb-[16vh]">
49+
{contributorsByYear.map((group) => (
50+
<div key={group.year} className="mb-12">
4051
<div className="text-2xl mb-4 text-base-content font-normal font-ibm">
4152
{group.year}
53+
<span className="text-s text-primary ml-s">
54+
{descs[group.year] ?? ""}
55+
</span>
4256
</div>
4357
<div className="grid grid-cols-1 gap-2">
4458
{group.members.map((contributor) => (
@@ -47,16 +61,39 @@ const AboutUsPage = () => {
4761
className="flex flex-row items-center justify-center"
4862
>
4963
<span className="text-sm text-right font-ibm text-primary font-normal mr-6 min-w-[240px]">
50-
{getContributionText(contributor.contributions)}
64+
{getContributionText(contributor.roles)}
5165
</span>
52-
<span className="text-m text-left text-base-content font-bold font-ibm min-w-[220px]">
66+
<a
67+
href={contributor.profile}
68+
className="text-m text-left text-base-content font-bold font-ibm min-w-[220px]"
69+
>
5370
{contributor.name}
54-
</span>
71+
</a>
5572
</div>
5673
))}
5774
</div>
5875
</div>
5976
))}
77+
<div className="mb-12">
78+
<div className="text-2xl mb-4 text-base-content font-normal font-ibm">
79+
Testers
80+
</div>
81+
<div className="grid grid-cols-1 gap-2">
82+
{testers.map((tester) => (
83+
<div
84+
key={tester.name}
85+
className="flex flex-row items-center justify-center"
86+
>
87+
<span className="text-sm text-right font-ibm text-primary font-normal mr-6 min-w-[240px]">
88+
Solo Testing
89+
</span>
90+
<span className="text-m text-left text-base-content font-bold font-ibm min-w-[220px]">
91+
{tester.name}
92+
</span>
93+
</div>
94+
))}
95+
</div>
96+
</div>
6097
</div>
6198

6299
<FabMenu />
@@ -67,29 +104,7 @@ const AboutUsPage = () => {
67104
function getContributionText(contributions) {
68105
if (!contributions || !Array.isArray(contributions)) return "";
69106

70-
if (
71-
contributions.includes("code") &&
72-
contributions.includes("projectManagement")
73-
) {
74-
return "Technical Lead";
75-
}
76-
77-
return contributions
78-
.map((contribution) => {
79-
switch (contribution) {
80-
case "code":
81-
return "Software Engineer";
82-
case "projectManagement":
83-
return "Project Manager";
84-
case "design":
85-
return "Design Lead";
86-
case "infra":
87-
return "Infrastructure";
88-
default:
89-
return contribution;
90-
}
91-
})
92-
.join("/");
107+
return contributions.map(titlecase).join(" / ");
93108
}
94109

95110
export default AboutUsPage;

0 commit comments

Comments
 (0)