diff --git a/apps/partner-sas/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 b/apps/partner-sas/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 deleted file mode 100644 index 8c6f275f4..000000000 Binary files a/apps/partner-sas/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 and /dev/null differ diff --git a/apps/partner-sas/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 b/apps/partner-sas/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 new file mode 100644 index 000000000..3b360cdf2 Binary files /dev/null and b/apps/partner-sas/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 differ diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/index.tsx index 39da26dd0..ea974461d 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/index.tsx @@ -9,6 +9,7 @@ import { appendSlugToPathname } from "@/utils/appendSlugToPathname" import { trackClick } from "@/utils/tracking" import SidePeekImages from "../../Images" +import { getRestaurantIconName } from "./utils" import styles from "./restaurantBarItem.module.css" @@ -26,6 +27,7 @@ export default async function RestaurantBarItem({ menus, restaurantPage, mainBody, + type, } = restaurant const visibleImages = restaurant.content.images.slice(0, 2) @@ -36,8 +38,9 @@ export default async function RestaurantBarItem({ return (
+ -

{name}

+

{name}

{visibleImages.length ? : null} diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/restaurantBarItem.module.css b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/restaurantBarItem.module.css index 67d4fe419..55e197502 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/restaurantBarItem.module.css +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/restaurantBarItem.module.css @@ -6,6 +6,10 @@ .stickyHeading { position: sticky; top: 0; + display: flex; + gap: var(--Space-x1); + color: var(--Text-Interactive-Default); + align-items: center; } /* Hack to make it look like the heading has a background which covers the top of the sidepeek */ .stickyHeading::before { diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/utils.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/utils.tsx new file mode 100644 index 000000000..417c5f35c --- /dev/null +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/RestaurantBar/RestaurantBarItem/utils.tsx @@ -0,0 +1,30 @@ +import { logger } from "@scandic-hotels/common/logger" + +import type { MaterialIconProps } from "@scandic-hotels/design-system/Icons/MaterialIcon" + +import { RestaurantTypes } from "@/types/enums/restaurants" + +export function getRestaurantIconName(type: string): MaterialIconProps["icon"] { + switch (type) { + case RestaurantTypes.Restaurant: + return "restaurant" + + case RestaurantTypes.Bar: + case RestaurantTypes.RooftopBar: + case RestaurantTypes.SkyBar: + return "local_bar" + + case RestaurantTypes.Cafe: + return "local_cafe" + + case RestaurantTypes.OutdoorTerrace: + return "deck" + + case RestaurantTypes.Other: + return "brunch_dining" + + default: + logger.warn("Unsupported restaurant type") + return "restaurant" + } +} diff --git a/apps/scandic-web/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 b/apps/scandic-web/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 deleted file mode 100644 index 8c6f275f4..000000000 Binary files a/apps/scandic-web/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 and /dev/null differ diff --git a/apps/scandic-web/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 b/apps/scandic-web/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 new file mode 100644 index 000000000..3b360cdf2 Binary files /dev/null and b/apps/scandic-web/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 differ diff --git a/apps/scandic-web/types/enums/restaurants.ts b/apps/scandic-web/types/enums/restaurants.ts new file mode 100644 index 000000000..cc862cfe8 --- /dev/null +++ b/apps/scandic-web/types/enums/restaurants.ts @@ -0,0 +1,9 @@ +export enum RestaurantTypes { + Restaurant = "Restaurant", + Bar = "Bar", + RooftopBar = "RooftopBar", + SkyBar = "SkyBar", + Cafe = "Cafe", + OutdoorTerrace = "OutdoorTerrace", + Other = "Other", +} diff --git a/packages/design-system/lib/fonts.css b/packages/design-system/lib/fonts.css index 93c6d1f15..35877a742 100644 --- a/packages/design-system/lib/fonts.css +++ b/packages/design-system/lib/fonts.css @@ -269,7 +269,7 @@ font-style: normal; font-weight: 400; font-display: block; - src: url(/_static/fonts/material-symbols/rounded-9290efcd.woff2) + src: url(/_static/fonts/material-symbols/rounded-93de53b3.woff2) format('woff2'); } diff --git a/packages/design-system/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 b/packages/design-system/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 deleted file mode 100644 index 8c6f275f4..000000000 Binary files a/packages/design-system/public/_static/fonts/material-symbols/rounded-9290efcd.woff2 and /dev/null differ diff --git a/packages/design-system/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 b/packages/design-system/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 new file mode 100644 index 000000000..3b360cdf2 Binary files /dev/null and b/packages/design-system/public/_static/fonts/material-symbols/rounded-93de53b3.woff2 differ diff --git a/packages/trpc/lib/routers/hotels/schemas/hotel/include/restaurants.ts b/packages/trpc/lib/routers/hotels/schemas/hotel/include/restaurants.ts index e0d8b26a6..5913dd64f 100644 --- a/packages/trpc/lib/routers/hotels/schemas/hotel/include/restaurants.ts +++ b/packages/trpc/lib/routers/hotels/schemas/hotel/include/restaurants.ts @@ -78,18 +78,19 @@ export const restaurantsSchema = z.object({ attributes: z.object({ bookTableUrl: nullableStringValidator, content: contentSchema, + elevatorPitch: z.string().optional(), email: z.string().email().optional(), externalBreakfast: externalBreakfastSchema, isPublished: z.boolean().default(false), + mainBody: z.string().optional(), menus: z.array(menuItemSchema).default([]), name: z.string().default(""), + nameInUrl: z.string().optional(), openingDetails: z.array(openingDetailsSchema).default([]), phoneNumber: z.string().optional(), restaurantPage: z.boolean().default(false), - elevatorPitch: z.string().optional(), - nameInUrl: z.string().optional(), - mainBody: z.string().optional(), specialAlerts: specialAlertsSchema, + type: z.string(), }), id: z.string(), type: z.literal("restaurants"), diff --git a/scripts/material-symbols-update.mjs b/scripts/material-symbols-update.mjs index a2398d54c..6ccfff306 100644 --- a/scripts/material-symbols-update.mjs +++ b/scripts/material-symbols-update.mjs @@ -74,6 +74,7 @@ const icons = [ 'confirmation_number', 'connected_tv', 'content_copy', + 'brunch_dining', 'contract', 'cool_to_dry', 'countertops',