Skip to content

Commit b8896c3

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

File tree

5 files changed

+157
-117
lines changed

5 files changed

+157
-117
lines changed

.all-contributorsrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@
168168
]
169169
},
170170
{
171-
"login": "Kot6603",
171+
"login": "koutaroyumiba",
172172
"name": "Koutaro Yumiba",
173173
"avatar_url": "https://avatars.githubusercontent.com/u/89110272?v=4",
174-
"profile": "https://github.com/Kot6603",
174+
"profile": "https://github.com/koutaroyumiba",
175175
"contributions": [
176176
"code"
177177
]
@@ -430,4 +430,4 @@
430430
]
431431
}
432432
]
433-
}
433+
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
5656
<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>
5757
<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>
5858
<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>
59+
<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>
6060
</tr>
6161
<tr>
6262
<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>

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)