Merged in feat/sw-1493-revised-comparison-block (pull request #1236)

feat(SW-1493): Revised SAS comparison block

* Base of new TierDetails for SAS tier comparison

* Add backgrounds and content to TierDetails

* Implement new cms schema for SasTierComparison

* Override gap in jsontohtml styling to 0

* Add animations to comparison details

* Redesign again

* Update content model to new design

* Add border to bottom item in tier match list

* Wrap interpolate-size in @supports to be safe

* Merge branch 'master' into feat/sw-1493-revised-comparison-block


Approved-by: Joakim Jäderberg

server/routers/hotels/schemas/additionalData.ts

@@ -34,32 +34,31 @@ export const extraPageSchema = z.object({
   mainBody: z.string().optional(),
 })
 
-export const additionalDataSchema = z
-  .object({
-    attributes: z.object({
-      name: z.string(),
-      id: z.string(),
-      displayWebPage: z.object({
-        healthGym: z.boolean(),
-        meetingRoom: z.boolean(),
-        parking: z.boolean(),
-        specialNeeds: z.boolean(),
-      }),
-      specialNeedGroups: z.array(specialNeedGroupSchema),
-      gallery: gallerySchema.optional(),
-      conferencesAndMeetings: facilitySchema.optional(),
-      healthAndWellness: facilitySchema.optional(),
-      restaurantImages: facilitySchema.optional(),
-      restaurantsOverviewPage: restaurantsOverviewPageSchema,
-      meetingRooms: extraPageSchema,
-      healthAndFitness: extraPageSchema,
-      hotelParking: extraPageSchema,
-      hotelSpecialNeeds: extraPageSchema,
-      accessibilityElevatorPitchText: z.string().optional(),
-      hotelRoomElevatorPitchText: z.string().optional(),
+export const additionalDataSchema = z.object({
+  attributes: z.object({
+    name: z.string(),
+    id: z.string(),
+    displayWebPage: z.object({
+      healthGym: z.boolean(),
+      meetingRoom: z.boolean(),
+      parking: z.boolean(),
+      specialNeeds: z.boolean(),
     }),
-    type: z.literal("additionalData"),
-  })
+    specialNeedGroups: z.array(specialNeedGroupSchema),
+    gallery: gallerySchema.optional(),
+    conferencesAndMeetings: facilitySchema.optional(),
+    healthAndWellness: facilitySchema.optional(),
+    restaurantImages: facilitySchema.optional(),
+    restaurantsOverviewPage: restaurantsOverviewPageSchema,
+    meetingRooms: extraPageSchema,
+    healthAndFitness: extraPageSchema,
+    hotelParking: extraPageSchema,
+    hotelSpecialNeeds: extraPageSchema,
+    accessibilityElevatorPitchText: z.string().optional(),
+    hotelRoomElevatorPitchText: z.string().optional(),
+  }),
+  type: z.literal("additionalData"),
+})
 
 export function transformAdditionalData(
   data: z.output<typeof additionalDataSchema>
@@ -67,6 +66,6 @@ export function transformAdditionalData(
   return {
     ...data.attributes,
     id: data.attributes.id,
-    type: data.type
+    type: data.type,
   }
-}
+}

server/routers/hotels/schemas/hotel/include/include.ts

@@ -7,7 +7,11 @@ import {
   roomCategoriesSchema,
   transformRoomCategories,
 } from "@/server/routers/hotels/schemas/hotel/include/roomCategories"
-import { additionalDataSchema, transformAdditionalData } from "../../additionalData"
+
+import {
+  additionalDataSchema,
+  transformAdditionalData,
+} from "../../additionalData"
 
 export const includeSchema = z
   .discriminatedUnion("type", [

server/routers/hotels/schemas/hotel/include/roomCategories.ts

@@ -86,12 +86,12 @@ export function transformRoomCategories(
     totalOccupancy:
       data.attributes.occupancy.min === data.attributes.occupancy.max
         ? {
-          max: data.attributes.occupancy.max,
-          range: `${data.attributes.occupancy.max}`,
-        }
+            max: data.attributes.occupancy.max,
+            range: `${data.attributes.occupancy.max}`,
+          }
         : {
-          max: data.attributes.occupancy.max,
-          range: `${data.attributes.occupancy.min}-${data.attributes.occupancy.max}`,
-        },
+            max: data.attributes.occupancy.max,
+            range: `${data.attributes.occupancy.min}-${data.attributes.occupancy.max}`,
+          },
   }
 }

server/routers/hotels/schemas/meetingRoom.ts

@@ -2,49 +2,48 @@ import { z } from "zod"
 
 import { imageSchema } from "./image"
 
-export const meetingRoomsSchema = z
-  .object({
-    data: z.array(
-      z.object({
-        attributes: z.object({
-          name: z.string(),
-          email: z.string().optional(),
-          phoneNumber: z.string(),
-          size: z.number(),
-          doorWidth: z.number(),
-          doorHeight: z.number(),
-          length: z.number(),
-          width: z.number(),
-          height: z.number(),
-          floorNumber: z.number(),
-          content: z.object({
-            images: z.array(imageSchema),
-            texts: z.object({
-              facilityInformation: z.string().optional(),
-              surroundingInformation: z.string().optional(),
-              descriptions: z.object({
+export const meetingRoomsSchema = z.object({
+  data: z.array(
+    z.object({
+      attributes: z.object({
+        name: z.string(),
+        email: z.string().optional(),
+        phoneNumber: z.string(),
+        size: z.number(),
+        doorWidth: z.number(),
+        doorHeight: z.number(),
+        length: z.number(),
+        width: z.number(),
+        height: z.number(),
+        floorNumber: z.number(),
+        content: z.object({
+          images: z.array(imageSchema),
+          texts: z.object({
+            facilityInformation: z.string().optional(),
+            surroundingInformation: z.string().optional(),
+            descriptions: z.object({
+              short: z.string().optional(),
+              medium: z.string().optional(),
+            }),
+            meetingDescription: z
+              .object({
                 short: z.string().optional(),
                 medium: z.string().optional(),
-              }),
-              meetingDescription: z
-                .object({
-                  short: z.string().optional(),
-                  medium: z.string().optional(),
-                })
-                .optional(),
-            }),
+              })
+              .optional(),
           }),
-          seatings: z.array(
-            z.object({
-              type: z.string(),
-              capacity: z.number(),
-            })
-          ),
-          lighting: z.string(),
-          sortOrder: z.number().optional(),
         }),
-        id: z.string(),
-        type: z.string(),
-      })
-    ),
-  })
+        seatings: z.array(
+          z.object({
+            type: z.string(),
+            capacity: z.number(),
+          })
+        ),
+        lighting: z.string(),
+        sortOrder: z.number().optional(),
+      }),
+      id: z.string(),
+      type: z.string(),
+    })
+  ),
+})