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

fix: rewriting rules for my-pages

Browse Source
This commit is contained in:
Michael Zetterberg
2024-05-16 15:22:39 +02:00
parent f1682b5a15
commit 5e3041a73a
18 changed files with 150 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

17
app/[lang]/(live)/(protected)/my-pages/@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)/my-pages/@breadcrumbs/default.tsx
View File

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

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

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

17
app/[lang]/(live)/(protected)/my-pages/@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)/my-pages/@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)/my-pages/@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)/my-pages/@breadcrumbs/stays/default.tsx
View File

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

17
app/[lang]/(live)/(protected)/my-pages/@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} />
}

34
app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css Normal file
View File

@@ -0,0 +1,34 @@
.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;
}
}
.blocks {
display: grid;
gap: 4.2rem;
padding-top: 4rem;
padding-left: 1.6rem;
padding-right: 1.6rem;
}
@media screen and (min-width: 950px) {
.blocks {
gap: 6.4rem;
padding-left: 0;
padding-right: 0;
}
}

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

@@ -0,0 +1,45 @@
import { myPages } from "@/constants/routes/myPages"
import { serverClient } from "@/lib/trpc/server"
import MaxWidth from "@/components/MaxWidth"
import Content from "@/components/MyPages/AccountPage/Content"
import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
import Sidebar from "@/components/MyPages/Sidebar"
import styles from "./page.module.css"
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,
})
return (
<>
<Breadcrumbs breadcrumbs={breadcrumbs} />
<div className={styles.content}>
<Sidebar lang={params.lang} />
<MaxWidth className={styles.blocks} tag="main">
{accountPage.content.length ? (
<Content lang={params.lang} content={accountPage.content} />
) : (
<p>No content published</p>
)}
</MaxWidth>
</div>
</>
)
}

19
app/[lang]/(live)/(protected)/my-pages/layout.module.css
View File

@@ -7,22 +7,3 @@
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;
}
}

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

@@ -1,13 +1,11 @@
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>) {
@@ -16,11 +14,7 @@ export default async function MyPagesLayout({
className={`${firaMono.variable} ${firaSans.variable} ${styles.layout}`}
>
<Header lang={params.lang} />
{breadcrumbs}
<div className={styles.content}>
<Sidebar lang={params.lang} />
{children}
</div>
{children}
</div>
)
}

15
app/[lang]/(live)/(protected)/my-pages/page.module.css
View File

@@ -1,15 +0,0 @@
.blocks {
display: grid;
gap: 4.2rem;
padding-top: 4rem;
padding-left: 1.6rem;
padding-right: 1.6rem;
}
@media screen and (min-width: 950px) {
.blocks {
gap: 6.4rem;
padding-left: 0;
padding-right: 0;
}
}

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

@@ -1,31 +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<LangParams, UriParams>) {
if (!searchParams.uri) {
throw new Error("Bad URI")
}
const accountPage = await serverClient().contentstack.accountPage.get({
url: searchParams.uri,
lang: params.lang,
})
return (
<MaxWidth className={styles.blocks} tag="main">
<Content lang={params.lang} content={accountPage.content} />
</MaxWidth>
)
}