From f1a0f7d0daab71065253b8b7f1714de0a8291247 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Thu, 20 Jun 2024 14:09:15 +0200 Subject: [PATCH 1/4] feat: enable design tokens in current web --- app/[lang]/(live-current)/layout.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx index 9712b1a86..cefbf795a 100644 --- a/app/[lang]/(live-current)/layout.tsx +++ b/app/[lang]/(live-current)/layout.tsx @@ -1,4 +1,5 @@ -import "@scandic-hotels/design-system/current/style.css" +import "@/app/globals.css" +import "@scandic-hotels/design-system/style.css" import Script from "next/script" From 5d29f65c6f9b69ea487f3dd81961932df78720e2 Mon Sep 17 00:00:00 2001 From: Chuma McPhoy Date: Thu, 20 Jun 2024 14:38:31 +0200 Subject: [PATCH 2/4] fix: add error fallback for mobile dropdown parallel route --- .../{ => current-content-page}/page.tsx | 0 .../(live-current)/@myPagesMobileDropdown/error.tsx | 12 ++++++++++++ 2 files changed, 12 insertions(+) rename app/[lang]/(live-current)/@myPagesMobileDropdown/{ => current-content-page}/page.tsx (100%) create mode 100644 app/[lang]/(live-current)/@myPagesMobileDropdown/error.tsx diff --git a/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx b/app/[lang]/(live-current)/@myPagesMobileDropdown/current-content-page/page.tsx similarity index 100% rename from app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx rename to app/[lang]/(live-current)/@myPagesMobileDropdown/current-content-page/page.tsx diff --git a/app/[lang]/(live-current)/@myPagesMobileDropdown/error.tsx b/app/[lang]/(live-current)/@myPagesMobileDropdown/error.tsx new file mode 100644 index 000000000..fca9f2df6 --- /dev/null +++ b/app/[lang]/(live-current)/@myPagesMobileDropdown/error.tsx @@ -0,0 +1,12 @@ +"use client" + +import { useParams } from "next/navigation" + +import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDropdown" + +import { LangParams } from "@/types/params" + +export default function Error() { + const params = useParams() + return +} From 462966a571180a44bf171500145d5704a402ac27 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Thu, 20 Jun 2024 13:44:00 +0200 Subject: [PATCH 3/4] fix: change name of danish points page --- constants/routes/myPages.js | 2 +- constants/routes/webviews.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/constants/routes/myPages.js b/constants/routes/myPages.js index f942d96af..6964c088f 100644 --- a/constants/routes/myPages.js +++ b/constants/routes/myPages.js @@ -50,7 +50,7 @@ export const profileEdit = { /** @type {import('@/types/routes').LangRoute} */ export const points = { - da: `${myPages.da}/points`, + da: `${myPages.da}/point`, de: `${myPages.de}/punkte`, en: `${myPages.en}/points`, fi: `${myPages.fi}/pisteet`, diff --git a/constants/routes/webviews.ts b/constants/routes/webviews.ts index 92f9b4766..2680e6228 100644 --- a/constants/routes/webviews.ts +++ b/constants/routes/webviews.ts @@ -26,12 +26,12 @@ export const benefits = { } export const points = { - da: `${myPages.da}/points`, - de: `${myPages.de}/points`, + da: `${myPages.da}/point`, + de: `${myPages.de}/punkte`, en: `${myPages.en}/points`, - fi: `${myPages.fi}/points`, - no: `${myPages.no}/points`, - sv: `${myPages.sv}/points`, + fi: `${myPages.fi}/pisteet`, + no: `${myPages.no}/poeng`, + sv: `${myPages.sv}/poang`, } export const programOverview = { From 83252ec6d7d50510e4c9fe749d95664ebf245bb9 Mon Sep 17 00:00:00 2001 From: Chuma McPhoy Date: Mon, 24 Jun 2024 12:21:22 +0200 Subject: [PATCH 4/4] fix: use correct variant for signout link in dropdown --- components/Current/Header/MyPagesMobileDropdown/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/Current/Header/MyPagesMobileDropdown/index.tsx b/components/Current/Header/MyPagesMobileDropdown/index.tsx index f79865496..ecc93eddf 100644 --- a/components/Current/Header/MyPagesMobileDropdown/index.tsx +++ b/components/Current/Header/MyPagesMobileDropdown/index.tsx @@ -61,11 +61,11 @@ export default function MyPagesMobileDropdown({ {menuItem.display_sign_out_link && lang ? (
  • {formatMessage({ id: "Log out" })}