scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rebase issues

Browse Source
This commit is contained in:
Christel Westerberg
2024-05-21 16:13:50 +02:00
parent d5f2604ca0
commit 158b5a5dbb
25 changed files with 43 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/[lang]/(live)/(protected)/bypass/page.tsx
View File

@@ -1,7 +0,0 @@
import { auth } from "@/auth"
export default async function ByPass() {
const session = await auth()
return <pre>{JSON.stringify(session, null, 2)}</pre>
}

0
app/[lang]/(live)/(public)/[contentType]/layout.module.css → app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css
View File

0
app/[lang]/(live)/(public)/[contentType]/layout.tsx → app/[lang]/(live)/(public)/[contentType]/[uid]/layout.tsx
View File

0
app/[lang]/(live)/(public)/[contentType]/page.tsx → app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx
View File

64
app/[lang]/(live)/(public)/login/route.ts
View File

@@ -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 {

14
app/[lang]/webview/loyalty-page/page.tsx
View File

@@ -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<LangParams, UriParams>) {
if (!searchParams.uri) {
return notFound()
}
const loyaltyPage = await serverClient().contentstack.loyaltyPage.get({
href: searchParams.uri,
locale: params.lang,
})
}: PageArgs<LangParams>) {
const loyaltyPage = await serverClient().contentstack.loyaltyPage.get()
return (
<section className={styles.content}>
{loyaltyPage.sidebar ? <Sidebar blocks={loyaltyPage.sidebar} /> : null}

16
app/[lang]/webview/my-pages/page.tsx
View File

@@ -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<LangParams, UriParams>) {
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<LangParams>) {
const accountPage = await serverClient().contentstack.accountPage.get()
return (
<MaxWidth className={styles.blocks} tag="main">