From 0131b5f7316c7dc11d04431c6d4f55ad50d7381d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Tue, 4 Nov 2025 09:15:43 +0000 Subject: [PATCH] Merged in chore/cleanup-my-pages-overview (pull request #3049) chore(LOY-447): remove flag and unused code on my pages overview * chore: remove flag and unused code Approved-by: Chuma Mcphoy (We Ahead) --- apps/scandic-web/.env.local.example | 1 - .../Overview/Buttons/CopyButton.tsx | 47 ------------- .../Overview/Buttons/copybutton.module.css | 6 -- .../Overview/Friend/Hero/hero.module.css | 21 ------ .../Overview/Friend/Hero/hero.ts | 7 -- .../Overview/Friend/Hero/heroVariants.ts | 15 ----- .../Overview/Friend/Hero/index.tsx | 8 --- .../Friend/MembershipNumber/index.tsx | 44 ------------ .../membershipNumber.module.css | 37 ---------- .../membershipNumberVariants.ts | 15 ----- .../Overview/Friend/friend.module.css | 41 ------------ .../DynamicContent/Overview/Friend/index.tsx | 56 ---------------- .../Overview/Stats/ExpiringPoints/index.tsx | 40 ----------- .../Points/Container/container.module.css | 13 ---- .../Overview/Stats/Points/Container/index.tsx | 5 -- .../Stats/Points/PointsColumn/index.tsx | 42 ------------ .../PointsColumn/pointsColumn.module.css | 9 --- .../Overview/Stats/Points/index.tsx | 67 ------------------- .../DynamicContent/Overview/Stats/index.tsx | 18 ----- .../Overview/Stats/stats.module.css | 11 --- .../Blocks/DynamicContent/Overview/index.tsx | 37 +++------- .../DynamicContent/Points/Overview/index.tsx | 31 ++------- apps/scandic-web/env/server.ts | 6 -- .../components/myPages/membershipNumber.ts | 9 --- 24 files changed, 18 insertions(+), 568 deletions(-) delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/friend.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx delete mode 100644 apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/stats.module.css delete mode 100644 apps/scandic-web/types/components/myPages/membershipNumber.ts diff --git a/apps/scandic-web/.env.local.example b/apps/scandic-web/.env.local.example index 590572138..3de22aae6 100644 --- a/apps/scandic-web/.env.local.example +++ b/apps/scandic-web/.env.local.example @@ -53,7 +53,6 @@ GOOGLE_DYNAMIC_MAP_ID="" ENABLE_SURPRISES="true" ENABLE_DTMC="true" -ENABLE_NEW_OVERVIEW_SECTION="true" SHOW_SITE_WIDE_ALERT="false" diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx deleted file mode 100644 index 1dda084ae..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/CopyButton.tsx +++ /dev/null @@ -1,47 +0,0 @@ -"use client" - -import { useIntl } from "react-intl" - -import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" -import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton" -import { toast } from "@scandic-hotels/design-system/Toast" - -import styles from "./copybutton.module.css" - -import type { CopyButtonProps } from "@/types/components/myPages/membership" - -export default function CopyButton({ membershipNumber }: CopyButtonProps) { - const intl = useIntl() - - function handleCopy() { - try { - navigator.clipboard.writeText(membershipNumber) - toast.success( - intl.formatMessage({ - id: "myPages.membershipIdCopied", - defaultMessage: "Membership ID copied to clipboard", - }) - ) - } catch { - toast.error( - intl.formatMessage({ - id: "errorMessage.copyFailed", - defaultMessage: "Failed to copy", - }) - ) - } - } - - return ( - - ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css deleted file mode 100644 index 82b3ad777..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Buttons/copybutton.module.css +++ /dev/null @@ -1,6 +0,0 @@ -.button { - display: flex; - justify-content: center; - align-items: center; - color: var(--Scandic-Brand-Pale-Peach); -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css deleted file mode 100644 index 822a5d301..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.module.css +++ /dev/null @@ -1,21 +0,0 @@ -.hero { - border-radius: var(--Corner-radius-xl); - display: grid; - gap: var(--Spacing-x2); - grid-template-columns: 1fr; - padding: var(--Spacing-x7) var(--Spacing-x6); -} - -.burgundy { - background-color: var(--Scandic-Brand-Burgundy); -} - -.red { - background-color: var(--Scandic-Brand-Scandic-Red); -} - -@media screen and (min-width: 768px) { - .hero { - grid-template-columns: 1fr 1fr; - } -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts deleted file mode 100644 index 0f2adcec4..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/hero.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { VariantProps } from "class-variance-authority" - -import type { heroVariants } from "./heroVariants" - -export interface HeroProps - extends Omit, "color">, - VariantProps {} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts deleted file mode 100644 index 324fb46aa..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/heroVariants.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { cva } from "class-variance-authority" - -import styles from "./hero.module.css" - -export const heroVariants = cva(styles.hero, { - variants: { - color: { - burgundy: styles.burgundy, - red: styles.red, - }, - }, - defaultVariants: { - color: "red", - }, -}) diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx deleted file mode 100644 index 7b783e485..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/Hero/index.tsx +++ /dev/null @@ -1,8 +0,0 @@ -import { heroVariants } from "./heroVariants" - -import type { HeroProps } from "./hero" - -export default function Hero({ className, color, children }: HeroProps) { - const classNames = heroVariants({ className, color }) - return
{children}
-} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx deleted file mode 100644 index b8c4bd79f..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/index.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import Caption from "@scandic-hotels/design-system/Caption" - -import { getIntl } from "@/i18n" - -import CopyButton from "../../Buttons/CopyButton" -import { membershipNumberVariants } from "./membershipNumberVariants" - -import styles from "./membershipNumber.module.css" - -import type { MembershipNumberProps } from "@/types/components/myPages/membershipNumber" - -export default async function MembershipNumber({ - className, - color, - membership, -}: MembershipNumberProps) { - const intl = await getIntl() - const classNames = membershipNumberVariants({ className, color }) - - return ( -
- - {intl.formatMessage({ - id: "overview.membershipNumber.label", - defaultMessage: "Membership ID:", - })} - - - - - {membership?.membershipNumber ?? - intl.formatMessage({ - id: "common.NA", - defaultMessage: "N/A", - })} - - - {membership?.membershipNumber && ( - - )} - -
- ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css deleted file mode 100644 index 53021569a..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumber.module.css +++ /dev/null @@ -1,37 +0,0 @@ -.membershipContainer { - align-items: center; - background: var(--Scandic-Brand-Burgundy); - border-radius: var(--Corner-radius-sm); - display: grid; - grid-template-columns: 1fr; - justify-items: center; - padding: var(--Spacing-x1) var(--Spacing-x2) 0; -} - -.icon { - display: flex; - align-items: center; - flex-direction: row; - justify-content: center; - padding-left: var(--Spacing-x2); -} - -.burgundy { - background-color: var(--Main-Brand-Burgundy); -} - -.red { - background-color: var(--Scandic-Brand-Scandic-Red); -} - -@media screen and (min-width: 768px) { - .membershipContainer { - grid-template-columns: auto auto; - padding: 0 0 0 var(--Spacing-x2); - gap: var(--Spacing-x-half); - } - - .icon { - padding-left: 0; - } -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts deleted file mode 100644 index 7cdd28a27..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { cva } from "class-variance-authority" - -import styles from "./membershipNumber.module.css" - -export const membershipNumberVariants = cva(styles.membershipContainer, { - variants: { - color: { - burgundy: styles.burgundy, - red: styles.red, - }, - }, - defaultVariants: { - color: "burgundy", - }, -}) diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/friend.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/friend.module.css deleted file mode 100644 index 8f01b52a2..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/friend.module.css +++ /dev/null @@ -1,41 +0,0 @@ -.friend { - align-items: center; - display: flex; - flex-direction: column; - gap: var(--Spacing-x4); - justify-content: center; -} - -.header { - display: flex; - flex-direction: column; - gap: var(--Spacing-x2); -} - -.levelLabel { - position: relative; - transform: rotate(-13deg) translate(0px, -15px); - margin-left: -35px; -} - -.friend .name { - text-align: center; -} - -.membership { - align-items: center; - display: flex; - flex-direction: column; - gap: var(--Spacing-x2); - justify-content: center; -} - -.membershipContainer { - align-items: center; - background: var(--Scandic-Brand-Burgundy); - border-radius: var(--Corner-radius-sm); - display: grid; - grid-template-columns: 1fr; - justify-items: center; - padding: var(--Spacing-x1) var(--Spacing-x7) 0 var(--Spacing-x7); -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/index.tsx deleted file mode 100644 index b81c10909..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Friend/index.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { MembershipLevelEnum } from "@scandic-hotels/common/constants/membershipLevels" -import Body from "@scandic-hotels/design-system/Body" -import Title from "@scandic-hotels/design-system/Title" - -import { membershipLevels } from "@/constants/membershipLevels" - -import MembershipLevelIcon from "@/components/Levels/Icon" -import { getIntl } from "@/i18n" -import { isHighestMembership } from "@/utils/user" - -import styles from "./friend.module.css" - -import type { FriendProps } from "@/types/components/myPages/friend" - -export default async function Friend({ - children, - membership, - name, -}: FriendProps) { - const intl = await getIntl() - if (!membership?.membershipLevel) { - return null - } - const isHighestLevel = isHighestMembership(membership.membershipLevel) - - const lvlMessageHighest = intl.formatMessage({ - id: "overview.friend.highestLevel", - defaultMessage: "Highest level", - }) - - const lvlMessageLevel = intl.formatMessage( - { id: "common.membershipLevelWithValue", defaultMessage: "Level {level}" }, - { level: membershipLevels[membership.membershipLevel] } - ) - - return ( -
-
- - {isHighestLevel ? lvlMessageHighest : lvlMessageLevel} - - -
-
- - {name} - - {children} -
-
- ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx deleted file mode 100644 index 1ea967631..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import { Lang } from "@scandic-hotels/common/constants/language" -import { dt } from "@scandic-hotels/common/dt" -import Body from "@scandic-hotels/design-system/Body" -import { getFriendsMembership } from "@scandic-hotels/trpc/routers/user/helpers" - -import { getIntl } from "@/i18n" -import { getLang } from "@/i18n/serverContext" - -import type { UserProps } from "@/types/components/myPages/user" - -export default async function ExpiringPoints({ user }: UserProps) { - const intl = await getIntl() - const membership = user.loyalty ? getFriendsMembership(user.loyalty) : null - - if (!membership || !membership.pointsToExpire) { - // TODO: handle this case? - return null - } - const d = dt(membership.pointsExpiryDate) - - const lang = await getLang() - const dateFormat = lang == Lang.fi ? "DD.MM.YYYY" : "YYYY-MM-DD" - - return ( -
- - {intl.formatMessage( - { - id: "overview.stats.expiringPoints", - defaultMessage: "{points} spendable points expiring by {date}", - }, - { - points: intl.formatNumber(membership.pointsToExpire), - date: d.format(dateFormat), - } - )} - -
- ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css deleted file mode 100644 index 5f514a8d1..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/container.module.css +++ /dev/null @@ -1,13 +0,0 @@ -.points { - display: grid; - gap: var(--Spacing-x5); - text-wrap: balance; -} - -@media screen and (min-width: 768px) { - .points { - grid-auto-flow: column; - row-gap: 0; - column-gap: var(--Spacing-x2); - } -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx deleted file mode 100644 index a3a7856ee..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/Container/index.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import styles from "./container.module.css" - -export default function PointsContainer({ children }: React.PropsWithChildren) { - return
{children}
-} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx deleted file mode 100644 index 8dd2f83ec..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/index.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import Body from "@scandic-hotels/design-system/Body" -import Title from "@scandic-hotels/design-system/Title" - -import { getIntl } from "@/i18n" - -import styles from "./pointsColumn.module.css" - -import type { PointsColumnProps } from "@/types/components/myPages/points" - -export async function PointsColumn({ - title, - subtitle, - value, -}: PointsColumnProps) { - const intl = await getIntl() - - let number = "N/A" - if (typeof value === "number") { - number = intl.formatNumber(value) - } - - return ( -
- - {title} - - - {number} - - {subtitle ? ( - - {subtitle} - - ) : null} -
- ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css deleted file mode 100644 index 18599b825..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/PointsColumn/pointsColumn.module.css +++ /dev/null @@ -1,9 +0,0 @@ -@media screen and (min-width: 768px) { - .firstRow { - align-content: flex-end; - } - - .article { - display: grid; - } -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx deleted file mode 100644 index ecb523109..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import { MembershipLevelEnum } from "@scandic-hotels/common/constants/membershipLevels" -import { getFriendsMembership } from "@scandic-hotels/trpc/routers/user/helpers" - -import { serverClient } from "@/lib/trpc/server" - -import { getIntl } from "@/i18n" - -import PointsContainer from "./Container" -import { PointsColumn } from "./PointsColumn" - -import type { UserProps } from "@/types/components/myPages/user" - -export default async function Points({ user }: UserProps) { - const intl = await getIntl() - - const membership = user.loyalty ? getFriendsMembership(user.loyalty) : null - - const caller = await serverClient() - const nextLevel = - membership?.nextLevel && MembershipLevelEnum[membership.nextLevel] - ? await caller.contentstack.loyaltyLevels.byLevel({ - level: MembershipLevelEnum[membership.nextLevel], - }) - : null - - return ( - - - {nextLevel && ( - - )} - {/* TODO: Show NextLevelNightsColumn when nightsToTopTier data is correct from Antavo */} - {/* {membership?.nightsToTopTier && ( - - )} */} - - ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx deleted file mode 100644 index 8578e0b06..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { Divider } from "@scandic-hotels/design-system/Divider" - -import ExpiringPoints from "./ExpiringPoints" -import Points from "./Points" - -import styles from "./stats.module.css" - -import type { UserProps } from "@/types/components/myPages/user" - -export default function Stats({ user }: UserProps) { - return ( -
- - - -
- ) -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/stats.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/stats.module.css deleted file mode 100644 index 1b240b32b..000000000 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/stats.module.css +++ /dev/null @@ -1,11 +0,0 @@ -.stats { - align-content: center; - display: grid; - gap: var(--Spacing-x2); -} - -@media screen and (min-width: 1367px) { - .stats { - gap: var(--Spacing-x4); - } -} diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx index 94a820683..3f23cc9ba 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx @@ -1,4 +1,3 @@ -import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { env } from "@/env/server" @@ -9,15 +8,11 @@ import DigitalTeamMemberCard from "@/components/MyPages/DigitalTeamMemberCard" import DigitalTeamMemberCardAlert from "@/components/MyPages/DigitalTeamMemberCard/Alert" import LevelProgressCard from "@/components/MyPages/LevelProgressCard" 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 { getIntl } from "@/i18n" -import Hero from "./Friend/Hero" -import MembershipNumber from "./Friend/MembershipNumber" -import Friend from "./Friend" import MembershipOverviewCard from "./MembershipOverviewCard" -import Stats from "./Stats" import UserBaseInfo from "./UserBaseInfo" import styles from "./overview.module.css" @@ -40,9 +35,8 @@ export default async function Overview({ @@ -61,23 +55,14 @@ export default async function Overview({ - {env.ENABLE_NEW_OVERVIEW_SECTION ? ( - <> - -
- - -
- - ) : ( - - - - - - - - )} + + <> + +
+ + +
+ diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx index f1148d6c9..c0e5cfce9 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx @@ -1,6 +1,3 @@ -import { Divider } from "@scandic-hotels/design-system/Divider" - -import { env } from "@/env/server" import { getProfile } from "@/lib/trpc/memoizedRequests" import LevelProgressCard from "@/components/MyPages/LevelProgressCard" @@ -8,10 +5,6 @@ import { Section } from "@/components/Section" import SectionHeader from "@/components/Section/Header/Deprecated" import SectionLink from "@/components/Section/Link" -import Friend from "../../Overview/Friend" -import Hero from "../../Overview/Friend/Hero" -import MembershipNumber from "../../Overview/Friend/MembershipNumber" -import Stats from "../../Overview/Stats" import PointsToSpendCard from "../PointsToSpendCard" import styles from "./overview.module.css" @@ -37,23 +30,13 @@ export default async function PointsOverview({ headingAs={"h3"} headingLevel={"h1"} /> - {env.ENABLE_NEW_OVERVIEW_SECTION ? ( -
- - -
- ) : ( - - - - - - - - )} +
+ + +
) diff --git a/apps/scandic-web/env/server.ts b/apps/scandic-web/env/server.ts index e452e5a4d..9b4b98139 100644 --- a/apps/scandic-web/env/server.ts +++ b/apps/scandic-web/env/server.ts @@ -152,11 +152,6 @@ export const env = createEnv({ .refine((s) => s === "1" || s === "0") .transform((s) => s === "1") .default("1"), - ENABLE_NEW_OVERVIEW_SECTION: z - .string() - .refine((s) => s === "true" || s === "false") - .transform((s) => s === "true") - .default("false"), CHATBOT_LIVE_LANGS: z .string() .optional() @@ -241,7 +236,6 @@ export const env = createEnv({ DTMC_ENTRA_ID_SECRET: process.env.DTMC_ENTRA_ID_SECRET, HOTEL_BRANDING: process.env.HOTEL_BRANDING, WEBVIEW_SHOW_OVERVIEW: process.env.WEBVIEW_SHOW_OVERVIEW, - ENABLE_NEW_OVERVIEW_SECTION: process.env.ENABLE_NEW_OVERVIEW_SECTION, CHATBOT_LIVE_LANGS: process.env.CHATBOT_LIVE_LANGS, }, }) diff --git a/apps/scandic-web/types/components/myPages/membershipNumber.ts b/apps/scandic-web/types/components/myPages/membershipNumber.ts deleted file mode 100644 index b9e8a4bd2..000000000 --- a/apps/scandic-web/types/components/myPages/membershipNumber.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { User } from "@scandic-hotels/trpc/types/user" -import type { VariantProps } from "class-variance-authority" - -import type { membershipNumberVariants } from "@/components/Blocks/DynamicContent/Overview/Friend/MembershipNumber/membershipNumberVariants" - -export interface MembershipNumberProps - extends Omit, "color">, - VariantProps, - Pick {}