Merge branch 'develop' into feat/SW-185-implement-footer-navigation

types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts

@@ -0,0 +1,40 @@
+export type BookingConfirmation = {
+  email: string
+  hotel: {
+    name: string
+    address: string
+    location: string
+    phone: string
+    image: string
+    checkIn: string
+    checkOut: string
+    breakfast: {
+      start: string
+      end: string
+    }
+  }
+  stay: {
+    nights: number
+    start: string
+    end: string
+  }
+  summary: {
+    roomType: string
+    bedType: string
+    breakfast: string
+    flexibility: string
+  }
+}
+
+export type IntroSectionProps = {
+  email: BookingConfirmation["email"]
+}
+
+export type StaySectionProps = {
+  hotel: BookingConfirmation["hotel"]
+  stay: BookingConfirmation["stay"]
+}
+
+export type SummarySectionProps = {
+  summary: BookingConfirmation["summary"]
+}

types/components/imageContainer.ts

@@ -1,4 +1,4 @@
-import type { ImageVaultAsset } from "./imageVaultImage"
+import type { ImageVaultAsset } from "./imageVault"
 
 export type ImageContainerProps = {
   leftImage: ImageVaultAsset

types/components/imageVault.ts

@@ -0,0 +1,26 @@
+/**
+ * @file TypeScript typings for ImageVault
+ *
+ * The types in this file are based on the source maps of the downloaded
+ * distribution at https://clientscript.imagevault.se/Installation/ImageVaultInsertMedia
+ *
+ * They have been clean up and amended to.
+ */
+
+import { z } from "zod"
+
+import { imageVaultAssetSchema } from "@/server/routers/contentstack/schemas/imageVault"
+
+export type ImageVaultAssetResponse = z.infer<typeof imageVaultAssetSchema>
+
+export type ImageVaultAsset = {
+  id: number
+  title: string
+  url: string
+  dimensions: {
+    width: number
+    height: number
+    aspectRatio: number
+  }
+  meta: { alt: string | undefined | null; caption: string | undefined | null }
+}

types/components/imageVaultImage.ts

@@ -1,115 +0,0 @@
-/**
- * @file TypeScript typings for ImageVault
- *
- * The types in this file are based on the source maps of the downloaded
- * distribution at https://clientscript.imagevault.se/Installation/ImageVaultInsertMedia
- *
- * They have been clean up and amended to.
- */
-
-export type MetaData = {
-  DefinitionType?: number
-  Description: string | null
-  LanguageId: null
-  MetadataDefinitionId: number
-  Name: string
-  Value: string
-}
-
-export type ImageVaultAsset = {
-  id: number
-  title: string
-  url: string
-  dimensions: {
-    width: number
-    height: number
-    aspectRatio: number
-  }
-  meta: { alt: string | undefined; caption: string | undefined }
-}
-
-/**
- * The response from ImageVault when inserting an asset
- */
-export declare class InsertResponse {
-  /**
-   * The media item id of the asset
-   */
-  Id: number
-  /**
-   * The id of the vault where the asset resides
-   */
-  VaultId: number
-  /**
-   * The name of the asset
-   */
-  Name: string
-  /**
-   * The conversion selected by the user. Is an array but will only contain one object
-   */
-  MediaConversions: MediaConversion[]
-  /**
-   * Date when the asset was added to ImageVault
-   */
-  DateAdded: string
-  /**
-   * Name of the user that added the asset to ImageVault
-   */
-  AddedBy: string
-
-  Metadata?: MetaData[] | undefined
-}
-
-/**
- * Defines a media asset, original or conversion
- */
-export declare class MediaConversion {
-  /**
-   * The url to the conversion
-   */
-  Url: string
-  /**
-   * Name of the conversion
-   */
-  Name: string
-  /**
-   * Html representing the conversion
-   */
-  Html: string
-  /**
-   * Content type of the conversion
-   */
-  ContentType: string
-  /**
-   * Width, in pixels, of the conversion
-   */
-  Width: number
-  /**
-   * Height, in pixels, of the conversion
-   */
-  Height: number
-  /**
-   * Aspect ratio of the conversion
-   */
-  AspectRatio: number
-  /**
-   * Width of the selected/requested format
-   */
-  FormatWidth: number
-  /**
-   * Height of the selected/requested format
-   */
-  FormatHeight: number
-  /**
-   * Aspect ratio of the selected/requested format
-   */
-  FormatAspectRatio: number
-  /**
-   * Name of the media format
-   */
-  MediaFormatName: string
-  /**
-   * Id of the selected media format
-   */
-  MediaFormatId: number
-}

types/components/metadata/index.ts

@@ -0,0 +1,5 @@
+import { z } from "zod"
+
+import { getMetaDataSchema } from "@/server/routers/contentstack/metadata/output"
+
+export interface MetaData extends z.infer<typeof getMetaDataSchema> {}

types/components/myPages/myPage/earnAndBurn.ts

@@ -1,4 +1,4 @@
-import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Desktop/Row/awardPointsVariants"
+import { awardPointsVariants } from "@/components/MyPages/Blocks/Points/EarnAndBurn/JourneyTable/Table/Row/awardPointsVariants"
 
 import type { VariantProps } from "class-variance-authority"
 

types/components/myPages/myPage/enums.ts

@@ -16,3 +16,17 @@ export enum ContentEntries {
   AccountPageContentShortcuts = "AccountPageContentShortcuts",
   AccountPageContentTextContent = "AccountPageContentTextContent",
 }
+
+export enum RewardTransactionTypes {
+  stay = "stay",
+  rewardNight = "rewardnight",
+  enrollment = "enrollment",
+  expired = "expired",
+  redgift = "redgift",
+  ancillary = "ancillary",
+  pointShop = "pointshop",
+  tui_points = "tui_points",
+  mastercard_points = "mastercard_points",
+  stayAdj = "stay/adj",
+  othersAdj = "others/adj",
+}

types/components/myPages/myProfile/addCreditCardButton.ts

@@ -1,3 +0,0 @@
-export type AddCreditCardButtonProps = {
-  redirectUrl: string
-}

types/components/myPages/myProfile/card.ts

@@ -1,3 +0,0 @@
-export interface CardProps extends React.HTMLAttributes<HTMLElement> {
-  tag?: "article" | "div" | "section"
-}

types/components/myPages/myProfile/creditCards.ts

@@ -0,0 +1,9 @@
+import type { CreditCard } from "@/types/user"
+
+export type CreditCardRowProps = {
+  card: CreditCard
+}
+
+export type DeleteCreditCardConfirmationProps = {
+  card: CreditCard
+}

types/components/tracking.ts

@@ -4,6 +4,7 @@ import type { Lang } from "@/constants/languages"
 
 export enum TrackingChannelEnum {
   "scandic-friends" = "scandic-friends",
+  "static-content-page" = "static-content-page",
 }
 
 export type TrackingChannel = keyof typeof TrackingChannelEnum

types/fetch.ts

@@ -1,7 +1,7 @@
 export interface RequestOptionsWithJSONBody
   extends Omit<RequestInit, "body" | "method"> {
-  body: Record<string, unknown>
+  body?: Record<string, unknown>
 }
 
 export interface RequestOptionsWithOutBody
-  extends Omit<RequestInit, "body" | "method"> { }
+  extends Omit<RequestInit, "body" | "method"> {}

types/requests/imageContainer.ts

@@ -1,11 +1,11 @@
-import { InsertResponse } from "../components/imageVaultImage"
+import { ImageVaultAssetResponse } from "../components/imageVault"
 import { EmbedEnum } from "./utils/embeds"
 import { Typename } from "./utils/typename"
 
 export type ImageContainer = Typename<
   {
-    image_left: InsertResponse
-    image_right: InsertResponse
+    image_left: ImageVaultAssetResponse
+    image_right: ImageVaultAssetResponse
     system: {
       uid: string
     }

types/requests/pageType.ts

@@ -2,5 +2,6 @@ export enum PageTypeEnum {
   accountPage = "account-page",
   loyaltyPage = "loyalty-page",
   hotelPage = "hotel-page",
+  contentPage = "content-page",
   currentBlocksPage = "current-blocks-page",
 }

types/rte/attrs.ts

@@ -1,4 +1,4 @@
-import { InsertResponse } from "../components/imageVaultImage"
+import { ImageVaultAssetResponse } from "../components/imageVault"
 import { RTEItemTypeEnum } from "./enums"
 
 import type { Lang } from "@/constants/languages"
@@ -39,7 +39,9 @@ export interface RTELinkAttrs extends Attributes {
   type: RTEItemTypeEnum.entry
 }
 
-export interface RTEImageVaultAttrs extends Attributes, InsertResponse {
+export interface RTEImageVaultAttrs
+  extends Attributes,
+    ImageVaultAssetResponse {
   height: string
   width: string
   style: string[]

types/trpc/routers/contentstack/contentPage.ts

@@ -0,0 +1,13 @@
+import { z } from "zod"
+
+import { validateContentPageSchema } from "@/server/routers/contentstack/contentPage/output"
+
+import { ImageVaultAsset } from "@/types/components/imageVault"
+
+export type ContentPageDataRaw = z.infer<typeof validateContentPageSchema>
+
+type ContentPageRaw = ContentPageDataRaw["content_page"]
+
+export type ContentPage = Omit<ContentPageRaw, "hero_image"> & {
+  heroImage?: ImageVaultAsset
+}

types/user.ts

@@ -1,6 +1,6 @@
 import { z } from "zod"
 
-import { getUserSchema } from "@/server/routers/user/output"
+import { creditCardSchema, getUserSchema } from "@/server/routers/user/output"
 
 type Journey = {
   tag: string
@@ -28,3 +28,5 @@ export interface User extends z.infer<typeof getUserSchema> {
   shortcuts: ShortcutLink[]
   victories: Victory[]
 }
+
+export type CreditCard = z.output<typeof creditCardSchema>