diff --git a/.env.local.example b/.env.local.example index f24f3b573..b8711818e 100644 --- a/.env.local.example +++ b/.env.local.example @@ -17,7 +17,6 @@ DEPLOY_PRIME_URL="http://localhost:3000" DESIGN_SYSTEM_ACCESS_TOKEN="" NEXTAUTH_REDIRECT_PROXY_URL="http://localhost:3000/api/web/auth" NEXTAUTH_SECRET="" -# NEXTAUTH_URL="DO NOT SET THIS HERE, it is managed in next.config.js" REVALIDATE_SECRET="" SEAMLESS_LOGIN_DA="http://www.example.dk/updatelogin" SEAMLESS_LOGIN_DE="http://www.example.de/updatelogin" @@ -31,4 +30,8 @@ SEAMLESS_LOGOUT_EN="http://www.example.com/updatelogout?newweb" SEAMLESS_LOGOUT_FI="http://www.example.fi/updatelogout?newweb" SEAMLESS_LOGOUT_NO="http://www.example.no/updatelogout?newweb" SEAMLESS_LOGOUT_SV="http://www.example.sv/updatelogout?newweb" -WEBVIEW_ENCRYPTION_KEY="MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" \ No newline at end of file +WEBVIEW_ENCRYPTION_KEY="MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" + +PUBLIC_URL="http://localhost:3000" +AUTH_URL="$PUBLIC_URL/api/web/auth" +NEXTAUTH_URL="$PUBLIC_URL/api/web/auth" diff --git a/.gitignore b/.gitignore index 1e2395721..4663988fb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,7 @@ certificates .netlify #vscode -.vscode/ \ No newline at end of file +.vscode/ + +# localfile with all the CSS variables exported from design system +variables.css \ No newline at end of file diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx new file mode 100644 index 000000000..666fa6367 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx @@ -0,0 +1,5 @@ +import Breadcrumbs from "@/components/MyPages/Breadcrumbs" + +export default function AllBreadcrumbs() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx new file mode 100644 index 000000000..f110fe5bf --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx @@ -0,0 +1,3 @@ +export default function DefaultMyPages() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css index 872aa93d7..6667d27ac 100644 --- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css @@ -1,34 +1,29 @@ .content { display: grid; - padding-bottom: 7.7rem; - padding-left: 0; - padding-right: 0; + padding-bottom: var(--Spacing-x9); + padding-left: var(--Spacing-x0); + padding-right: var(--Spacing-x0); 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; + gap: var(--Spacing-x5); + padding-left: var(--Spacing-x2); + padding-right: var(--Spacing-x2); } -@media screen and (min-width: 950px) { +@media screen and (min-width: 1367px) { + .content { + gap: var(--Spacing-x9); + grid-template-columns: 25rem 1fr; + padding-left: var(--Spacing-x3); + padding-right: var(--Spacing-x3); + } + .blocks { - gap: 6.4rem; - padding-left: 0; - padding-right: 0; + gap: var(--Spacing-x7); + padding-left: var(--Spacing-x0); + padding-right: var(--Spacing-x0); } } diff --git a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx index 3097f566b..a6050337e 100644 --- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx @@ -1,8 +1,7 @@ +import { _ } from "@/lib/translation" 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" @@ -15,19 +14,15 @@ export default async function MyPages({ const accountPage = await serverClient().contentstack.accountPage.get() return ( - <> - - -
- - - {accountPage.content.length ? ( - - ) : ( -

No content published

- )} - -
- +
+ +
+ {accountPage.content.length ? ( + + ) : ( +

{_("No content published")}

+ )} +
+
) } diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.module.css b/app/[lang]/(live)/(protected)/my-pages/layout.module.css index 5e70c4db4..d2b0bc4bd 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/layout.module.css @@ -3,7 +3,8 @@ background-color: var(--Scandic-Brand-Warm-White); display: grid; - font-family: var(--ff-fira-sans); - grid-template-rows: var(--header-height) auto 1fr; + font-family: var(--typography-Body-Regular-fontFamily); + gap: var(--Spacing-x3); + grid-template-rows: auto 1fr; min-height: 100dvh; } diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index 935f1addd..4ba2376f5 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx @@ -1,17 +1,17 @@ -import { firaMono, firaSans } from "@/app/fonts" - import styles from "./layout.module.css" import { LangParams, LayoutArgs } from "@/types/params" export default async function MyPagesLayout({ + breadcrumbs, children, -}: React.PropsWithChildren>) { +}: React.PropsWithChildren> & { + breadcrumbs: React.ReactNode +}) { return ( -
+
+ {breadcrumbs} {children} -
+ ) } diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx index 2759874ed..adbde5d25 100644 --- a/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx +++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx @@ -15,7 +15,7 @@ export default async function ContentTypePage({ }: PageArgs) { switch (params.contentType) { case "loyalty-page": - return + return case "content-page": return default: diff --git a/app/[lang]/(live)/error.module.css b/app/[lang]/(live)/error.module.css index 4782b4cb4..ed84d6e82 100644 --- a/app/[lang]/(live)/error.module.css +++ b/app/[lang]/(live)/error.module.css @@ -2,7 +2,7 @@ --header-height: 4.5rem; display: grid; - font-family: var(--ff-fira-sans); + font-family: var(--typography-Body-Regular-fontFamily); grid-template-rows: var(--header-height) auto 1fr; min-height: 100dvh; } @@ -15,7 +15,7 @@ position: relative; } -@media screen and (min-width: 950px) { +@media screen and (min-width: 1367px) { .content { gap: 10rem; grid-template-columns: 25rem 1fr; diff --git a/app/[lang]/(live)/error.tsx b/app/[lang]/(live)/error.tsx index b05823085..b833c6699 100644 --- a/app/[lang]/(live)/error.tsx +++ b/app/[lang]/(live)/error.tsx @@ -7,8 +7,6 @@ import { findLang } from "@/constants/languages" import { login } from "@/constants/routes/handleAuth" import { SESSION_EXPIRED } from "@/server/errors/trpc" -import { firaMono, firaSans } from "@/app/fonts" - import styles from "./error.module.css" import { LangParams } from "@/types/params" @@ -34,9 +32,7 @@ export default function Error({ const lang = findLang(pathname) return ( -
+
{lang}: Something went wrong!
) diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index b3e6c387f..34e4cf3b5 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -5,7 +5,6 @@ import Script from "next/script" import TrpcProvider from "@/lib/trpc/Provider" -import { biroScriptPlus, firaMono, firaSans } from "@/app/fonts" import AdobeScript from "@/components/Current/AdobeScript" import VwoScript from "@/components/Current/VwoScript" @@ -43,9 +42,7 @@ export default async function RootLayout({ - + {children}