Merge branch 'ft-dashboard-stats-v1' of github.com:parlemonde/1villag…

…e into contribution-chart

.gitignore

@@ -67,3 +67,5 @@ medias
 server/ffmpeg-audio-mixer
 
 *.http
+
+.husky/

.vscode/settings.json

@@ -5,6 +5,7 @@
   },
   "eslint.nodePath": ".yarn/sdks",
   "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+  "prettier.configPath": ".prettierrc.js",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "editor.formatOnSave": true,

docker-compose-windows.yml

@@ -4,7 +4,7 @@
 #     environment:
 #       - MYSQL_ROOT_PASSWORD=my-secret-pw
 #     healthcheck:
-#       test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
+#       test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
 #       timeout: 20s
 #       retries: 10
 #     ports:
@@ -25,3 +25,5 @@
 #     volumes:
 #       - ./.minio-data:/data
 #     command: server --console-address ":9090" /data
+
+

docker-compose.yml

@@ -34,17 +34,17 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-    command: ['yarn', 'run', 'migration:run-dev']
+    command: [ 'yarn', 'run', 'migration:run-dev' ]
   mysql:
     image: mysql:8
     environment:
       - MYSQL_ROOT_PASSWORD=my-secret-pw
     healthcheck:
-      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
+      test: [ 'CMD', 'mysqladmin', 'ping', '-h', 'localhost' ]
       timeout: 20s
       retries: 10
     ports:
-      - '3306:3306'
+      - '3307:3306'
       - '33060:33060'
     volumes:
       - ./.mysql-data:/var/lib/mysql

next.config.js

@@ -10,6 +10,7 @@ module.exports = {
       issuer: /\.[jt]sx?$/,
       use: ['@svgr/webpack'],
     });
+    config.resolve.alias.canvas = false;
     return config;
   },
   experimental: { esmExternals: false },

package.json

@@ -24,7 +24,8 @@
     "migration:run": "yarn typeorm migration:run -d dist/server/utils/data-source.js",
     "migration:run-dev": "rm -rf dist && yarn build:server && yarn typeorm migration:run -d dist/server/utils/data-source.js || true",
     "migration:revert-dev": "rm -rf dist && yarn build:server && npx typeorm migration:revert -d dist/server/utils/data-source.js || true",
-    "typeorm": "typeorm-ts-node-commonjs"
+    "typeorm": "typeorm-ts-node-commonjs",
+    "prepare": "husky"
   },
   "jest": {
     "testEnvironment": "node",
@@ -55,6 +56,7 @@
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "^12.1.6",
+    "@react-pdf/types": "^2.5.0",
     "@svgr/webpack": "6.2.1",
     "@swc/cli": "^0.1.57",
     "@swc/core": "1.2.205",
@@ -109,6 +111,7 @@
     "eslint-plugin-react": "7.30.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "geojson": "0.5.0",
+    "husky": "^9.0.11",
     "jest": "28.1.1",
     "nodemon": "2.0.18",
     "prettier": "2.7.1",
@@ -155,7 +158,7 @@
     "express": "^4.18.1",
     "express-rate-limit": "^6.4.0",
     "express-useragent": "^1.0.15",
-    "ffmpeg-audio-mixer": "^1.3.0",
+    "ffmpeg-audio-mixer": "^1.5.0",
     "fs-extra": "^10.1.0",
     "helmet": "^5.1.0",
     "html-to-draftjs": "^1.5.0",
@@ -179,6 +182,7 @@
     "query-string": "^7.1.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-pdf": "^8.0.0",
     "react-player": "^2.10.1",
     "react-query": "^3.39.2",
     "resize-observer-polyfill": "^1.5.1",

prepareHusky.mjs

@@ -0,0 +1,25 @@
+/* eslint-disable no-console */
+import fs from 'fs';
+
+function checkHuskyFolder() {
+  const pathHuskyDir = './.husky';
+  const huskyFolderExists = fs.existsSync(pathHuskyDir);
+  if (!huskyFolderExists) {
+    // eslint-disable-next-line no-undef
+    const msg = 'You must run the following command first command\n- npx husky init && node ./prepareHusky.mjs';
+    // console.log('Husky pre-push setup created!!');
+    throw msg;
+  } else {
+    fs.unlink(pathHuskyDir + '/pre-commit', (err) => {
+      // eslint-disable-next-line no-undef
+      if (err) console.log('No pre-commit file found');
+    });
+    fs.writeFile(`${pathHuskyDir}/pre-push`, 'yarn build', { ovewrite: true }, function (err) {
+      if (err) throw err;
+      // eslint-disable-next-line no-undef
+      console.log('Husky setup Ok!');
+    });
+  }
+}
+
+checkHuskyFolder();