Merged in monorepo-step-1 (pull request #1080)

Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood

apps/scandic-web/app/[lang]/(live)/(protected)/layout.tsx

@@ -0,0 +1,3 @@
+import { ProtectedLayout } from "@/components/ProtectedLayout"
+
+export default ProtectedLayout

apps/scandic-web/app/[lang]/(live)/(protected)/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner fullPage />
+}

apps/scandic-web/app/[lang]/(live)/(protected)/logout/route.ts

@@ -0,0 +1,115 @@
+import { type NextRequest, NextResponse } from "next/server"
+import { AuthError } from "next-auth"
+
+import { Lang } from "@/constants/languages"
+import { env } from "@/env/server"
+import { internalServerError } from "@/server/errors/next"
+import { getPublicURL } from "@/server/utils"
+
+import { signOut } from "@/auth"
+
+export async function GET(
+  request: NextRequest,
+  context: { params: { lang: Lang } }
+) {
+  const publicURL = getPublicURL(request)
+
+  let redirectTo: string = ""
+
+  const returnUrl = request.headers.get("x-returnurl")
+  const isSeamless = request.headers.get("x-logout-source") === "seamless"
+
+  console.log(
+    `[logout] source: ${request.headers.get("x-logout-source") || "normal"}`
+  )
+
+  const redirectToSearchParamValue =
+    request.nextUrl.searchParams.get("redirectTo")
+  const redirectToFallback = "/"
+
+  if (isSeamless) {
+    if (returnUrl) {
+      redirectTo = returnUrl
+    } else {
+      console.log(
+        `[login] missing returnUrl, using fallback: ${redirectToFallback}`
+      )
+      redirectTo = redirectToFallback
+    }
+  } else {
+    redirectTo = redirectToSearchParamValue || redirectToFallback
+
+    // Make relative URL to absolute URL
+    if (redirectTo.startsWith("/")) {
+      console.log(`[logout] make redirectTo absolute, from ${redirectTo}`)
+      redirectTo = new URL(redirectTo, publicURL).href
+      console.log(`[logout] make redirectTo absolute, to ${redirectTo}`)
+    }
+
+    try {
+      // Initiate the seamless logout flow
+      let redirectUrlValue
+      switch (context.params.lang) {
+        case Lang.da:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_DA
+          break
+        case Lang.de:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_DE
+          break
+        case Lang.en:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_EN
+          break
+        case Lang.fi:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_FI
+          break
+        case Lang.no:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_NO
+          break
+        case Lang.sv:
+          redirectUrlValue = env.SEAMLESS_LOGOUT_SV
+          break
+      }
+      const redirectUrl = new URL(redirectUrlValue)
+      console.log(
+        `[logout] creating redirect to seamless logout: ${redirectUrl}`
+      )
+      redirectTo = redirectUrl.toString()
+    } catch (e) {
+      console.error(
+        "Unable to create URL for seamless logout, proceeding without it."
+      )
+      console.error(e)
+    }
+  }
+
+  try {
+    redirectTo = `${env.CURITY_ISSUER_USER}/authn/authenticate/logout?redirect_uri=${encodeURIComponent(redirectTo)}`
+    console.log(`[logout] final redirectUrl: ${redirectTo}`)
+    console.log({ logout_env: process.env })
+
+    /**
+     * Passing `redirect: false` to `signOut` will return a result object
+     * instead of automatically redirecting inside of `signOut`.
+     * https://github.com/nextauthjs/next-auth/blob/3c035ec/packages/next-auth/src/lib/actions.ts#L104
+     */
+    const redirectUrlObj = await signOut({
+      redirectTo,
+      redirect: false,
+    })
+
+    if (redirectUrlObj) {
+      console.log(`[logout] redirecting to: ${redirectUrlObj.redirect}`)
+      return NextResponse.redirect(redirectUrlObj.redirect)
+    } else {
+      console.error(`[logout] missing redirectUrlObj reponse from signOut()`)
+    }
+  } catch (error) {
+    if (error instanceof AuthError) {
+      console.log({ signOutAuthError: error })
+    } else {
+      console.log({ signOutError: error })
+    }
+  }
+
+  return internalServerError()
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/error.tsx

@@ -0,0 +1,33 @@
+"use client"
+
+import * as Sentry from "@sentry/nextjs"
+import { useEffect } from "react"
+import { useIntl } from "react-intl"
+
+export default function Error({
+  error,
+}: {
+  error: Error & { digest?: string }
+}) {
+  const intl = useIntl()
+
+  useEffect(() => {
+    if (!error) return
+
+    console.error({ breadcrumbsError: error })
+    Sentry.captureException(error)
+  }, [error])
+
+  return (
+    <p>
+      <strong>
+        {intl.formatMessage(
+          { id: "Breadcrumbs failed for this page ({errorId})" },
+          {
+            errorId: `${error.digest}@${Date.now()}`,
+          }
+        )}
+      </strong>
+    </p>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx

@@ -0,0 +1,15 @@
+import { Suspense } from "react"
+
+import Breadcrumbs from "@/components/Breadcrumbs"
+import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton"
+
+import type { LangParams, PageArgs } from "@/types/params"
+import { PageContentTypeEnum } from "@/types/requests/contentType"
+
+export default function AllBreadcrumbs({}: PageArgs<LangParams>) {
+  return (
+    <Suspense fallback={<BreadcrumbsSkeleton />}>
+      <Breadcrumbs variant={PageContentTypeEnum.accountPage} />
+    </Suspense>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx

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

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/error.tsx

@@ -0,0 +1,33 @@
+"use client"
+
+import * as Sentry from "@sentry/nextjs"
+import { useEffect } from "react"
+import { useIntl } from "react-intl"
+
+export default function Error({
+  error,
+}: {
+  error: Error & { digest?: string }
+}) {
+  const intl = useIntl()
+
+  useEffect(() => {
+    if (!error) return
+
+    console.error(error)
+    Sentry.captureException(error)
+  }, [error])
+
+  return (
+    <p>
+      <strong>
+        {intl.formatMessage(
+          { id: "Error loading this page ({errorId})" },
+          {
+            errorId: `${error.digest}@${Date.now()}`,
+          }
+        )}
+      </strong>
+    </p>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner />
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css

@@ -0,0 +1,18 @@
+.blocks {
+  display: grid;
+  gap: var(--Spacing-x5);
+  max-width: var(--max-width-page);
+  align-content: flex-start;
+}
+
+@media screen and (min-width: 768px) {
+  .blocks {
+    gap: var(--Spacing-x7);
+  }
+}
+
+@media screen and (min-width: 1367px) {
+  .blocks {
+    gap: var(--Spacing-x7);
+  }
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx

@@ -0,0 +1,50 @@
+import { Suspense } from "react"
+
+import { serverClient } from "@/lib/trpc/server"
+
+import Blocks from "@/components/Blocks"
+import SectionHeader from "@/components/Section/Header"
+import TrackingSDK from "@/components/TrackingSDK"
+import { getIntl } from "@/i18n"
+
+import styles from "./page.module.css"
+
+import type { LangParams, PageArgs } from "@/types/params"
+
+export { generateMetadata } from "@/utils/generateMetadata"
+
+export default async function MyPages({}: PageArgs<
+  LangParams & { path: string[] }
+>) {
+  const accountPageRes = await serverClient().contentstack.accountPage.get()
+  const intl = await getIntl()
+
+  if (!accountPageRes) {
+    return null
+  }
+
+  const { tracking, accountPage } = accountPageRes
+  const { heading, preamble, content } = accountPage
+
+  return (
+    <>
+      <main className={styles.blocks}>
+        <SectionHeader
+          title={heading}
+          preamble={preamble}
+          headingAs="h1"
+          headingLevel="h1"
+        />
+
+        {content?.length ? (
+          <Blocks blocks={content} />
+        ) : (
+          <p>{intl.formatMessage({ id: "No content published" })}</p>
+        )}
+      </main>
+      <Suspense fallback={null}>
+        <TrackingSDK pageData={tracking} />
+      </Suspense>
+    </>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/layout.module.css

@@ -0,0 +1,26 @@
+.layout {
+  display: grid;
+  font-family: var(--typography-Body-Regular-fontFamily);
+  grid-template-rows: auto 1fr;
+  min-height: 100dvh;
+  max-width: var(--max-width-page);
+  margin: 0 auto;
+  width: 100%;
+}
+
+.container {
+  background-color: var(--Base-Background-Primary-Normal);
+}
+
+.content {
+  display: grid;
+  padding-bottom: var(--Spacing-x9);
+  position: relative;
+}
+
+@media screen and (min-width: 1367px) {
+  .content {
+    gap: var(--Spacing-x5);
+    grid-template-columns: max(340px) 1fr;
+  }
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/layout.tsx

@@ -0,0 +1,30 @@
+import { Suspense } from "react"
+
+import Sidebar from "@/components/MyPages/Sidebar"
+import SidebarNavigationSkeleton from "@/components/MyPages/Sidebar/SidebarNavigationSkeleton"
+import Surprises from "@/components/MyPages/Surprises"
+
+import styles from "./layout.module.css"
+
+export default async function MyPagesLayout({
+  breadcrumbs,
+  children,
+}: React.PropsWithChildren<{
+  breadcrumbs: React.ReactNode
+}>) {
+  return (
+    <div className={styles.container}>
+      <section className={styles.layout}>
+        {breadcrumbs}
+        <section className={styles.content}>
+          <Suspense fallback={<SidebarNavigationSkeleton />}>
+            <Sidebar />
+          </Suspense>
+          {children}
+        </section>
+      </section>
+
+      <Surprises />
+    </div>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner fullPage />
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.module.css

@@ -0,0 +1,12 @@
+.container {
+  background-color: var(--Main-Grey-White);
+  border-radius: var(--Corner-radius-Large);
+  display: grid;
+  gap: var(--Spacing-x3);
+  padding: var(--Spacing-x2) var(--Spacing-x2) var(--Spacing-x4);
+}
+@media screen and (min-width: 768px) {
+  .container {
+    padding: var(--Spacing-x3) var(--Spacing-x3) var(--Spacing-x4);
+  }
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx

@@ -0,0 +1,19 @@
+import { getProfile } from "@/lib/trpc/memoizedRequests"
+
+import Form from "@/components/Forms/Edit/Profile"
+
+import styles from "./page.module.css"
+
+export default async function EditProfileSlot() {
+  const user = await getProfile()
+  if (!user || "error" in user) {
+    return null
+  }
+  return (
+    <>
+      <div className={styles.container}>
+        <Form user={user} />
+      </div>
+    </>
+  )
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/layout.tsx

@@ -0,0 +1,3 @@
+export default function ProfileLayout({ children }: React.PropsWithChildren) {
+  return <main>{children}</main>
+}

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/profile/page.tsx

@@ -0,0 +1,27 @@
+import { Suspense } from "react"
+
+import { serverClient } from "@/lib/trpc/server"
+
+import Profile from "@/components/MyPages/myprofile/profile/profile"
+import TrackingSDK from "@/components/TrackingSDK"
+
+import type { LangParams, PageArgs } from "@/types/params"
+
+export { generateMetadata } from "@/utils/generateMetadata"
+
+export default async function ProfilePage({}: PageArgs<LangParams>) {
+  const accountPage = await serverClient().contentstack.accountPage.get()
+
+  if (!accountPage) {
+    return null
+  }
+
+  return (
+    <>
+      <Profile />
+      <Suspense fallback={null}>
+        <TrackingSDK pageData={accountPage.tracking} />
+      </Suspense>
+    </>
+  )
+}