Add online platform selection

MahjongPantheon · Sep 19, 2024 · 0eac634 · 0eac634
1 parent cafaa9b
commit 0eac634
Show file tree

Hide file tree

Showing 31 changed files with 1,725 additions and 554 deletions.
diff --git a/Bragi/yarn.lock b/Bragi/yarn.lock
diff --git a/Common/generated/Common/EventData.php b/Common/generated/Common/EventData.php
diff --git a/Common/generated/Common/PlatformType.php b/Common/generated/Common/PlatformType.php
diff --git a/Common/generated/GPBMetadata/Proto/Atoms.php b/Common/generated/GPBMetadata/Proto/Atoms.php
diff --git a/Common/proto/atoms.proto b/Common/proto/atoms.proto
@@ -502,6 +502,7 @@ message EventData {
   bool is_rating_shown = 16;
   bool achievements_shown = 17;
   bool allow_view_other_tables = 18;
+  PlatformType platform_id = 19;
 }
 
 message TableState {
@@ -591,6 +592,12 @@ enum EndingPolicy {
   ENDING_POLICY_EP_END_AFTER_HAND = 2;
 }
 
+enum PlatformType {
+  PLATFORM_TYPE_UNSPECIFIED = 0;
+  PLATFORM_TYPE_TENHOUNET = 1;
+  PLATFORM_TYPE_MAHJONGSOUL = 2;
+}
+
 message RulesetConfig {
   ComplexUma complex_uma = 1;
   EndingPolicy ending_policy = 2;

diff --git a/Forseti/app/Layout.tsx b/Forseti/app/Layout.tsx
@@ -178,7 +178,7 @@ export const Layout: React.FC<React.PropsWithChildren> = ({ children }) => {
 
   return (
     <actionButtonCtx.Provider value={actionButtonRef}>
-      <authCtx.Provider value={{ isLoggedIn, setIsLoggedIn }}>
+      <authCtx.Provider value={{ isLoggedIn, setIsLoggedIn, isSuperadmin, setIsSuperadmin }}>
         <modalsCtx.Provider
           value={{
             showStopEventModal,
@@ -366,10 +366,8 @@ export const Layout: React.FC<React.PropsWithChildren> = ({ children }) => {
                   header={
                     <AppHeader
                       title={title}
-                      isSuperadmin={isSuperadmin}
                       eventData={eventData}
                       dark={dark}
-                      isLoggedIn={isLoggedIn}
                       toggleColorScheme={toggleColorScheme}
                       toggleDimmed={toggleDimmed}
                       saveLang={saveLang}
@@ -381,8 +379,6 @@ export const Layout: React.FC<React.PropsWithChildren> = ({ children }) => {
                         <Navbar.Section grow component={ScrollArea} mx='-xs' px='xs'>
                           <MainMenu
                             title={title}
-                            isLoggedIn={isLoggedIn}
-                            isSuperadmin={isSuperadmin}
                             dark={dark}
                             toggleColorScheme={toggleColorScheme}
                             toggleDimmed={toggleDimmed}

diff --git a/Forseti/app/clients/proto/atoms.pb.ts b/Forseti/app/clients/proto/atoms.pb.ts
@@ -48,6 +48,11 @@ export type EndingPolicy =
   | "ENDING_POLICY_EP_ONE_MORE_HAND"
   | "ENDING_POLICY_EP_END_AFTER_HAND";
 
+export type PlatformType =
+  | "PLATFORM_TYPE_UNSPECIFIED"
+  | "PLATFORM_TYPE_TENHOUNET"
+  | "PLATFORM_TYPE_MAHJONGSOUL";
+
 export interface AccessRules {
   rules: Record<string, AccessRules.Rules["value"] | undefined>;
 }
@@ -509,6 +514,7 @@ export interface EventData {
   isRatingShown: boolean;
   achievementsShown: boolean;
   allowViewOtherTables: boolean;
+  platformId: PlatformType;
 }
 
 export interface TableState {
@@ -978,6 +984,52 @@ export const EndingPolicy = {
   },
 } as const;
 
+export const PlatformType = {
+  PLATFORM_TYPE_UNSPECIFIED: "PLATFORM_TYPE_UNSPECIFIED",
+  PLATFORM_TYPE_TENHOUNET: "PLATFORM_TYPE_TENHOUNET",
+  PLATFORM_TYPE_MAHJONGSOUL: "PLATFORM_TYPE_MAHJONGSOUL",
+  /**
+   * @private
+   */
+  _fromInt: function (i: number): PlatformType {
+    switch (i) {
+      case 0: {
+        return "PLATFORM_TYPE_UNSPECIFIED";
+      }
+      case 1: {
+        return "PLATFORM_TYPE_TENHOUNET";
+      }
+      case 2: {
+        return "PLATFORM_TYPE_MAHJONGSOUL";
+      }
+      // unknown values are preserved as numbers. this occurs when new enum values are introduced and the generated code is out of date.
+      default: {
+        return i as unknown as PlatformType;
+      }
+    }
+  },
+  /**
+   * @private
+   */
+  _toInt: function (i: PlatformType): number {
+    switch (i) {
+      case "PLATFORM_TYPE_UNSPECIFIED": {
+        return 0;
+      }
+      case "PLATFORM_TYPE_TENHOUNET": {
+        return 1;
+      }
+      case "PLATFORM_TYPE_MAHJONGSOUL": {
+        return 2;
+      }
+      // unknown values are preserved as numbers. this occurs when new enum values are introduced and the generated code is out of date.
+      default: {
+        return i as unknown as number;
+      }
+    }
+  },
+} as const;
+
 export const AccessRules = {
   /**
    * Serializes AccessRules to protobuf.
@@ -6298,6 +6350,7 @@ export const EventData = {
       isRatingShown: false,
       achievementsShown: false,
       allowViewOtherTables: false,
+      platformId: PlatformType._fromInt(0),
       ...msg,
     };
   },
@@ -6357,6 +6410,9 @@ export const EventData = {
     if (msg.allowViewOtherTables) {
       writer.writeBool(18, msg.allowViewOtherTables);
     }
+    if (msg.platformId && PlatformType._toInt(msg.platformId)) {
+      writer.writeEnum(19, PlatformType._toInt(msg.platformId));
+    }
     return writer;
   },
 
@@ -6434,6 +6490,10 @@ export const EventData = {
           msg.allowViewOtherTables = reader.readBool();
           break;
         }
+        case 19: {
+          msg.platformId = PlatformType._fromInt(reader.readEnum());
+          break;
+        }
         default: {
           reader.skipField();
           break;
@@ -8328,6 +8388,52 @@ export const EndingPolicyJSON = {
   },
 } as const;
 
+export const PlatformTypeJSON = {
+  PLATFORM_TYPE_UNSPECIFIED: "PLATFORM_TYPE_UNSPECIFIED",
+  PLATFORM_TYPE_TENHOUNET: "PLATFORM_TYPE_TENHOUNET",
+  PLATFORM_TYPE_MAHJONGSOUL: "PLATFORM_TYPE_MAHJONGSOUL",
+  /**
+   * @private
+   */
+  _fromInt: function (i: number): PlatformType {
+    switch (i) {
+      case 0: {
+        return "PLATFORM_TYPE_UNSPECIFIED";
+      }
+      case 1: {
+        return "PLATFORM_TYPE_TENHOUNET";
+      }
+      case 2: {
+        return "PLATFORM_TYPE_MAHJONGSOUL";
+      }
+      // unknown values are preserved as numbers. this occurs when new enum values are introduced and the generated code is out of date.
+      default: {
+        return i as unknown as PlatformType;
+      }
+    }
+  },
+  /**
+   * @private
+   */
+  _toInt: function (i: PlatformType): number {
+    switch (i) {
+      case "PLATFORM_TYPE_UNSPECIFIED": {
+        return 0;
+      }
+      case "PLATFORM_TYPE_TENHOUNET": {
+        return 1;
+      }
+      case "PLATFORM_TYPE_MAHJONGSOUL": {
+        return 2;
+      }
+      // unknown values are preserved as numbers. this occurs when new enum values are introduced and the generated code is out of date.
+      default: {
+        return i as unknown as number;
+      }
+    }
+  },
+} as const;
+
 export const AccessRulesJSON = {
   /**
    * Serializes AccessRules to JSON.
@@ -12921,6 +13027,7 @@ export const EventDataJSON = {
       isRatingShown: false,
       achievementsShown: false,
       allowViewOtherTables: false,
+      platformId: PlatformType._fromInt(0),
       ...msg,
     };
   },
@@ -12985,6 +13092,9 @@ export const EventDataJSON = {
     if (msg.allowViewOtherTables) {
       json["allowViewOtherTables"] = msg.allowViewOtherTables;
     }
+    if (msg.platformId && PlatformTypeJSON._toInt(msg.platformId)) {
+      json["platformId"] = msg.platformId;
+    }
     return json;
   },
 
@@ -13058,6 +13168,10 @@ export const EventDataJSON = {
     if (_allowViewOtherTables_) {
       msg.allowViewOtherTables = _allowViewOtherTables_;
     }
+    const _platformId_ = json["platformId"] ?? json["platform_id"];
+    if (_platformId_) {
+      msg.platformId = PlatformType._fromInt(_platformId_);
+    }
     return msg;
   },
 };

diff --git a/Forseti/app/components/AppHeader.tsx b/Forseti/app/components/AppHeader.tsx
@@ -49,24 +49,13 @@ const useStyles = createStyles((theme) => ({
 }));
 
 export const AppHeader: React.FC<{
-  isLoggedIn: boolean;
-  isSuperadmin: boolean;
   eventData: Event | null;
   title?: string;
   dark: boolean;
   toggleColorScheme: () => void;
   toggleDimmed: () => void;
   saveLang: (lang: string) => void;
-}> = ({
-  title,
-  isSuperadmin,
-  isLoggedIn,
-  eventData,
-  dark,
-  toggleColorScheme,
-  toggleDimmed,
-  saveLang,
-}) => {
+}> = ({ title, eventData, dark, toggleColorScheme, toggleDimmed, saveLang }) => {
   const { classes } = useStyles();
   const i18n = useI18n();
 
@@ -104,8 +93,6 @@ export const AppHeader: React.FC<{
           />
           <MainMenu
             title={title}
-            isLoggedIn={isLoggedIn}
-            isSuperadmin={isSuperadmin}
             dark={dark}
             closeMenu={closeMenu}
             toggleColorScheme={toggleColorScheme}