Merged in monorepo-step-1 (pull request #1080)

Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood

apps/scandic-web/components/BookingWidget/Client.tsx

@@ -0,0 +1,225 @@
+"use client"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { useEffect, useRef, useState } from "react"
+import { FormProvider, useForm } from "react-hook-form"
+
+import { dt } from "@/lib/dt"
+import { StickyElementNameEnum } from "@/stores/sticky-position"
+
+import Form, {
+  BookingWidgetFormSkeleton,
+} from "@/components/Forms/BookingWidget"
+import { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
+import { CloseLargeIcon } from "@/components/Icons"
+import useStickyPosition from "@/hooks/useStickyPosition"
+import { debounce } from "@/utils/debounce"
+import isValidJson from "@/utils/isValidJson"
+import { convertSearchParamsToObj } from "@/utils/url"
+
+import MobileToggleButton, {
+  MobileToggleButtonSkeleton,
+} from "./MobileToggleButton"
+
+import styles from "./bookingWidget.module.css"
+
+import type {
+  BookingCodeSchema,
+  BookingWidgetClientProps,
+  BookingWidgetSchema,
+  BookingWidgetSearchData,
+} from "@/types/components/bookingWidget"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+
+export default function BookingWidgetClient({
+  locations,
+  type,
+  bookingWidgetSearchParams,
+}: BookingWidgetClientProps) {
+  const [isOpen, setIsOpen] = useState(false)
+  const bookingWidgetRef = useRef(null)
+  useStickyPosition({
+    ref: bookingWidgetRef,
+    name: StickyElementNameEnum.BOOKING_WIDGET,
+  })
+
+  const bookingWidgetSearchData = bookingWidgetSearchParams
+    ? convertSearchParamsToObj<BookingWidgetSearchData>(
+        bookingWidgetSearchParams
+      )
+    : undefined
+
+  const getLocationObj = (destination: string): Location | undefined => {
+    if (destination) {
+      const location: Location | undefined = locations.find((location) => {
+        return (
+          location.name.toLowerCase() === destination.toLowerCase() ||
+          //@ts-ignore (due to operaId not property error)
+          (location.operaId && location.operaId == destination)
+        )
+      })
+      return location
+    }
+    return undefined
+  }
+
+  const reqFromDate = bookingWidgetSearchData?.fromDate?.toString()
+  const reqToDate = bookingWidgetSearchData?.toDate?.toString()
+
+  const parsedFromDate = reqFromDate ? dt(reqFromDate) : undefined
+  const parsedToDate = reqToDate ? dt(reqToDate) : undefined
+
+  const now = dt()
+
+  const isDateParamValid =
+    parsedFromDate &&
+    parsedToDate &&
+    parsedFromDate.isSameOrAfter(now, "day") &&
+    parsedToDate.isAfter(parsedFromDate)
+
+  const selectedLocation = bookingWidgetSearchData
+    ? getLocationObj(
+        (bookingWidgetSearchData.hotelId ??
+          bookingWidgetSearchData.city) as string
+      )
+    : undefined
+
+  const selectedBookingCode = bookingWidgetSearchData
+    ? bookingWidgetSearchData.bookingCode
+    : ""
+
+  const defaultRoomsData: BookingWidgetSchema["rooms"] =
+    bookingWidgetSearchData?.rooms?.map((room) => ({
+      adults: room.adults,
+      childrenInRoom: room.childrenInRoom ?? [],
+    })) ?? [
+      {
+        adults: 1,
+        childrenInRoom: [],
+      },
+    ]
+
+  const methods = useForm<BookingWidgetSchema>({
+    defaultValues: {
+      search: selectedLocation?.name ?? "",
+      location: selectedLocation ? JSON.stringify(selectedLocation) : undefined,
+      date: {
+        // UTC is required to handle requests from far away timezones https://scandichotels.atlassian.net/browse/SWAP-6375 & PET-507
+        // This is specifically to handle timezones falling in different dates.
+        fromDate: isDateParamValid
+          ? parsedFromDate.format("YYYY-MM-DD")
+          : now.utc().format("YYYY-MM-DD"),
+        toDate: isDateParamValid
+          ? parsedToDate.format("YYYY-MM-DD")
+          : now.utc().add(1, "day").format("YYYY-MM-DD"),
+      },
+      bookingCode: {
+        value: selectedBookingCode,
+        remember: false,
+      },
+      redemption: false,
+      voucher: false,
+      rooms: defaultRoomsData,
+    },
+    shouldFocusError: false,
+    mode: "onSubmit",
+    resolver: zodResolver(bookingWidgetSchema),
+    reValidateMode: "onSubmit",
+  })
+
+  function closeMobileSearch() {
+    setIsOpen(false)
+    document.body.style.overflowY = "visible"
+  }
+
+  function openMobileSearch() {
+    setIsOpen(true)
+    document.body.style.overflowY = "hidden"
+  }
+
+  useEffect(() => {
+    const debouncedResizeHandler = debounce(function ([
+      entry,
+    ]: ResizeObserverEntry[]) {
+      if (entry.contentRect.width > 1366) {
+        closeMobileSearch()
+      }
+    })
+    const observer = new ResizeObserver(debouncedResizeHandler)
+
+    observer.observe(document.body)
+
+    return () => {
+      if (observer) {
+        observer.unobserve(document.body)
+      }
+    }
+  }, [])
+
+  useEffect(() => {
+    if (typeof window !== "undefined" && !selectedLocation) {
+      const sessionStorageSearchData = sessionStorage.getItem("searchData")
+
+      const initialSelectedLocation: Location | undefined =
+        sessionStorageSearchData && isValidJson(sessionStorageSearchData)
+          ? JSON.parse(sessionStorageSearchData)
+          : undefined
+
+      initialSelectedLocation?.name &&
+        methods.setValue("search", initialSelectedLocation.name)
+      sessionStorageSearchData &&
+        methods.setValue(
+          "location",
+          encodeURIComponent(sessionStorageSearchData)
+        )
+    }
+  }, [methods, selectedLocation])
+
+  useEffect(() => {
+    if (typeof window !== "undefined" && !selectedBookingCode) {
+      const storedBookingCode = localStorage.getItem("bookingCode")
+      const initialBookingCode: BookingCodeSchema | undefined =
+        storedBookingCode && isValidJson(storedBookingCode)
+          ? JSON.parse(storedBookingCode)
+          : undefined
+
+      initialBookingCode?.remember &&
+        methods.setValue("bookingCode", initialBookingCode)
+    }
+  }, [methods, selectedBookingCode])
+
+  return (
+    <FormProvider {...methods}>
+      <section
+        ref={bookingWidgetRef}
+        className={styles.wrapper}
+        data-open={isOpen}
+      >
+        <MobileToggleButton openMobileSearch={openMobileSearch} />
+        <div className={styles.formContainer}>
+          <button
+            className={styles.close}
+            onClick={closeMobileSearch}
+            type="button"
+          >
+            <CloseLargeIcon />
+          </button>
+          <Form locations={locations} type={type} onClose={closeMobileSearch} />
+        </div>
+      </section>
+      <div className={styles.backdrop} onClick={closeMobileSearch} />
+    </FormProvider>
+  )
+}
+
+export function BookingWidgetSkeleton() {
+  return (
+    <>
+      <section className={styles.wrapper} style={{ top: 0 }}>
+        <MobileToggleButtonSkeleton />
+        <div className={styles.formContainer}>
+          <BookingWidgetFormSkeleton />
+        </div>
+      </section>
+    </>
+  )
+}

apps/scandic-web/components/BookingWidget/MobileToggleButton/button.module.css

@@ -0,0 +1,37 @@
+.complete,
+.partial {
+  align-items: center;
+  box-shadow: 0px 8px 24px 0px rgba(0, 0, 0, 0.16);
+  cursor: pointer;
+  display: grid;
+  gap: var(--Spacing-x-one-and-half);
+  padding: var(--Spacing-x2);
+  z-index: 1;
+  background-color: var(--Base-Surface-Primary-light-Normal);
+}
+
+.complete {
+  grid-template-columns: 1fr 36px;
+}
+
+.partial {
+  grid-template-columns: minmax(auto, 150px) min-content minmax(auto, 150px) auto;
+}
+
+.icon {
+  align-items: center;
+  background-color: var(--Base-Button-Primary-Fill-Normal);
+  border-radius: 50%;
+  display: flex;
+  height: 36px;
+  justify-content: center;
+  justify-self: flex-end;
+  width: 36px;
+}
+
+@media screen and (min-width: 768px) {
+  .complete,
+  .partial {
+    display: none;
+  }
+}

apps/scandic-web/components/BookingWidget/MobileToggleButton/index.tsx

@@ -0,0 +1,176 @@
+"use client"
+
+import { useWatch } from "react-hook-form"
+import { useIntl } from "react-intl"
+
+import { dt } from "@/lib/dt"
+
+import { EditIcon, SearchIcon } from "@/components/Icons"
+import SkeletonShimmer from "@/components/SkeletonShimmer"
+import Divider from "@/components/TempDesignSystem/Divider"
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
+import useLang from "@/hooks/useLang"
+import isValidJson from "@/utils/isValidJson"
+
+import styles from "./button.module.css"
+
+import type {
+  BookingWidgetSchema,
+  BookingWidgetToggleButtonProps,
+} from "@/types/components/bookingWidget"
+import type { Location } from "@/types/trpc/routers/hotel/locations"
+
+export default function MobileToggleButton({
+  openMobileSearch,
+}: BookingWidgetToggleButtonProps) {
+  const intl = useIntl()
+  const lang = useLang()
+  const d = useWatch({ name: "date" })
+  const location = useWatch({ name: "location" })
+  const rooms: BookingWidgetSchema["rooms"] = useWatch({ name: "rooms" })
+
+  const parsedLocation: Location | null =
+    location && isValidJson(location)
+      ? JSON.parse(decodeURIComponent(location))
+      : null
+
+  const selectedFromDate = dt(d.fromDate).locale(lang).format("D MMM")
+  const selectedToDate = dt(d.toDate).locale(lang).format("D MMM")
+
+  const locationAndDateIsSet = parsedLocation && d
+
+  const totalNights = dt(d.toDate).diff(dt(d.fromDate), "days")
+  const totalRooms = rooms.length
+  const totalAdults = rooms.reduce((acc, room) => {
+    if (room.adults) {
+      acc = acc + room.adults
+    }
+    return acc
+  }, 0)
+  const totalChildren = rooms.reduce((acc, room) => {
+    if (room.childrenInRoom) {
+      acc = acc + room.childrenInRoom.length
+    }
+    return acc
+  }, 0)
+
+  const totalNightsMsg = intl.formatMessage(
+    { id: "{totalNights, plural, one {# night} other {# nights}}" },
+    { totalNights }
+  )
+
+  const totalAdultsMsg = intl.formatMessage(
+    { id: "{totalAdults, plural, one {# adult} other {# adults}}" },
+    { totalAdults }
+  )
+
+  const totalChildrenMsg = intl.formatMessage(
+    { id: "{totalChildren, plural, one {# child} other {# children}}" },
+    { totalChildren }
+  )
+
+  const totalRoomsMsg = intl.formatMessage(
+    { id: "{totalRooms, plural, one {# room} other {# rooms}}" },
+    { totalRooms }
+  )
+
+  const totalDetails = [totalAdultsMsg]
+  if (totalChildren > 0) {
+    totalDetails.push(totalChildrenMsg)
+  }
+  totalDetails.push(totalRoomsMsg)
+
+  return (
+    <div
+      className={locationAndDateIsSet ? styles.complete : styles.partial}
+      onClick={openMobileSearch}
+      role="button"
+    >
+      {!locationAndDateIsSet && (
+        <>
+          <div>
+            <Caption type="bold" color="red">
+              {intl.formatMessage({ id: "Where to?" })}
+            </Caption>
+            <Body color="uiTextPlaceholder">
+              {parsedLocation
+                ? parsedLocation.name
+                : intl.formatMessage({ id: "Destination" })}
+            </Body>
+          </div>
+          <Divider color="baseSurfaceSubtleNormal" variant="vertical" />
+          <div>
+            <Caption type="bold" color="red">
+              {totalNightsMsg}
+            </Caption>
+            <Body>
+              {intl.formatMessage(
+                { id: "{selectedFromDate} - {selectedToDate}" },
+                {
+                  selectedFromDate,
+                  selectedToDate,
+                }
+              )}
+            </Body>
+          </div>
+          <div className={styles.icon}>
+            <SearchIcon color="white" />
+          </div>
+        </>
+      )}
+
+      {locationAndDateIsSet && (
+        <>
+          <div>
+            <Caption color="red">{parsedLocation?.name}</Caption>
+            <Caption>
+              {intl.formatMessage(
+                {
+                  id: "{selectedFromDate} - {selectedToDate} ({totalNights}) {details}",
+                },
+                {
+                  selectedFromDate,
+                  selectedToDate,
+                  totalNights: totalNightsMsg,
+                  details: totalDetails.join(", "),
+                }
+              )}
+            </Caption>
+          </div>
+          <div className={styles.icon}>
+            <EditIcon color="white" />
+          </div>
+        </>
+      )}
+    </div>
+  )
+}
+
+export function MobileToggleButtonSkeleton() {
+  const intl = useIntl()
+
+  return (
+    <div className={styles.partial}>
+      <div>
+        <Caption type="bold" color="red">
+          {intl.formatMessage({ id: "Where to?" })}
+        </Caption>
+        <SkeletonShimmer height="24px" />
+      </div>
+      <Divider color="baseSurfaceSubtleNormal" variant="vertical" />
+      <div>
+        <Caption type="bold" color="red">
+          {intl.formatMessage(
+            { id: "{totalNights, plural, one {# night} other {# nights}}" },
+            { totalNights: 0 }
+          )}
+        </Caption>
+        <SkeletonShimmer height="24px" />
+      </div>
+      <div className={styles.icon}>
+        <SearchIcon color="white" />
+      </div>
+    </div>
+  )
+}

apps/scandic-web/components/BookingWidget/bookingWidget.module.css

@@ -0,0 +1,63 @@
+.wrapper {
+  position: sticky;
+  z-index: var(--booking-widget-z-index);
+}
+
+.formContainer {
+  display: grid;
+  grid-template-rows: auto 1fr;
+  background-color: var(--UI-Input-Controls-Surface-Normal);
+  border-radius: var(--Corner-radius-Large) var(--Corner-radius-Large) 0 0;
+  gap: var(--Spacing-x3);
+  height: calc(100dvh - 20px);
+  width: 100%;
+  padding: var(--Spacing-x3) var(--Spacing-x2) var(--Spacing-x7);
+  position: fixed;
+  bottom: -100%;
+  transition: bottom 300ms ease;
+}
+
+.wrapper[data-open="true"] {
+  z-index: var(--booking-widget-open-z-index);
+}
+
+.wrapper[data-open="true"] .formContainer {
+  bottom: 0;
+}
+
+.close {
+  background: none;
+  border: none;
+  cursor: pointer;
+  justify-self: flex-end;
+  padding: 0;
+}
+
+.wrapper[data-open="true"] + .backdrop {
+  background-color: rgba(0, 0, 0, 0.4);
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+  z-index: calc(var(--booking-widget-open-z-index) - 1);
+}
+
+@media screen and (min-width: 768px) {
+  .wrapper {
+    top: 0;
+  }
+
+  .formContainer {
+    display: block;
+    background-color: var(--Base-Surface-Primary-light-Normal);
+    box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.05);
+    height: auto;
+    position: static;
+    padding: 0;
+  }
+
+  .close {
+    display: none;
+  }
+}

apps/scandic-web/components/BookingWidget/index.tsx

@@ -0,0 +1,37 @@
+import {
+  getLocations,
+  isBookingWidgetHidden,
+} from "@/lib/trpc/memoizedRequests"
+
+import BookingWidgetClient from "./Client"
+
+import type { BookingWidgetProps } from "@/types/components/bookingWidget"
+
+export function preload() {
+  void getLocations()
+}
+
+export default async function BookingWidget({
+  type,
+  bookingWidgetSearchParams,
+}: BookingWidgetProps) {
+  const isHidden = await isBookingWidgetHidden()
+
+  if (isHidden) {
+    return null
+  }
+
+  const locations = await getLocations()
+
+  if (!locations || "error" in locations) {
+    return null
+  }
+
+  return (
+    <BookingWidgetClient
+      locations={locations.data}
+      type={type}
+      bookingWidgetSearchParams={bookingWidgetSearchParams}
+    />
+  )
+}