Merge pull request #2044 from Plant-for-the-Planet-org/hotfix/sync-de…

…velop

Syncs develop with base branch for project redesign

.env.local.example

@@ -22,4 +22,8 @@ NEXT_PUBLIC_DONATION_URL=https://donate.plant-for-the-planet.org
 CONFIG_URL=https://app.plant-for-the-planet.org/app/config
 VERCEL_URL=localhost
 
-DB_CONN_URL=
+DB_CONN_URL=
+
+#Redis
+REDIS_URL=
+REDIS_TOKEN=

.storybook/preview.js

@@ -5,8 +5,7 @@ import materialTheme from '../src/theme/themeStyles';
 import { ThemeProvider } from '@storybook/theming';
 import { I18nextProvider } from 'react-i18next';
 import i18n from './i18n';
-import { useEffect } from 'react';
-import globalStyles from '../src/theme/theme';
+import { lazy, useEffect } from 'react';
 import { useTheme } from '../src/theme/themeContext';
 
 // import { ThemeProvider } from 'emotion-theming';
@@ -16,6 +15,9 @@ import { useTheme } from '../src/theme/themeContext';
  * Read more about them at:
  * https://storybook.js.org/docs/react/writing-stories/decorators#global-decorators
  */
+
+const globalStyles = lazy(() => import('../src/theme/theme'));
+
 export const decorators = [
   (Story, context) => {
     const { locale } = context.globals;

folderCrawler.js

@@ -0,0 +1,32 @@
+const fs = require('fs');
+const path = require('path');
+
+function crawlFolderStructure(rootDir) {
+  const files = [];
+  function crawlDirectory(dir) {
+    const items = fs.readdirSync(dir);
+
+    for (const item of items) {
+      const itemPath = path.join(dir, item);
+      const stats = fs.statSync(itemPath);
+
+      if (stats.isDirectory()) {
+        crawlDirectory(itemPath); // Recursive call for subdirectories
+      } else {
+        files.push(`/${path.relative(rootDir, itemPath).replace(/\[.*?\]/g, ':path').replace(/\/?index\.tsx?$/, '').replace(/\.tsx?$/, '')}`); // Add modified file path to the array
+      }
+    }
+  }
+  try {
+    crawlDirectory(rootDir);
+    return files;
+  } catch (error) {
+    console.error('Error while crawling:', error.message);
+    return [];
+  }
+}
+
+const scriptDir = __dirname;
+const rootPath = path.join(scriptDir, 'pages');
+const fileList = crawlFolderStructure(rootPath);
+console.log(fileList);

middleware.ts

@@ -0,0 +1,30 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getTenantSlug } from './src/utils/multiTenancy/helpers';
+
+export const config = {
+  matcher: [
+    // This regular expression matches any string except those containing "api", "static", files with extensions, or "_next".
+    '/((?!api|static|.*\\..*|_next).*)',
+    '/',
+    '/sites/:slug*',
+  ],
+};
+
+export default async function middleware(req: NextRequest) {
+  const url = req.nextUrl;
+
+  const host = req.headers.get('host');
+
+  const slug = await getTenantSlug(host!);
+
+  // Prevent security issues – users should not be able to canonically access
+  // the pages/sites folder and its respective contents.
+  if (url.pathname.startsWith(`/sites`)) {
+    url.pathname = `/404`;
+  } else {
+    // rewrite to the current subdomain under the pages/sites folder
+    url.pathname = `/sites/${slug}${url.pathname}`;
+  }
+
+  return NextResponse.rewrite(url);
+}

next.config.js

@@ -121,7 +121,9 @@ const nextConfig = {
     SITE_IMAGERY_API_URL: SITE_IMAGERY_API_URL,
     WIDGET_URL: process.env.WIDGET_URL,
     CONFIG_URL: process.env.CONFIG_URL,
-    ENABLE_ANALYTICS: DB_CONN_URL ? 'true' : 'false',
+    ENABLE_ANALYTICS: DB_CONN_URL ? true : false,
+    REDIS_URL: process.env.REDIS_URL,
+    REDIS_TOKEN: process.env.REDIS_TOKEN,
   },
   trailingSlash: false,
   reactStrictMode: true,