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
This commit is contained in:
Anton Gunnarsson
2025-02-26 10:36:17 +00:00
committed by Linus Flood
parent 667cab6fb6
commit 80100e7631
2731 changed files with 30986 additions and 23708 deletions

View File

@@ -0,0 +1,37 @@
import {
BedDoubleIcon,
BedSingleIcon,
KingBedSmallIcon,
} from "@/components/Icons"
import type { FC } from "react"
import type { IconProps } from "@/types/components/icon"
export function getBedIcon(name: string): FC<IconProps> | null {
const iconMappings = [
{
icon: BedDoubleIcon,
texts: ["Queen"],
},
{
icon: KingBedSmallIcon,
texts: ["King"],
},
{
icon: KingBedSmallIcon,
texts: ["CustomOccupancy"],
},
{
icon: BedSingleIcon,
texts: ["Twin"],
},
{
icon: BedSingleIcon,
texts: ["Single"],
},
]
const icon = iconMappings.find((icon) => icon.texts.includes(name))
return icon ? icon.icon : BedSingleIcon
}

View File

@@ -0,0 +1,240 @@
import {
AcIcon,
AirplaneIcon,
BalconyIcon,
BathtubIcon,
BedDoubleIcon,
BedHotelIcon,
BedroomParentIcon,
BedSingleIcon,
BikeIcon,
BreakfastIcon,
BusinessIcon,
CableIcon,
ChairIcon,
CityIcon,
CoffeeAltIcon,
CoffeeIcon,
CoffeeMakerIcon,
ConciergeIcon,
CoolIcon,
DeskIcon,
DiningIcon,
ElectricBikeIcon,
FamilyIcon,
FitnessIcon,
FootstoolIcon,
HairdryerIcon,
HandSoapIcon,
HealthBeautyIcon,
HeartIcon,
IronIcon,
KayakingIcon,
KettleIcon,
LaptopIcon,
LaundryMachineIcon,
LocalBarIcon,
LuggageIcon,
MicrowaveIcon,
MirrorIcon,
NatureIcon,
NightlifeIcon,
NoSmokingIcon,
OutdoorFurnitureIcon,
ParkingIcon,
PetsIcon,
PhoneIcon,
RestaurantIcon,
RoomServiceIcon,
SafetyBoxIcon,
SaunaIcon,
ShowerIcon,
SpeakerIcon,
StoreIcon,
StreetIcon,
SwimIcon,
TshirtWashIcon,
TvCastingIcon,
WifiIcon,
WindowCurtainsAltIcon,
WindowNotAvailableIcon,
WineBarIcon,
WoodFloorIcon,
YardIcon,
} from "@/components/Icons"
import type { FC } from "react"
import type { IconProps } from "@/types/components/icon"
export function getFacilityIcon(
name: string | undefined
): FC<IconProps> | null {
if (!name) {
return HeartIcon
}
const normalizedName = name.toLowerCase()
const iconMappings = [
{ icon: AcIcon, name: "aircondition" },
{ icon: AirplaneIcon, name: "airport" },
{ icon: BalconyIcon, name: "balcony" },
{ icon: BalconyIcon, name: "balconyorterrace" },
{ icon: BalconyIcon, name: "frenchbalcony" },
{ icon: BathtubIcon, name: "bathroomwithbathtub" },
{ icon: BathtubIcon, name: "bathroomwithshowerandbathtub" },
{ icon: BathtubIcon, name: "bathroomwithshowerorbathtub" },
{ icon: BedDoubleIcon, name: "adjustablebeds" },
{ icon: BedDoubleIcon, name: "setoftwopillows" },
{ icon: BedHotelIcon, name: "armchairbed" },
{ icon: BedHotelIcon, name: "pulloutbed" },
{ icon: BedroomParentIcon, name: "separatebedroom" },
{ icon: BedSingleIcon, name: "extrabed" },
{ icon: BikeIcon, name: "bikeforloan" },
{ icon: BreakfastIcon, name: "breakfast" },
{ icon: BreakfastIcon, name: "servesbreakfastalwaysincluded" },
{ icon: BusinessIcon, name: "meetingconferencefacilities" },
{ icon: BusinessIcon, name: "meetingrooms" },
{ icon: CableIcon, name: "internetwithcableintheroom" },
{ icon: ChairIcon, name: "armchair" },
{ icon: ChairIcon, name: "connectingrooms" },
{ icon: CityIcon, name: "viewcityview" },
{ icon: CoffeeAltIcon, name: "nespressomachine" },
{ icon: CoffeeIcon, name: "café" },
{ icon: CoffeeIcon, name: "coffee" },
{ icon: CoffeeMakerIcon, name: "coffeemachine" },
{ icon: ConciergeIcon, name: "lifestyleconcierge" },
{ icon: CoolIcon, name: "aircooling" },
{ icon: CoolIcon, name: "cooler" },
{ icon: CoolIcon, name: "coolingcabinet" },
{ icon: DeskIcon, name: "deskandchair" },
{ icon: DiningIcon, name: "diningarea" },
{ icon: DiningIcon, name: "tablefordining" },
{ icon: ElectricBikeIcon, name: "ebikeschargingstation" },
{ icon: FamilyIcon, name: "extrafamilyfriendly" },
{ icon: FitnessIcon, name: "gym" },
{ icon: FootstoolIcon, name: "footstool" },
{ icon: HairdryerIcon, name: "hairdryer" },
{ icon: HandSoapIcon, name: "toiletries" },
{ icon: HealthBeautyIcon, name: "beautysalon" },
{ icon: HeartIcon, name: "bathrobes" },
{ icon: HeartIcon, name: "bathroom2separatebathrooms" },
{ icon: HeartIcon, name: "bodycareproducts" },
{ icon: HeartIcon, name: "bodylotion" },
{ icon: HeartIcon, name: "bowling" },
{ icon: HeartIcon, name: "bunkbed" },
{ icon: HeartIcon, name: "bunkbed80x188cm" },
{ icon: HeartIcon, name: "carpetingwalltowallcarpet" },
{ icon: HeartIcon, name: "cashfree800pmtill0600am" },
{ icon: HeartIcon, name: "cashfreehotel" },
{ icon: HeartIcon, name: "coffeevoucher" },
{ icon: HeartIcon, name: "complimentarycoldrefreshments" },
{ icon: HeartIcon, name: "conditioner" },
{ icon: HeartIcon, name: "conventioncentre" },
{ icon: HeartIcon, name: "disabledparking" },
{ icon: HeartIcon, name: "dockingstationforipodipad" },
{ icon: HeartIcon, name: "dryingcabinet" },
{ icon: HeartIcon, name: "easyaccess" },
{ icon: HeartIcon, name: "garmentsteamer" },
{ icon: HeartIcon, name: "highfloor" },
{ icon: HeartIcon, name: "icemachine" },
{ icon: HeartIcon, name: "icemachinereception" },
{ icon: HeartIcon, name: "jaccuzzi" },
{ icon: HeartIcon, name: "jacuzzi" },
{ icon: HeartIcon, name: "kitchen" },
{ icon: HeartIcon, name: "kitchenette" },
{ icon: HeartIcon, name: "latecheckoutuntil1400guaranteed" },
{ icon: HeartIcon, name: "livemusicexhibitions" },
{ icon: HeartIcon, name: "massage" },
{ icon: HeartIcon, name: "meetingarea" },
{ icon: HeartIcon, name: "minibarincludedinroomrate" },
{ icon: HeartIcon, name: "overnightsecurity" },
{ icon: HeartIcon, name: "parkingadditionalcost" },
{ icon: HeartIcon, name: "privatesauna" },
{ icon: HeartIcon, name: "refrigerator" },
{ icon: HeartIcon, name: "seatingarea" },
{ icon: HeartIcon, name: "security24hoours" },
{ icon: HeartIcon, name: "separatelivingroom" },
{ icon: HeartIcon, name: "separatetoilet" },
{ icon: HeartIcon, name: "servicesecurity24h" },
{ icon: HeartIcon, name: "shampoo" },
{ icon: HeartIcon, name: "slippers" },
{ icon: HeartIcon, name: "sofabed" },
{ icon: HeartIcon, name: "sofas" },
{ icon: HeartIcon, name: "sofawithtable" },
{ icon: HeartIcon, name: "spaciousroom" },
{ icon: HeartIcon, name: "stillandsparklingwater" },
{ icon: HeartIcon, name: "table" },
{ icon: HeartIcon, name: "tassimocoffeemaker" },
{ icon: HeartIcon, name: "terrace" },
{ icon: HeartIcon, name: "trouserpress" },
{ icon: HeartIcon, name: "tv" },
{ icon: HeartIcon, name: "tvwithcomplimentarymoviechannels" },
{ icon: HeartIcon, name: "tvwithmoviechannels" },
{ icon: HeartIcon, name: "tvwithstreamingoption" },
{ icon: HeartIcon, name: "ventilationinroom" },
{ icon: HeartIcon, name: "view" },
{ icon: HeartIcon, name: "viewfjordview" },
{ icon: HeartIcon, name: "viewlakeview" },
{ icon: HeartIcon, name: "viewpanoramicview" },
{ icon: HeartIcon, name: "viewseaview" },
{ icon: HeartIcon, name: "wallbed" },
{ icon: HeartIcon, name: "wallmountedcyclerack" },
{ icon: HeartIcon, name: "wardrobe" },
{ icon: HeartIcon, name: "wellnessandsaunaentrancefeeadmission16years" },
{ icon: HeartIcon, name: "wellnesspoolsaunaentrancefeeadmission16years" },
{ icon: HeartIcon, name: "windownook" },
{ icon: IronIcon, name: "ironandironingboard" },
{ icon: IronIcon, name: "ironingroom" },
{ icon: KayakingIcon, name: "kayaksforloan" },
{ icon: KettleIcon, name: "kettle" },
{ icon: KettleIcon, name: "kettlewithcoffeetea" },
{ icon: LaptopIcon, name: "laptopsafe" },
{ icon: LaptopIcon, name: "laptoptray" },
{ icon: LaundryMachineIcon, name: "laundryservice" },
{ icon: LocalBarIcon, name: "bar" },
{ icon: LocalBarIcon, name: "rooftopbar" },
{ icon: LocalBarIcon, name: "skybar" },
{ icon: LuggageIcon, name: "luggagelockers" },
{ icon: MicrowaveIcon, name: "microwave" },
{ icon: MirrorIcon, name: "cosmeticmirror" },
{ icon: NatureIcon, name: "viewparkview" },
{ icon: NightlifeIcon, name: "disconightclub" },
{ icon: NoSmokingIcon, name: "nonsmoking" },
{ icon: OutdoorFurnitureIcon, name: "outdoorterrace" },
{ icon: ParkingIcon, name: "parking" },
{ icon: ParkingIcon, name: "parkingfreeparking" },
{ icon: PetsIcon, name: "petfriendlyrooms" },
{ icon: PhoneIcon, name: "directdialphoneandvoicemail" },
{ icon: RestaurantIcon, name: "restaurant" },
{ icon: RoomServiceIcon, name: "roomservice" },
{ icon: SafetyBoxIcon, name: "safetybox" },
{ icon: SaunaIcon, name: "sauna" },
{ icon: ShowerIcon, name: "bathroomwithshower" },
{ icon: ShowerIcon, name: "rainshower" },
{ icon: ShowerIcon, name: "sharedbathroomwithshower" },
{ icon: ShowerIcon, name: "showergel" },
{ icon: ShowerIcon, name: "showerproductsscentbygrandcentral" },
{ icon: SpeakerIcon, name: "modernvinylplayer" },
{ icon: SpeakerIcon, name: "musicplayer" },
{ icon: StoreIcon, name: "hairdresser" },
{ icon: StoreIcon, name: "shop" },
{ icon: StreetIcon, name: "viewstreetview" },
{ icon: SwimIcon, name: "pool" },
{ icon: TshirtWashIcon, name: "handwash" },
{ icon: TvCastingIcon, name: "tvwithchromecast" },
{ icon: WifiIcon, name: "freewifi" },
{ icon: WindowCurtainsAltIcon, name: "blackoutcurtains" },
{ icon: WindowNotAvailableIcon, name: "nowindow" },
{ icon: WineBarIcon, name: "minibar" },
{ icon: WoodFloorIcon, name: "woodenfloor" },
{ icon: YardIcon, name: "viewatriumview" },
]
const icon = iconMappings.find(
(icon) => icon.name.toLowerCase() === normalizedName
)
return icon ? icon.icon : HeartIcon
}

View File

@@ -0,0 +1,140 @@
import { useIntl } from "react-intl"
import ImageGallery from "@/components/ImageGallery"
import SidePeek from "@/components/TempDesignSystem/SidePeek"
import Body from "@/components/TempDesignSystem/Text/Body"
import Caption from "@/components/TempDesignSystem/Text/Caption"
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
import { mapApiImagesToGalleryImages } from "@/utils/imageGallery"
import { getBedIcon } from "./bedIcon"
import { getFacilityIcon } from "./facilityIcon"
import styles from "./roomSidePeek.module.css"
import { SidePeekEnum } from "@/types/components/hotelReservation/sidePeek"
import type { RoomSidePeekProps } from "@/types/components/sidePeeks/roomSidePeek"
export default function RoomSidePeek({
room,
activeSidePeek,
close,
}: RoomSidePeekProps) {
const intl = useIntl()
const roomSize = room.roomSize
const totalOccupancy = room.totalOccupancy
const roomDescription = room.descriptions.medium
const galleryImages = mapApiImagesToGalleryImages(room.images)
return (
<SidePeek
title={room.name}
isOpen={activeSidePeek === SidePeekEnum.roomDetails}
handleClose={close}
>
<div className={styles.wrapper}>
<div className={styles.mainContent}>
{totalOccupancy && (
<Caption color="uiTextMediumContrast" className={styles.guests}>
{intl.formatMessage(
{
id: "Max. {max, plural, one {{range} guest} other {{range} guests}}",
},
{
max: totalOccupancy.max,
range: totalOccupancy.range,
}
)}
</Caption>
)}
{roomSize && (
<Caption color="uiTextMediumContrast">
{roomSize.min === roomSize.max
? intl.formatMessage(
{ id: "{roomSize} m²" },
{
roomSize: roomSize.min,
}
)
: intl.formatMessage(
{
id: "{roomSizeMin}{roomSizeMax} m²",
},
{
roomSizeMin: roomSize.min,
roomSizeMax: roomSize.max,
}
)}
</Caption>
)}
<div className={styles.imageContainer}>
<ImageGallery
images={galleryImages}
title={room.name}
height={280}
/>
</div>
<Body color="uiTextHighContrast">{roomDescription}</Body>
</div>
<div className={styles.listContainer}>
<Subtitle type="two" color="uiTextHighContrast">
{intl.formatMessage({ id: "Room amenities" })}
</Subtitle>
<ul className={styles.facilityList}>
{room.roomFacilities
.sort((a, b) => a.sortOrder - b.sortOrder)
.map((facility) => {
const Icon = getFacilityIcon(facility.icon)
return (
<li key={facility.name}>
{Icon && (
<Icon
width={24}
height={24}
color="uiTextMediumContrast"
/>
)}
<Body
asChild
className={!Icon ? styles.noIcon : undefined}
color="uiTextMediumContrast"
>
<span>{facility.name}</span>
</Body>
</li>
)
})}
</ul>
</div>
<div className={styles.listContainer}>
<Subtitle type="two" color="uiTextHighContrast">
{intl.formatMessage({ id: "Bed options" })}
</Subtitle>
<Body color="grey">
{intl.formatMessage({ id: "Based on availability" })}
</Body>
<ul className={styles.bedOptions}>
{room.roomTypes.map((roomType) => {
const BedIcon = getBedIcon(roomType.mainBed.type)
return (
<li key={roomType.code}>
{BedIcon && (
<BedIcon
color="uiTextMediumContrast"
width={24}
height={24}
/>
)}
<Body color="uiTextMediumContrast" asChild>
<span>{roomType.mainBed.description}</span>
</Body>
</li>
)
})}
</ul>
</div>
</div>
</SidePeek>
)
}

View File

@@ -0,0 +1,69 @@
.button {
margin-left: auto;
padding: 0 0 0 var(--Spacing-x-half);
text-decoration: none;
}
.wrapper {
display: flex;
flex-direction: column;
gap: var(--Spacing-x2);
position: relative;
margin-bottom: calc(
var(--Spacing-x4) * 2 + 80px
); /* Creates space between the wrapper and buttonContainer */
}
.mainContent,
.listContainer {
display: flex;
flex-direction: column;
gap: var(--Spacing-x-one-and-half);
}
.imageContainer {
position: relative;
border-radius: var(--Corner-radius-Medium);
overflow: hidden;
}
.imageContainer img {
width: 100%;
aspect-ratio: 16/9;
object-fit: cover;
}
.facilityList {
column-count: 2;
column-gap: var(--Spacing-x2);
}
.facilityList li {
display: flex !important; /* Overrides the display none from grids.stackable on Hotel Page */
gap: var(--Spacing-x1);
margin-bottom: var(--Spacing-x-half);
}
.bedOptions li {
display: flex;
gap: var(--Spacing-x1);
margin-bottom: var(--Spacing-x-half);
}
.facilityList li svg {
flex-shrink: 0;
}
.noIcon {
margin-left: var(--Spacing-x4);
}
.buttonContainer {
background-color: var(--Base-Background-Primary-Normal);
border-top: 1px solid var(--Base-Border-Subtle);
padding: var(--Spacing-x4) var(--Spacing-x2);
width: 100%;
position: absolute;
left: 0;
bottom: 0;
}