feat: merge upstream main to origin

Author: CorinneBosch

.gitignore

@@ -25,6 +25,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
+.env
 .env.local
 .env.development.local
 .env.test.local

next.config.js

@@ -31,4 +31,25 @@ module.exports = {
 
     return config;
   },
+
+  async rewrites() {
+    return [
+      {
+        source: '/api/mp/lib.min.js',
+        destination: 'https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js',
+      },
+      {
+        source: '/api/mp/lib.js',
+        destination: 'https://cdn.mxpnl.com/libs/mixpanel-2-latest.js',
+      },
+      {
+        source: '/api/mp/decide',
+        destination: 'https://decide.mixpanel.com/decide',
+      },
+      {
+        source: '/api/mp/:slug',
+        destination: 'https://api.mixpanel.com/:slug',
+      },
+    ];
+  },
 };

package.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "clsx": "^1.1.1",
     "lodash": "^4.17.21",
+    "mixpanel-browser": "^2.45.0",
     "next": "^12.1.6",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
@@ -37,6 +38,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.2.0",
     "@types/lodash": "^4.14.182",
+    "@types/mixpanel-browser": "^2.38.0",
     "@types/react": "^18.0.9",
     "@types/tailwindcss": "^3.0.10",
     "@typescript-eslint/eslint-plugin": "^5.25.0",

public/backgrounds/allocate-treasury.png

@@ -11,10 +11,9 @@ export default function CenteredContent(props: Props) {
       <div
         className={clsxm(
           props.className,
-          'max-w-[1320px]',
+          'max-w-[1440px]',
           'md:px-10',
           'mx-auto',
-          'px-5',
           'w-full'
         )}
       >