Merged in feat/SW-1711-switch-icons (pull request #1558)

Switches out all the old icons to new ones, and moves them to the design system. The new icons are of three different types: Materialise Symbol, Nucleo, and Customized. Also adds further mapping between facilities/amenities and icons. Approved-by: Michael Zetterberg Approved-by: Erik Tiekstra
2025-03-27 09:42:52 +00:00
parent 93c7fe64bf
commit 5de2a993a7
524 changed files with 4442 additions and 6802 deletions
@@ -1,6 +1,5 @@
-import { FacilityCard, FacilityImage } from "./hotelPage/facilities"
-
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
+import type { FacilityCard, FacilityImage } from "./hotelPage/facilities"

 export interface CardImageProps extends React.HTMLAttributes<HTMLDivElement> {
  card: FacilityCard | CardProps
@@ -1,4 +1,4 @@
-import { NavigationItem } from "@/server/routers/contentstack/base/output"
+import type { NavigationItem } from "@/server/routers/contentstack/base/output"

 export type FooterNavigationProps = {
  linkGroups: NavigationItem[]
@@ -3,7 +3,7 @@ import type {
  CurrentHeaderLink,
  TopMenuHeaderLink,
 } from "@/types/requests/currentHeader"
-import { User } from "@/types/user"
+import type { User } from "@/types/user"

 export type MainMenuProps = {
  frontpageLinkText: string
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"

-import {
+import type {
  validateFooterConfigSchema,
  validateFooterRefConfigSchema,
  validateLinkItem,
@@ -1,3 +1,5 @@
+import type { IconName } from "@/components/Icons/iconName"
+
 export type SocialIconsProps = {
-  iconName: string
+  iconName: IconName
 }
@@ -1,6 +1,6 @@
 import type { LinkProps } from "next/link"

-import type { IconName } from "../icon"
+import type { IconName } from "@/components/Icons/iconName"

 export interface HeaderLinkProps extends React.PropsWithChildren {
  href: LinkProps["href"]
@@ -1,6 +0,0 @@
-import type { Hotel } from "@/types/hotel"
-
-export type HotelLogoProps = {
-  hotelId: Hotel["operaId"]
-  hotelType: Hotel["hotelType"]
-}
@@ -1,4 +1,4 @@
-import { Hotel } from "@/types/hotel"
+import type { Hotel } from "@/types/hotel"

 export type HotelSelectionHeaderProps = {
  hotel: Hotel
@@ -1,130 +0,0 @@
-import type { VariantProps } from "class-variance-authority"
-
-import type { iconVariants } from "@/components/Icons/variants"
-
-export interface IconProps
-  extends Omit<React.SVGAttributes<HTMLOrSVGElement>, "color">,
-    VariantProps<typeof iconVariants> {}
-
-export enum IconName {
-  Accesories = "Accesories",
-  Accessibility = "Accessibility",
-  AccountCircle = "AccountCircle",
-  Air = "Air",
-  Airplane = "Airplane",
-  ArrowFrom = "ArrowFrom",
-  ArrowRight = "ArrowRight",
-  ArrowTo = "ArrowTo",
-  Bar = "Bar",
-  Bed = "Bed",
-  Biking = "Biking",
-  Business = "Business",
-  Calendar = "Calendar",
-  Camera = "Camera",
-  Cellphone = "Cellphone",
-  Check = "Check",
-  CheckCircle = "CheckCircle",
-  ChevronDown = "ChevronDown",
-  ChevronDownSmall = "ChevronDownSmall",
-  ChevronLeft = "ChevronLeft",
-  ChevronLeftSmall = "ChevronLeftSmall",
-  ChevronRight = "ChevronRight",
-  ChevronRightSmall = "ChevronRightSmall",
-  ChevronUp = "ChevronUp",
-  ChevronUpSmall = "ChevronUpSmall",
-  Close = "Close",
-  CloseLarge = "CloseLarge",
-  CoffeeAlt = "CoffeeAlt",
-  Coin = "Coin",
-  Concierge = "Concierge",
-  ConvenienceStore24h = "ConvenienceStore24h",
-  Cool = "Cool",
-  CroissantCoffeeEgg = "CroissantCoffeeEgg",
-  CrossCircle = "CrossCircle",
-  CrossCircleOutline = "CrossCircleOutline",
-  Cultural = "Cultural",
-  CutleryOne = "CutleryOne",
-  CutleryTwo = "CutleryTwo",
-  Diamond = "Diamond",
-  Directions = "Directions",
-  DoorOpen = "DoorOpen",
-  Dresser = "Dresser",
-  ElectricBike = "ElectricBike",
-  ElectricCar = "ElectricCar",
-  Email = "Email",
-  ExternalLink = "ExternalLink",
-  EyeHide = "EyeHide",
-  EyeShow = "EyeShow",
-  Facebook = "Facebook",
-  Fan = "Fan",
-  Fitness = "Fitness",
-  Footstool = "Footstool",
-  Gallery = "Gallery",
-  Garage = "Garage",
-  Gift = "Gift",
-  GiftOpen = "GiftOpen",
-  Globe = "Globe",
-  Golf = "Golf",
-  Groceries = "Groceries",
-  Hanger = "Hanger",
-  HangerAlt = "HangerAlt",
-  HandKey = "HandKey",
-  KidsMocktail = "KidsMocktail",
-  Heat = "Heat",
-  House = "House",
-  HotelNight = "HotelNight",
-  Image = "Image",
-  InfoCircle = "InfoCircle",
-  Instagram = "Instagram",
-  Kayaking = "Kayaking",
-  Kettle = "Kettle",
-  Kids = "Kids",
-  Lamp = "Lamp",
-  LaundryMachine = "LaundryMachine",
-  Link = "Link",
-  LocalBar = "LocalBar",
-  Location = "Location",
-  Lock = "Lock",
-  MagicWand = "MagicWand",
-  Map = "Map",
-  Minus = "Minus",
-  MoneyHand = "MoneyHand",
-  Museum = "Museum",
-  Nature = "Nature",
-  Nightlife = "Nightlife",
-  NoSmoking = "NoSmoking",
-  OpenInNew = "OpenInNew",
-  OpenInNewSmall = "OpenInNewSmall",
-  OutdoorFurniture = "OutdoorFurniture",
-  Parking = "Parking",
-  People2 = "People2",
-  Person = "Person",
-  Pets = "Pets",
-  Phone = "Phone",
-  Plus = "Plus",
-  PlusCircle = "PlusCircle",
-  PriceTag = "PriceTag",
-  Restaurant = "Restaurant",
-  RoomService = "RoomService",
-  Sauna = "Sauna",
-  Search = "Search",
-  Service = "Service",
-  Shopping = "Shopping",
-  Skateboarding = "Skateboarding",
-  Smoking = "Smoking",
-  Snowflake = "Snowflake",
-  Spa = "Spa",
-  StarFilled = "StarFilled",
-  Street = "Street",
-  Swim = "Swim",
-  Swipe = "Swipe",
-  Thermostat = "Thermostat",
-  Train = "Train",
-  Tripadvisor = "Tripadvisor",
-  Tshirt = "Tshirt",
-  TshirtWash = "TshirtWash",
-  TvCasting = "TvCasting",
-  Voucher = "Voucher",
-  WarningTriangle = "WarningTriangle",
-  Wifi = "Wifi",
-}
@@ -1,4 +1,4 @@
-import { User } from "@/types/user"
+import type { User } from "@/types/user"

 export interface FriendProps
  extends React.PropsWithChildren<Pick<User, "membership" | "name">> {}
@@ -1,8 +1,7 @@
-import { VariantProps } from "class-variance-authority"
-
-import { membershipNumberVariants } from "@/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants"
+import type { VariantProps } from "class-variance-authority"

 import type { User } from "@/types/user"
+import type { membershipNumberVariants } from "@/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants"

 export interface MembershipNumberProps
  extends Omit<React.HTMLAttributes<HTMLDivElement>, "color">,
@@ -3,7 +3,8 @@ import {
  type REWARD_IDS,
 } from "@/constants/rewards"

-import type { IconProps } from "@/types/components/icon"
+import type { LogoAndIllustrationProps } from "@scandic-hotels/design-system/Icons"
+
 import type {
  ApiReward,
  BenefitReward,
@@ -13,9 +14,9 @@ import type {

 export type { BaseReward, Campaign, Reward, Surprise, Tier }

-export interface RewardIconProps extends IconProps {
+export interface RewardIconProps extends LogoAndIllustrationProps {
  rewardId: string
-  size?: "small" | "medium" | "large"
+  iconSize?: "small" | "medium" | "large"
 }

 export type RewardId = (typeof REWARD_IDS)[keyof typeof REWARD_IDS]
@@ -1,4 +1,4 @@
-import { Stay } from "@/server/routers/user/output"
+import type { Stay } from "@/server/routers/user/output"

 export type Page = {
  data: Stay[]
@@ -1,6 +1,5 @@
-import { userQueryRouter } from "@/server/routers/user/query"
-
 import type { User } from "@/types/user"
+import type { userQueryRouter } from "@/server/routers/user/query"

 export type UserQueryRouter = typeof userQueryRouter

@@ -1,9 +1,8 @@
-import { VariantProps } from "class-variance-authority"
-
-import { teaserCardVariants } from "@/components/TempDesignSystem/TeaserCard/variants"
+import type { VariantProps } from "class-variance-authority"

 import type { ImageVaultAsset } from "@/types/components/imageVault"
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
+import type { teaserCardVariants } from "@/components/TempDesignSystem/TeaserCard/variants"
 import type { TeaserCard } from "../trpc/routers/contentstack/blocks"

 interface SidePeekButton {
@@ -1,6 +1,6 @@
 import { z } from "zod"

-import { IconName } from "../components/icon"
+import { IconName } from "@/components/Icons/iconName"

 export namespace UspGridEnum {
  export const enum icons {
@@ -1,8 +1,7 @@
-import { LoginType } from "./components/tracking"
-
 import type { DefaultJWT } from "next-auth/jwt"

 import type { RefreshTokenError } from "./authError"
+import type { LoginType } from "./components/tracking"

 // Module augmentation
 // https://authjs.dev/getting-started/typescript#popular-interfaces-to-augment
@@ -1,5 +1,4 @@
-import { Lang } from "@/constants/languages"
-
+import type { Lang } from "@/constants/languages"
 import type { System } from "../system"
 import type { AllRequestResponse } from "../utils/all"
 import type { Edges } from "../utils/edges"
@@ -1,3 +1,3 @@
-import { Lang } from "@/constants/languages"
+import type { Lang } from "@/constants/languages"

 export type LangRoute = Record<Lang, string>
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"

-import {
+import type {
  breadcrumbsRefsSchema,
  breadcrumbsSchema,
  rawBreadcrumbsDataSchema,
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"

-import {
+import type {
  blocksSchema,
  collectionPageRefsSchema,
  collectionPageSchema,
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"

-import {
+import type {
  validateLinkItem,
  validateLinksWithType,
  validateSecondaryLinks,
@@ -1,6 +1,6 @@
-import { z } from "zod"
+import type { z } from "zod"

-import {
+import type {
  headerRefsSchema,
  headerSchema,
  menuItemSchema,