diff --git a/components/MyPages/AccountPage/Content.tsx b/components/MyPages/AccountPage/Content.tsx index 327a8da61..6be82bbfb 100644 --- a/components/MyPages/AccountPage/Content.tsx +++ b/components/MyPages/AccountPage/Content.tsx @@ -36,7 +36,7 @@ function DynamicComponent({ user, lang, content }: AccountPageContentProps) { switch (content.component) { case DynamicContentComponents.membership_overview: - return + return case DynamicContentComponents.previous_stays: return case DynamicContentComponents.soonest_stays: diff --git a/components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css b/components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css index 55d660c66..9cedea259 100644 --- a/components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css +++ b/components/MyPages/Blocks/Benefits/CurrentLevel/current.module.css @@ -1,20 +1,29 @@ -.cardContainer { +.container { display: grid; - gap: 4px; + gap: 1.5rem; } .header { display: flex; justify-content: space-between; } + .title { font-weight: 600; } +.subtitle { + margin: 0; + font-size: 2rem; +} .value { color: var(--some-red-color, #ed2027); } +.cardContainer { + display: grid; + gap: 4px; +} .cardSubtitle { font-family: var(--ff-fira-sans); font-size: 12px; diff --git a/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx b/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx index 85c4a6bb4..83a884390 100644 --- a/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx +++ b/components/MyPages/Blocks/Benefits/CurrentLevel/index.tsx @@ -21,9 +21,9 @@ export default async function CurrentBenefitsBlock({ const benefits = await serverClient().user.benefits.current() return ( -
+
- + <Title as="h3" level="h2" className={styles.title} uppercase> {title} {link && ( diff --git a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx b/components/MyPages/Blocks/Benefits/NextLevel/index.tsx index fc894cba7..03c7a417f 100644 --- a/components/MyPages/Blocks/Benefits/NextLevel/index.tsx +++ b/components/MyPages/Blocks/Benefits/NextLevel/index.tsx @@ -19,7 +19,7 @@ export default async function NextLevelBenefitsBlock({ return (
- + <Title as="h3" level="h2" uppercase className={styles.title}> {title} {link && ( <Link className={styles.link} href={link.href}> diff --git a/components/MyPages/Blocks/Benefits/NextLevel/next.module.css b/components/MyPages/Blocks/Benefits/NextLevel/next.module.css index 181794db4..ae0f44a3d 100644 --- a/components/MyPages/Blocks/Benefits/NextLevel/next.module.css +++ b/components/MyPages/Blocks/Benefits/NextLevel/next.module.css @@ -7,6 +7,7 @@ display: flex; justify-content: space-between; } + .cardContainer { display: grid; gap: 0.4rem; @@ -16,6 +17,10 @@ font-weight: 600; } +.subtitle { + margin: 0; + font-size: 2rem; +} .card { text-decoration: none; display: flex; diff --git a/components/MyPages/Blocks/Overview/UpcomingStays/index.tsx b/components/MyPages/Blocks/Overview/UpcomingStays/index.tsx deleted file mode 100644 index 98786b46e..000000000 --- a/components/MyPages/Blocks/Overview/UpcomingStays/index.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { _ } from "@/lib/translation" -import { serverClient } from "@/lib/trpc/server" - -import StayCard from "@/components/MyPages/Blocks/Stays/StayCard" -import EmptyUpcomingStaysBlock from "@/components/MyPages/Blocks/Stays/Upcoming/EmptyUpcomingStays" -import Link from "@/components/TempDesignSystem/Link" -import Title from "@/components/Title" - -import styles from "./upcoming.module.css" - -import type { LangParams } from "@/types/params" - -export default async function UpcomingStays({ lang }: LangParams) { - const stays = await serverClient().user.stays.upcoming({ - perPage: 3, - }) - - return ( - <section className={styles.container}> - <header className={styles.header}> - <Title level="h2" as="h5" uppercase> - {_("Your upcoming stays")} - - - {_("See all")} - -
- {stays.data.length ? ( -
- {stays.data.map((stay) => ( - - ))} -
- ) : ( - - )} -
- ) -} diff --git a/components/MyPages/Blocks/Overview/UpcomingStays/upcoming.module.css b/components/MyPages/Blocks/Overview/UpcomingStays/upcoming.module.css deleted file mode 100644 index d1237395d..000000000 --- a/components/MyPages/Blocks/Overview/UpcomingStays/upcoming.module.css +++ /dev/null @@ -1,54 +0,0 @@ -.container { - display: grid; - gap: 2.2rem; - overflow: hidden; - margin-right: -2rem; -} - -.header { - align-items: baseline; - display: flex; - justify-content: space-between; -} - -.link { - display: none; -} - -.stays { - display: flex; - gap: 2rem; - overflow-x: auto; - - /* Hide scrollbar IE and Edge */ - -ms-overflow-style: none; - /* Hide Scrollbar Firefox */ - scrollbar-width: none; -} - -/* Hide Scrollbar Chrome, Safari and Opera */ -.stays::-webkit-scrollbar { - display: none; -} - -@media screen and (min-width: 950px) { - .container { - margin-right: 0; - } - @media screen and (max-width: 950px) { - .stays { - padding-right: 2rem; - } - } - - .link { - color: var(--some-black-color, #111); - display: inline-block; - font-family: var(--ff-fira-sans); - font-size: 1.4rem; - font-weight: 600; - letter-spacing: 1.2%; - line-height: 140%; - text-decoration: none; - } -} diff --git a/components/MyPages/Blocks/Overview/index.tsx b/components/MyPages/Blocks/Overview/index.tsx index fb63d7415..1c7b73ed5 100644 --- a/components/MyPages/Blocks/Overview/index.tsx +++ b/components/MyPages/Blocks/Overview/index.tsx @@ -7,12 +7,12 @@ import styles from "./overview.module.css" import type { OverviewProps } from "@/types/components/myPages/myPage/overview" -export default function Overview({ user }: OverviewProps) { +export default function Overview({ user, title }: OverviewProps) { return (
- - Good morning + <Title as="h3" level="h2" uppercase className={styles.title}> + {title}
diff --git a/components/MyPages/Blocks/Overview/overview.module.css b/components/MyPages/Blocks/Overview/overview.module.css index 7482a47e3..0a96f3467 100644 --- a/components/MyPages/Blocks/Overview/overview.module.css +++ b/components/MyPages/Blocks/Overview/overview.module.css @@ -4,6 +4,10 @@ gap: 0.8rem; } +.title { + font-weight: 600; +} + .overview { display: grid; gap: 1.7rem; diff --git a/components/MyPages/Blocks/Stays/Header/index.tsx b/components/MyPages/Blocks/Stays/Header/index.tsx index 5b062cbc6..e753889ba 100644 --- a/components/MyPages/Blocks/Stays/Header/index.tsx +++ b/components/MyPages/Blocks/Stays/Header/index.tsx @@ -10,7 +10,13 @@ export default function Header({ title, subtitle, link }: HeaderProps) { return ( <>
- + <Title + as="h3" + level="h2" + className={styles.title} + weight="semiBold" + uppercase + > {title} {link && ( diff --git a/types/components/myPages/myPage/overview.ts b/types/components/myPages/myPage/overview.ts index 4df5c59f3..7ad910578 100644 --- a/types/components/myPages/myPage/overview.ts +++ b/types/components/myPages/myPage/overview.ts @@ -1,5 +1,6 @@ import type { User } from "@/types/user" export type OverviewProps = { + title: string user: User }