diff --git a/app/[lang]/(live)/(protected)/my-pages/_constants.ts b/app/[lang]/(live)/(protected)/my-pages/_constants.ts index feb4502ca..1ee770976 100644 --- a/app/[lang]/(live)/(protected)/my-pages/_constants.ts +++ b/app/[lang]/(live)/(protected)/my-pages/_constants.ts @@ -1,12 +1,12 @@ export const breadcrumbs = { - "/my-pages2": [ + "/my-pages": [ { title: "My Pages", }, ], - "/my-pages2/profile": [ + "/my-pages/profile": [ { - href: "/my-pages2", + href: "/my-pages", title: "My Pages", }, { diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/page.tsx deleted file mode 100644 index 25acf3e0a..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/benefits/page.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { benefits } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" - -import type { LangParams, PageArgs } from "@/types/params" - -export default async function BenefitsBreadcrumbs({ - params, -}: PageArgs) { - const href = benefits[params.lang].replace(`/${params.lang}`, "") - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale: params.lang, - }) - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/page.tsx deleted file mode 100644 index 203ace024..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/overview/page.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { overview } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" - -import type { LangParams, PageArgs } from "@/types/params" - -export default async function OverviewBreadcrumbs({ - params, -}: PageArgs) { - const href = overview[params.lang].replace(`/${params.lang}`, "") - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale: params.lang, - }) - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/[...catchAll]/page.tsx deleted file mode 100644 index 243892846..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/[...catchAll]/page.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { profile } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" - -import type { LangParams, PageArgs } from "@/types/params" - -export default async function ProfileBreadcrumbs({ - params, -}: PageArgs) { - const href = profile[params.lang].replace(`/${params.lang}`, "") - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale: params.lang, - }) - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/page.tsx deleted file mode 100644 index 243892846..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/profile/page.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { profile } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" - -import type { LangParams, PageArgs } from "@/types/params" - -export default async function ProfileBreadcrumbs({ - params, -}: PageArgs) { - const href = profile[params.lang].replace(`/${params.lang}`, "") - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale: params.lang, - }) - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/page.tsx deleted file mode 100644 index 69a7ccdab..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/@breadcrumbs/stays/page.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { stays } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" - -import type { LangParams, PageArgs } from "@/types/params" - -export default async function StaysBreadcrumbs({ - params, -}: PageArgs) { - const href = stays[params.lang].replace(`/${params.lang}`, "") - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale: params.lang, - }) - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/_constants.ts b/app/[lang]/(live)/(protected)/my-pages2/_constants.ts deleted file mode 100644 index feb4502ca..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/_constants.ts +++ /dev/null @@ -1,16 +0,0 @@ -export const breadcrumbs = { - "/my-pages2": [ - { - title: "My Pages", - }, - ], - "/my-pages2/profile": [ - { - href: "/my-pages2", - title: "My Pages", - }, - { - title: "My Profile", - }, - ], -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/layout.module.css b/app/[lang]/(live)/(protected)/my-pages2/layout.module.css deleted file mode 100644 index 4782b4cb4..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/layout.module.css +++ /dev/null @@ -1,27 +0,0 @@ -.layout { - --header-height: 4.5rem; - - display: grid; - font-family: var(--ff-fira-sans); - grid-template-rows: var(--header-height) auto 1fr; - min-height: 100dvh; -} - -.content { - display: grid; - padding-bottom: 7.7rem; - padding-left: 0; - padding-right: 0; - position: relative; -} - -@media screen and (min-width: 950px) { - .content { - gap: 10rem; - grid-template-columns: 25rem 1fr; - padding-bottom: 17.5rem; - padding-left: 2.4rem; - padding-right: 2.4rem; - padding-top: 5.8rem; - } -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/layout.tsx b/app/[lang]/(live)/(protected)/my-pages2/layout.tsx deleted file mode 100644 index b5e51dd1d..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/layout.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts" -import Header from "@/components/MyPages/Header" -import Sidebar from "@/components/MyPages/Sidebar" - -import styles from "./layout.module.css" - -import type { MyPagesLayoutProps } from "@/types/components/myPages/layout" - -export default async function MyPagesLayout({ - breadcrumbs, - children, - params, -}: React.PropsWithChildren) { - return ( -
-
- {breadcrumbs} -
- - {children} -
-
- ) -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/page.module.css b/app/[lang]/(live)/(protected)/my-pages2/page.module.css deleted file mode 100644 index f7c717942..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/page.module.css +++ /dev/null @@ -1,15 +0,0 @@ -.blocks { - display: grid; - gap: 4.2rem; - padding-top: 4rem; - padding-left: 2rem; - padding-right: 2rem; -} - -@media screen and (min-width: 950px) { - .blocks { - gap: 6.4rem; - padding-left: 0; - padding-right: 0; - } -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/page.tsx deleted file mode 100644 index ce3c31901..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/page.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { redirect } from "next/navigation" - -import { myPages, overview } from "@/constants/routes/myPages" -import { serverClient } from "@/lib/trpc/server" - -import MaxWidth from "@/components/MaxWidth" -import Content from "@/components/MyPages/AccountPage/Content" - -import styles from "./page.module.css" - -import type { LangParams, PageArgs, UriParams } from "@/types/params" - -export default async function MyPages({ - params, - searchParams, -}: PageArgs) { - if (!searchParams.uri) { - throw new Error("Bad URI") - } - - const myPagesRoot = myPages[params.lang].replace(`/${params.lang}`, "") - if (searchParams.uri === myPagesRoot) { - redirect(overview[params.lang]) - } - const accountPage = await serverClient().contentstack.accountPage.get({ - url: searchParams.uri, - lang: params.lang, - }) - - return ( - - - - ) -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/[...catchAll]/page.tsx deleted file mode 100644 index cd138565d..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/[...catchAll]/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import CommunicationPreferences from "@/components/MyProfile/CommunicationPreferences" - -export default function Communication() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/page.tsx deleted file mode 100644 index cd138565d..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@communication/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import CommunicationPreferences from "@/components/MyProfile/CommunicationPreferences" - -export default function Communication() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/[...catchAll]/page.tsx deleted file mode 100644 index fc36f789e..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/[...catchAll]/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import CreditCards from "@/components/MyProfile/CreditCards" - -export default function CreditCardSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/page.tsx deleted file mode 100644 index fc36f789e..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@creditCards/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import CreditCards from "@/components/MyProfile/CreditCards" - -export default function CreditCardSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/edit/page.tsx deleted file mode 100644 index 215039f2f..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/edit/page.tsx +++ /dev/null @@ -1,38 +0,0 @@ -"use client" -import { profile } from "@/constants/routes/myPages" -import { _ } from "@/lib/translation" -import { useProfileStore } from "@/stores/edit-profile" - -import Button from "@/components/TempDesignSystem/Button" -import Link from "@/components/TempDesignSystem/Link" - -import type { LangParams, PageArgs } from "@/types/params" - -export default function EditProfile({ params }: PageArgs) { - const isPending = useProfileStore((store) => store.pending) - const isValid = useProfileStore((store) => store.valid) - return ( - <> - - - - ) -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/page.tsx deleted file mode 100644 index c17431379..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@edit/page.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Page() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/[...catchAll]/page.tsx deleted file mode 100644 index 924d5c4cb..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/[...catchAll]/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import MembershipCard from "@/components/MyProfile/MembershipCard" - -export default function MembershipCardSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/page.tsx deleted file mode 100644 index 924d5c4cb..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@membershipCard/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import MembershipCard from "@/components/MyProfile/MembershipCard" - -export default function MembershipCardSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@password/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@password/[...catchAll]/page.tsx deleted file mode 100644 index 51895bc82..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@password/[...catchAll]/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Password from "@/components/MyProfile/Password" - -export default function PasswordSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@password/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@password/page.tsx deleted file mode 100644 index 51895bc82..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@password/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Password from "@/components/MyProfile/Password" - -export default function PasswordSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/page.tsx deleted file mode 100644 index 87dd80061..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/edit/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import EditProfile from "@/components/MyProfile/Profile/Edit" - -export default function EditProfileSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/error.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/error.tsx deleted file mode 100644 index 197ee9e67..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/error.tsx +++ /dev/null @@ -1,8 +0,0 @@ -"use client" - -import type { ErrorPage } from "@/types/next/error" - -export default function ProfileError({ error }: ErrorPage) { - console.error(error) - return

Error happened, Profile

-} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/page.tsx deleted file mode 100644 index fd7a32b77..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@profile/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Profile from "@/components/MyProfile/Profile" - -export default function ProfileInfo() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@view/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/default.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/default.tsx deleted file mode 100644 index 86b9e9a38..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/default.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Default() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/page.tsx deleted file mode 100644 index fe4978be0..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/edit/page.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function EditPage() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@view/page.tsx deleted file mode 100644 index 30bf1b004..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@view/page.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { profileEdit } from "@/constants/routes/myPages" -import { _ } from "@/lib/translation" - -import Button from "@/components/TempDesignSystem/Button" -import Link from "@/components/TempDesignSystem/Link" - -import type { LangParams, PageArgs } from "@/types/params" - -export default function ProfileView({ params }: PageArgs) { - return ( - - ) -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/[...catchAll]/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/[...catchAll]/page.tsx deleted file mode 100644 index d22592741..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/[...catchAll]/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Wishes from "@/components/MyProfile/Wishes" - -export default function WishesSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/page.tsx deleted file mode 100644 index d22592741..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/@wishes/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import Wishes from "@/components/MyProfile/Wishes" - -export default function WishesSlot() { - return -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/edit/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/edit/page.tsx deleted file mode 100644 index 496477ced..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/edit/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import "../profileLayout.css" - -export default function EditProfilePage() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/layout.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/layout.tsx deleted file mode 100644 index 26c1df4d6..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/layout.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import MaxWidth from "@/components/MaxWidth" - -import type { ProfileLayoutProps } from "@/types/components/myPages/myProfile/layout" - -export default function ProfileLayout({ - children, - communication, - creditCards, - edit, - membershipCard, - password, - profile, - view, - wishes, -}: React.PropsWithChildren) { - return ( - -
- {edit} - {view} -
- {profile} - {children} -
- {communication} - {wishes} - {membershipCard} - {creditCards} - {password} -
-
- ) -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/page.tsx b/app/[lang]/(live)/(protected)/my-pages2/profile/page.tsx deleted file mode 100644 index cc60f11d8..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import "./profileLayout.css" - -export default function ProfilePage() { - return null -} diff --git a/app/[lang]/(live)/(protected)/my-pages2/profile/profileLayout.css b/app/[lang]/(live)/(protected)/my-pages2/profile/profileLayout.css deleted file mode 100644 index 6246001ca..000000000 --- a/app/[lang]/(live)/(protected)/my-pages2/profile/profileLayout.css +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Due to css import issues with parallell routes we are forced to - * use a regular css file and import it in the page.tsx - */ -.profile-page { - display: grid; - gap: 3rem; -} - -.profile-btns { - align-items: center; - display: flex; - gap: 1rem; - justify-content: flex-end; - position: absolute; - right: 0; - /* Creates the 16px gap from design */ - top: -1.6rem; - /* Moves itself to top of container to avoid calc */ - transform: translateY(-100%); -} - -.profile-cards { - display: grid; - gap: 0.4rem; - grid-template-columns: 1fr 1fr; -} diff --git a/components/MaxWidth/index.tsx b/components/MaxWidth/index.tsx index 495447a76..a947ae92b 100644 --- a/components/MaxWidth/index.tsx +++ b/components/MaxWidth/index.tsx @@ -1,6 +1,9 @@ "use client" import { cva } from "class-variance-authority" +import { Lang } from "@/constants/languages" +import { trpc } from "@/lib/trpc/client" + import styles from "./maxWidth.module.css" import type { MaxWidthProps } from "@/types/components/max-width" @@ -12,6 +15,10 @@ export default function MaxWidth({ tag = "section", ...props }: MaxWidthProps) { + const d = trpc.contentstack.breadcrumbs.get.useQuery({ + locale: Lang.en, + href: "/my-pages/overview", + }) const Cmp = tag return } diff --git a/constants/routes/myPages.js b/constants/routes/myPages.js index 1d218dd58..ab96ebcf9 100644 --- a/constants/routes/myPages.js +++ b/constants/routes/myPages.js @@ -11,7 +11,7 @@ export const myPages = { da: "/da/mine-sider", de: "/de/mein-profil", - en: "/en/my-pages2", + en: "/en/my-pages", fi: "/fi/minun-sivujani", no: "/no/mine-sider", sv: "/sv/mina-sidor", diff --git a/middlewares/authRequired.ts b/middlewares/authRequired.ts index 34ef0c066..99debb1dc 100644 --- a/middlewares/authRequired.ts +++ b/middlewares/authRequired.ts @@ -57,7 +57,7 @@ export const middleware = auth(async (request) => { searchParams.set("uri", pathNameWithoutLang) return NextResponse.rewrite( - new URL(`/${lang}/my-pages2?${searchParams.toString()}`, nextUrl) + new URL(`/${lang}/my-pages?${searchParams.toString()}`, nextUrl) ) } return NextResponse.next() diff --git a/next.config.js b/next.config.js index c6138382f..dc8b453d2 100644 --- a/next.config.js +++ b/next.config.js @@ -77,23 +77,23 @@ const nextConfig = { beforeFiles: [ { source: benefits.da, - destination: "/da/my-pages2/benefits", + destination: "/da/my-pages/benefits", }, { source: benefits.de, - destination: "/de/my-pages2/benefits", + destination: "/de/my-pages/benefits", }, { source: benefits.fi, - destination: "/fi/my-pages2/benefits", + destination: "/fi/my-pages/benefits", }, { source: benefits.no, - destination: "/no/my-pages2/benefits", + destination: "/no/my-pages/benefits", }, { source: benefits.sv, - destination: "/sv/my-pages2/benefits", + destination: "/sv/my-pages/benefits", }, { source: login.da, destination: "/da/login" }, @@ -102,35 +102,35 @@ const nextConfig = { { source: login.no, destination: "/no/login" }, { source: login.sv, destination: "/sv/login" }, - { source: myPages.da, destination: "/da/my-pages2/overview" }, - { source: myPages.de, destination: "/de/my-pages2/overview" }, - { source: myPages.fi, destination: "/fi/my-pages2/overview" }, - { source: myPages.no, destination: "/no/my-pages2/overview" }, - { source: myPages.sv, destination: "/sv/my-pages2/overview" }, + { source: myPages.da, destination: "/da/my-pages/overview" }, + { source: myPages.de, destination: "/de/my-pages/overview" }, + { source: myPages.fi, destination: "/fi/my-pages/overview" }, + { source: myPages.no, destination: "/no/my-pages/overview" }, + { source: myPages.sv, destination: "/sv/my-pages/overview" }, - { source: overview.da, destination: "/da/my-pages2/overview" }, - { source: overview.de, destination: "/de/my-pages2/overview" }, - { source: overview.fi, destination: "/fi/my-pages2/overview" }, - { source: overview.no, destination: "/no/my-pages2/overview" }, - { source: overview.sv, destination: "/sv/my-pages2/overview" }, + { source: overview.da, destination: "/da/my-pages/overview" }, + { source: overview.de, destination: "/de/my-pages/overview" }, + { source: overview.fi, destination: "/fi/my-pages/overview" }, + { source: overview.no, destination: "/no/my-pages/overview" }, + { source: overview.sv, destination: "/sv/my-pages/overview" }, - { source: profile.da, destination: "/da/my-pages2/profile" }, - { source: profile.de, destination: "/de/my-pages2/profile" }, - { source: profile.fi, destination: "/fi/my-pages2/profile" }, - { source: profile.no, destination: "/no/my-pages2/profile" }, - { source: profile.sv, destination: "/sv/my-pages2/profile" }, + { source: profile.da, destination: "/da/my-pages/profile" }, + { source: profile.de, destination: "/de/my-pages/profile" }, + { source: profile.fi, destination: "/fi/my-pages/profile" }, + { source: profile.no, destination: "/no/my-pages/profile" }, + { source: profile.sv, destination: "/sv/my-pages/profile" }, - { source: profileEdit.da, destination: "/da/my-pages2/profile/edit" }, - { source: profileEdit.de, destination: "/de/my-pages2/profile/edit" }, - { source: profileEdit.fi, destination: "/fi/my-pages2/profile/edit" }, - { source: profileEdit.no, destination: "/no/my-pages2/profile/edit" }, - { source: profileEdit.sv, destination: "/sv/my-pages2/profile/edit" }, + { source: profileEdit.da, destination: "/da/my-pages/profile/edit" }, + { source: profileEdit.de, destination: "/de/my-pages/profile/edit" }, + { source: profileEdit.fi, destination: "/fi/my-pages/profile/edit" }, + { source: profileEdit.no, destination: "/no/my-pages/profile/edit" }, + { source: profileEdit.sv, destination: "/sv/my-pages/profile/edit" }, - { source: stays.da, destination: "/da/my-pages2/stays" }, - { source: stays.de, destination: "/de/my-pages2/stays" }, - { source: stays.fi, destination: "/fi/my-pages2/stays" }, - { source: stays.no, destination: "/no/my-pages2/stays" }, - { source: stays.sv, destination: "/sv/my-pages2/stays" }, + { source: stays.da, destination: "/da/my-pages/stays" }, + { source: stays.de, destination: "/de/my-pages/stays" }, + { source: stays.fi, destination: "/fi/my-pages/stays" }, + { source: stays.no, destination: "/no/my-pages/stays" }, + { source: stays.sv, destination: "/sv/my-pages/stays" }, ], } },