merge: base branch and resolve merge conflicts

Plant-for-the-Planet-org · Jul 18, 2024 · aa337db · aa337db
2 parents c3dcffc + 4dc86c5
commit aa337db
Show file tree

Hide file tree

Showing 211 changed files with 14,098 additions and 1,684 deletions.
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
@@ -7,6 +7,7 @@ name: 'Chromatic'
 on:
   push:
     branches:
+      - hotfix/chromatic-build-issue
       - develop
       - feature/redesign-explore-btn
       - feature/design-projectlist-filter

diff --git a/.storybook/i18n.js b/.storybook/i18n.js
@@ -13,6 +13,7 @@ import me from '../public/static/locales/en/me.json';
 import planet from '../public/static/locales/en/planet.json';
 import planetcash from '../public/static/locales/en/planetcash.json';
 import profile from '../public/static/locales/en/profile.json';
+import project from '../public/static/locales/en/project.json';
 import redeem from '../public/static/locales/en/redeem.json';
 import registerTrees from '../public/static/locales/en/registerTrees.json';
 import tenants from '../public/static/locales/en/tenants.json';
@@ -36,6 +37,7 @@ import meDE from '../public/static/locales/de/me.json';
 import planetDE from '../public/static/locales/de/planet.json';
 import planetcashDE from '../public/static/locales/de/planetcash.json';
 import profileDE from '../public/static/locales/de/profile.json';
+import projectDE from '../public/static/locales/de/project.json';
 import redeemDE from '../public/static/locales/de/redeem.json';
 import registerTreesDE from '../public/static/locales/de/registerTrees.json';
 import tenantsDE from '../public/static/locales/de/tenants.json';
@@ -62,6 +64,7 @@ const messages_en = {
   ...planet,
   ...planetcash,
   ...profile,
+  ...project,
   ...redeem,
   ...registerTrees,
   ...tenants,
@@ -87,6 +90,7 @@ const messages_de = {
   ...planetDE,
   ...planetcashDE,
   ...profileDE,
+  ...projectDE,
   ...redeemDE,
   ...registerTreesDE,
   ...tenantsDE,

diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -9,6 +9,12 @@ import { useTheme } from '../src/theme/themeContext';
 // import { ThemeProvider } from 'emotion-theming';
 import getMessages from './i18n';
 import { NextIntlClientProvider } from 'next-intl';
+import { TenantProvider } from '../src/features/common/Layout/TenantContext';
+import { UserPropsProvider } from '../src/features/common/Layout/UserPropsContext';
+import { lazy } from 'react';
+import { useTheme } from '../src/theme/themeContext';
+
+const globalStyles = lazy(() => import('../src/theme/theme'));
 
 /*
  * Global decorator to apply the styles to all stories
@@ -31,9 +37,14 @@ export const decorators = [
           style={{ backgroundColor: 'transparent' }}
         >
           <MUIThemeProvider theme={materialTheme}>
-            <ThemeProvider theme={materialTheme}>
-              <Story />
-            </ThemeProvider>
+            {/* TenantProvider and UserPropsProvider are added for ProfileCard storybook to function properly */}
+            <TenantProvider>
+              <UserPropsProvider>
+                <ThemeProvider theme={materialTheme}>
+                  <Story />
+                </ThemeProvider>
+              </UserPropsProvider>
+            </TenantProvider>
           </MUIThemeProvider>
         </div>
       </NextIntlClientProvider>

diff --git a/global.d.ts b/global.d.ts
@@ -26,6 +26,7 @@ type MessagesPlanetcash =
 type MessagesProfile = typeof import('./public/static/locales/en/profile.json');
 type MessagesProjectDetails =
   typeof import('./public/static/locales/en/projectDetails.json');
+type MessagesProject = typeof import('./public/static/locales/en/project.json');
 type MessagesRedeem = typeof import('./public/static/locales/en/redeem.json');
 type MessagesRegisterTrees =
   typeof import('./public/static/locales/en/registerTrees.json');
@@ -52,6 +53,7 @@ type Messages = MessagesAllProjects &
   MessagesPlanetcash &
   MessagesProfile &
   MessagesProjectDetails &
+  MessagesProject &
   MessagesRedeem &
   MessagesRegisterTrees &
   MessagesTenants &

diff --git a/i18n.ts b/i18n.ts
@@ -27,6 +27,7 @@ export default getRequestConfig(async ({ locale }) => {
     ...(await import(`./public/static/locales/${locale}/planetcash.json`))
       .default,
     ...(await import(`./public/static/locales/${locale}/profile.json`)).default,
+    ...(await import(`./public/static/locales/${locale}/project.json`)).default,
     ...(await import(`./public/static/locales/${locale}/redeem.json`)).default,
     ...(await import(`./public/static/locales/${locale}/registerTrees.json`))
       .default,
@@ -54,6 +55,7 @@ export default getRequestConfig(async ({ locale }) => {
     ...(await import(`./public/static/locales/en/planet.json`)).default,
     ...(await import(`./public/static/locales/en/planetcash.json`)).default,
     ...(await import(`./public/static/locales/en/profile.json`)).default,
+    ...(await import(`./public/static/locales/en/project.json`)).default,
     ...(await import(`./public/static/locales/en/redeem.json`)).default,
     ...(await import(`./public/static/locales/en/registerTrees.json`)).default,
     ...(await import(`./public/static/locales/en/tenants.json`)).default,