Merge branch 'cory2067:master' into what

cory2067 · Nov 8, 2024 · d31c689 · d31c689
2 parents b0272f6 + 66c2988
commit d31c689
Show file tree

Hide file tree

Showing 15 changed files with 410 additions and 410 deletions.
diff --git a/client/src/components/modules/Navbar/NavbarLeft.tsx b/client/src/components/modules/Navbar/NavbarLeft.tsx
@@ -18,7 +18,7 @@ export function NavbarTitle(props: NavbarTitleProps) {
       <Typography
         className={`NavbarLeft-title ${props.tourney ? "NavbarLeft-title-inactive" : ""}`}
       >
-        GLOBAL <b>TAIKO</b> SHOWDOWN
+        GLOBAL <b>TAIKO</b> SHOWDOWN / <b>GRATIA</b> PRODUCTIONS
       </Typography>
       {props.tourney && (
         <>

diff --git a/client/src/components/modules/Navbar/Right/RightMenuItem.tsx b/client/src/components/modules/Navbar/Right/RightMenuItem.tsx
@@ -3,7 +3,7 @@ import { Link } from "@reach/router";
 import { Menu, MenuItemProps, Typography } from "antd";
 import { LanguageContext, contentManager } from "../../../../ContentManager";
 
-const MERCH_LINK = "https://teespring.com/stores/gtsosu-store";
+const MERCH_LINK = "https://merch.gtsosu.com";
 const MOUSEPAD_LINK = "https://merch.streamelements.com/gtsosu";
 
 type RightMenuItemProps = MenuItemProps & {

diff --git a/client/src/components/modules/Qualifiers.js b/client/src/components/modules/Qualifiers.js
@@ -39,8 +39,8 @@ class Qualifiers extends Component {
   isStaff = () =>
     hasAccess(this.props.user, this.props.tourney, [
       "Referee",
-      "Mapsetter",
-      "All-Star Mapsetter",
+      "Mappooler",
+      "All-Star Mappooler",
       "Head Pooler",
       "Mapper",
     ]);

diff --git a/client/src/components/pages/Mappools.js b/client/src/components/pages/Mappools.js
@@ -51,8 +51,8 @@ class Mappools extends Component {
       this.props.user,
       this.props.tourney,
       this.state.current.name === "All Stars"
-        ? ["Mapsetter", "All-Star Mapsetter", "Head Pooler", "Mapper"]
-        : ["Mapsetter", "Head Pooler", "Mapper"]
+        ? ["Mappooler", "All-Star Mappooler", "Head Pooler", "Mapper"]
+        : ["Mappooler", "Head Pooler", "Mapper"]
     );
 
   sortMaps = (maps) => {