refactor(SW-302): update naming

This commit is contained in:
Matilda Landström
2024-09-17 15:42:15 +02:00
parent 369710b0a7
commit 02cb03f154
5 changed files with 17 additions and 18 deletions

View File

@@ -24,7 +24,6 @@
display: grid; display: grid;
gap: var(--Spacing-x1); gap: var(--Spacing-x1);
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
grid-auto-flow: dense;
} }
.mobileGrid { .mobileGrid {

View File

@@ -41,7 +41,7 @@ import {
TWENTYFOUR_HOURS, TWENTYFOUR_HOURS,
} from "./utils" } from "./utils"
import { facilityEnum } from "@/types/components/hotelPage/facilities" import { FacilityEnum } from "@/types/components/hotelPage/facilities"
import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel" import { AvailabilityEnum } from "@/types/components/hotelReservation/selectHotel/selectHotel"
import type { RequestOptionsWithOutBody } from "@/types/fetch" import type { RequestOptionsWithOutBody } from "@/types/fetch"
import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage" import type { GetHotelPageData } from "@/types/trpc/routers/contentstack/hotelPage"
@@ -216,15 +216,15 @@ export const hotelQueryRouter = router({
const facilities: Array<Facility> = [ const facilities: Array<Facility> = [
{ {
...apiJson.data.attributes.restaurantImages, ...apiJson.data.attributes.restaurantImages,
id: facilityEnum.restaurant, id: FacilityEnum.restaurant,
}, },
{ {
...apiJson.data.attributes.conferencesAndMeetings, ...apiJson.data.attributes.conferencesAndMeetings,
id: facilityEnum.conference, id: FacilityEnum.conference,
}, },
{ {
...apiJson.data.attributes.healthAndWellness, ...apiJson.data.attributes.healthAndWellness,
id: facilityEnum.wellness, id: FacilityEnum.wellness,
}, },
] ]

View File

@@ -1,18 +1,18 @@
import type { CardProps } from "@/components/TempDesignSystem/Card/card" import type { CardProps } from "@/components/TempDesignSystem/Card/card"
export type Facility = Array<CardProps> export type FacilityCards = Array<CardProps>
export type Facilities = Array<Facility> export type Facilities = Array<FacilityCards>
export type FacilityProps = { export type FacilityProps = {
facilities: Facilities facilities: Facilities
} }
export type CardGridProps = { export type CardGridProps = {
facility: Facility facility: FacilityCards
} }
export enum facilityEnum { export enum FacilityEnum {
wellness = "wellness-and-exercise", wellness = "wellness-and-exercise",
conference = "meetings-and-conferences", conference = "meetings-and-conferences",
restaurant = "restaurant-and-bar", restaurant = "restaurant-and-bar",

View File

@@ -9,8 +9,8 @@ import { getLang } from "@/i18n/serverContext"
import { import {
type Facilities, type Facilities,
type Facility as f, type FacilityCards,
facilityEnum, FacilityEnum,
} from "@/types/components/hotelPage/facilities" } from "@/types/components/hotelPage/facilities"
import type { ImageVaultAsset } from "@/types/components/imageVault" import type { ImageVaultAsset } from "@/types/components/imageVault"
import type { CardProps } from "@/components/TempDesignSystem/Card/card" import type { CardProps } from "@/components/TempDesignSystem/Card/card"
@@ -25,7 +25,7 @@ type ActivityCard = {
contentPage: Array<{ href: string }> contentPage: Array<{ href: string }>
} }
export function setActivityCard(activitiesCard: ActivityCard): f { export function setActivityCard(activitiesCard: ActivityCard): FacilityCards {
const hasImage = activitiesCard.background_image const hasImage = activitiesCard.background_image
return [ return [
{ {
@@ -83,7 +83,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
}) })
switch (facility.id) { switch (facility.id) {
case facilityEnum.wellness: case FacilityEnum.wellness:
card.theme = "one" card.theme = "one"
card.id = "wellness-and-exercise" card.id = "wellness-and-exercise"
;(card.heading = intl.formatMessage({ id: "Sauna and gym" })), ;(card.heading = intl.formatMessage({ id: "Sauna and gym" })),
@@ -97,7 +97,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
grid.unshift(card) grid.unshift(card)
break break
case facilityEnum.conference: case FacilityEnum.conference:
card.theme = "primaryDim" card.theme = "primaryDim"
card.id = "meetings-and-conferences" card.id = "meetings-and-conferences"
;(card.heading = intl.formatMessage({ ;(card.heading = intl.formatMessage({
@@ -111,7 +111,7 @@ export async function setFacilityCards(facilities: Array<Facility>) {
grid.push(card) grid.push(card)
break break
case facilityEnum.restaurant: case FacilityEnum.restaurant:
card.theme = "primaryDark" card.theme = "primaryDark"
card.id = "restaurant-and-bar" card.id = "restaurant-and-bar"
card.heading = intl.formatMessage({ card.heading = intl.formatMessage({

View File

@@ -1,8 +1,8 @@
import type { Facility } from "@/types/components/hotelPage/facilities" import type { FacilityCards } from "@/types/components/hotelPage/facilities"
import type { CardProps } from "@/components/TempDesignSystem/Card/card" import type { CardProps } from "@/components/TempDesignSystem/Card/card"
export function sortCards(grid: Facility) { export function sortCards(cards: FacilityCards) {
const sortedCards = grid.slice(0).sort((a: CardProps, b: CardProps) => { const sortedCards = cards.slice(0).sort((a: CardProps, b: CardProps) => {
if (!a.backgroundImage && b.backgroundImage) { if (!a.backgroundImage && b.backgroundImage) {
return 1 return 1
} }