Skip to content

Commit 508169b

Browse files
authored
chore: streamlined achievements backend (UltiMafia#2589)
1 parent 17243a4 commit 508169b

File tree

6 files changed

+35
-320
lines changed

6 files changed

+35
-320
lines changed

app.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const gameRouter = require("./routes/game");
1313
const setupRouter = require("./routes/setup");
1414
const deckRouter = require("./routes/anonymousDeck");
1515
const roleRouter = require("./routes/roles");
16+
const achievementsRouter = require("./routes/achievements");
1617
const userRouter = require("./routes/user");
1718
const forumsRouter = require("./routes/forums");
1819
const commentRouter = require("./routes/comment");
@@ -70,6 +71,7 @@ apiRouter.use("/game", gameRouter);
7071
apiRouter.use("/setup", setupRouter);
7172
apiRouter.use("/deck", deckRouter);
7273
apiRouter.use("/roles", roleRouter);
74+
apiRouter.use("/achievements", achievementsRouter);
7375
apiRouter.use("/user", userRouter);
7476
apiRouter.use("/forums", forumsRouter);
7577
apiRouter.use("/comment", commentRouter);

react_main/src/Contexts.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,11 @@ export function SiteInfoProvider({ children, setSiteInfoLoading }) {
368368
.then((res) =>
369369
updateSiteInfo({ type: "setProp", prop: "rolesRaw", value: res.data })
370370
),
371+
axios
372+
.get("/api/achievements")
373+
.then((res) =>
374+
updateSiteInfo({ type: "setProp", prop: "achievementsRaw", value: res.data })
375+
),
371376
axios.get("/api/roles/modifiers").then((res) =>
372377
updateSiteInfo({
373378
type: "setProp",
@@ -402,6 +407,7 @@ export function SiteInfoProvider({ children, setSiteInfoLoading }) {
402407
const ready =
403408
siteInfoVal.roles &&
404409
siteInfoVal.rolesRaw &&
410+
siteInfoVal.achievementsRaw &&
405411
siteInfoVal.modifiers &&
406412
siteInfoVal.gamesettings &&
407413
siteInfoVal.items &&

react_main/src/constants/Achievements.js

Lines changed: 0 additions & 310 deletions
This file was deleted.

react_main/src/pages/Learn/Achievements.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from "react";
1+
import React, { useContext } from "react";
22
import "css/play.css";
33
import {
44
Paper,
@@ -15,15 +15,15 @@ import {
1515
AccordionDetails,
1616
} from "@mui/material";
1717
import { useTheme } from "@mui/material/styles";
18-
19-
//import { AchievementList } from "../../../../data/Achievements";
20-
import { AchievementData } from "../../constants/Achievements";
18+
import { SiteInfoContext } from "../../Contexts";
2119

2220
export default function Achievements(props) {
2321
const theme = useTheme();
22+
const siteInfo = useContext(SiteInfoContext);
2423

25-
const commandTableRows = Object.keys(AchievementData.Mafia).map((key) => {
26-
let { reward, description } = AchievementData.Mafia[key];
24+
const achievementData = siteInfo.achievementsRaw?.Mafia || {};
25+
const commandTableRows = Object.keys(achievementData).map((key) => {
26+
let { reward, description } = achievementData[key];
2727

2828
return {
2929
term: key,
@@ -45,7 +45,7 @@ export default function Achievements(props) {
4545
<TableBody>
4646
{commandTableRows.map((row) => (
4747
<TableRow
48-
key={row.name}
48+
key={row.term}
4949
sx={{ "&:last-child td, &:last-child th": { border: 0 } }}
5050
>
5151
<TableCell component="th" scope="row" align="center">

0 commit comments

Comments
 (0)