diff --git a/components/Loyalty/Blocks/DynamicContent/index.tsx b/components/Loyalty/Blocks/DynamicContent/index.tsx index 7ad602a4e..68dc8534a 100644 --- a/components/Loyalty/Blocks/DynamicContent/index.tsx +++ b/components/Loyalty/Blocks/DynamicContent/index.tsx @@ -20,9 +20,6 @@ async function DynamicComponentBlock({ component }: DynamicComponentProps) { const session = await auth() const user = session ? await serverClient().user.get() : null - if (!user) { - return null - } switch (component) { case LoyaltyComponentEnum.how_it_works: diff --git a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx b/components/MyPages/Blocks/Benefits/NextLevel/index.tsx index cebb9df11..f4db1e7f2 100644 --- a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx +++ b/components/MyPages/Blocks/Benefits/NextLevel/index.tsx @@ -4,7 +4,6 @@ import { serverClient } from "@/lib/trpc/server" import SectionContainer from "@/components/Section/Container" import Header from "@/components/Section/Header" -import Button from "@/components/TempDesignSystem/Button" import Chip from "@/components/TempDesignSystem/Chip" import Grids from "@/components/TempDesignSystem/Grids" import BiroScript from "@/components/TempDesignSystem/Text/BiroScript" diff --git a/components/MyPages/Blocks/Overview/Friend/friend.module.css b/components/MyPages/Blocks/Overview/Friend/friend.module.css index 4e777a262..f103b1a53 100644 --- a/components/MyPages/Blocks/Overview/Friend/friend.module.css +++ b/components/MyPages/Blocks/Overview/Friend/friend.module.css @@ -9,11 +9,13 @@ .header { display: flex; flex-direction: column; + gap: var(--Spacing-x1); } .levelLabel { position: relative; transform: rotate(-13deg) translate(0px, -15px); + margin-left: -35px; } .name { @@ -39,17 +41,6 @@ padding: var(--Spacing-x1) var(--Spacing-x2); } -.membershipId { - color: var(--Scandic-Brand-Pale-Peach); - /* TODO: Not yet exported by the design team, change to variable l8r */ - font-family: var(--ff-fira-mono, "fira mono"); - font-size: 14px; - font-weight: 400; - letter-spacing: 0.168px; - line-height: 140%; - margin: 0; -} - @media screen and (min-width: 768px) { .membershipContainer { grid-template-columns: auto auto; diff --git a/components/MyPages/Blocks/Overview/Friend/index.tsx b/components/MyPages/Blocks/Overview/Friend/index.tsx index 68892b4eb..f723fdc1a 100644 --- a/components/MyPages/Blocks/Overview/Friend/index.tsx +++ b/components/MyPages/Blocks/Overview/Friend/index.tsx @@ -1,6 +1,7 @@ import { membershipLevels } from "@/constants/membershipLevels" import BiroScript from "@/components/TempDesignSystem/Text/BiroScript" +import Caption from "@/components/TempDesignSystem/Text/Caption" import Title from "@/components/TempDesignSystem/Text/Title" import { getIntl } from "@/i18n" import { getMembership } from "@/utils/user" @@ -35,12 +36,10 @@ export default async function Friend({ user }: UserProps) { {user.name}
-

- {formatMessage({ id: "Membership ID" })}: -

-

+ + {formatMessage({ id: "Membership ID" })}:{" "} {membership ? membership.membershipNumber : "N/A"} -

+
diff --git a/components/MyPages/Blocks/Overview/Stats/NextLevel/index.tsx b/components/MyPages/Blocks/Overview/Stats/NextLevel/index.tsx index 2e0e40def..13a5de384 100644 --- a/components/MyPages/Blocks/Overview/Stats/NextLevel/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/NextLevel/index.tsx @@ -33,8 +33,15 @@ export default async function NextLevel({ } return (
- {formatMessage({ id: "Next level" })}: - + <Body color="pale" textAlign="center"> + {formatMessage({ id: "Next level" })}: + </Body> + <Title + className={styles.nextLevel} + color="pale" + level="h3" + textAlign="center" + > {nextLevel?.name || "N/A"} <BiroScript>{formatMessage({ id: "Coming up" })}!</BiroScript> diff --git a/components/MyPages/Blocks/Overview/Stats/NextLevel/nextLevel.module.css b/components/MyPages/Blocks/Overview/Stats/NextLevel/nextLevel.module.css index 8f0c3f435..ee4800d29 100644 --- a/components/MyPages/Blocks/Overview/Stats/NextLevel/nextLevel.module.css +++ b/components/MyPages/Blocks/Overview/Stats/NextLevel/nextLevel.module.css @@ -8,6 +8,6 @@ .nextLevel { gap: var(--Spacing-x1); grid-template-columns: auto auto; - justify-content: flex-start; + justify-content: center; } } diff --git a/components/MyPages/Blocks/Overview/Stats/Points/index.tsx b/components/MyPages/Blocks/Overview/Stats/Points/index.tsx index b0a4996be..6a9260865 100644 --- a/components/MyPages/Blocks/Overview/Stats/Points/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/Points/index.tsx @@ -13,17 +13,19 @@ export default async function Points({ user }: UserProps) { return (
- {formatMessage({ id: "Total Points" })} - + <Body color="pale" textAlign="center"> + {formatMessage({ id: "Total Points" })} + </Body> + <Title color="pale" level="h2" textAlign="center"> {membership ? membership.currentPoints : "N/A"}
- + {formatMessage({ id: "Points until next level" })} {/* TODO */} - + <Title color="pale" level="h2" textAlign="center"> {membership ? membership.currentPoints : "N/A"}
diff --git a/components/MyPages/Blocks/Overview/Stats/index.tsx b/components/MyPages/Blocks/Overview/Stats/index.tsx index a9f0308e4..6d6ed585e 100644 --- a/components/MyPages/Blocks/Overview/Stats/index.tsx +++ b/components/MyPages/Blocks/Overview/Stats/index.tsx @@ -12,7 +12,7 @@ export default function Stats({ user, lang }: UserProps & LangParams) { return (
- +
) diff --git a/components/MyPages/Blocks/Overview/index.tsx b/components/MyPages/Blocks/Overview/index.tsx index 0f4696d46..31caee281 100644 --- a/components/MyPages/Blocks/Overview/index.tsx +++ b/components/MyPages/Blocks/Overview/index.tsx @@ -27,7 +27,7 @@ export default async function Overview({
- +
diff --git a/components/MyPages/Blocks/Stays/StayCard/stay.module.css b/components/MyPages/Blocks/Stays/StayCard/stay.module.css index 124203040..c27472ce8 100644 --- a/components/MyPages/Blocks/Stays/StayCard/stay.module.css +++ b/components/MyPages/Blocks/Stays/StayCard/stay.module.css @@ -1,7 +1,7 @@ .stay { background-color: var(--Main-Grey-White); - border: 1px solid var(--Scandic-Brand-Burgundy); - border-radius: var(--Corner-radius-Small); + border: 1px solid var(--Base-Border-Subtle); + border-radius: var(--Corner-radius-Medium); display: grid; overflow: hidden; } diff --git a/components/MyPages/Blocks/Stays/Upcoming/Client.tsx b/components/MyPages/Blocks/Stays/Upcoming/Client.tsx index 536495cfb..105289c6c 100644 --- a/components/MyPages/Blocks/Stays/Upcoming/Client.tsx +++ b/components/MyPages/Blocks/Stays/Upcoming/Client.tsx @@ -8,7 +8,6 @@ import Grids from "@/components/TempDesignSystem/Grids" import ListContainer from "../ListContainer" import ShowMoreButton from "../ShowMoreButton" import StayCard from "../StayCard" -import EmptyUpcomingStaysBlock from "./EmptyUpcomingStays" import type { UpcomingStaysClientProps, @@ -61,7 +60,5 @@ export default function ClientUpcomingStays({ ) : null} - ) : ( - - ) + ) : null } diff --git a/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx b/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx index 1c239fbfa..27ed484b0 100644 --- a/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx +++ b/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays/index.tsx @@ -1,13 +1,17 @@ -import { useIntl } from "react-intl" +import { homeHrefs } from "@/constants/homeHrefs" +import { env } from "@/env/server" import Button from "@/components/TempDesignSystem/Button" import Link from "@/components/TempDesignSystem/Link" import Title from "@/components/TempDesignSystem/Text/Title" +import { getIntl } from "@/i18n" import styles from "./emptyUpcomingStays.module.css" -export default function EmptyUpcomingStaysBlock() { - const { formatMessage } = useIntl() +import { LangParams } from "@/types/params" + +export default async function EmptyUpcomingStaysBlock({ lang }: LangParams) { + const { formatMessage } = await getIntl() return (
@@ -18,7 +22,9 @@ export default function EmptyUpcomingStaysBlock() { </span>
) diff --git a/components/MyPages/Blocks/Stays/Upcoming/index.tsx b/components/MyPages/Blocks/Stays/Upcoming/index.tsx index 7e44e76ca..736251cfa 100644 --- a/components/MyPages/Blocks/Stays/Upcoming/index.tsx +++ b/components/MyPages/Blocks/Stays/Upcoming/index.tsx @@ -4,6 +4,7 @@ import SectionContainer from "@/components/Section/Container" import SectionHeader from "@/components/Section/Header" import ClientUpcomingStays from "./Client" +import EmptyUpcomingStaysBlock from "./EmptyUpcomingStays" import type { AccountPageComponentProps } from "@/types/components/myPages/myPage/accountPage" @@ -20,10 +21,14 @@ export default async function UpcomingStays({ return ( - + {initialUpcomingStays.data.length ? ( + + ) : ( + + )} ) }