feat(LOY-263): added new link to missing points form

removed soonest stays for redundancy
This commit is contained in:
Christian Andolf
2025-06-18 13:57:37 +02:00
parent 8c4715dd24
commit acc77625c8
6 changed files with 54 additions and 45 deletions

View File

@@ -1,18 +1,25 @@
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { serverClient } from "@/lib/trpc/server" import { serverClient } from "@/lib/trpc/server"
import ButtonLink from "@/components/ButtonLink"
import SectionContainer from "@/components/Section/Container" import SectionContainer from "@/components/Section/Container"
import SectionHeader from "@/components/Section/Header" import SectionHeader from "@/components/Section/Header"
import SectionLink from "@/components/Section/Link" import SectionLink from "@/components/Section/Link"
import { getIntl } from "@/i18n"
import ClientPreviousStays from "./Client" import ClientPreviousStays from "./Client"
import styles from "./previous.module.css"
import type { AccountPageComponentProps } from "@/types/components/myPages/myPage/accountPage" import type { AccountPageComponentProps } from "@/types/components/myPages/myPage/accountPage"
export default async function PreviousStays({ export default async function PreviousStays({
title, title,
subtitle,
link, link,
}: AccountPageComponentProps) { }: AccountPageComponentProps) {
const intl = await getIntl()
const caller = await serverClient() const caller = await serverClient()
const initialPreviousStays = await caller.user.stays.previous({ const initialPreviousStays = await caller.user.stays.previous({
limit: 6, limit: 6,
@@ -24,7 +31,28 @@ export default async function PreviousStays({
return ( return (
<SectionContainer> <SectionContainer>
<SectionHeader title={title} preamble={subtitle} link={link} /> <div className={styles.header}>
<SectionHeader title={title} link={link} />
<div className={styles.claim}>
<Typography variant="Body/Supporting text (caption)/smRegular">
<p>
{intl.formatMessage({
defaultMessage: "Missing a previous stay?",
})}
</p>
</Typography>
<ButtonLink
href="https://www.scandichotels.com/forms/missing-points"
variant="Text"
target="_blank"
size="Small"
typography="Body/Supporting text (caption)/smBold"
>
{intl.formatMessage({ defaultMessage: "Claim points" })}
<MaterialIcon icon="open_in_new" size={20} color="CurrentColor" />
</ButtonLink>
</div>
</div>
<ClientPreviousStays initialPreviousStays={initialPreviousStays} /> <ClientPreviousStays initialPreviousStays={initialPreviousStays} />
<SectionLink link={link} variant="mobile" /> <SectionLink link={link} variant="mobile" />
</SectionContainer> </SectionContainer>

View File

@@ -0,0 +1,22 @@
.header {
display: flex;
flex-direction: column;
justify-content: space-between;
gap: var(--Space-x1);
}
.claim {
color: var(--Text-Secondary);
display: flex;
align-items: center;
justify-content: space-between;
gap: var(--Space-x2);
}
@media screen and (min-width: 1367px) {
.header {
align-items: center;
flex-direction: row;
gap: var(--Space-x6);
}
}

View File

@@ -1,39 +0,0 @@
import { serverClient } from "@/lib/trpc/server"
import SectionContainer from "@/components/Section/Container"
import SectionHeader from "@/components/Section/Header"
import SectionLink from "@/components/Section/Link"
import Grids from "@/components/TempDesignSystem/Grids"
import EmptyUpcomingStaysBlock from "../EmptyUpcomingStays"
import StayCard from "../StayCard"
import type { AccountPageComponentProps } from "@/types/components/myPages/myPage/accountPage"
export default async function SoonestStays({
title,
subtitle,
link,
}: AccountPageComponentProps) {
const caller = await serverClient()
const upcomingStays = await caller.user.stays.upcoming({ limit: 3 })
if (!upcomingStays?.data) {
return null
}
return (
<SectionContainer>
<SectionHeader title={title} preamble={subtitle} link={link} />
{upcomingStays.data.length ? (
<Grids.Stackable>
{upcomingStays.data.map((stay) => (
<StayCard key={stay.attributes.confirmationNumber} stay={stay} />
))}
</Grids.Stackable>
) : (
<EmptyUpcomingStaysBlock />
)}
<SectionLink link={link} variant="mobile" />
</SectionContainer>
)
}

View File

@@ -13,7 +13,6 @@ import type { AccountPageComponentProps } from "@/types/components/myPages/myPag
export default async function UpcomingStays({ export default async function UpcomingStays({
title, title,
subtitle,
link, link,
}: AccountPageComponentProps) { }: AccountPageComponentProps) {
const caller = await serverClient() const caller = await serverClient()
@@ -23,7 +22,7 @@ export default async function UpcomingStays({
return ( return (
<SectionContainer className={styles.container}> <SectionContainer className={styles.container}>
<SectionHeader title={title} preamble={subtitle} link={link} /> <SectionHeader title={title} link={link} />
{initialUpcomingStays?.data.length ? ( {initialUpcomingStays?.data.length ? (
<ClientUpcomingStays initialUpcomingStays={initialUpcomingStays} /> <ClientUpcomingStays initialUpcomingStays={initialUpcomingStays} />
) : ( ) : (

View File

@@ -16,7 +16,6 @@ import SASTransferPoints from "@/components/Blocks/DynamicContent/SAS/TransferPo
import SASTierComparisonBlock from "@/components/Blocks/DynamicContent/SASTierComparison" import SASTierComparisonBlock from "@/components/Blocks/DynamicContent/SASTierComparison"
import SignupFormWrapper from "@/components/Blocks/DynamicContent/SignupFormWrapper" import SignupFormWrapper from "@/components/Blocks/DynamicContent/SignupFormWrapper"
import PreviousStays from "@/components/Blocks/DynamicContent/Stays/Previous" import PreviousStays from "@/components/Blocks/DynamicContent/Stays/Previous"
import SoonestStays from "@/components/Blocks/DynamicContent/Stays/Soonest"
import UpcomingStays from "@/components/Blocks/DynamicContent/Stays/Upcoming" import UpcomingStays from "@/components/Blocks/DynamicContent/Stays/Upcoming"
import LoadingSpinner from "@/components/LoadingSpinner" import LoadingSpinner from "@/components/LoadingSpinner"
@@ -63,7 +62,6 @@ function DynamicContentBlocks(props: DynamicContentProps) {
case DynamicContentEnum.Blocks.components.sign_up_form: case DynamicContentEnum.Blocks.components.sign_up_form:
return <SignupFormWrapper dynamic_content={dynamic_content} /> return <SignupFormWrapper dynamic_content={dynamic_content} />
case DynamicContentEnum.Blocks.components.soonest_stays: case DynamicContentEnum.Blocks.components.soonest_stays:
return <SoonestStays {...dynamic_content} />
case DynamicContentEnum.Blocks.components.upcoming_stays: case DynamicContentEnum.Blocks.components.upcoming_stays:
return <UpcomingStays {...dynamic_content} /> return <UpcomingStays {...dynamic_content} />
case DynamicContentEnum.Blocks.components.sas_linked_account: case DynamicContentEnum.Blocks.components.sas_linked_account:

View File

@@ -6,4 +6,5 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
gap: var(--Space-x05);
} }