From c13211010f4064f85034d3d61131b2a58364411b Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Thu, 15 Aug 2024 12:29:19 +0300
Subject: [PATCH 01/10] Add missing layoutBehavior

---
 packages/commons-ui-next/src/Link/Link.js | 47 ++++++++---------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/packages/commons-ui-next/src/Link/Link.js b/packages/commons-ui-next/src/Link/Link.js
index b8e73dbe9..5356e339e 100644
--- a/packages/commons-ui-next/src/Link/Link.js
+++ b/packages/commons-ui-next/src/Link/Link.js
@@ -14,14 +14,23 @@ const Anchor = styled("a")({});
 
 export const NextLinkComposed = React.forwardRef(
   function NextLinkComposed(props, ref) {
-    const { linkAs, locale, prefetch, replace, scroll, shallow, to, ...other } =
-      props;
+    const {
+      linkAs,
+      locale,
+      prefetch,
+      legacyBehavior = true,
+      replace,
+      scroll,
+      shallow,
+      to,
+      ...other
+    } = props;
 
     return (
       <NextLink
         as={linkAs}
         href={to}
-        legacyBehavior
+        legacyBehavior={legacyBehavior}
         locale={locale}
         passHref
         prefetch={prefetch}
@@ -37,6 +46,7 @@ export const NextLinkComposed = React.forwardRef(
 
 NextLinkComposed.propTypes = {
   href: PropTypes.string,
+  legacyBehavior: PropTypes.bool,
   linkAs: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   locale: PropTypes.string,
   passHref: PropTypes.bool,
@@ -44,17 +54,7 @@ NextLinkComposed.propTypes = {
   replace: PropTypes.bool,
   scroll: PropTypes.bool,
   shallow: PropTypes.bool,
-};
-
-NextLinkComposed.defaultProps = {
-  href: undefined,
-  linkAs: undefined,
-  locale: undefined,
-  passHref: undefined,
-  prefetch: undefined,
-  replace: undefined,
-  scroll: undefined,
-  shallow: undefined,
+  to: PropTypes.oneOfType([PropTypes.object, PropTypes.string]).isRequired,
 };
 
 function checkIfPathsMatch(linkPath, currentPath) {
@@ -70,6 +70,7 @@ const Link = React.forwardRef(function Link(props, ref) {
     className: classNameProp,
     href,
     isActive: isActiveProp,
+    legacyBehavior,
     linkAs: linkAsProp,
     locale,
     noLinkStyle,
@@ -132,6 +133,7 @@ const Link = React.forwardRef(function Link(props, ref) {
     scroll,
     shallow,
     prefetch,
+    legacyBehavior,
     locale,
   };
 
@@ -162,6 +164,7 @@ Link.propTypes = {
   className: PropTypes.string,
   href: PropTypes.string,
   isActive: PropTypes.func,
+  legacyBehavior: PropTypes.bool,
   linkAs: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   locale: PropTypes.string,
   noLinkStyle: PropTypes.bool,
@@ -172,20 +175,4 @@ Link.propTypes = {
   shallow: PropTypes.bool,
 };
 
-Link.defaultProps = {
-  activeClassName: undefined,
-  as: undefined,
-  className: undefined,
-  href: undefined,
-  isActive: undefined,
-  linkAs: undefined,
-  locale: undefined,
-  noLinkStyle: undefined,
-  prefetch: undefined,
-  replace: undefined,
-  role: undefined,
-  scroll: undefined,
-  shallow: undefined,
-};
-
 export default Link;

From b8ae0373031e34f220aa5fd9267416bfd38f6720 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Thu, 15 Aug 2024 12:30:12 +0300
Subject: [PATCH 02/10] Include page slug in returned page data

---
 apps/roboshield/src/lib/data/common/index.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/roboshield/src/lib/data/common/index.ts b/apps/roboshield/src/lib/data/common/index.ts
index 85fd15142..e384b0ef8 100644
--- a/apps/roboshield/src/lib/data/common/index.ts
+++ b/apps/roboshield/src/lib/data/common/index.ts
@@ -50,16 +50,15 @@ export async function getPageProps(
   api: Api,
   context: GetServerSidePropsContext,
 ) {
-  const { resolvedUrl } = context;
-  let path;
-  if (resolvedUrl === "/" || resolvedUrl === "") {
-    path = "index";
-  } else {
-    path = resolvedUrl.replace(/^\//, "");
-  }
+  // For now, RoboShield only supports single paths i.e. /, /about, etc.,
+  // so params.slug[0] is good enough
+  const {
+    params: { slug: slugs },
+  } = context;
+  const [slug] = slugs || ["index"];
   const {
     docs: [page],
-  } = await api.findPage(path);
+  } = await api.findPage(slug);
 
   if (!page) {
     return null;
@@ -74,6 +73,7 @@ export async function getPageProps(
     blocks,
     footer,
     navbar,
+    slug,
   };
 }
 

From ed17cb0e2ece1ed670bebaab8c66a06b5ae72cc7 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Thu, 15 Aug 2024 12:31:12 +0300
Subject: [PATCH 03/10] Re-render main component on page change

---
 apps/roboshield/src/components/Page/Page.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/roboshield/src/components/Page/Page.tsx b/apps/roboshield/src/components/Page/Page.tsx
index 70ebfe716..f2eb50082 100644
--- a/apps/roboshield/src/components/Page/Page.tsx
+++ b/apps/roboshield/src/components/Page/Page.tsx
@@ -30,12 +30,18 @@ interface Props {
   children?: React.ReactNode;
   navbar?: Navbar;
   footer?: FooterProps;
+  slug?: string;
 }
-function Page({ children, navbar, footer }: Props) {
+
+/**
+ * While the layout (navbar, footer) remain the same, the main component
+ * changes from page to page. Use `slug` to track page changes.
+ */
+function Page({ children, footer, navbar, slug }: Props) {
   return (
     <>
       {navbar ? <NavBar {...navbar} /> : null}
-      {children ? <main>{children}</main> : null}
+      {children ? <main key={slug}>{children}</main> : null}
       {footer ? <Footer {...footer} /> : null}
     </>
   );

From 479ea041f5b5294c0a316d637bcfb06d59e74311 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Thu, 15 Aug 2024 12:31:45 +0300
Subject: [PATCH 04/10] Clean up

---
 .../src/components/BlockRenderer/BlockRenderer.tsx         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx b/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
index 0f52ee963..4179ec1d9 100644
--- a/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
+++ b/apps/roboshield/src/components/BlockRenderer/BlockRenderer.tsx
@@ -22,11 +22,10 @@ export default function BlockRenderer({ blocks }: BlockRendererProps) {
       {blocks?.map((block) => {
         const Component: FC<any> = components[block.blockType];
 
-        if (Component) {
-          return <Component key={block.blockType} {...block} />;
+        if (!Component) {
+          return null;
         }
-
-        return null;
+        return <Component {...block} key={block.id} />;
       })}
     </>
   );

From aa81f1cd81f3f71c472cd06d3ef8165b365d85a7 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Fri, 16 Aug 2024 16:06:21 +0300
Subject: [PATCH 05/10] Add next-seo

---
 apps/roboshield/package.json |   1 +
 pnpm-lock.yaml               | 772 ++++++++++++++++++++++++-----------
 2 files changed, 542 insertions(+), 231 deletions(-)

diff --git a/apps/roboshield/package.json b/apps/roboshield/package.json
index 64707e49f..6c1702c7d 100644
--- a/apps/roboshield/package.json
+++ b/apps/roboshield/package.json
@@ -43,6 +43,7 @@
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "next": "^14.2.5",
+    "next-seo": "^6.5.0",
     "nodemailer-sendgrid": "^1.0.3",
     "payload": "^2.25.0",
     "react": "^18.3.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3d321f4f..ef065d827 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -236,7 +236,7 @@ importers:
         version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       identity-obj-proxy:
         specifier: ^3.0.0
         version: 3.0.0
@@ -305,10 +305,10 @@ importers:
         version: 14.2.5
       '@payloadcms/bundler-webpack':
         specifier: ^1.0.7
-        version: 1.0.7(@swc/core@1.7.6(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(sass@1.69.4)
+        version: 1.0.7(@swc/core@1.7.6(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(sass@1.69.4)
       '@payloadcms/db-mongodb':
         specifier: ^1.7.1
-        version: 1.7.1(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
+        version: 1.7.1(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
       '@payloadcms/live-preview':
         specifier: ^0.2.2
         version: 0.2.2
@@ -317,22 +317,22 @@ importers:
         version: 0.2.0(react@18.3.1)
       '@payloadcms/plugin-cloud-storage':
         specifier: ^1.1.3
-        version: 1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
+        version: 1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
       '@payloadcms/plugin-nested-docs':
         specifier: ^1.0.12
-        version: 1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
+        version: 1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
       '@payloadcms/plugin-sentry':
         specifier: ^0.0.6
-        version: 0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)
+        version: 0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react@18.3.1)
       '@payloadcms/plugin-seo':
         specifier: ^2.3.2
-        version: 2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)
+        version: 2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react@18.3.1)
       '@payloadcms/richtext-slate':
         specifier: ^1.5.2
-        version: 1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@sentry/nextjs':
         specifier: ^8.22.0
-        version: 8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+        version: 8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       camelcase-keys:
         specifier: ^9.1.3
         version: 9.1.3
@@ -365,7 +365,7 @@ importers:
         version: 1.0.3
       payload:
         specifier: ^2.25.0
-        version: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+        version: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       prop-types:
         specifier: ^15.8.1
         version: 15.8.1
@@ -429,10 +429,10 @@ importers:
         version: link:../../packages/eslint-config-commons-ui
       eslint-import-resolver-webpack:
         specifier: ^0.13.8
-        version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+        version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       identity-obj-proxy:
         specifier: ^3.0.0
         version: 3.0.0
@@ -459,7 +459,7 @@ importers:
         version: 5.5.4
       webpack:
         specifier: ^5.93.0
-        version: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+        version: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))
 
   apps/climatemappedafrica:
     dependencies:
@@ -664,7 +664,7 @@ importers:
         version: 5.3.2(@babel/core@7.25.2)(babel-plugin-module-resolver@4.1.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       eslint-plugin-module-resolver:
         specifier: ^1.5.0
         version: 1.5.0
@@ -682,7 +682,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../../packages/jest-config-commons-ui
@@ -869,7 +869,7 @@ importers:
         version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       identity-obj-proxy:
         specifier: ^3.0.0
         version: 3.0.0
@@ -1107,7 +1107,7 @@ importers:
         version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(esbuild@0.21.5))
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       eslint-plugin-module-resolver:
         specifier: ^1.5.0
         version: 1.5.0
@@ -1125,7 +1125,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../../packages/jest-config-commons-ui
@@ -1291,13 +1291,13 @@ importers:
         version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       identity-obj-proxy:
         specifier: ^3.0.0
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../../packages/jest-config-commons-ui
@@ -1360,31 +1360,31 @@ importers:
         version: 14.2.5(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)
       '@payloadcms/bundler-webpack':
         specifier: ^1.0.7
-        version: 1.0.7(@swc/core@1.7.6(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(sass@1.69.4)
+        version: 1.0.7(@swc/core@1.6.1(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(sass@1.69.4)
       '@payloadcms/db-mongodb':
         specifier: ^1.7.1
-        version: 1.7.1(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
+        version: 1.7.1(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
       '@payloadcms/live-preview-react':
         specifier: ^0.2.0
         version: 0.2.0(react@18.3.1)
       '@payloadcms/plugin-cloud-storage':
         specifier: ^1.1.3
-        version: 1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
+        version: 1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
       '@payloadcms/plugin-nested-docs':
         specifier: ^1.0.12
-        version: 1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))
+        version: 1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))
       '@payloadcms/plugin-sentry':
         specifier: ^0.0.6
-        version: 0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react@18.3.1)
+        version: 0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)
       '@payloadcms/plugin-seo':
         specifier: ^2.3.2
-        version: 2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react@18.3.1)
+        version: 2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)
       '@payloadcms/richtext-slate':
         specifier: ^1.5.2
-        version: 1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@sentry/nextjs':
         specifier: ^8.22.0
-        version: 8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
+        version: 8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       ace-builds:
         specifier: ^1.35.4
         version: 1.35.4
@@ -1403,12 +1403,15 @@ importers:
       next:
         specifier: ^14.2.5
         version: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4)
+      next-seo:
+        specifier: ^6.5.0
+        version: 6.5.0(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       nodemailer-sendgrid:
         specifier: ^1.0.3
         version: 1.0.3
       payload:
         specifier: ^2.25.0
-        version: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
+        version: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -1469,19 +1472,19 @@ importers:
         version: 8.57.0
       eslint-config-next:
         specifier: ^14.2.5
-        version: 14.2.5(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)(typescript@5.5.4)
+        version: 14.2.5(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)(typescript@5.5.4)
       eslint-config-prettier:
         specifier: ^9.1.0
         version: 9.1.0(eslint@8.57.0)
       eslint-import-resolver-webpack:
         specifier: ^0.13.8
-        version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
+        version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../../packages/jest-config-commons-ui
@@ -1490,7 +1493,7 @@ importers:
         version: 3.3.3
       ts-node:
         specifier: ^10.9.2
-        version: 10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)
+        version: 10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)
       typescript:
         specifier: ^5.5.4
         version: 5.5.4
@@ -1602,7 +1605,7 @@ importers:
         version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
@@ -1665,7 +1668,7 @@ importers:
         version: 133.0.0(encoding@0.1.13)
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
       next:
         specifier: ^14.2.5
         version: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4)
@@ -1751,7 +1754,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../jest-config-commons-ui
@@ -1809,7 +1812,7 @@ importers:
         version: link:../eslint-config-commons-ui
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../jest-config-commons-ui
@@ -1879,7 +1882,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../jest-config-commons-ui
@@ -1927,7 +1930,7 @@ importers:
         version: 1.1.0
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       eslint-plugin-jest:
         specifier: ^27.9.0
         version: 27.9.0(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4)
@@ -2046,7 +2049,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../jest-config-commons-ui
@@ -2112,7 +2115,7 @@ importers:
         version: link:../eslint-config-commons-ui
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       jest-config-commons-ui:
         specifier: workspace:*
         version: link:../jest-config-commons-ui
@@ -2170,7 +2173,7 @@ importers:
         version: 3.0.0
       jest:
         specifier: ^29.7.0
-        version: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+        version: 29.7.0(babel-plugin-macros@3.1.0)
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
@@ -14195,7 +14198,7 @@ snapshots:
       '@aws-crypto/sha1-browser': 5.2.0
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.623.0(@aws-sdk/client-sts@3.621.0)
+      '@aws-sdk/client-sso-oidc': 3.623.0(@aws-sdk/client-sts@3.623.0)
       '@aws-sdk/client-sts': 3.623.0
       '@aws-sdk/core': 3.623.0
       '@aws-sdk/credential-provider-node': 3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.623.0)
@@ -14297,51 +14300,7 @@ snapshots:
       tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
-
-  '@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.621.0)':
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.621.0
-      '@aws-sdk/core': 3.623.0
-      '@aws-sdk/credential-provider-node': 3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)
-      '@aws-sdk/middleware-host-header': 3.620.0
-      '@aws-sdk/middleware-logger': 3.609.0
-      '@aws-sdk/middleware-recursion-detection': 3.620.0
-      '@aws-sdk/middleware-user-agent': 3.620.0
-      '@aws-sdk/region-config-resolver': 3.614.0
-      '@aws-sdk/types': 3.609.0
-      '@aws-sdk/util-endpoints': 3.614.0
-      '@aws-sdk/util-user-agent-browser': 3.609.0
-      '@aws-sdk/util-user-agent-node': 3.614.0
-      '@smithy/config-resolver': 3.0.5
-      '@smithy/core': 2.3.2
-      '@smithy/fetch-http-handler': 3.2.4
-      '@smithy/hash-node': 3.0.3
-      '@smithy/invalid-dependency': 3.0.3
-      '@smithy/middleware-content-length': 3.0.5
-      '@smithy/middleware-endpoint': 3.1.0
-      '@smithy/middleware-retry': 3.0.14
-      '@smithy/middleware-serde': 3.0.3
-      '@smithy/middleware-stack': 3.0.3
-      '@smithy/node-config-provider': 3.1.4
-      '@smithy/node-http-handler': 3.1.4
-      '@smithy/protocol-http': 4.1.0
-      '@smithy/smithy-client': 3.1.12
-      '@smithy/types': 3.3.0
-      '@smithy/url-parser': 3.0.3
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.14
-      '@smithy/util-defaults-mode-node': 3.0.14
-      '@smithy/util-endpoints': 2.0.5
-      '@smithy/util-middleware': 3.0.3
-      '@smithy/util-retry': 3.0.3
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.6.3
-    transitivePeerDependencies:
-      - aws-crt
+    optional: true
 
   '@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0)':
     dependencies:
@@ -14430,6 +14389,7 @@ snapshots:
       tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
+    optional: true
 
   '@aws-sdk/client-sso@3.623.0':
     dependencies:
@@ -14518,6 +14478,7 @@ snapshots:
       tslib: 2.6.3
     transitivePeerDependencies:
       - aws-crt
+    optional: true
 
   '@aws-sdk/client-sts@3.623.0':
     dependencies:
@@ -14575,6 +14536,7 @@ snapshots:
       '@smithy/util-middleware': 3.0.3
       fast-xml-parser: 4.4.1
       tslib: 2.6.3
+    optional: true
 
   '@aws-sdk/core@3.623.0':
     dependencies:
@@ -14617,6 +14579,7 @@ snapshots:
       '@smithy/types': 3.3.0
       '@smithy/util-stream': 3.1.3
       tslib: 2.6.3
+    optional: true
 
   '@aws-sdk/credential-provider-http@3.622.0':
     dependencies:
@@ -14647,6 +14610,7 @@ snapshots:
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
+    optional: true
 
   '@aws-sdk/credential-provider-ini@3.621.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)':
     dependencies:
@@ -14667,24 +14631,6 @@ snapshots:
       - aws-crt
     optional: true
 
-  '@aws-sdk/credential-provider-ini@3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)':
-    dependencies:
-      '@aws-sdk/client-sts': 3.621.0
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.622.0
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.621.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.3
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-
   '@aws-sdk/credential-provider-ini@3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.623.0)':
     dependencies:
       '@aws-sdk/client-sts': 3.623.0
@@ -14721,6 +14667,7 @@ snapshots:
       - '@aws-sdk/client-sso-oidc'
       - '@aws-sdk/client-sts'
       - aws-crt
+    optional: true
 
   '@aws-sdk/credential-provider-node@3.621.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)':
     dependencies:
@@ -14742,25 +14689,6 @@ snapshots:
       - aws-crt
     optional: true
 
-  '@aws-sdk/credential-provider-node@3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)':
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.620.1
-      '@aws-sdk/credential-provider-http': 3.622.0
-      '@aws-sdk/credential-provider-ini': 3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.621.0)
-      '@aws-sdk/credential-provider-process': 3.620.1
-      '@aws-sdk/credential-provider-sso': 3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))
-      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.621.0)
-      '@aws-sdk/types': 3.609.0
-      '@smithy/credential-provider-imds': 3.2.0
-      '@smithy/property-provider': 3.1.3
-      '@smithy/shared-ini-file-loader': 3.1.4
-      '@smithy/types': 3.3.0
-      tslib: 2.6.3
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-
   '@aws-sdk/credential-provider-node@3.623.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(@aws-sdk/client-sts@3.623.0)':
     dependencies:
       '@aws-sdk/credential-provider-env': 3.620.1
@@ -14800,6 +14728,7 @@ snapshots:
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
+    optional: true
 
   '@aws-sdk/credential-provider-sso@3.621.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))':
     dependencies:
@@ -14835,6 +14764,7 @@ snapshots:
       '@smithy/property-provider': 3.1.3
       '@smithy/types': 3.3.0
       tslib: 2.6.3
+    optional: true
 
   '@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.623.0)':
     dependencies:
@@ -14844,6 +14774,29 @@ snapshots:
       '@smithy/types': 3.3.0
       tslib: 2.6.3
 
+  '@aws-sdk/credential-providers@3.621.0(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))':
+    dependencies:
+      '@aws-sdk/client-cognito-identity': 3.621.0
+      '@aws-sdk/client-sso': 3.621.0
+      '@aws-sdk/client-sts': 3.621.0
+      '@aws-sdk/credential-provider-cognito-identity': 3.621.0
+      '@aws-sdk/credential-provider-env': 3.620.1
+      '@aws-sdk/credential-provider-http': 3.621.0
+      '@aws-sdk/credential-provider-ini': 3.621.0(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))(@aws-sdk/client-sts@3.621.0)
+      '@aws-sdk/credential-provider-node': 3.621.0(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))(@aws-sdk/client-sts@3.621.0)
+      '@aws-sdk/credential-provider-process': 3.620.1
+      '@aws-sdk/credential-provider-sso': 3.621.0(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))
+      '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.621.0)
+      '@aws-sdk/types': 3.609.0
+      '@smithy/credential-provider-imds': 3.2.0
+      '@smithy/property-provider': 3.1.3
+      '@smithy/types': 3.3.0
+      tslib: 2.6.3
+    transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
+      - aws-crt
+    optional: true
+
   '@aws-sdk/credential-providers@3.621.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))':
     dependencies:
       '@aws-sdk/client-cognito-identity': 3.621.0
@@ -14996,6 +14949,7 @@ snapshots:
       '@smithy/shared-ini-file-loader': 3.1.4
       '@smithy/types': 3.3.0
       tslib: 2.6.3
+    optional: true
 
   '@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))':
     dependencies:
@@ -16967,6 +16921,41 @@ snapshots:
       - ts-node
     optional: true
 
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.14.14
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.7
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))':
     dependencies:
       '@jest/console': 29.7.0
@@ -17755,33 +17744,33 @@ snapshots:
 
   '@panva/hkdf@1.2.1': {}
 
-  '@payloadcms/bundler-webpack@1.0.7(@swc/core@1.7.6(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(sass@1.69.4)':
+  '@payloadcms/bundler-webpack@1.0.7(@swc/core@1.6.1(@swc/helpers@0.5.5))(ajv@8.17.1)(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(sass@1.69.4)':
     dependencies:
       ajv: 8.17.1
       compression: 1.7.4
       connect-history-api-fallback: 1.6.0
-      css-loader: 5.2.7(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      file-loader: 6.2.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      css-loader: 5.2.7(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      file-loader: 6.2.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       find-node-modules: 2.1.3
-      html-webpack-plugin: 5.6.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      html-webpack-plugin: 5.6.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       md5: 2.3.0
-      mini-css-extract-plugin: 1.6.2(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      mini-css-extract-plugin: 1.6.2(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       path-browserify: 1.0.1
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       postcss: 8.4.31
-      postcss-loader: 6.2.1(postcss@8.4.31)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      postcss-loader: 6.2.1(postcss@8.4.31)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       postcss-preset-env: 9.0.0(postcss@8.4.31)
       process: 0.11.10
-      sass-loader: 12.6.0(sass@1.69.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      style-loader: 2.0.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      swc-loader: 0.2.6(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      swc-minify-webpack-plugin: 2.1.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      terser-webpack-plugin: 5.3.10(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      sass-loader: 12.6.0(sass@1.69.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      style-loader: 2.0.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      swc-loader: 0.2.6(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      swc-minify-webpack-plugin: 2.1.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      terser-webpack-plugin: 5.3.10(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
       webpack-bundle-analyzer: 4.10.2
       webpack-cli: 4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0)
-      webpack-dev-middleware: 6.1.2(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      webpack-dev-middleware: 6.1.2(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       webpack-hot-middleware: 2.26.1
     transitivePeerDependencies:
       - '@rspack/core'
@@ -17843,16 +17832,16 @@ snapshots:
       - utf-8-validate
       - webpack-dev-server
 
-  '@payloadcms/db-mongodb@1.7.1(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
+  '@payloadcms/db-mongodb@1.7.1(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
     dependencies:
       bson-objectid: 2.0.4
       deepmerge: 4.3.1
       get-port: 5.1.1
       http-status: 1.6.2
-      mongoose: 6.12.3(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0))
+      mongoose: 6.12.3(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))
       mongoose-aggregate-paginate-v2: 1.0.6
       mongoose-paginate-v2: 1.7.22
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       prompts: 2.4.2
       uuid: 9.0.0
     transitivePeerDependencies:
@@ -17884,10 +17873,10 @@ snapshots:
 
   '@payloadcms/live-preview@0.2.2': {}
 
-  '@payloadcms/plugin-cloud-storage@1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
+  '@payloadcms/plugin-cloud-storage@1.1.3(@aws-sdk/client-s3@3.623.0)(@aws-sdk/lib-storage@3.623.0(@aws-sdk/client-s3@3.623.0))(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
     dependencies:
       find-node-modules: 2.1.3
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       range-parser: 1.2.1
     optionalDependencies:
       '@aws-sdk/client-s3': 3.623.0
@@ -17902,20 +17891,20 @@ snapshots:
       '@aws-sdk/client-s3': 3.623.0
       '@aws-sdk/lib-storage': 3.623.0(@aws-sdk/client-s3@3.623.0)
 
-  '@payloadcms/plugin-nested-docs@1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
+  '@payloadcms/plugin-nested-docs@1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))':
     dependencies:
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
 
   '@payloadcms/plugin-nested-docs@1.0.12(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))':
     dependencies:
       payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
 
-  '@payloadcms/plugin-sentry@0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)':
+  '@payloadcms/plugin-sentry@0.0.6(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)':
     dependencies:
       '@sentry/node': 7.118.0
       '@sentry/types': 7.118.0
       express: 4.19.2
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       react: 18.3.1
     transitivePeerDependencies:
       - supports-color
@@ -17930,9 +17919,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@payloadcms/plugin-seo@2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)':
+  '@payloadcms/plugin-seo@2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react@18.3.1)':
     dependencies:
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       react: 18.3.1
 
   '@payloadcms/plugin-seo@2.3.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(react@18.3.1)':
@@ -17940,12 +17929,12 @@ snapshots:
       payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
       react: 18.3.1
 
-  '@payloadcms/richtext-slate@1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@payloadcms/richtext-slate@1.5.2(payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@faceless-ui/modal': 2.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       i18next: 22.5.1
       is-hotkey: 0.2.0
-      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      payload: 2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       react: 18.3.1
       react-i18next: 11.18.6(i18next@22.5.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       slate: 0.91.4
@@ -18636,7 +18625,7 @@ snapshots:
       '@sentry/utils': 7.118.0
       localforage: 1.10.0
 
-  '@sentry/nextjs@8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
+  '@sentry/nextjs@8.22.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4))(react@18.3.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
     dependencies:
       '@opentelemetry/instrumentation-http': 0.52.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.25.1
@@ -18648,14 +18637,14 @@ snapshots:
       '@sentry/types': 8.22.0
       '@sentry/utils': 8.22.0
       '@sentry/vercel-edge': 8.22.0
-      '@sentry/webpack-plugin': 2.20.1(encoding@0.1.13)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      '@sentry/webpack-plugin': 2.20.1(encoding@0.1.13)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       chalk: 3.0.0
       next: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.45.3)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.69.4)
       resolve: 1.22.8
       rollup: 3.29.4
       stacktrace-parser: 0.1.10
     optionalDependencies:
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
     transitivePeerDependencies:
       - '@opentelemetry/api'
       - '@opentelemetry/core'
@@ -18804,12 +18793,12 @@ snapshots:
       '@sentry/types': 8.22.0
       '@sentry/utils': 8.22.0
 
-  '@sentry/webpack-plugin@2.20.1(encoding@0.1.13)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
+  '@sentry/webpack-plugin@2.20.1(encoding@0.1.13)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
     dependencies:
       '@sentry/bundler-plugin-core': 2.20.1(encoding@0.1.13)
       unplugin: 1.0.1
       uuid: 9.0.1
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -18886,6 +18875,7 @@ snapshots:
       '@smithy/types': 3.3.0
       '@smithy/util-middleware': 3.0.3
       tslib: 2.6.3
+    optional: true
 
   '@smithy/core@2.3.2':
     dependencies:
@@ -19010,6 +19000,7 @@ snapshots:
       '@smithy/util-retry': 3.0.3
       tslib: 2.6.3
       uuid: 9.0.1
+    optional: true
 
   '@smithy/middleware-retry@3.0.14':
     dependencies:
@@ -19097,6 +19088,7 @@ snapshots:
       '@smithy/types': 3.3.0
       '@smithy/util-stream': 3.1.3
       tslib: 2.6.3
+    optional: true
 
   '@smithy/smithy-client@3.1.12':
     dependencies:
@@ -19152,6 +19144,7 @@ snapshots:
       '@smithy/types': 3.3.0
       bowser: 2.11.0
       tslib: 2.6.3
+    optional: true
 
   '@smithy/util-defaults-mode-browser@3.0.14':
     dependencies:
@@ -19170,6 +19163,7 @@ snapshots:
       '@smithy/smithy-client': 3.1.11
       '@smithy/types': 3.3.0
       tslib: 2.6.3
+    optional: true
 
   '@smithy/util-defaults-mode-node@3.0.14':
     dependencies:
@@ -20524,7 +20518,7 @@ snapshots:
     optionalDependencies:
       '@jest/globals': 29.7.0
       '@types/jest': 29.5.12
-      jest: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
 
   '@testing-library/jest-dom@6.4.5(@jest/globals@29.7.0)(@types/jest@29.5.12)(jest@29.7.0(@types/node@20.14.14))':
     dependencies:
@@ -21088,9 +21082,9 @@ snapshots:
       '@webassemblyjs/ast': 1.12.1
       '@xtuc/long': 4.2.2
 
-  '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
+  '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))':
     dependencies:
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
       webpack-cli: 4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0)
 
   '@webpack-cli/info@1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))':
@@ -22224,6 +22218,21 @@ snapshots:
       - ts-node
     optional: true
 
+  create-jest@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
+    dependencies:
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-config: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest-util: 29.7.0
+      prompts: 2.4.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   create-jest@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
     dependencies:
       '@jest/types': 29.6.3
@@ -22285,6 +22294,20 @@ snapshots:
       postcss-selector-parser: 6.1.1
       postcss-value-parser: 4.2.0
 
+  css-loader@5.2.7(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      icss-utils: 5.1.0(postcss@8.4.31)
+      loader-utils: 2.0.4
+      postcss: 8.4.31
+      postcss-modules-extract-imports: 3.1.0(postcss@8.4.31)
+      postcss-modules-local-by-default: 4.0.5(postcss@8.4.31)
+      postcss-modules-scope: 3.2.0(postcss@8.4.31)
+      postcss-modules-values: 4.0.0(postcss@8.4.31)
+      postcss-value-parser: 4.2.0
+      schema-utils: 3.3.0
+      semver: 7.6.3
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   css-loader@5.2.7(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.31)
@@ -23123,7 +23146,7 @@ snapshots:
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.57.0
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       object.assign: 4.1.5
       object.entries: 1.1.8
       semver: 6.3.1
@@ -23132,22 +23155,22 @@ snapshots:
     dependencies:
       eslint: 8.57.0
       eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.9.0(eslint@8.57.0)
       eslint-plugin-react: 7.35.0(eslint@8.57.0)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
       object.assign: 4.1.5
       object.entries: 1.1.8
 
-  eslint-config-next@14.2.5(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)(typescript@5.5.4):
+  eslint-config-next@14.2.5(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)(typescript@5.5.4):
     dependencies:
       '@next/eslint-plugin-next': 14.2.5
       '@rushstack/eslint-patch': 1.10.4
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.9.0(eslint@8.57.0)
       eslint-plugin-react: 7.35.0(eslint@8.57.0)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
@@ -23205,13 +23228,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0):
+  eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       debug: 4.3.6
       enhanced-resolve: 5.17.1
       eslint: 8.57.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.7.6
       is-core-module: 2.15.0
@@ -23239,12 +23262,12 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+  eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       array.prototype.find: 2.2.3
       debug: 3.2.7
       enhanced-resolve: 0.9.1
-      eslint-plugin-import: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       find-root: 1.1.0
       hasown: 2.0.2
       interpret: 1.4.0
@@ -23253,7 +23276,7 @@ snapshots:
       lodash: 4.17.21
       resolve: 2.0.0-next.5
       semver: 5.7.2
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -23262,7 +23285,7 @@ snapshots:
       array.prototype.find: 2.2.3
       debug: 3.2.7
       enhanced-resolve: 0.9.1
-      eslint-plugin-import: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       find-root: 1.1.0
       hasown: 2.0.2
       interpret: 1.4.0
@@ -23280,7 +23303,7 @@ snapshots:
       array.prototype.find: 2.2.3
       debug: 3.2.7
       enhanced-resolve: 0.9.1
-      eslint-plugin-import: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       find-root: 1.1.0
       hasown: 2.0.2
       interpret: 1.4.0
@@ -23298,7 +23321,7 @@ snapshots:
       array.prototype.find: 2.2.3
       debug: 3.2.7
       enhanced-resolve: 0.9.1
-      eslint-plugin-import: 2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       find-root: 1.1.0
       hasown: 2.0.2
       interpret: 1.4.0
@@ -23311,15 +23334,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
-      eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)))
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -23334,17 +23357,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.1)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlastindex: 1.2.5
@@ -23354,7 +23367,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.15.0
       is-glob: 4.0.3
@@ -23398,34 +23411,9 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.29.1(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0):
+  eslint-plugin-jest-dom@5.4.0(@testing-library/dom@10.1.0)(eslint@8.57.0):
     dependencies:
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(eslint@8.57.0)
-      hasown: 2.0.2
-      is-core-module: 2.15.0
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      tsconfig-paths: 3.15.0
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-jest-dom@5.4.0(@testing-library/dom@10.1.0)(eslint@8.57.0):
-    dependencies:
-      '@babel/runtime': 7.25.0
+      '@babel/runtime': 7.25.0
       eslint: 8.57.0
       requireindex: 1.2.0
     optionalDependencies:
@@ -23436,7 +23424,7 @@ snapshots:
       '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4)
       eslint: 8.57.0
     optionalDependencies:
-      jest: 29.7.0(@types/node@20.14.14)
+      jest: 29.7.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -23833,6 +23821,12 @@ snapshots:
     dependencies:
       flat-cache: 3.2.0
 
+  file-loader@6.2.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      loader-utils: 2.0.4
+      schema-utils: 3.3.0
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   file-loader@6.2.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       loader-utils: 2.0.4
@@ -24558,14 +24552,14 @@ snapshots:
       readable-stream: 1.0.34
       through2: 0.4.2
 
-  html-webpack-plugin@5.5.3(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+  html-webpack-plugin@5.5.3(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
       lodash: 4.17.21
       pretty-error: 4.0.0
       tapable: 2.2.1
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
 
   html-webpack-plugin@5.5.3(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))):
     dependencies:
@@ -24576,6 +24570,16 @@ snapshots:
       tapable: 2.2.1
       webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))
 
+  html-webpack-plugin@5.6.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      '@types/html-minifier-terser': 6.1.0
+      html-minifier-terser: 6.1.0
+      lodash: 4.17.21
+      pretty-error: 4.0.0
+      tapable: 2.2.1
+    optionalDependencies:
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   html-webpack-plugin@5.6.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
@@ -25117,6 +25121,26 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
+  jest-cli@29.7.0:
+    dependencies:
+      '@jest/core': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.14.14)
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.14.14)
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
   jest-cli@29.7.0(@types/node@20.14.14):
     dependencies:
       '@jest/core': 29.7.0
@@ -25137,6 +25161,44 @@ snapshots:
       - ts-node
     optional: true
 
+  jest-cli@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest-cli@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jest-cli@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
     dependencies:
       '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
@@ -25156,6 +25218,25 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest-cli@29.7.0(babel-plugin-macros@3.1.0):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/test-result': 29.7.0
+      '@jest/types': 29.6.3
+      chalk: 4.1.2
+      create-jest: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      exit: 0.1.2
+      import-local: 3.2.0
+      jest-config: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jest-config@29.7.0(@types/node@20.14.14):
     dependencies:
       '@babel/core': 7.25.2
@@ -25187,6 +25268,37 @@ snapshots:
       - supports-color
     optional: true
 
+  jest-config@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
+    dependencies:
+      '@babel/core': 7.25.2
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.25.2)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.7
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 20.14.14
+      ts-node: 10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
   jest-config@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
     dependencies:
       '@babel/core': 7.25.2
@@ -25454,6 +25566,19 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
+  jest@29.7.0:
+    dependencies:
+      '@jest/core': 29.7.0
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+    optional: true
+
   jest@29.7.0(@types/node@20.14.14):
     dependencies:
       '@jest/core': 29.7.0
@@ -25467,6 +25592,30 @@ snapshots:
       - ts-node
     optional: true
 
+  jest@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
+  jest@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jest@29.7.0(@types/node@20.14.14)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4)):
     dependencies:
       '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
@@ -25479,6 +25628,18 @@ snapshots:
       - supports-color
       - ts-node
 
+  jest@29.7.0(babel-plugin-macros@3.1.0):
+    dependencies:
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4))
+      '@jest/types': 29.6.3
+      import-local: 3.2.0
+      jest-cli: 29.7.0(babel-plugin-macros@3.1.0)
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   jiti@1.21.6: {}
 
   jmespath@0.16.0: {}
@@ -26138,6 +26299,13 @@ snapshots:
 
   min-indent@1.0.1: {}
 
+  mini-css-extract-plugin@1.6.2(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      loader-utils: 2.0.4
+      schema-utils: 3.3.0
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack-sources: 1.4.3
+
   mini-css-extract-plugin@1.6.2(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       loader-utils: 2.0.4
@@ -26237,6 +26405,18 @@ snapshots:
       '@types/whatwg-url': 8.2.2
       whatwg-url: 11.0.0
 
+  mongodb@4.17.1(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0)):
+    dependencies:
+      bson: 4.7.2
+      mongodb-connection-string-url: 2.6.0
+      socks: 2.8.3
+    optionalDependencies:
+      '@aws-sdk/credential-providers': 3.621.0(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))
+      '@mongodb-js/saslprep': 1.1.8
+    transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
+      - aws-crt
+
   mongodb@4.17.1(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0)):
     dependencies:
       bson: 4.7.2
@@ -26253,6 +26433,20 @@ snapshots:
 
   mongoose-paginate-v2@1.7.22: {}
 
+  mongoose@6.12.3(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0)):
+    dependencies:
+      bson: 4.7.2
+      kareem: 2.5.1
+      mongodb: 4.17.1(@aws-sdk/client-sso-oidc@3.621.0(@aws-sdk/client-sts@3.621.0))
+      mpath: 0.9.0
+      mquery: 4.0.3
+      ms: 2.1.3
+      sift: 16.0.1
+    transitivePeerDependencies:
+      - '@aws-sdk/client-sso-oidc'
+      - aws-crt
+      - supports-color
+
   mongoose@6.12.3(@aws-sdk/client-sso-oidc@3.623.0(@aws-sdk/client-sts@3.623.0)):
     dependencies:
       bson: 4.7.2
@@ -26853,7 +27047,7 @@ snapshots:
 
   pause@0.0.1: {}
 
-  payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+  payload@2.25.0(@swc/helpers@0.5.5)(@types/react@18.3.3)(encoding@0.1.13)(typescript@5.5.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@date-io/date-fns': 2.16.0(date-fns@2.30.0)
       '@dnd-kit/core': 6.0.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -26889,7 +27083,7 @@ snapshots:
       graphql-query-complexity: 0.12.0(graphql@16.8.1)
       graphql-scalars: 1.22.2(graphql@16.8.1)
       graphql-type-json: 0.3.2(graphql@16.8.1)
-      html-webpack-plugin: 5.5.3(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      html-webpack-plugin: 5.5.3(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       http-status: 1.6.2
       i18next: 22.5.1
       i18next-browser-languagedetector: 6.1.8
@@ -26938,8 +27132,8 @@ snapshots:
       scheduler: 0.23.0
       scmp: 2.1.0
       sharp: 0.33.4
-      swc-loader: 0.2.3(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
-      terser-webpack-plugin: 5.3.9(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      swc-loader: 0.2.3(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      terser-webpack-plugin: 5.3.9(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       ts-essentials: 7.0.3(typescript@5.5.4)
       use-context-selector: 1.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(scheduler@0.23.0)
       uuid: 9.0.1
@@ -27302,6 +27496,14 @@ snapshots:
       '@csstools/utilities': 1.0.0(postcss@8.4.31)
       postcss: 8.4.31
 
+  postcss-loader@6.2.1(postcss@8.4.31)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      cosmiconfig: 7.1.0
+      klona: 2.0.6
+      postcss: 8.4.31
+      semver: 7.6.3
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   postcss-loader@6.2.1(postcss@8.4.31)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       cosmiconfig: 7.1.0
@@ -28343,6 +28545,14 @@ snapshots:
     dependencies:
       truncate-utf8-bytes: 1.0.2
 
+  sass-loader@12.6.0(sass@1.69.4)(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      klona: 2.0.6
+      neo-async: 2.6.2
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+    optionalDependencies:
+      sass: 1.69.4
+
   sass-loader@12.6.0(sass@1.69.4)(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       klona: 2.0.6
@@ -28919,6 +29129,12 @@ snapshots:
       '@tokenizer/token': 0.3.0
       peek-readable: 4.1.0
 
+  style-loader@2.0.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      loader-utils: 2.0.4
+      schema-utils: 3.3.0
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   style-loader@2.0.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       loader-utils: 2.0.4
@@ -28979,22 +29195,33 @@ snapshots:
       csso: 5.0.5
       picocolors: 1.0.1
 
-  swc-loader@0.2.3(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+  swc-loader@0.2.3(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@swc/core': 1.6.1(@swc/helpers@0.5.5)
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
 
   swc-loader@0.2.3(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))):
     dependencies:
       '@swc/core': 1.6.1(@swc/helpers@0.5.5)
       webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))
 
+  swc-loader@0.2.6(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      '@swc/core': 1.6.1(@swc/helpers@0.5.5)
+      '@swc/counter': 0.1.3
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   swc-loader@0.2.6(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@swc/core': 1.7.6(@swc/helpers@0.5.5)
       '@swc/counter': 0.1.3
       webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
 
+  swc-minify-webpack-plugin@2.1.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      '@swc/core': 1.6.1(@swc/helpers@0.5.5)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   swc-minify-webpack-plugin@2.1.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@swc/core': 1.7.6(@swc/helpers@0.5.5)
@@ -29066,6 +29293,17 @@ snapshots:
 
   term-size@2.2.1: {}
 
+  terser-webpack-plugin@5.3.10(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.25
+      jest-worker: 27.5.1
+      schema-utils: 3.3.0
+      serialize-javascript: 6.0.2
+      terser: 5.31.3
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+    optionalDependencies:
+      '@swc/core': 1.6.1(@swc/helpers@0.5.5)
+
   terser-webpack-plugin@5.3.10(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
@@ -29119,14 +29357,14 @@ snapshots:
       terser: 5.31.3
       webpack: 5.93.0
 
-  terser-webpack-plugin@5.3.9(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+  terser-webpack-plugin@5.3.9(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.31.3
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
     optionalDependencies:
       '@swc/core': 1.6.1(@swc/helpers@0.5.5)
 
@@ -29271,6 +29509,26 @@ snapshots:
     dependencies:
       tslib: 1.14.1
 
+  ts-node@10.9.2(@swc/core@1.6.1(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4):
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.11
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.4
+      '@types/node': 20.14.14
+      acorn: 8.12.1
+      acorn-walk: 8.3.3
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 5.5.4
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+    optionalDependencies:
+      '@swc/core': 1.6.1(@swc/helpers@0.5.5)
+
   ts-node@10.9.2(@swc/core@1.7.6(@swc/helpers@0.5.5))(@types/node@20.14.14)(typescript@5.5.4):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
@@ -29533,6 +29791,15 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
+  url-loader@4.1.1(file-loader@6.2.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      loader-utils: 2.0.4
+      mime-types: 2.1.35
+      schema-utils: 3.3.0
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+    optionalDependencies:
+      file-loader: 6.2.0(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+
   url-loader@4.1.1(file-loader@6.2.0(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       loader-utils: 2.0.4
@@ -30312,7 +30579,7 @@ snapshots:
   webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
       '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))
       '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0))
       colorette: 2.0.20
@@ -30322,11 +30589,21 @@ snapshots:
       import-local: 3.2.0
       interpret: 2.2.0
       rechoir: 0.7.1
-      webpack: 5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
       webpack-merge: 5.10.0
     optionalDependencies:
       webpack-bundle-analyzer: 4.10.2
 
+  webpack-dev-middleware@6.1.2(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
+    dependencies:
+      colorette: 2.0.20
+      memfs: 3.5.3
+      mime-types: 2.1.35
+      range-parser: 1.2.1
+      schema-utils: 4.2.0
+    optionalDependencies:
+      webpack: 5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0)
+
   webpack-dev-middleware@6.1.2(webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5))(webpack-cli@4.10.0)):
     dependencies:
       colorette: 2.0.20
@@ -30411,6 +30688,39 @@ snapshots:
       - esbuild
       - uglify-js
 
+  webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0):
+    dependencies:
+      '@types/eslint-scope': 3.7.7
+      '@types/estree': 1.0.5
+      '@webassemblyjs/ast': 1.12.1
+      '@webassemblyjs/wasm-edit': 1.12.1
+      '@webassemblyjs/wasm-parser': 1.12.1
+      acorn: 8.12.1
+      acorn-import-attributes: 1.9.5(acorn@8.12.1)
+      browserslist: 4.23.2
+      chrome-trace-event: 1.0.4
+      enhanced-resolve: 5.17.1
+      es-module-lexer: 1.5.4
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 3.3.0
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.10(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack@5.93.0(@swc/core@1.6.1(@swc/helpers@0.5.5))(webpack-cli@4.10.0))
+      watchpack: 2.4.1
+      webpack-sources: 3.2.3
+    optionalDependencies:
+      webpack-cli: 4.10.0(webpack-bundle-analyzer@4.10.2)(webpack@5.93.0)
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
+
   webpack@5.93.0(@swc/core@1.7.6(@swc/helpers@0.5.5)):
     dependencies:
       '@types/eslint-scope': 3.7.7

From 01ab4f56afbfa61f8cde5d102cdbe409421dd11c Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Fri, 16 Aug 2024 16:11:22 +0300
Subject: [PATCH 06/10] Standardize usage of Google Analytics

 + Only charterafrica should continue with GA_MEASUREMENT_ID
 + RoboShield will introduce use of CMS for analytics ID
---
 Dockerfile                                    | 203 +++++++++---------
 apps/climatemappedafrica/.env.template        |   2 +-
 apps/climatemappedafrica/src/lib/ga/index.js  |   2 +-
 .../src/pages/_document.js                    |   4 +-
 apps/climatemappedafrica/turbo.json           |   1 -
 apps/pesayetu/.env.template                   |   2 +-
 apps/pesayetu/src/lib/ga/index.js             |   2 +-
 apps/pesayetu/src/pages/_document.js          |   4 +-
 apps/pesayetu/turbo.json                      |   1 -
 turbo.json                                    |   8 +-
 10 files changed, 115 insertions(+), 114 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 834d89d47..c68dc6fc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -387,9 +387,12 @@ ARG NEXT_PUBLIC_APP_LOGO_URL \
   PAYLOAD_PUBLIC_APP_URL
 
 # TODO(koech): Standadise naming of GA MEASUREMENT ID. Our options:
-#              - GA_MEASUREMENT_ID (charterafrica, civicsignalblog, codeforafrica)
-#              - GOOGLE_ANALYTICS_ID (pesayetu, roboshield, vpnmanager)
+#              - GA_MEASUREMENT_ID (charterafrica)
+#              - GOOGLE_ANALYTICS_ID (pesayetu, vpnmanager)
 #              This is only needed at runtime
+# TODO(koech): Completely remove the use of ENV var for Googel analytics
+#              for those app that have CMS. Measurement id should be set
+#              in the Settings part of a site.
 ENV NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \
   PAYLOAD_PUBLIC_APP_URL=${PAYLOAD_PUBLIC_APP_URL} \
   PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH}
@@ -437,106 +440,102 @@ CMD ["node", "dist/server.js"]
 # codeforafrica-desp: image with all codeforafrica dependencies
 # -------------------------------------------------------------
 
-  FROM base-deps AS codeforafrica-deps
-
-  # TODO(kilemensi): Figure out why this is needed
-  COPY packages/commons-ui-testing-library/package.json ./packages/commons-ui-testing-library/package.json
-  
-  COPY apps/codeforafrica/package.json ./apps/codeforafrica/package.json
-  
-  RUN pnpm --filter "./apps/codeforafrica/" install --offline --frozen-lockfile
-  
-  #
-  # codeforafrica-builder: image that uses deps to build shippable output
-  # ---------------------------------------------------------------------
-  
-  FROM base-builder AS codeforafrica-builder
-  
-  ARG NEXT_TELEMETRY_DISABLED \
-    # Next.js / Payload (build time)
-    PORT \
-    # Next.js (runtime)
-    NEXT_PUBLIC_APP_NAME="Code for Africa" \
-    NEXT_PUBLIC_APP_URL \
-    NEXT_PUBLIC_SENTRY_DSN \
-    # Payload (runtime)
-    # TODO(koech): Standadise naming of Mongo DB URL. Our options:
-    #              - MONGODB_URL (codeforafrica)
-    #              - MONGO_URL (charterafrica, roboshield)
-    MONGODB_URL \
-    PAYLOAD_SECRET \
-    # Sentry (build time)
-    SENTRY_AUTH_TOKEN \
-    SENTRY_ENVIRONMENT \
-    SENTRY_ORG \
-    SENTRY_PROJECT
-  
-  # This is in app-builder instead of base-builder just incase app-deps adds deps
-  COPY --from=codeforafrica-deps /workspace/node_modules ./node_modules
-  
-  COPY --from=codeforafrica-deps /workspace/apps/codeforafrica/node_modules ./apps/codeforafrica/node_modules
-  
-  COPY apps/codeforafrica ./apps/codeforafrica/
-  
-  # When building Next.js app, Next.js needs to connect to local Payload
-  ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000
-  RUN pnpm --filter "./apps/codeforafrica/" build-next
-  
-  # When building Payload app, Payload needs to have final app URL
-  ENV PAYLOAD_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
-  RUN pnpm --filter "./apps/codeforafrica/" build-payload
-  
-  #
-  # codeforafrica-runner: final deployable image
-  # --------------------------------------------
-  
-  FROM base-runner AS codeforafrica-runner
-  
-  ARG NEXT_PUBLIC_APP_LOGO_URL \
-    PAYLOAD_CONFIG_PATH="dist/payload.config.js" \
-    PAYLOAD_PUBLIC_APP_URL
-  
-  # TODO(koech): Standadise naming of GA MEASUREMENT ID. Our options:
-  #              - GA_MEASUREMENT_ID (charterafrica, codeforafrica)
-  #              - GOOGLE_ANALYTICS_ID (pesayetu, roboshield, vpnmanager)
-  #              This is only needed at runtime
-  ENV NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \
-    PAYLOAD_PUBLIC_APP_URL=${PAYLOAD_PUBLIC_APP_URL} \
-    PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH}
-  
-  RUN set -ex \
-    # Create nextjs cache dir w/ correct permissions
-    && mkdir -p ./apps/codeforafrica//.next \
-    && chown nextjs:nodejs ./apps/codeforafrica/.next
-  
-  # PNPM
-  # symlink some dependencies
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
-  
-  # Since we can't use output: "standalone", copy all app's dependencies
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/node_modules ./apps/codeforafrica/node_modules
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/next.config.js ./apps/codeforafrica/next.config.js
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/.env ./apps/codeforafrica/.env
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/migrations ./apps/codeforafrica/migrations
-  # Next.js
-  # Public assets
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/public ./apps/codeforafrica/public
-  
-  # Since we can't use output: "standalone", copy the whole app's .next folder
-  # TODO(kilemensi): Figure out which files in .next folder are not needed
-  COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/.next ./apps/codeforafrica/.next
-  
-  # Payload
-  COPY --from=codeforafrica-builder /workspace/apps/codeforafrica/dist ./apps/codeforafrica/dist
-  COPY --from=codeforafrica-builder /workspace/apps/codeforafrica/build ./apps/codeforafrica/build
-  
-  # Since we can't use output: "standalone", switch to specific app's folder
-  WORKDIR /workspace/apps/codeforafrica
-  
-  USER nextjs
-  
-  # Custom server to run Payload and Next.js in the same app
-  CMD ["node", "dist/server.js"]
+FROM base-deps AS codeforafrica-deps
+
+# TODO(kilemensi): Figure out why this is needed
+COPY packages/commons-ui-testing-library/package.json ./packages/commons-ui-testing-library/package.json
+
+COPY apps/codeforafrica/package.json ./apps/codeforafrica/package.json
+
+RUN pnpm --filter "./apps/codeforafrica/" install --offline --frozen-lockfile
+
+#
+# codeforafrica-builder: image that uses deps to build shippable output
+# ---------------------------------------------------------------------
+
+FROM base-builder AS codeforafrica-builder
+
+ARG NEXT_TELEMETRY_DISABLED \
+  # Next.js / Payload (build time)
+  PORT \
+  # Next.js (runtime)
+  NEXT_PUBLIC_APP_NAME="Code for Africa" \
+  NEXT_PUBLIC_APP_URL \
+  NEXT_PUBLIC_SENTRY_DSN \
+  # Payload (runtime)
+  # TODO(koech): Standadise naming of Mongo DB URL. Our options:
+  #              - MONGODB_URL (codeforafrica)
+  #              - MONGO_URL (charterafrica, roboshield)
+  MONGODB_URL \
+  PAYLOAD_SECRET \
+  # Sentry (build time)
+  SENTRY_AUTH_TOKEN \
+  SENTRY_ENVIRONMENT \
+  SENTRY_ORG \
+  SENTRY_PROJECT
+
+# This is in app-builder instead of base-builder just incase app-deps adds deps
+COPY --from=codeforafrica-deps /workspace/node_modules ./node_modules
+
+COPY --from=codeforafrica-deps /workspace/apps/codeforafrica/node_modules ./apps/codeforafrica/node_modules
+
+COPY apps/codeforafrica ./apps/codeforafrica/
+
+# When building Next.js app, Next.js needs to connect to local Payload
+ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000
+RUN pnpm --filter "./apps/codeforafrica/" build-next
+
+# When building Payload app, Payload needs to have final app URL
+ENV PAYLOAD_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
+RUN pnpm --filter "./apps/codeforafrica/" build-payload
+
+#
+# codeforafrica-runner: final deployable image
+# --------------------------------------------
+
+FROM base-runner AS codeforafrica-runner
+
+ARG NEXT_PUBLIC_APP_LOGO_URL \
+  PAYLOAD_CONFIG_PATH="dist/payload.config.js" \
+  PAYLOAD_PUBLIC_APP_URL
+
+ENV NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \
+  PAYLOAD_PUBLIC_APP_URL=${PAYLOAD_PUBLIC_APP_URL} \
+  PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH}
+
+RUN set -ex \
+  # Create nextjs cache dir w/ correct permissions
+  && mkdir -p ./apps/codeforafrica//.next \
+  && chown nextjs:nodejs ./apps/codeforafrica/.next
+
+# PNPM
+# symlink some dependencies
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/node_modules ./node_modules
+
+# Since we can't use output: "standalone", copy all app's dependencies
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/node_modules ./apps/codeforafrica/node_modules
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/next.config.js ./apps/codeforafrica/next.config.js
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/.env ./apps/codeforafrica/.env
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/migrations ./apps/codeforafrica/migrations
+# Next.js
+# Public assets
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/public ./apps/codeforafrica/public
+
+# Since we can't use output: "standalone", copy the whole app's .next folder
+# TODO(kilemensi): Figure out which files in .next folder are not needed
+COPY --from=codeforafrica-builder --chown=nextjs:nodejs /workspace/apps/codeforafrica/.next ./apps/codeforafrica/.next
+
+# Payload
+COPY --from=codeforafrica-builder /workspace/apps/codeforafrica/dist ./apps/codeforafrica/dist
+COPY --from=codeforafrica-builder /workspace/apps/codeforafrica/build ./apps/codeforafrica/build
+
+# Since we can't use output: "standalone", switch to specific app's folder
+WORKDIR /workspace/apps/codeforafrica
+
+USER nextjs
+
+# Custom server to run Payload and Next.js in the same app
+CMD ["node", "dist/server.js"]
 
 
 # ============================================================================
diff --git a/apps/climatemappedafrica/.env.template b/apps/climatemappedafrica/.env.template
index b95f0578b..61c5a0d8b 100644
--- a/apps/climatemappedafrica/.env.template
+++ b/apps/climatemappedafrica/.env.template
@@ -35,4 +35,4 @@ S3_UPLOAD_BUCKET=name-of-s3-bucket
 S3_UPLOAD_REGION=bucket-region-us-east-1
 
 #Analytics
-NEXT_PUBLIC_GOOGLE_ANALYTICS = "G-xxxxxxxx"
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID = "G-xxxxxxxx"
diff --git a/apps/climatemappedafrica/src/lib/ga/index.js b/apps/climatemappedafrica/src/lib/ga/index.js
index f23602d3a..441d00313 100644
--- a/apps/climatemappedafrica/src/lib/ga/index.js
+++ b/apps/climatemappedafrica/src/lib/ga/index.js
@@ -1,7 +1,7 @@
 // log the pageview with their URL
 export const pageview = (url) => {
   /* eslint-env browser */
-  window.gtag("config", process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS, {
+  window.gtag("config", process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID, {
     page_path: url,
   });
 };
diff --git a/apps/climatemappedafrica/src/pages/_document.js b/apps/climatemappedafrica/src/pages/_document.js
index 0393f86fb..8285e0b92 100644
--- a/apps/climatemappedafrica/src/pages/_document.js
+++ b/apps/climatemappedafrica/src/pages/_document.js
@@ -12,7 +12,7 @@ export default class MyDocument extends Document {
           {/* Global Site Tag (gtag.js) - Google Analytics */}
           <script
             async
-            src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}`}
+            src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}`}
           />
           <script
             // eslint-disable-next-line react/no-danger
@@ -21,7 +21,7 @@ export default class MyDocument extends Document {
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
-            gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}', {
+            gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}', {
               page_path: window.location.pathname,
             });
           `,
diff --git a/apps/climatemappedafrica/turbo.json b/apps/climatemappedafrica/turbo.json
index e0f8821a0..3dbc40709 100644
--- a/apps/climatemappedafrica/turbo.json
+++ b/apps/climatemappedafrica/turbo.json
@@ -9,7 +9,6 @@
       "env": [
         "HURUMAP_API_URL",
         "NEXT_PUBLIC_APP_URL",
-        "NEXT_PUBLIC_GOOGLE_ANALYTICS",
         "NEXT_PUBLIC_IMAGE_DOMAINS",
         "NEXT_PUBLIC_IMAGE_UNOPTIMIZED",
         "NEXT_PUBLIC_IMAGE_SCALE_FACTOR",
diff --git a/apps/pesayetu/.env.template b/apps/pesayetu/.env.template
index 436550d60..52da60eda 100644
--- a/apps/pesayetu/.env.template
+++ b/apps/pesayetu/.env.template
@@ -54,7 +54,7 @@ S3_UPLOAD_BUCKET=name-of-s3-bucket
 S3_UPLOAD_REGION=bucket-region-us-east-1
 
 #Analytics
-NEXT_PUBLIC_GOOGLE_ANALYTICS = "G-xxxxxxxx"
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID = "G-xxxxxxxx"
 
 # Storybook Telemetry
 # https://storybook.js.org/docs/configure/telemetry
diff --git a/apps/pesayetu/src/lib/ga/index.js b/apps/pesayetu/src/lib/ga/index.js
index f23602d3a..441d00313 100644
--- a/apps/pesayetu/src/lib/ga/index.js
+++ b/apps/pesayetu/src/lib/ga/index.js
@@ -1,7 +1,7 @@
 // log the pageview with their URL
 export const pageview = (url) => {
   /* eslint-env browser */
-  window.gtag("config", process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS, {
+  window.gtag("config", process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID, {
     page_path: url,
   });
 };
diff --git a/apps/pesayetu/src/pages/_document.js b/apps/pesayetu/src/pages/_document.js
index a5ebda579..77226dcf9 100644
--- a/apps/pesayetu/src/pages/_document.js
+++ b/apps/pesayetu/src/pages/_document.js
@@ -12,7 +12,7 @@ export default class MyDocument extends Document {
           {/* Global Site Tag (gtag.js) - Google Analytics */}
           <script
             async
-            src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}`}
+            src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}`}
           />
           <script
             // eslint-disable-next-line react/no-danger
@@ -21,7 +21,7 @@ export default class MyDocument extends Document {
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
-            gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}', {
+            gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}', {
               page_path: window.location.pathname,
             });
           `,
diff --git a/apps/pesayetu/turbo.json b/apps/pesayetu/turbo.json
index a94603cb7..e9216538f 100644
--- a/apps/pesayetu/turbo.json
+++ b/apps/pesayetu/turbo.json
@@ -10,7 +10,6 @@
         "HURUMAP_API_URL",
         "JWT_SECRET_KEY",
         "NEXT_PUBLIC_APP_URL",
-        "NEXT_PUBLIC_GOOGLE_ANALYTICS",
         "NEXT_PUBLIC_IMAGE_DOMAINS",
         "NEXT_PUBLIC_IMAGE_UNOPTIMIZED",
         "NEXT_PUBLIC_IMAGE_SCALE_FACTOR",
diff --git a/turbo.json b/turbo.json
index 470becb53..0a33f3f4f 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,7 +1,12 @@
 {
   "$schema": "https://turbo.build/schema.json",
   "globalDependencies": ["**/.env.*local"],
-  "globalEnv": ["CI", "GITHUB_TOKEN", "PORT"],
+  "globalEnv": [
+    "CI",
+    "GITHUB_TOKEN",
+    "PORT",
+    "NEXT_PUBLIC_GOOGLE_ANALYTICS_ID"
+  ],
   "tasks": {
     "build": {
       "dependsOn": ["^build"],
@@ -18,7 +23,6 @@
         "NEXT_PUBLIC_APP_URL",
         "NEXT_PUBLIC_IMAGE_DOMAINS",
         "NEXT_PUBLIC_IMAGE_UNOPTIMIZED",
-        "NEXT_PUBLIC_GOOGLE_ANALYTICS_ID",
         "NEXT_PUBLIC_VERCEL_ENV",
         "NEXT_PUBLIC_VERCEL_URL",
         "NODE_ENV",

From 425cdc6e0780561047561ccd22f6c33b441bfea6 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Fri, 16 Aug 2024 16:13:30 +0300
Subject: [PATCH 07/10] Add analytics to Settings and show it via _app

---
 apps/roboshield/src/pages/_app.tsx            |  9 +++++---
 .../src/payload/globals/Site/EngagementTab.ts | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/apps/roboshield/src/pages/_app.tsx b/apps/roboshield/src/pages/_app.tsx
index b89c46df6..da7f895eb 100644
--- a/apps/roboshield/src/pages/_app.tsx
+++ b/apps/roboshield/src/pages/_app.tsx
@@ -1,5 +1,7 @@
+import SEO from "@/roboshield/next-seo.config";
 import { CssBaseline, ThemeProvider } from "@mui/material";
 import { GoogleAnalytics } from "@next/third-parties/google";
+import { DefaultSeo } from "next-seo";
 import type { AppProps } from "next/app";
 import Head from "next/head";
 import { ReactNode } from "react";
@@ -16,14 +18,15 @@ function getDefaultLayout(page: ReactNode, pageProps: any) {
 export default function App(props: AppProps | any) {
   const { Component, pageProps } = props;
   const getLayout = Component.getLayout || getDefaultLayout;
-  const gaId = process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID;
+  const { analytics } = pageProps;
+  const { analyticsId: gaId } = analytics || {};
 
   return (
     <>
+      <DefaultSeo {...SEO} />
       <AppCacheProvider {...props}>
         <Head>
           <meta name="viewport" content="initial-scale=1, width=device-width" />
-          <title>RoboShield</title>
         </Head>
         <ThemeProvider theme={theme}>
           <CssBaseline />
@@ -32,7 +35,7 @@ export default function App(props: AppProps | any) {
           </GlobalProvider>
         </ThemeProvider>
       </AppCacheProvider>
-      {gaId?.length ? <GoogleAnalytics gaId={gaId} /> : null}
+      <GoogleAnalytics gaId={gaId} />
     </>
   );
 }
diff --git a/apps/roboshield/src/payload/globals/Site/EngagementTab.ts b/apps/roboshield/src/payload/globals/Site/EngagementTab.ts
index d61390ad6..c0d6cab15 100644
--- a/apps/roboshield/src/payload/globals/Site/EngagementTab.ts
+++ b/apps/roboshield/src/payload/globals/Site/EngagementTab.ts
@@ -55,6 +55,28 @@ const EngagementTab: Tab = {
         },
       ],
     },
+    {
+      name: "analytics",
+      type: "group",
+      label: "Site Analytics",
+      localized: true,
+      fields: [
+        {
+          type: "collapsible",
+          label: "Google Analytics",
+          fields: [
+            {
+              name: "analyticsId",
+              type: "text",
+            },
+          ],
+          admin: {
+            description:
+              "Measurement ID: https://support.google.com/analytics/answer/12270356",
+          },
+        },
+      ],
+    },
   ],
 };
 

From aec1306eaab4dbb007ce15ce6fc2b0c640a4bb0f Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Fri, 16 Aug 2024 16:15:33 +0300
Subject: [PATCH 08/10] Use next-seo and payload to pull seo and analytics
 settings

SEO information will for the following order:
 1. Post SEO wins
 2. Page SEO wins whenever there isn't Post SEO
 2. Settings/Site SEO wins whenever there isn't Page SEO
---
 apps/roboshield/payload-types.ts             |  8 ++
 apps/roboshield/payload.config.ts            | 22 ++---
 apps/roboshield/src/components/Page/Page.tsx |  5 +-
 apps/roboshield/src/lib/data/common/index.ts | 20 +++--
 apps/roboshield/src/lib/data/seo.ts          | 94 ++++++++++++++++++++
 apps/roboshield/src/lib/payload/index.ts     |  6 +-
 apps/roboshield/src/next-seo.config.js       | 26 ++++++
 apps/roboshield/src/utils/site.ts            | 25 ++++++
 8 files changed, 186 insertions(+), 20 deletions(-)
 create mode 100644 apps/roboshield/src/lib/data/seo.ts
 create mode 100644 apps/roboshield/src/next-seo.config.js
 create mode 100644 apps/roboshield/src/utils/site.ts

diff --git a/apps/roboshield/payload-types.ts b/apps/roboshield/payload-types.ts
index 9ca401cb1..71e1419a5 100644
--- a/apps/roboshield/payload-types.ts
+++ b/apps/roboshield/payload-types.ts
@@ -390,6 +390,9 @@ export interface SettingsSite {
     title: string;
     embedCode: string;
   };
+  analytics?: {
+    analyticsId?: string | null;
+  };
   initiative: {
     title: string;
     description: {
@@ -411,6 +414,11 @@ export interface SettingsSite {
         }[]
       | null;
   };
+  meta?: {
+    title?: string | null;
+    description?: string | null;
+    image?: string | Media | null;
+  };
   updatedAt?: string | null;
   createdAt?: string | null;
 }
diff --git a/apps/roboshield/payload.config.ts b/apps/roboshield/payload.config.ts
index 487f2b6da..1b9a0c6d3 100644
--- a/apps/roboshield/payload.config.ts
+++ b/apps/roboshield/payload.config.ts
@@ -1,19 +1,19 @@
-import { buildConfig } from "payload/config";
-import { slateEditor } from "@payloadcms/richtext-slate";
-import { mongooseAdapter } from "@payloadcms/db-mongodb";
+import { loadEnvConfig } from "@next/env";
 import { webpackBundler } from "@payloadcms/bundler-webpack";
-import { CollectionConfig, GlobalConfig } from "payload/types";
+import { mongooseAdapter } from "@payloadcms/db-mongodb";
 import { cloudStorage } from "@payloadcms/plugin-cloud-storage";
-import Site from "./src/payload/globals/Site";
+import { s3Adapter } from "@payloadcms/plugin-cloud-storage/s3";
+import nestedDocs from "@payloadcms/plugin-nested-docs";
+import seo from "@payloadcms/plugin-seo";
+import { slateEditor } from "@payloadcms/richtext-slate";
+import { buildConfig } from "payload/config";
+import { CollectionConfig, GlobalConfig } from "payload/types";
+import { Config } from "./payload-types";
 import Media from "./src/payload/collections/Media";
 import Pages from "./src/payload/collections/Pages";
-import seo from "@payloadcms/plugin-seo";
-import nestedDocs from "@payloadcms/plugin-nested-docs";
-import { s3Adapter } from "@payloadcms/plugin-cloud-storage/s3";
 import Users from "./src/payload/collections/Users";
+import Site from "./src/payload/globals/Site";
 import { defaultLocale, locales } from "./src/payload/utils/locales";
-import { loadEnvConfig } from "@next/env";
-import { Config } from "./payload-types";
 
 const projectDir = process.cwd();
 loadEnvConfig(projectDir);
@@ -109,7 +109,7 @@ export default buildConfig({
     }),
     seo({
       collections: ["pages"],
-      globals: [],
+      globals: ["settings-site"],
       uploadsCollection: "media",
       generateTitle: ({ doc }: any) => doc?.title?.value as string,
       generateURL: ({ doc }: any) =>
diff --git a/apps/roboshield/src/components/Page/Page.tsx b/apps/roboshield/src/components/Page/Page.tsx
index f2eb50082..8056f0d5e 100644
--- a/apps/roboshield/src/components/Page/Page.tsx
+++ b/apps/roboshield/src/components/Page/Page.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { NextSeo, NextSeoProps } from "next-seo";
 
 import Footer from "@/roboshield/components/Footer";
 import type { FooterProps } from "@/roboshield/components/Footer";
@@ -30,6 +31,7 @@ interface Props {
   children?: React.ReactNode;
   navbar?: Navbar;
   footer?: FooterProps;
+  seo?: NextSeoProps;
   slug?: string;
 }
 
@@ -37,9 +39,10 @@ interface Props {
  * While the layout (navbar, footer) remain the same, the main component
  * changes from page to page. Use `slug` to track page changes.
  */
-function Page({ children, footer, navbar, slug }: Props) {
+function Page({ children, footer, navbar, seo, slug }: Props) {
   return (
     <>
+      <NextSeo {...seo} />
       {navbar ? <NavBar {...navbar} /> : null}
       {children ? <main key={slug}>{children}</main> : null}
       {footer ? <Footer {...footer} /> : null}
diff --git a/apps/roboshield/src/lib/data/common/index.ts b/apps/roboshield/src/lib/data/common/index.ts
index e384b0ef8..f0c91b882 100644
--- a/apps/roboshield/src/lib/data/common/index.ts
+++ b/apps/roboshield/src/lib/data/common/index.ts
@@ -1,7 +1,8 @@
-import { blockify } from "../blockify";
-import { GetServerSidePropsContext } from "next";
+import { blockify } from "@/roboshield/lib/data/blockify";
+import getPageSeoFromMeta from "@/roboshield/lib/data/seo";
 import { Api } from "@/roboshield/lib/payload";
 import { SettingsSite } from "@/root/payload-types";
+import { GetServerSidePropsContext } from "next";
 
 export function imageFromMedia(alt: string, url: string) {
   return { alt, src: url };
@@ -52,13 +53,13 @@ export async function getPageProps(
 ) {
   // For now, RoboShield only supports single paths i.e. /, /about, etc.,
   // so params.slug[0] is good enough
-  const {
-    params: { slug: slugs },
-  } = context;
+  const slugs = context.params?.slug as string[] | undefined;
   const [slug] = slugs || ["index"];
+  const { draftMode = false } = context;
+  const options = { draft: draftMode };
   const {
     docs: [page],
-  } = await api.findPage(slug);
+  } = await api.findPage(slug, options);
 
   if (!page) {
     return null;
@@ -67,12 +68,17 @@ export async function getPageProps(
   const blocks = await blockify(page.blocks, api);
 
   const siteSettings = await api.findGlobal("settings-site");
-  const navbar = getNavBar(siteSettings);
+  const { analytics } = siteSettings;
   const footer = getFooter(siteSettings);
+  const navbar = getNavBar(siteSettings);
+  const seo = getPageSeoFromMeta(page, siteSettings);
+
   return {
+    analytics,
     blocks,
     footer,
     navbar,
+    seo,
     slug,
   };
 }
diff --git a/apps/roboshield/src/lib/data/seo.ts b/apps/roboshield/src/lib/data/seo.ts
new file mode 100644
index 000000000..3ba666d1f
--- /dev/null
+++ b/apps/roboshield/src/lib/data/seo.ts
@@ -0,0 +1,94 @@
+import site from "@/roboshield/utils/site";
+import { Media, Page, SettingsSite } from "@/root/payload-types";
+import { NextSeoProps } from "next-seo";
+
+type OpenGraphMedia = {
+  url: string;
+  width?: number | null;
+  height?: number | null;
+  alt?: string;
+  type?: string;
+  secureUrl?: string;
+};
+
+type RichTextProps = {
+  [k: string]: unknown;
+}[];
+
+function stringifyDescription(description: RichTextProps) {
+  if (!Array.isArray(description)) {
+    return "";
+  }
+  return description.reduce((result, item) => {
+    if (item.text) {
+      // eslint-disable-next-line no-param-reassign
+      result += item.text;
+    }
+
+    if (Array.isArray(item.children)) {
+      // eslint-disable-next-line no-param-reassign
+      result += stringifyDescription(item.children);
+    }
+    return result;
+  }, "");
+}
+
+function mediaToImage(
+  stringOrMediaImage: string | Media | null | undefined,
+  title: string | null,
+): OpenGraphMedia | null {
+  const media = stringOrMediaImage as Media;
+
+  if (!media?.url) {
+    return null;
+  }
+  const { height, mimeType: type, url, width } = media;
+  const image: OpenGraphMedia = {
+    height,
+    url,
+    width,
+  };
+  if (type) {
+    image.type = type;
+  }
+  const alt = media.alt || title;
+  if (alt) {
+    image.alt = alt;
+  }
+  return image;
+}
+
+export default function getPageSeoFromMeta(
+  page: Page,
+  settings: SettingsSite,
+): NextSeoProps {
+  const canonical = site.url.replace(/\/+$/, "");
+  const defaultTitle = settings.meta?.title || settings.title || site.name;
+  const title = page.meta?.title || page.title || defaultTitle;
+  const titleTemplate = defaultTitle && `%s | ${defaultTitle}`;
+  const description =
+    page.meta?.description ||
+    settings.meta?.description ||
+    stringifyDescription(settings.description);
+  const openGraph: Record<string, any> = {
+    description,
+    type: "website",
+    siteName: defaultTitle,
+  };
+  const image =
+    mediaToImage(page.meta?.image, title) ||
+    mediaToImage(settings.meta?.image, title);
+  if (image) {
+    openGraph.images = [image];
+  }
+  const seo = {
+    title,
+    titleTemplate,
+    defaultTitle,
+    description,
+    canonical,
+    openGraph,
+  };
+
+  return Object.fromEntries(Object.entries(seo).filter(([key, val]) => val));
+}
diff --git a/apps/roboshield/src/lib/payload/index.ts b/apps/roboshield/src/lib/payload/index.ts
index 94178357f..237d9a7a2 100644
--- a/apps/roboshield/src/lib/payload/index.ts
+++ b/apps/roboshield/src/lib/payload/index.ts
@@ -8,8 +8,12 @@ export type CollectionConfig = keyof Config["collections"];
 export type CollectionItemTypes = Config["collections"][CollectionConfig];
 export type GlobalConfig = keyof Config["globals"];
 
-async function findPage(slug: string): Promise<PaginatedDocs<Page>> {
+async function findPage(
+  slug: string,
+  options?: Partial<ByIDOptions<CollectionConfig>>,
+): Promise<PaginatedDocs<Page>> {
   return payload.find({
+    ...options,
     collection: "pages",
     where: {
       slug: {
diff --git a/apps/roboshield/src/next-seo.config.js b/apps/roboshield/src/next-seo.config.js
new file mode 100644
index 000000000..e5eedabb2
--- /dev/null
+++ b/apps/roboshield/src/next-seo.config.js
@@ -0,0 +1,26 @@
+import site from "@/roboshield/utils/site";
+
+const config = {
+  openGraph: {
+    type: "website",
+    locale: "en_GB",
+    url: site.environmentUrl,
+    site_name: site.name,
+    images: [
+      {
+        url: `${site.environmentUrl}image.jpg`,
+        width: 1600,
+        height: 800,
+        alt: site.name,
+        type: "image/jpeg",
+      },
+    ],
+  },
+  twitter: {
+    handle: "@Code4Africa",
+    site: "@Code4Africa",
+    cardType: "summary_large_image",
+  },
+};
+
+export default config;
diff --git a/apps/roboshield/src/utils/site.ts b/apps/roboshield/src/utils/site.ts
new file mode 100644
index 000000000..6064ddb21
--- /dev/null
+++ b/apps/roboshield/src/utils/site.ts
@@ -0,0 +1,25 @@
+const name = process.env.NEXT_PUBLIC_APP_NAME ?? "RoboShield";
+
+// see: https://developer.mozilla.org/en-US/docs/Web/API/URL/pathname
+const ensureTrailingSlash = (str: string) => {
+  const url = new URL(str);
+  if (!url.pathname.endsWith("/")) {
+    url.pathname = `${url.pathname}/`;
+  }
+  return url.toString();
+};
+const url = ensureTrailingSlash(process.env.NEXT_PUBLIC_APP_URL as string);
+let environmentUrl = url;
+if (process.env.NEXT_PUBLIC_VERCEL_ENV === "preview") {
+  environmentUrl = ensureTrailingSlash(
+    `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`,
+  );
+}
+
+const site = {
+  environmentUrl,
+  name,
+  url,
+};
+
+export default site;

From 4322f517bfccc0882cf2ee3949107b79f86e41e1 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <clemence@codeforafrica.org>
Date: Fri, 16 Aug 2024 16:20:01 +0300
Subject: [PATCH 09/10] Send download and copy events to Google Analytics

Also cleans up the message about RoboShield in the generated robots.txt
text.
---
 .../src/components/Finish/Finish.tsx          | 20 ++++++++++---------
 apps/roboshield/src/lib/config.ts             |  2 +-
 apps/roboshield/src/lib/robots.ts             |  6 +++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/roboshield/src/components/Finish/Finish.tsx b/apps/roboshield/src/components/Finish/Finish.tsx
index a9d04d428..6e19d28ec 100644
--- a/apps/roboshield/src/components/Finish/Finish.tsx
+++ b/apps/roboshield/src/components/Finish/Finish.tsx
@@ -1,15 +1,16 @@
 import { Box, Snackbar } from "@mui/material";
+import { sendGAEvent } from "@next/third-parties/google";
 import { useEffect, useState } from "react";
 
-import Code from "../Code";
+import Code from "@/roboshield/components/Code";
 import StepperNav from "@/roboshield/components/StepperNav";
 
+import SkipToLastStep from "@/roboshield/components/SkipToLastStep";
+import StepHint from "@/roboshield/components/StepHint";
 import { useGlobalState } from "@/roboshield/context/GlobalContext";
 import { generateRobots } from "@/roboshield/lib/robots";
 import { StepComponent } from "@/roboshield/types/stepComponent";
 import { downloadFile } from "@/roboshield/utils/file";
-import SkipToLastStep from "@/roboshield/components/SkipToLastStep";
-import StepHint from "@/roboshield/components/StepHint";
 
 interface Props extends StepComponent {
   handleReset: () => void;
@@ -37,27 +38,28 @@ export default function Finish({
     });
   }
 
-  const getCopyMetadata = () => {
-    const date = new Date().toISOString();
-    const url = window.location.href;
-    return `${code}\n\n\n# Generated on: ${date}\n# URL: ${url}\n\n`;
+  const reportShieldEvent = (event: string) => {
+    const value = new Date().toISOString();
+    sendGAEvent("event", event, { value: "xyz" });
   };
 
   const handleDownload = async () => {
+    reportShieldEvent("download");
     const filename = "robots.txt";
     if (!saved) {
       await saveData();
       setSaved(true);
     }
-    await downloadFile(filename, getCopyMetadata());
+    await downloadFile(filename, code);
   };
 
   const handleCopy = async () => {
+    reportShieldEvent("copy");
     if (!saved) {
       await saveData();
       setSaved(true);
     }
-    navigator.clipboard.writeText(getCopyMetadata());
+    navigator.clipboard.writeText(code);
     setShowSnackbar(true);
   };
 
diff --git a/apps/roboshield/src/lib/config.ts b/apps/roboshield/src/lib/config.ts
index efece1104..599d13103 100644
--- a/apps/roboshield/src/lib/config.ts
+++ b/apps/roboshield/src/lib/config.ts
@@ -85,7 +85,7 @@ export const platforms: Platform[] = [
 
 export const configureCrawlDelay = (delay: number) => {
   const comment =
-    "#Crawl-delay Specifies the minimum interval (in seconds)\n#for a robot to wait after loading one page, before starting to load another.\n";
+    "# Crawl-delay Specifies the minimum interval (in seconds)\n#for a robot to wait after loading one page, before starting to load another.\n";
   return `${comment}Crawl-delay: ${delay}\n\n`;
 };
 
diff --git a/apps/roboshield/src/lib/robots.ts b/apps/roboshield/src/lib/robots.ts
index 2178f8691..8b4cd50d5 100644
--- a/apps/roboshield/src/lib/robots.ts
+++ b/apps/roboshield/src/lib/robots.ts
@@ -29,7 +29,8 @@ const mergeAndSortBots = (existingBots: Robot[], newBots: Robot[]) => {
 };
 
 export async function generateRobots(state: GlobalState) {
-  let robots = ``;
+  let robots = `
+  `;
 
   if (state.crawlDelay && state.crawlDelay > 0) {
     robots += configureCrawlDelay(state.crawlDelay);
@@ -73,8 +74,7 @@ export async function generateRobots(state: GlobalState) {
       robots += configureSitemaps(validSitemaps);
     }
   }
-
-  return robots;
+  return `${robots}\n# Generatedy by RoboShield (https://roboshield.trustlab.africa)\n`;
 }
 
 export const validateRobots = (robots: string) => {

From 7ba06596129475939502ba2ac977890ec30f9848 Mon Sep 17 00:00:00 2001
From: Clemence Kyara <kilemensi@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:04:22 +0300
Subject: [PATCH 10/10] Fix spelling

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c68dc6fc7..e453e2e77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -390,7 +390,7 @@ ARG NEXT_PUBLIC_APP_LOGO_URL \
 #              - GA_MEASUREMENT_ID (charterafrica)
 #              - GOOGLE_ANALYTICS_ID (pesayetu, vpnmanager)
 #              This is only needed at runtime
-# TODO(koech): Completely remove the use of ENV var for Googel analytics
+# TODO(koech): Completely remove the use of ENV vars for Google Analytics
 #              for those app that have CMS. Measurement id should be set
 #              in the Settings part of a site.
 ENV NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \