Merged in feat/LOY-422-new-upcoming-stays (pull request #3121)
feat(LOY-422): Upcoming Stays Redesign * feat(LOY-422): Upcoming Stays Redesign * feat(LOY-422): Carousel next/previous arrows * chore(LOY-422): add new material icon * refactor(LOY-422): restructure new and old upcoming stays * fix(LOY-422): handle less than 1 case * chore(LOY-422): remove uneeded id * chore(LOY-422): remove intl label for date edge case Approved-by: Matilda Landström
This commit is contained in:
@@ -66,3 +66,5 @@ DTMC_ENTRA_ID_ISSUER=""
|
||||
DTMC_ENTRA_ID_SECRET=""
|
||||
|
||||
HOTEL_BRANDING="0" # 0 - disabled, 1 - enabled
|
||||
|
||||
NEW_STAYS_ON_MY_PAGES="true"
|
||||
|
||||
@@ -30,3 +30,20 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
/* Styles for new empty upcoming stays design */
|
||||
.emptyUpcomingStaysContainer {
|
||||
display: flex;
|
||||
padding: var(--Space-x6);
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: var(--Space-x3);
|
||||
border-radius: var(--Corner-radius-lg);
|
||||
background: var(--Surface-Brand-Primary-1-Default);
|
||||
}
|
||||
|
||||
.heading {
|
||||
color: var(--Text-Heading);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import ButtonLink from "@scandic-hotels/design-system/ButtonLink"
|
||||
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
|
||||
import Link from "@scandic-hotels/design-system/OldDSLink"
|
||||
import Title from "@scandic-hotels/design-system/Title"
|
||||
import { Typography } from "@scandic-hotels/design-system/Typography"
|
||||
|
||||
import { env } from "@/env/server"
|
||||
|
||||
import { getIntl } from "@/i18n"
|
||||
import { getLang } from "@/i18n/serverContext"
|
||||
@@ -13,39 +17,60 @@ export default async function EmptyUpcomingStaysBlock() {
|
||||
|
||||
const href = `/${lang}`
|
||||
|
||||
return (
|
||||
<section className={styles.container}>
|
||||
<div className={styles.titleContainer}>
|
||||
<Title
|
||||
as="h4"
|
||||
level="h3"
|
||||
color="red"
|
||||
className={styles.title}
|
||||
textAlign="center"
|
||||
if (!env.NEW_STAYS_ON_MY_PAGES) {
|
||||
return (
|
||||
<section className={styles.container}>
|
||||
<div className={styles.titleContainer}>
|
||||
<Title
|
||||
as="h4"
|
||||
level="h3"
|
||||
color="red"
|
||||
className={styles.title}
|
||||
textAlign="center"
|
||||
>
|
||||
{intl.formatMessage({
|
||||
id: "stays.noUpcomingStays",
|
||||
defaultMessage: "You have no upcoming stays.",
|
||||
})}
|
||||
<span className={styles.burgundyTitle}>
|
||||
{intl.formatMessage({
|
||||
id: "stays.whereToGoNext",
|
||||
defaultMessage: "Where should you go next?",
|
||||
})}
|
||||
</span>
|
||||
</Title>
|
||||
</div>
|
||||
<Link
|
||||
href={href}
|
||||
className={styles.link}
|
||||
color="Text/Interactive/Secondary"
|
||||
>
|
||||
{intl.formatMessage({
|
||||
id: "stays.noUpcomingStays",
|
||||
defaultMessage: "You have no upcoming stays.",
|
||||
id: "stays.getInspired",
|
||||
defaultMessage: "Get inspired",
|
||||
})}
|
||||
<span className={styles.burgundyTitle}>
|
||||
{intl.formatMessage({
|
||||
id: "stays.whereToGoNext",
|
||||
defaultMessage: "Where should you go next?",
|
||||
})}
|
||||
</span>
|
||||
</Title>
|
||||
</div>
|
||||
<Link
|
||||
href={href}
|
||||
className={styles.link}
|
||||
color="Text/Interactive/Secondary"
|
||||
>
|
||||
<MaterialIcon icon="arrow_forward" color="CurrentColor" />
|
||||
</Link>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<section className={styles.emptyUpcomingStaysContainer}>
|
||||
<Typography variant="Title/Subtitle/md">
|
||||
<p className={styles.heading}>
|
||||
{intl.formatMessage({
|
||||
id: "stays.noUpcomingStaysAtTheMoment",
|
||||
defaultMessage: "You have no upcoming stays at the moment",
|
||||
})}
|
||||
</p>
|
||||
</Typography>
|
||||
<ButtonLink href={href} variant="Tertiary" color="Primary" size="Small">
|
||||
{intl.formatMessage({
|
||||
id: "stays.getInspired",
|
||||
defaultMessage: "Get inspired",
|
||||
id: "stays.findDestinationOrHotel",
|
||||
defaultMessage: "Find destination or hotel",
|
||||
})}
|
||||
<MaterialIcon icon="arrow_forward" color="CurrentColor" />
|
||||
</Link>
|
||||
</ButtonLink>
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import { Typography } from "@scandic-hotels/design-system/Typography"
|
||||
import { getIntl } from "@/i18n"
|
||||
import { getLang } from "@/i18n/serverContext"
|
||||
|
||||
import { getDaysUntilText } from "./utils"
|
||||
import { getDaysUntilText } from "../utils/getDaysUntilText"
|
||||
|
||||
import styles from "./nextStay.module.css"
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import { env } from "@/env/server"
|
||||
import { serverClient } from "@/lib/trpc/server"
|
||||
|
||||
import { Section } from "@/components/Section"
|
||||
import { SectionHeader } from "@/components/Section/Header"
|
||||
import SectionLink from "@/components/Section/Link"
|
||||
|
||||
import EmptyUpcomingStaysBlock from "../EmptyUpcomingStays"
|
||||
import NextStayContent from "./NextStayContent"
|
||||
|
||||
import styles from "./nextStay.module.css"
|
||||
@@ -15,7 +17,7 @@ export default async function NextStay({ title, link }: NextStayProps) {
|
||||
const nextStay = await caller.user.stays.next()
|
||||
|
||||
if (!nextStay) {
|
||||
return null
|
||||
return env.NEW_STAYS_ON_MY_PAGES ? <EmptyUpcomingStaysBlock /> : null
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -29,10 +29,7 @@
|
||||
|
||||
.imageOverlay {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
inset: 0;
|
||||
background: linear-gradient(
|
||||
to bottom,
|
||||
rgba(0, 0, 0, 0.1) 0%,
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
.container {
|
||||
display: inline-grid;
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
"use client"
|
||||
|
||||
import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner"
|
||||
import { trpc } from "@scandic-hotels/trpc/client"
|
||||
|
||||
import { Carousel } from "@/components/Carousel"
|
||||
import useLang from "@/hooks/useLang"
|
||||
|
||||
import CarouselCard from "./CarouselCard"
|
||||
|
||||
import styles from "./upcoming.module.css"
|
||||
|
||||
import type {
|
||||
UpcomingStaysClientProps,
|
||||
UpcomingStaysNonNullResponseObject,
|
||||
} from "@/types/components/myPages/stays/upcoming"
|
||||
|
||||
export default function UpcomingStaysCarousel({
|
||||
initialUpcomingStays,
|
||||
}: UpcomingStaysClientProps) {
|
||||
const lang = useLang()
|
||||
const { data, isLoading } = trpc.user.stays.upcoming.useInfiniteQuery(
|
||||
{
|
||||
limit: 6,
|
||||
lang,
|
||||
},
|
||||
{
|
||||
getNextPageParam: (lastPage) => {
|
||||
return lastPage?.nextCursor
|
||||
},
|
||||
initialData: {
|
||||
pageParams: [undefined, 1],
|
||||
pages: [initialUpcomingStays],
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
if (isLoading) {
|
||||
return <LoadingSpinner />
|
||||
}
|
||||
|
||||
const stays = data.pages
|
||||
.filter((page): page is UpcomingStaysNonNullResponseObject => !!page?.data)
|
||||
.flatMap((page) => page.data)
|
||||
|
||||
if (!stays.length) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<Carousel className={styles.carousel}>
|
||||
<Carousel.Content>
|
||||
{stays.map((stay) => (
|
||||
<Carousel.Item
|
||||
key={stay.attributes.confirmationNumber}
|
||||
className={styles.carouselItem}
|
||||
>
|
||||
<CarouselCard stay={stay} />
|
||||
</Carousel.Item>
|
||||
))}
|
||||
</Carousel.Content>
|
||||
<Carousel.Previous className={styles.navigationButton} />
|
||||
<Carousel.Next className={styles.navigationButton} />
|
||||
<Carousel.Dots />
|
||||
</Carousel>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
.card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: var(--Base-Surface-Primary-light-Normal);
|
||||
border: 1px solid var(--Border-Default);
|
||||
overflow: hidden;
|
||||
border-radius: var(--Corner-radius-lg);
|
||||
}
|
||||
|
||||
.imageContainer {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
aspect-ratio: 16/9;
|
||||
border-radius: var(--Corner-radius-lg) var(--Corner-radius-lg) 0 0;
|
||||
background:
|
||||
linear-gradient(0deg, rgba(0, 0, 0, 0.4) 0%, rgba(0, 0, 0, 0.4) 100%),
|
||||
lightgray 50% / cover no-repeat,
|
||||
var(--Neutral-20);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.imageOverlay {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
background: linear-gradient(
|
||||
180deg,
|
||||
rgba(0, 0, 0, 0.4) 0%,
|
||||
rgba(0, 0, 0, 0.2) 50%,
|
||||
rgba(0, 0, 0, 0.6) 100%
|
||||
);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
z-index: 2;
|
||||
padding: var(--Space-x2);
|
||||
color: var(--Text-Inverted);
|
||||
place-content: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--Space-x1);
|
||||
padding: var(--Space-x2);
|
||||
}
|
||||
|
||||
.infoRow {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.infoItem {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--Space-x05);
|
||||
}
|
||||
|
||||
.dateRange {
|
||||
text-align: right;
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
"use client"
|
||||
|
||||
import { useIntl } from "react-intl"
|
||||
|
||||
import { dt } from "@scandic-hotels/common/dt"
|
||||
import ButtonLink from "@scandic-hotels/design-system/ButtonLink"
|
||||
import { Divider } from "@scandic-hotels/design-system/Divider"
|
||||
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
|
||||
import Image from "@scandic-hotels/design-system/Image"
|
||||
import { Typography } from "@scandic-hotels/design-system/Typography"
|
||||
|
||||
import useLang from "@/hooks/useLang"
|
||||
|
||||
import { getDaysUntilText } from "../../utils/getDaysUntilText"
|
||||
|
||||
import styles from "./carouselCard.module.css"
|
||||
|
||||
import type { Stay } from "@scandic-hotels/trpc/routers/user/output"
|
||||
|
||||
interface CarouselCardProps {
|
||||
stay: Stay
|
||||
}
|
||||
|
||||
export default function CarouselCard({ stay }: CarouselCardProps) {
|
||||
const intl = useIntl()
|
||||
const lang = useLang()
|
||||
|
||||
const { attributes } = stay
|
||||
const {
|
||||
checkinDate,
|
||||
checkoutDate,
|
||||
hotelInformation,
|
||||
isWebAppOrigin,
|
||||
bookingUrl,
|
||||
} = attributes
|
||||
|
||||
const daysUntilText = getDaysUntilText(checkinDate, lang, intl)
|
||||
|
||||
return (
|
||||
<article className={styles.card}>
|
||||
<div className={styles.imageContainer}>
|
||||
<Image
|
||||
className={styles.image}
|
||||
alt={
|
||||
hotelInformation.hotelContent.images.altText ||
|
||||
hotelInformation.hotelContent.images.altText_En ||
|
||||
hotelInformation.hotelName
|
||||
}
|
||||
src={hotelInformation.hotelContent.images.src}
|
||||
width={400}
|
||||
height={300}
|
||||
priority
|
||||
/>
|
||||
<div className={styles.imageOverlay}>
|
||||
<Typography variant="Title/Overline/sm">
|
||||
<span>{daysUntilText}</span>
|
||||
</Typography>
|
||||
<Typography variant="Title/md">
|
||||
<span>{hotelInformation.hotelName}</span>
|
||||
</Typography>
|
||||
{hotelInformation.cityName && (
|
||||
<Typography variant="Title/Overline/sm">
|
||||
<span>{hotelInformation.cityName}</span>
|
||||
</Typography>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className={styles.content}>
|
||||
<div className={styles.infoRow}>
|
||||
<Typography variant="Body/Paragraph/mdRegular">
|
||||
<span className={styles.infoItem}>
|
||||
<MaterialIcon icon="calendar_month" color="Icon/Default" />
|
||||
{intl.formatMessage({
|
||||
id: "common.dates",
|
||||
defaultMessage: "Dates",
|
||||
})}
|
||||
</span>
|
||||
</Typography>
|
||||
<Typography variant="Body/Paragraph/mdRegular">
|
||||
<span className={styles.dateRange}>
|
||||
<time>{dt(checkinDate).locale(lang).format("D MMM")}</time>
|
||||
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
|
||||
{" → "}
|
||||
<time>{dt(checkoutDate).locale(lang).format("D MMM, YYYY")}</time>
|
||||
</span>
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
{isWebAppOrigin && (
|
||||
<>
|
||||
<Divider variant="horizontal" color="Border/Divider/Default" />
|
||||
<ButtonLink
|
||||
variant="Text"
|
||||
color="Primary"
|
||||
size="Small"
|
||||
href={bookingUrl}
|
||||
>
|
||||
{intl.formatMessage({
|
||||
id: "nextStay.seeDetailsAndExtras",
|
||||
defaultMessage: "See details & extras",
|
||||
})}
|
||||
<MaterialIcon
|
||||
icon="keyboard_arrow_right"
|
||||
color="CurrentColor"
|
||||
size={20}
|
||||
/>
|
||||
</ButtonLink>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</article>
|
||||
)
|
||||
}
|
||||
@@ -1,10 +1,12 @@
|
||||
import { env } from "@/env/server"
|
||||
import { serverClient } from "@/lib/trpc/server"
|
||||
|
||||
import { Section } from "@/components/Section"
|
||||
import SectionHeader from "@/components/Section/Header/Deprecated"
|
||||
import { SectionHeader } from "@/components/Section/Header"
|
||||
import SectionLink from "@/components/Section/Link"
|
||||
|
||||
import EmptyUpcomingStaysBlock from "../EmptyUpcomingStays"
|
||||
import UpcomingStaysCarousel from "./Carousel"
|
||||
import ClientUpcomingStays from "./Client"
|
||||
|
||||
import styles from "./upcoming.module.css"
|
||||
@@ -20,10 +22,25 @@ export default async function UpcomingStays({
|
||||
limit: 6,
|
||||
})
|
||||
|
||||
const hasStays =
|
||||
initialUpcomingStays?.data && initialUpcomingStays.data.length > 0
|
||||
|
||||
if (env.NEW_STAYS_ON_MY_PAGES) {
|
||||
if (!hasStays) return null
|
||||
|
||||
return (
|
||||
<Section className={styles.container}>
|
||||
{title && <SectionHeader heading={title} link={link} />}
|
||||
<UpcomingStaysCarousel initialUpcomingStays={initialUpcomingStays} />
|
||||
<SectionLink link={link} variant="mobile" />
|
||||
</Section>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Section className={styles.container}>
|
||||
<SectionHeader title={title} link={link} />
|
||||
{initialUpcomingStays?.data.length ? (
|
||||
{title && <SectionHeader heading={title} link={link} />}
|
||||
{hasStays ? (
|
||||
<ClientUpcomingStays initialUpcomingStays={initialUpcomingStays} />
|
||||
) : (
|
||||
<EmptyUpcomingStaysBlock />
|
||||
@@ -0,0 +1,11 @@
|
||||
.container {
|
||||
display: inline-grid;
|
||||
}
|
||||
|
||||
.carousel {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.carousel .navigationButton {
|
||||
top: 40%;
|
||||
}
|
||||
@@ -3,7 +3,7 @@ import { describe, expect, it } from "vitest"
|
||||
import { Lang } from "@scandic-hotels/common/constants/language"
|
||||
import { dt } from "@scandic-hotels/common/dt"
|
||||
|
||||
import { getDaysUntilText } from "./utils"
|
||||
import { getDaysUntilText } from "./getDaysUntilText"
|
||||
|
||||
import type { IntlShape, MessageDescriptor } from "react-intl"
|
||||
|
||||
@@ -13,7 +13,6 @@ const mockIntl = {
|
||||
values?: Record<string, string | number | boolean | Date>
|
||||
) => {
|
||||
const messages: Record<string, string> = {
|
||||
"nextStay.past": `{date}`,
|
||||
"nextStay.today": "Today",
|
||||
"nextStay.tomorrow": "Tomorrow",
|
||||
"nextStay.inXDays": `In {days} days`,
|
||||
@@ -14,15 +14,7 @@ export function getDaysUntilText(
|
||||
|
||||
// Handle past dates edge case.
|
||||
if (daysUntil < 0) {
|
||||
return intl.formatMessage(
|
||||
{
|
||||
id: "nextStay.past",
|
||||
defaultMessage: "{date} ",
|
||||
},
|
||||
{
|
||||
date: dt(checkinDate).locale(lang).format("D MMM YYYY"),
|
||||
}
|
||||
)
|
||||
return dt(checkinDate).locale(lang).format("D MMM YYYY")
|
||||
}
|
||||
|
||||
if (daysUntil === 0) {
|
||||
@@ -21,7 +21,7 @@ import SASTierComparisonBlock from "@/components/Blocks/DynamicContent/SASTierCo
|
||||
import SignupFormWrapper from "@/components/Blocks/DynamicContent/SignupFormWrapper"
|
||||
import NextStay from "@/components/Blocks/DynamicContent/Stays/NextStay"
|
||||
import PreviousStays from "@/components/Blocks/DynamicContent/Stays/Previous"
|
||||
import UpcomingStays from "@/components/Blocks/DynamicContent/Stays/Upcoming"
|
||||
import UpcomingStays from "@/components/Blocks/DynamicContent/Stays/UpcomingStays"
|
||||
import { SJWidget } from "@/components/SJWidget"
|
||||
|
||||
import JobylonFeed from "./JobylonFeed"
|
||||
|
||||
8
apps/scandic-web/env/server.ts
vendored
8
apps/scandic-web/env/server.ts
vendored
@@ -136,6 +136,13 @@ export const env = createEnv({
|
||||
.string()
|
||||
.optional()
|
||||
.transform((s) => s?.split(",") || []),
|
||||
NEW_STAYS_ON_MY_PAGES: z
|
||||
.string()
|
||||
// only allow "true" or "false"
|
||||
.refine((s) => s === "true" || s === "false")
|
||||
// transform to boolean
|
||||
.transform((s) => s === "true")
|
||||
.default("false"),
|
||||
},
|
||||
emptyStringAsUndefined: true,
|
||||
runtimeEnv: {
|
||||
@@ -213,6 +220,7 @@ export const env = createEnv({
|
||||
DTMC_ENTRA_ID_SECRET: process.env.DTMC_ENTRA_ID_SECRET,
|
||||
HOTEL_BRANDING: process.env.HOTEL_BRANDING,
|
||||
CHATBOT_LIVE_LANGS: process.env.CHATBOT_LIVE_LANGS,
|
||||
NEW_STAYS_ON_MY_PAGES: process.env.NEW_STAYS_ON_MY_PAGES,
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
display: grid;
|
||||
gap: var(--Space-x3);
|
||||
align-items: center;
|
||||
grid-template-areas:
|
||||
grid-template-areas:
|
||||
"availableRoomsCount"
|
||||
"noAvailabilityAlert"
|
||||
"filters";
|
||||
@@ -26,7 +26,8 @@
|
||||
@media screen and (min-width: 768px) {
|
||||
.container {
|
||||
grid-template-columns: 1fr auto;
|
||||
grid-template-areas: "availableRoomsCount filters"
|
||||
"noAvailabilityAlert noAvailabilityAlert";
|
||||
grid-template-areas:
|
||||
"availableRoomsCount filters"
|
||||
"noAvailabilityAlert noAvailabilityAlert";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
font-display: block;
|
||||
src: url(/_static/shared/fonts/material-symbols/rounded-1db5531f.woff2)
|
||||
src: url(/_static/shared/fonts/material-symbols/rounded-1b8067b7.woff2)
|
||||
format('woff2');
|
||||
}
|
||||
|
||||
|
||||
8
packages/trpc/env/server.ts
vendored
8
packages/trpc/env/server.ts
vendored
@@ -36,6 +36,13 @@ export const env = createEnv({
|
||||
SENTRY_ENVIRONMENT: z.string().default("development"),
|
||||
PUBLIC_URL: z.string().default(""),
|
||||
SALESFORCE_PREFERENCE_BASE_URL: z.string(),
|
||||
NEW_STAYS_ON_MY_PAGES: z
|
||||
.string()
|
||||
// only allow "true" or "false"
|
||||
.refine((s) => s === "true" || s === "false")
|
||||
// transform to boolean
|
||||
.transform((s) => s === "true")
|
||||
.default("false"),
|
||||
},
|
||||
emptyStringAsUndefined: true,
|
||||
runtimeEnv: {
|
||||
@@ -56,5 +63,6 @@ export const env = createEnv({
|
||||
SENTRY_ENVIRONMENT: process.env.SENTRY_ENVIRONMENT,
|
||||
PUBLIC_URL: process.env.NEXT_PUBLIC_PUBLIC_URL,
|
||||
SALESFORCE_PREFERENCE_BASE_URL: process.env.SALESFORCE_PREFERENCE_BASE_URL,
|
||||
NEW_STAYS_ON_MY_PAGES: process.env.NEW_STAYS_ON_MY_PAGES,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { createCounter } from "@scandic-hotels/common/telemetry"
|
||||
import { safeTry } from "@scandic-hotels/common/utils/safeTry"
|
||||
|
||||
import { env } from "../../../../env/server"
|
||||
import { router } from "../../.."
|
||||
import * as api from "../../../api"
|
||||
import { Transactions } from "../../../enums/transactions"
|
||||
@@ -184,6 +185,20 @@ export const userQueryRouter = router({
|
||||
language
|
||||
)
|
||||
|
||||
if (env.NEW_STAYS_ON_MY_PAGES) {
|
||||
if (updatedData.length <= 1) {
|
||||
// If there are 1 or fewer stays, return null since NextStay handles this
|
||||
return null
|
||||
}
|
||||
|
||||
// If there are multiple stays, filter out the first one since NextStay shows it
|
||||
const filteredData = updatedData.slice(1)
|
||||
return {
|
||||
data: filteredData,
|
||||
nextCursor,
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
data: updatedData,
|
||||
nextCursor,
|
||||
|
||||
@@ -19,327 +19,329 @@ const FONT_BASE_URL = `https://fonts.googleapis.com/css2?family=Material+Symbols
|
||||
|
||||
// Defines the subset of icons for the font
|
||||
const icons = [
|
||||
"accessibility",
|
||||
"accessible",
|
||||
"add_circle",
|
||||
"add",
|
||||
"air_purifier_gen",
|
||||
"air",
|
||||
"airline_seat_recline_normal",
|
||||
"airplane_ticket",
|
||||
"apartment",
|
||||
"apparel",
|
||||
"arrow_back_ios",
|
||||
"arrow_back",
|
||||
"arrow_forward_ios",
|
||||
"arrow_forward",
|
||||
"arrow_right",
|
||||
"arrow_upward",
|
||||
"assistant_navigation",
|
||||
"asterisk",
|
||||
"attractions",
|
||||
"award_star",
|
||||
"bakery_dining",
|
||||
"balcony",
|
||||
"bathroom",
|
||||
"bathtub",
|
||||
"beach_access",
|
||||
"bed",
|
||||
"bedroom_parent",
|
||||
"box",
|
||||
"brunch_dining",
|
||||
"business_center",
|
||||
"calendar_add_on",
|
||||
"calendar_clock",
|
||||
"calendar_month",
|
||||
"calendar_today",
|
||||
"call_quality",
|
||||
"call",
|
||||
"camera",
|
||||
"cancel",
|
||||
"chair",
|
||||
"charging_station",
|
||||
"check_box",
|
||||
"check_circle",
|
||||
"check",
|
||||
"checked_bag",
|
||||
"checkroom",
|
||||
"chevron_left",
|
||||
"chevron_right",
|
||||
"close",
|
||||
"coffee_maker",
|
||||
"coffee",
|
||||
"compare_arrows",
|
||||
"computer",
|
||||
"concierge",
|
||||
"confirmation_number",
|
||||
"connected_tv",
|
||||
"content_copy",
|
||||
"contract",
|
||||
"cool_to_dry",
|
||||
"countertops",
|
||||
"credit_card_heart",
|
||||
"credit_card",
|
||||
"curtains_closed",
|
||||
"curtains",
|
||||
"deck",
|
||||
"delete",
|
||||
"desk",
|
||||
"device_thermostat",
|
||||
"diamond",
|
||||
"dining",
|
||||
"directions_run",
|
||||
"directions_subway",
|
||||
"directions",
|
||||
"downhill_skiing",
|
||||
"download",
|
||||
"dresser",
|
||||
"edit_calendar",
|
||||
"edit_square",
|
||||
"edit",
|
||||
"electric_bike",
|
||||
"electric_car",
|
||||
"elevator",
|
||||
"emoji_transportation",
|
||||
"error_circle_rounded",
|
||||
"error",
|
||||
"exercise",
|
||||
"family_restroom",
|
||||
"fastfood",
|
||||
"favorite",
|
||||
"fax",
|
||||
"featured_seasonal_and_gifts",
|
||||
"festival",
|
||||
"filter_alt",
|
||||
"filter",
|
||||
"format_list_bulleted",
|
||||
"floor_lamp",
|
||||
"forest",
|
||||
"garage",
|
||||
"globe",
|
||||
"golf_course",
|
||||
"groups",
|
||||
"health_and_beauty",
|
||||
"heat",
|
||||
"hiking",
|
||||
"home",
|
||||
"hot_tub",
|
||||
"houseboat",
|
||||
"hvac",
|
||||
"id_card",
|
||||
"imagesmode",
|
||||
"info",
|
||||
"iron",
|
||||
"kayaking",
|
||||
"kettle",
|
||||
"keyboard_arrow_down",
|
||||
"keyboard_arrow_up",
|
||||
"king_bed",
|
||||
"kitchen",
|
||||
"landscape",
|
||||
"laundry",
|
||||
"link",
|
||||
"liquor",
|
||||
"live_tv",
|
||||
"local_bar",
|
||||
"local_cafe",
|
||||
"local_convenience_store",
|
||||
"local_drink",
|
||||
"local_laundry_service",
|
||||
"local_parking",
|
||||
"location_city",
|
||||
"location_on",
|
||||
"lock",
|
||||
"loyalty",
|
||||
"luggage",
|
||||
"mail",
|
||||
"map",
|
||||
"meeting_room",
|
||||
"microwave",
|
||||
"mode_fan",
|
||||
"museum",
|
||||
"music_cast",
|
||||
"music_note",
|
||||
"nature",
|
||||
"night_shelter",
|
||||
"nightlife",
|
||||
"open_in_new",
|
||||
"pan_zoom",
|
||||
"panorama",
|
||||
"pedal_bike",
|
||||
"person",
|
||||
"pets",
|
||||
"phone",
|
||||
"photo_camera",
|
||||
"pool",
|
||||
"print",
|
||||
"radio",
|
||||
"recommend",
|
||||
"redeem",
|
||||
"refresh",
|
||||
"remove",
|
||||
"restaurant",
|
||||
"room_service",
|
||||
"router",
|
||||
"sailing",
|
||||
"sauna",
|
||||
"scene",
|
||||
"search",
|
||||
"sell",
|
||||
"shopping_bag",
|
||||
"shower",
|
||||
"single_bed",
|
||||
"skateboarding",
|
||||
"smoke_free",
|
||||
"smoking_rooms",
|
||||
"spa",
|
||||
"sports_esports",
|
||||
"sports_golf",
|
||||
"sports_handball",
|
||||
"sports_tennis",
|
||||
"stairs",
|
||||
"star",
|
||||
"straighten",
|
||||
"styler",
|
||||
"support_agent",
|
||||
"swipe",
|
||||
"sync_saved_locally",
|
||||
"table_bar",
|
||||
"theater_comedy",
|
||||
"things_to_do",
|
||||
"train",
|
||||
"tram",
|
||||
"transit_ticket",
|
||||
"travel_luggage_and_bags",
|
||||
"travel",
|
||||
"trophy",
|
||||
"tv_guide",
|
||||
"tv_remote",
|
||||
"upload",
|
||||
"visibility_off",
|
||||
"visibility",
|
||||
"ward",
|
||||
"warning",
|
||||
"water_full",
|
||||
"wifi",
|
||||
"yard",
|
||||
"accessibility",
|
||||
"accessible",
|
||||
"add_circle",
|
||||
"add",
|
||||
"air_purifier_gen",
|
||||
"air",
|
||||
"airline_seat_recline_normal",
|
||||
"airplane_ticket",
|
||||
"apartment",
|
||||
"apparel",
|
||||
"arrow_back_ios",
|
||||
"arrow_back",
|
||||
"arrow_forward_ios",
|
||||
"arrow_forward",
|
||||
"arrow_right",
|
||||
"arrow_upward",
|
||||
"assistant_navigation",
|
||||
"asterisk",
|
||||
"attractions",
|
||||
"award_star",
|
||||
"bakery_dining",
|
||||
"balcony",
|
||||
"bathroom",
|
||||
"bathtub",
|
||||
"beach_access",
|
||||
"bed",
|
||||
"bedroom_parent",
|
||||
"box",
|
||||
"brunch_dining",
|
||||
"business_center",
|
||||
"calendar_add_on",
|
||||
"calendar_clock",
|
||||
"calendar_month",
|
||||
"calendar_today",
|
||||
"call_quality",
|
||||
"call",
|
||||
"camera",
|
||||
"cancel",
|
||||
"chair",
|
||||
"charging_station",
|
||||
"check_box",
|
||||
"check_circle",
|
||||
"check",
|
||||
"checked_bag",
|
||||
"checkroom",
|
||||
"chevron_left",
|
||||
"chevron_right",
|
||||
"close",
|
||||
"coffee_maker",
|
||||
"coffee",
|
||||
"compare_arrows",
|
||||
"computer",
|
||||
"concierge",
|
||||
"confirmation_number",
|
||||
"connected_tv",
|
||||
"content_copy",
|
||||
"contract",
|
||||
"cool_to_dry",
|
||||
"countertops",
|
||||
"credit_card_heart",
|
||||
"credit_card",
|
||||
"curtains_closed",
|
||||
"curtains",
|
||||
"deck",
|
||||
"delete",
|
||||
"desk",
|
||||
"device_thermostat",
|
||||
"diamond",
|
||||
"dining",
|
||||
"directions_run",
|
||||
"directions_subway",
|
||||
"directions",
|
||||
"downhill_skiing",
|
||||
"download",
|
||||
"dresser",
|
||||
"edit_calendar",
|
||||
"edit_square",
|
||||
"edit",
|
||||
"electric_bike",
|
||||
"electric_car",
|
||||
"elevator",
|
||||
"emoji_transportation",
|
||||
"error_circle_rounded",
|
||||
"error",
|
||||
"exercise",
|
||||
"family_restroom",
|
||||
"fastfood",
|
||||
"favorite",
|
||||
"fax",
|
||||
"featured_seasonal_and_gifts",
|
||||
"festival",
|
||||
"filter_alt",
|
||||
"filter",
|
||||
"format_list_bulleted",
|
||||
"floor_lamp",
|
||||
"forest",
|
||||
"garage",
|
||||
"globe",
|
||||
"golf_course",
|
||||
"groups",
|
||||
"health_and_beauty",
|
||||
"heat",
|
||||
"hiking",
|
||||
"home",
|
||||
"hot_tub",
|
||||
"houseboat",
|
||||
"hvac",
|
||||
"id_card",
|
||||
"imagesmode",
|
||||
"info",
|
||||
"iron",
|
||||
"kayaking",
|
||||
"kettle",
|
||||
"keyboard_arrow_down",
|
||||
"keyboard_arrow_right",
|
||||
"keyboard_arrow_up",
|
||||
"king_bed",
|
||||
"kitchen",
|
||||
"landscape",
|
||||
"laundry",
|
||||
"link",
|
||||
"liquor",
|
||||
"live_tv",
|
||||
"local_bar",
|
||||
"local_cafe",
|
||||
"local_convenience_store",
|
||||
"local_drink",
|
||||
"local_laundry_service",
|
||||
"local_parking",
|
||||
"location_city",
|
||||
"location_on",
|
||||
"lock",
|
||||
"loyalty",
|
||||
"luggage",
|
||||
"mail",
|
||||
"map",
|
||||
"meeting_room",
|
||||
"microwave",
|
||||
"mode_fan",
|
||||
"museum",
|
||||
"music_cast",
|
||||
"music_note",
|
||||
"nature",
|
||||
"night_shelter",
|
||||
"nightlife",
|
||||
"open_in_new",
|
||||
"pan_zoom",
|
||||
"panorama",
|
||||
"pedal_bike",
|
||||
"person",
|
||||
"pets",
|
||||
"phone",
|
||||
"photo_camera",
|
||||
"pool",
|
||||
"print",
|
||||
"radio",
|
||||
"recommend",
|
||||
"redeem",
|
||||
"refresh",
|
||||
"remove",
|
||||
"restaurant",
|
||||
"room_service",
|
||||
"router",
|
||||
"sailing",
|
||||
"sauna",
|
||||
"scene",
|
||||
"search",
|
||||
"sell",
|
||||
"shopping_bag",
|
||||
"shower",
|
||||
"single_bed",
|
||||
"skateboarding",
|
||||
"smoke_free",
|
||||
"smoking_rooms",
|
||||
"spa",
|
||||
"sports_esports",
|
||||
"sports_golf",
|
||||
"sports_handball",
|
||||
"sports_tennis",
|
||||
"stairs",
|
||||
"star",
|
||||
"straighten",
|
||||
"styler",
|
||||
"support_agent",
|
||||
"swipe",
|
||||
"sync_saved_locally",
|
||||
"table_bar",
|
||||
"theater_comedy",
|
||||
"things_to_do",
|
||||
"train",
|
||||
"tram",
|
||||
"transit_ticket",
|
||||
"travel_luggage_and_bags",
|
||||
"travel",
|
||||
"trophy",
|
||||
"tv_guide",
|
||||
"tv_remote",
|
||||
"upload",
|
||||
"visibility_off",
|
||||
"visibility",
|
||||
"ward",
|
||||
"warning",
|
||||
"water_full",
|
||||
"wifi",
|
||||
"yard",
|
||||
].sort();
|
||||
|
||||
function createHash(value: unknown) {
|
||||
const stringified = stringify(value);
|
||||
const hash = crypto.createHash("sha256");
|
||||
hash.update(stringified);
|
||||
return hash.digest("hex");
|
||||
const stringified = stringify(value);
|
||||
const hash = crypto.createHash("sha256");
|
||||
hash.update(stringified);
|
||||
return hash.digest("hex");
|
||||
}
|
||||
|
||||
const hash = createHash(icons).substring(0, 8);
|
||||
|
||||
async function fetchIconUrl(url: string) {
|
||||
const response = await fetch(url, {
|
||||
headers: {
|
||||
Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
|
||||
"User-Agent":
|
||||
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
|
||||
},
|
||||
});
|
||||
const response = await fetch(url, {
|
||||
headers: {
|
||||
Accept:
|
||||
"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
|
||||
"User-Agent":
|
||||
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
|
||||
},
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
console.error(`Unable to fetch woff2 for ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
if (!response.ok) {
|
||||
console.error(`Unable to fetch woff2 for ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const text = await response.text();
|
||||
const text = await response.text();
|
||||
|
||||
const isWoff2 = /format\('woff2'\)/.test(text);
|
||||
if (!isWoff2) {
|
||||
console.error(`Unable to identify woff2 font in response`);
|
||||
process.exit(1);
|
||||
}
|
||||
const isWoff2 = /format\('woff2'\)/.test(text);
|
||||
if (!isWoff2) {
|
||||
console.error(`Unable to identify woff2 font in response`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const srcUrl = text.match(/src: url\(([^)]+)\)/);
|
||||
const srcUrl = text.match(/src: url\(([^)]+)\)/);
|
||||
|
||||
if (srcUrl && srcUrl[1]) {
|
||||
return srcUrl[1];
|
||||
}
|
||||
if (srcUrl && srcUrl[1]) {
|
||||
return srcUrl[1];
|
||||
}
|
||||
|
||||
return null;
|
||||
return null;
|
||||
}
|
||||
|
||||
async function download(url: string, destFolder: string) {
|
||||
const dest = resolve(join(destFolder, `/rounded-${hash}.woff2`));
|
||||
const dest = resolve(join(destFolder, `/rounded-${hash}.woff2`));
|
||||
|
||||
try {
|
||||
const response = await fetch(url);
|
||||
try {
|
||||
const response = await fetch(url);
|
||||
|
||||
if (!response.ok) {
|
||||
console.error(`Unable to fetch ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (!response.body) {
|
||||
console.error(`Bad response from ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const fileStream = createWriteStream(dest);
|
||||
|
||||
// @ts-expect-error: type mismatch
|
||||
const readableNodeStream = Readable.fromWeb(response.body);
|
||||
|
||||
await pipeline(readableNodeStream, fileStream);
|
||||
} catch (error) {
|
||||
console.error(`Error downloading file from ${url}:`, error);
|
||||
process.exit(1);
|
||||
if (!response.ok) {
|
||||
console.error(`Unable to fetch ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if (!response.body) {
|
||||
console.error(`Bad response from ${url}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const fileStream = createWriteStream(dest);
|
||||
|
||||
// @ts-expect-error: type mismatch
|
||||
const readableNodeStream = Readable.fromWeb(response.body);
|
||||
|
||||
await pipeline(readableNodeStream, fileStream);
|
||||
} catch (error) {
|
||||
console.error(`Error downloading file from ${url}:`, error);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
async function cleanFontDirs() {
|
||||
await rm(FONT_DIR, { recursive: true, force: true });
|
||||
await mkdir(FONT_DIR, { recursive: true });
|
||||
await writeFile(
|
||||
join(FONT_DIR, ".auto-generated"),
|
||||
`Auto-generated, do not edit. Use scripts/material-symbols-update.mts to update.\nhash=${hash}\ncreated=${new Date().toISOString()}\n`,
|
||||
{ encoding: "utf-8" }
|
||||
);
|
||||
await rm(FONT_DIR, { recursive: true, force: true });
|
||||
await mkdir(FONT_DIR, { recursive: true });
|
||||
await writeFile(
|
||||
join(FONT_DIR, ".auto-generated"),
|
||||
`Auto-generated, do not edit. Use scripts/material-symbols-update.mts to update.\nhash=${hash}\ncreated=${new Date().toISOString()}\n`,
|
||||
{ encoding: "utf-8" },
|
||||
);
|
||||
}
|
||||
|
||||
async function updateFontCSS() {
|
||||
const file = resolve(__dirname, "../packages/design-system/lib/fonts.css");
|
||||
const file = resolve(__dirname, "../packages/design-system/lib/fonts.css");
|
||||
|
||||
const css = await readFile(file, {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
const css = await readFile(file, {
|
||||
encoding: "utf-8",
|
||||
});
|
||||
|
||||
await writeFile(
|
||||
file,
|
||||
css.replace(
|
||||
/url\(\/_static\/shared\/fonts\/material-symbols\/rounded[^)]+\)/,
|
||||
`url(/_static/shared/fonts/material-symbols/rounded-${hash}.woff2)`
|
||||
),
|
||||
{
|
||||
encoding: "utf-8",
|
||||
}
|
||||
);
|
||||
await writeFile(
|
||||
file,
|
||||
css.replace(
|
||||
/url\(\/_static\/shared\/fonts\/material-symbols\/rounded[^)]+\)/,
|
||||
`url(/_static/shared/fonts/material-symbols/rounded-${hash}.woff2)`,
|
||||
),
|
||||
{
|
||||
encoding: "utf-8",
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const fontUrl = `${FONT_BASE_URL}&icon_names=${icons.join(",")}&display=block`;
|
||||
const fontUrl = `${FONT_BASE_URL}&icon_names=${icons.join(",")}&display=block`;
|
||||
|
||||
const iconUrl = await fetchIconUrl(fontUrl);
|
||||
const iconUrl = await fetchIconUrl(fontUrl);
|
||||
|
||||
if (iconUrl) {
|
||||
await cleanFontDirs();
|
||||
if (iconUrl) {
|
||||
await cleanFontDirs();
|
||||
|
||||
await download(iconUrl, FONT_DIR);
|
||||
await download(iconUrl, FONT_DIR);
|
||||
|
||||
await updateFontCSS();
|
||||
await updateFontCSS();
|
||||
|
||||
console.log("Successfully updated icons!");
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.error(
|
||||
`Unable to find the icon font src URL in CSS response from Google Fonts at ${fontUrl}`
|
||||
);
|
||||
}
|
||||
console.log("Successfully updated icons!");
|
||||
process.exit(0);
|
||||
} else {
|
||||
console.error(
|
||||
`Unable to find the icon font src URL in CSS response from Google Fonts at ${fontUrl}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
Auto-generated, do not edit. Use scripts/material-symbols-update.mts to update.
|
||||
hash=1db5531f
|
||||
created=2025-09-17T06:58:37.841Z
|
||||
hash=1b8067b7
|
||||
created=2025-11-11T10:02:22.385Z
|
||||
|
||||
BIN
shared/fonts/material-symbols/rounded-1b8067b7.woff2
Normal file
BIN
shared/fonts/material-symbols/rounded-1b8067b7.woff2
Normal file
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user