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

feat: improve structure and error handling

Browse Source
This commit is contained in:
Michael Zetterberg
2024-05-14 15:55:46 +02:00
parent 01587d7fd5
commit f5108d1a8e
104 changed files with 1505 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/benefits/default.tsx
View File

@@ -1,3 +0,0 @@
export default function Default() {
return null
}

17
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/benefits/page.tsx
View File

@@ -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<LangParams>) {
const href = benefits[params.lang].replace(`/${params.lang}`, "")
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale: params.lang,
})
return <Breadcrumbs breadcrumbs={breadcrumbs} />
}

3
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/default.tsx
View File

@@ -1,3 +0,0 @@
export default function Default() {
return null
}

3
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/overview/default.tsx
View File

@@ -1,3 +0,0 @@
export default function Default() {
return null
}

17
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/overview/page.tsx
View File

@@ -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<LangParams>) {
const href = overview[params.lang].replace(`/${params.lang}`, "")
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale: params.lang,
})
return <Breadcrumbs breadcrumbs={breadcrumbs} />
}

17
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/profile/[...catchAll]/page.tsx
View File

@@ -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<LangParams>) {
const href = profile[params.lang].replace(`/${params.lang}`, "")
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale: params.lang,
})
return <Breadcrumbs breadcrumbs={breadcrumbs} />
}

17
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/profile/page.tsx
View File

@@ -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<LangParams>) {
const href = profile[params.lang].replace(`/${params.lang}`, "")
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale: params.lang,
})
return <Breadcrumbs breadcrumbs={breadcrumbs} />
}

3
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/stays/default.tsx
View File

@@ -1,3 +0,0 @@
export default function Default() {
return null
}

17
app/[lang]/(live)/(protected)/bypass/@breadcrumbs/stays/page.tsx
View File

@@ -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<LangParams>) {
const href = stays[params.lang].replace(`/${params.lang}`, "")
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale: params.lang,
})
return <Breadcrumbs breadcrumbs={breadcrumbs} />
}

26
app/[lang]/(live)/(protected)/bypass/layout.tsx
View File

@@ -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<MyPagesLayoutProps>) {
return (
<div
className={`${firaMono.variable} ${firaSans.variable} ${styles.layout}`}
>
<Header lang={params.lang} />
{breadcrumbs}
<div className={styles.content}>
<Sidebar lang={params.lang} />
{children}
</div>
</div>
)
}

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>
}

2
app/[lang]/(live)/(protected)/layout.tsx
View File

@@ -17,5 +17,5 @@ export default async function ProtectedLayout({
redirect(`/${params.lang}/login`)
}
return <>{children}</>
return children
}

1
app/[lang]/(live)/(protected)/logout/route.ts
View File

@@ -11,7 +11,6 @@ export async function GET(request: NextRequest) {
// If all else fails, always redirect to startpage
const redirectTo =
returnUrl ||
request.headers.get("x-redirect-to") ||
request.nextUrl.searchParams.get("redirectTo") ||
"/"

17
app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx
View File

@@ -13,25 +13,14 @@ import type { LangParams, PageArgs } from "@/types/params"
export default async function MyPages({
params,
}: PageArgs<LangParams & { path: string[] }>) {
const baseUrl = myPages[params.lang].replace(`/${params.lang}`, "")
const pathUrl = params.path.join("/")
const accountPage = await serverClient().contentstack.accountPage.get({
url: `${baseUrl}/${pathUrl}`,
lang: params.lang,
})
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href: `${baseUrl}/${pathUrl}`,
locale: params.lang,
})
const accountPage = await serverClient().contentstack.accountPage.get()
return (
<>
<Breadcrumbs breadcrumbs={breadcrumbs} />
<Breadcrumbs />
<div className={styles.content}>
<Sidebar lang={params.lang} />
<Sidebar />
<MaxWidth className={styles.blocks} tag="main">
{accountPage.content.length ? (
<Content lang={params.lang} content={accountPage.content} />

10
app/[lang]/(live)/(protected)/bypass/layout.module.css → app/[lang]/(live)/(protected)/my-pages/[[...uri]]/layout.module.css
View File

@@ -1,13 +1,3 @@
.layout {
--header-height: 4.5rem;
background-color: var(--Brand-Coffee-Subtle);
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;

21
app/[lang]/(live)/(protected)/my-pages/[[...uri]]/layout.tsx Normal file
View File

@@ -0,0 +1,21 @@
import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
import Sidebar from "@/components/MyPages/Sidebar"
import styles from "./layout.module.css"
import { LangParams, LayoutArgs, UriParams } from "@/types/params"
export default async function MyPagesURILayout({
children,
}: React.PropsWithChildren<LayoutArgs<LangParams & UriParams>>) {
return (
<>
<Breadcrumbs />
<div className={styles.content}>
<Sidebar />
{children}
</div>
</>
)
}

16
app/[lang]/(live)/(protected)/my-pages/_constants.ts
View File

@@ -1,16 +0,0 @@
export const breadcrumbs = {
"/my-pages": [
{
title: "My Pages",
},
],
"/my-pages/profile": [
{
href: "/my-pages",
title: "My Pages",
},
{
title: "My Profile",
},
],
}

7
app/[lang]/(live)/(protected)/my-pages/layout.tsx
View File

@@ -1,19 +1,16 @@
import { firaMono, firaSans } from "@/app/[lang]/(live)/fonts"
import Header from "@/components/MyPages/Header"
import styles from "./layout.module.css"
import type { MyPagesLayoutProps } from "@/types/components/myPages/layout"
import { LangParams, LayoutArgs } from "@/types/params"
export default async function MyPagesLayout({
children,
params,
}: React.PropsWithChildren<MyPagesLayoutProps>) {
}: React.PropsWithChildren<LayoutArgs<LangParams>>) {
return (
<div
className={`${firaMono.variable} ${firaSans.variable} ${styles.layout}`}
>
<Header lang={params.lang} />
{children}
</div>
)