diff --git a/app/[lang]/(live)/(protected)/bypass/page.tsx b/app/[lang]/(live)/(protected)/bypass/page.tsx deleted file mode 100644 index 9f37aa2a7..000000000 --- a/app/[lang]/(live)/(protected)/bypass/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { auth } from "@/auth" - -export default async function ByPass() { - const session = await auth() - - return 
{JSON.stringify(session, null, 2)}
-} diff --git a/app/[lang]/(live)/(public)/[contentType]/layout.module.css b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css similarity index 100% rename from app/[lang]/(live)/(public)/[contentType]/layout.module.css rename to app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css diff --git a/app/[lang]/(live)/(public)/[contentType]/layout.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx similarity index 100% rename from app/[lang]/(live)/(public)/[contentType]/layout.tsx rename to app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx diff --git a/app/[lang]/(live)/(public)/[contentType]/page.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx similarity index 100% rename from app/[lang]/(live)/(public)/[contentType]/page.tsx rename to app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx diff --git a/app/[lang]/(live)/(public)/login/route.ts b/app/[lang]/(live)/(public)/login/route.ts index 7879d01f5..5cbc22d9b 100644 --- a/app/[lang]/(live)/(public)/login/route.ts +++ b/app/[lang]/(live)/(public)/login/route.ts @@ -41,38 +41,38 @@ export async function GET( "redirectTo=; Expires=Thu, 01 Jan 1970 00:00:00 UTC; Path=/; HttpOnly; SameSite=Lax" ) - // try { - // // Initiate the seamless login flow - // let redirectUrlValue - // switch (context.params.lang) { - // case Lang.da: - // redirectUrlValue = env.SEAMLESS_LOGIN_DA - // break - // case Lang.de: - // redirectUrlValue = env.SEAMLESS_LOGIN_DE - // break - // case Lang.en: - // redirectUrlValue = env.SEAMLESS_LOGIN_EN - // break - // case Lang.fi: - // redirectUrlValue = env.SEAMLESS_LOGIN_FI - // break - // case Lang.no: - // redirectUrlValue = env.SEAMLESS_LOGIN_NO - // break - // case Lang.sv: - // redirectUrlValue = env.SEAMLESS_LOGIN_SV - // break - // } - // const redirectUrl = new URL(redirectUrlValue) - // redirectUrl.searchParams.set("returnurl", redirectTo) - // redirectTo = redirectUrl.toString() - // } catch (e) { - // console.error( - // "Unable to create URL for seamless login, proceeding without it." - // ) - // console.error(e) - // } + try { + // Initiate the seamless login flow + let redirectUrlValue + switch (context.params.lang) { + case Lang.da: + redirectUrlValue = env.SEAMLESS_LOGIN_DA + break + case Lang.de: + redirectUrlValue = env.SEAMLESS_LOGIN_DE + break + case Lang.en: + redirectUrlValue = env.SEAMLESS_LOGIN_EN + break + case Lang.fi: + redirectUrlValue = env.SEAMLESS_LOGIN_FI + break + case Lang.no: + redirectUrlValue = env.SEAMLESS_LOGIN_NO + break + case Lang.sv: + redirectUrlValue = env.SEAMLESS_LOGIN_SV + break + } + const redirectUrl = new URL(redirectUrlValue) + redirectUrl.searchParams.set("returnurl", redirectTo) + redirectTo = redirectUrl.toString() + } catch (e) { + console.error( + "Unable to create URL for seamless login, proceeding without it." + ) + console.error(e) + } } try { diff --git a/app/[lang]/webview/loyalty-page/page.tsx b/app/[lang]/webview/loyalty-page/page.tsx index 8d63f02ad..0c2ee7c00 100644 --- a/app/[lang]/webview/loyalty-page/page.tsx +++ b/app/[lang]/webview/loyalty-page/page.tsx @@ -8,20 +8,12 @@ import MaxWidth from "@/components/MaxWidth" import styles from "./page.module.css" -import { LangParams, PageArgs, UriParams } from "@/types/params" +import { LangParams, PageArgs } from "@/types/params" export default async function AboutScandicFriends({ params, - searchParams, -}: PageArgs) { - if (!searchParams.uri) { - return notFound() - } - - const loyaltyPage = await serverClient().contentstack.loyaltyPage.get({ - href: searchParams.uri, - locale: params.lang, - }) +}: PageArgs) { + const loyaltyPage = await serverClient().contentstack.loyaltyPage.get() return (
{loyaltyPage.sidebar ? : null} diff --git a/app/[lang]/webview/my-pages/page.tsx b/app/[lang]/webview/my-pages/page.tsx index e66326643..f6ef509a5 100644 --- a/app/[lang]/webview/my-pages/page.tsx +++ b/app/[lang]/webview/my-pages/page.tsx @@ -11,20 +11,10 @@ import Content from "@/components/MyPages/AccountPage/Webview/Content" import styles from "./page.module.css" -import { LangParams, PageArgs, UriParams } from "@/types/params" +import { LangParams, PageArgs } from "@/types/params" -export default async function MyPages({ - params, - searchParams, -}: PageArgs) { - if (!searchParams.uri) { - return notFound() - } - - const accountPage = await serverClient().contentstack.accountPage.get({ - url: searchParams.uri, - lang: params.lang, - }) +export default async function MyPages({ params }: PageArgs) { + const accountPage = await serverClient().contentstack.accountPage.get() return ( diff --git a/components/MyPages/Breadcrumbs/index.tsx b/components/MyPages/Breadcrumbs/index.tsx index 7ae70c5f4..f0fa8d566 100644 --- a/components/MyPages/Breadcrumbs/index.tsx +++ b/components/MyPages/Breadcrumbs/index.tsx @@ -1,4 +1,3 @@ -import { Lang } from "@/constants/languages" import { _ } from "@/lib/translation" import { serverClient } from "@/lib/trpc/server" @@ -7,17 +6,8 @@ import BreadcrumbsWithLink from "./BreadcrumbWithLink" import styles from "./breadcrumbs.module.css" -export default async function Breadcrumbs({ - href, - locale, -}: { - href: string - locale: Lang -}) { - const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({ - href, - locale, - }) +export default async function Breadcrumbs() { + const breadcrumbs = await serverClient().contentstack.breadcrumbs.get() return (