Merge branch 'staging' into feature/schedule

Author: igachmovmelon

.circleci/config.yml

@@ -143,6 +143,9 @@ jobs:
             if [ $CIRCLE_BRANCH = "env/unesco" ]; then
               ENV=sparkle-unesco
             fi
+            if [ $CIRCLE_BRANCH = "env/ohbm" ]; then
+              ENV=sparkle-ohbm
+            fi
 
             ./node_modules/.bin/firebase use $ENV --token "$FIREBASE_TOKEN"
             ./node_modules/.bin/firebase deploy --only functions --token "$FIREBASE_TOKEN"
@@ -265,6 +268,12 @@ jobs:
               TARGET=sparkle-unesco
               RELEASE_STAGE=env/unesco
             fi
+            if [ $CIRCLE_BRANCH = "env/ohbm" ]; then
+              PREFIX=OHBM_
+              ENV=sparkle-ohbm
+              TARGET=sparkle-ohbm
+              RELEASE_STAGE=env/ohbm
+            fi
 
             ./scripts/init-env.sh $PREFIX
 
@@ -321,6 +330,7 @@ workflows:
                 - env/kotr
                 - env/memrise
                 - env/unesco
+                - env/ohbm
       - deploy-hosting:
           requires:
             - lint-and-test
@@ -345,6 +355,7 @@ workflows:
                 - env/kotr
                 - env/memrise
                 - env/unesco
+                - env/ohbm
 #      - smoke-test:
 #          requires:
 #            - deploy-functions

.firebaserc

@@ -18,7 +18,8 @@
     "deloitte": "sparkle-deloitte",
     "kotr": "sparkle-kotr",
     "memrise": "sparkle-memrise",
-    "unesco": "sparkle-unesco"
+    "unesco": "sparkle-unesco",
+    "ohbm": "sparkle-ohbm"
   },
   "targets": {
     "co-reality-map": {
@@ -159,6 +160,13 @@
           "sparkle-unesco"
         ]
       }
+    },
+    "sparkle-ohbm": {
+      "hosting": {
+        "sparkle-ohbm": [
+          "sparkle-ohbm"
+        ]
+      }
     }
   }
 }

firebase.json

@@ -215,6 +215,17 @@
         }
       ],
       "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
+    },
+    {
+      "target": "sparkle-ohbm",
+      "public": "build",
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
     }
   ],
   "functions": {

src/components/templates/Audience/Audience.scss

@@ -40,7 +40,7 @@ $spacing: calc(1 * min(var(--seat-size), var(--seat-size-min)));
       flex-direction: column;
       align-items: center;
 
-      pointer-events: all;
+      pointer-events: auto;
 
       .video {
         width: 100%;

src/components/templates/PartyMap/components/RoomModal/RoomModal.scss

@@ -6,7 +6,7 @@ $spacing: 20px;
 .room-modal {
   padding: $spacing;
 
-  background-color: #19181a;
+  background-color: $saturated-black;
   background-repeat: no-repeat;
   background-size: cover;
 
@@ -27,13 +27,6 @@ $spacing: 20px;
     justify-content: space-around;
     align-items: center;
 
-    > img {
-      width: 60%;
-      height: auto;
-
-      border-radius: $border-radius;
-    }
-
     > * {
       flex: 1;
       height: fit-content;
@@ -45,6 +38,17 @@ $spacing: 20px;
     }
   }
 
+  &__icon {
+    flex-shrink: 0;
+    height: 180px;
+    width: 180px;
+    border-radius: $border-radius;
+    background-color: $black;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+
   .userlist-container {
     margin-top: $spacing;
   }

src/components/templates/PartyMap/components/RoomModal/RoomModal.tsx

@@ -93,6 +93,10 @@ export const RoomModalContent: React.FC<RoomModalContentProps> = ({
 
   const hasRoomEvents = renderedRoomEvents?.length > 0;
 
+  const iconStyles = {
+    backgroundImage: room.image_url ? `url(${room.image_url})` : undefined,
+  };
+
   return (
     <>
       <h2>{room.title}</h2>
@@ -102,11 +106,7 @@ export const RoomModalContent: React.FC<RoomModalContentProps> = ({
       )}
 
       <div className="room-modal__main">
-        {room.image_url ? (
-          <img src={room.image_url} alt={room.title} />
-        ) : (
-          <span>{room.title}</span>
-        )}
+        <div className="room-modal__icon" style={iconStyles} />
 
         <RoomModalOngoingEvent
           roomEvents={roomEvents}

src/index.tsx

@@ -151,6 +151,7 @@ if (BUGSNAG_API_KEY) {
     "env/kotr",
     "env/memrise",
     "env/unesco",
+    "env/ohbm",
   ];
 
   const releaseStage = () => {

src/pages/Admin/Details/ValidationSchema.ts

@@ -74,6 +74,7 @@ export const validationSchema_v2 = Yup.object()
     name: Yup.string()
       .required("Name is required!")
       .min(3, ({ min }) => `Name must be at least ${min} characters`)
+      .max(20, ({ max }) => `Name must be less than ${max} characters`)
       .when(
         "$editing",
         (editing: boolean, schema: Yup.StringSchema) =>
@@ -136,7 +137,8 @@ export const roomCreateSchema = Yup.object().shape<RoomSchemaShape>({
       is: false,
       then: Yup.string()
         .required("Venue name is required")
-        .min(3, ({ min }) => `Name must be at least ${min} characters`),
+        .min(3, ({ min }) => `Name must be at least ${min} characters`)
+        .max(20, ({ max }) => `Name must be less than ${max} characters`),
     })
     .when("useUrl", (useUrl: boolean, schema: Yup.StringSchema) =>
       !useUrl

src/pages/Admin/Venue/DetailsValidationSchema.ts

@@ -57,8 +57,9 @@ export const validationSchema = Yup.object()
   .shape<VenueInput>({
     template: Yup.mixed<VenueTemplate>().required(),
     name: Yup.string()
-      .required("Required")
-      .min(1, "Required")
+      .required("Venue name is required")
+      .min(1, ({ min }) => `Name must be at least ${min} characters`)
+      .max(20, ({ max }) => `Name must be less than ${max} characters`)
       .when(
         "$editing",
         (editing: boolean, schema: Yup.StringSchema) =>
@@ -111,8 +112,8 @@ export const validationSchema = Yup.object()
 
     bannerImageUrl: urlIfNoFileValidation("bannerImageFile"),
     logoImageUrl: urlIfNoFileValidation("logoImageFile"),
-    description: Yup.string().required("Required"),
-    subtitle: Yup.string().required("Required"),
+    description: Yup.string().required("Description required"),
+    subtitle: Yup.string().required("Subtitle required"),
     zoomUrl: Yup.string().when(
       "$template.template",
       (template: VenueTemplate, schema: Yup.MixedSchema<FileList>) =>