From 3aeaee64fba64d6c73e517118bc3cb33e5ca0869 Mon Sep 17 00:00:00 2001
From: Simon Emanuelsson <simon.emanuelsson@scandichotels.com>
Date: Tue, 16 Apr 2024 12:42:44 +0200
Subject: [PATCH] fix: parallell routes needs a page.tsx in root not just in
 catchAll route

---
 app/[lang]/(live)/(protected)/my-pages/page.tsx              | 1 -
 .../(protected)/my-pages/profile/@communication/page.tsx     | 5 +++++
 .../(protected)/my-pages/profile/@creditCards/page.tsx       | 5 +++++
 .../(protected)/my-pages/profile/@membershipCard/page.tsx    | 5 +++++
 .../(live)/(protected)/my-pages/profile/@password/page.tsx   | 5 +++++
 .../(live)/(protected)/my-pages/profile/@wishes/page.tsx     | 5 +++++
 app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx | 3 ---
 components/TempDesignSystem/Form/Country/index.tsx           | 3 ++-
 components/TempDesignSystem/Form/Date/Select/index.tsx       | 5 +++--
 9 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx
 create mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx
 create mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx
 create mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx
 create mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx
 delete mode 100644 app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx

diff --git a/app/[lang]/(live)/(protected)/my-pages/page.tsx b/app/[lang]/(live)/(protected)/my-pages/page.tsx
index d262e6802..72c90152b 100644
--- a/app/[lang]/(live)/(protected)/my-pages/page.tsx
+++ b/app/[lang]/(live)/(protected)/my-pages/page.tsx
@@ -6,5 +6,4 @@ import type { LangParams, PageArgs } from "@/types/params"
 
 export default function MyPages({ params }: PageArgs<LangParams>) {
   redirect(overview[params.lang])
-  return null
 }
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx
new file mode 100644
index 000000000..cd138565d
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@communication/page.tsx
@@ -0,0 +1,5 @@
+import CommunicationPreferences from "@/components/MyProfile/CommunicationPreferences"
+
+export default function Communication() {
+  return <CommunicationPreferences />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx
new file mode 100644
index 000000000..fc36f789e
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx
@@ -0,0 +1,5 @@
+import CreditCards from "@/components/MyProfile/CreditCards"
+
+export default function CreditCardSlot() {
+  return <CreditCards />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx
new file mode 100644
index 000000000..924d5c4cb
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@membershipCard/page.tsx
@@ -0,0 +1,5 @@
+import MembershipCard from "@/components/MyProfile/MembershipCard"
+
+export default function MembershipCardSlot() {
+  return <MembershipCard />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx
new file mode 100644
index 000000000..51895bc82
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@password/page.tsx
@@ -0,0 +1,5 @@
+import Password from "@/components/MyProfile/Password"
+
+export default function PasswordSlot() {
+  return <Password />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx
new file mode 100644
index 000000000..d22592741
--- /dev/null
+++ b/app/[lang]/(live)/(protected)/my-pages/profile/@wishes/page.tsx
@@ -0,0 +1,5 @@
+import Wishes from "@/components/MyProfile/Wishes"
+
+export default function WishesSlot() {
+  return <Wishes />
+}
diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
deleted file mode 100644
index fe4978be0..000000000
--- a/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function EditPage() {
-  return null
-}
diff --git a/components/TempDesignSystem/Form/Country/index.tsx b/components/TempDesignSystem/Form/Country/index.tsx
index c711f0c96..9d003f4c8 100644
--- a/components/TempDesignSystem/Form/Country/index.tsx
+++ b/components/TempDesignSystem/Form/Country/index.tsx
@@ -91,9 +91,10 @@ export default function CountrySelect({
            */
           UNSTABLE_portalContainer={divElement ?? undefined}
         >
-          <ListBox>
+          <ListBox aria-label="Country of residence">
             {countries.map((country, idx) => (
               <ListBoxItem
+                aria-label={country.name}
                 className={styles.listBoxItem}
                 id={country.name}
                 key={`${country.code}-${idx}`}
diff --git a/components/TempDesignSystem/Form/Date/Select/index.tsx b/components/TempDesignSystem/Form/Date/Select/index.tsx
index 75cea971b..b53e754af 100644
--- a/components/TempDesignSystem/Form/Date/Select/index.tsx
+++ b/components/TempDesignSystem/Form/Date/Select/index.tsx
@@ -63,12 +63,13 @@ export default function Select({
            */
           UNSTABLE_portalContainer={divElement ?? undefined}
         >
-          <ListBox className={styles.listBox}>
+          <ListBox aria-label={name} className={styles.listBox}>
             {items.map((item) => (
               <ListBoxItem
-                key={item}
+                aria-label={String(item)}
                 className={styles.listBoxItem}
                 id={item}
+                key={item}
                 textValue={String(item)}
               >
                 {item}