Merge pull request #163 from ungdev/dev

Merge to master for shop 2023
ungdev · Oct 17, 2023 · 0fc750b · 0fc750b
2 parents 3333d71 + f6f6242
commit 0fc750b
Show file tree

Hide file tree

Showing 85 changed files with 3,492 additions and 1,661 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,11 +1,11 @@
-# Nom de la PR
+# PR name
 
-## Changements
+## Changes
 
 ## Breaking changes
 
-## Ce qu'il reste à faire (POUR LES DRAFTS)
+## What's left to do (DELTE THIS PART FOR NON-DRAFT PRs)
 
-- [ ] Vérifier le build
+- [ ] Verify build
 - [ ] Lint
-- [ ] Supprimer les console.log / code commenté
+- [ ] Remove console.log / commented code
diff --git a/.mocharc.yml b/.mocharc.yml
@@ -6,4 +6,4 @@ spec: 'tests/**/*.test.ts'
 
 watch-extensions: ts
 
-timeout: 10000
+timeout: 30000
diff --git a/assets/email/template.html b/assets/email/template.html
@@ -6,7 +6,8 @@
     <meta name="x-apple-disable-message-reformatting" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta content="telephone=no" name="format-detection" />
-    <link href="https://fonts.googleapis.com/css2?family=Kanit&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Lexend&display=swap" rel="stylesheet">
     <title>UTT Arena {{& year}} - {{& title.topic}}</title>
   </head>
 
@@ -36,7 +37,7 @@
                 <tr style="background-color: {{& style.text.color}}">
                   <td style="text-align: right">
                     <img
-                      src="https://arena.utt.fr/logo.png"
+                      src="https://arena.utt.fr/images/logo.png"
                       alt="Logo UTT Arena"
                       title="Logo UTT Arena"
                       width="140"
@@ -229,7 +230,7 @@
                           <td style="text-align: center">
                             <a
                               target="_blank"
-                              href="https://twitter.com/UTTArena"
+                              href="https://x.com/UTTArena"
                               style="
                                 font-size: 14px;
                                 -webkit-text-size-adjust: none;
@@ -238,8 +239,8 @@
                                 display: inline-block;
                               ">
                               <img
-                                title="Twitter"
-                                src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjwhRE9DVFlQRSBzdmcgIFBVQkxJQyAnLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4nICAnaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkJz48c3ZnIGhlaWdodD0iMTAwJSIgc3R5bGU9ImZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2UtbWl0ZXJsaW1pdDoyOyIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgd2lkdGg9IjEwMCUiIHhtbDpzcGFjZT0icHJlc2VydmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6c2VyaWY9Imh0dHA6Ly93d3cuc2VyaWYuY29tLyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxyZWN0IGhlaWdodD0iNDAwIiBzdHlsZT0iZmlsbDpub25lOyIgd2lkdGg9IjQwMCIgeD0iNTYiIHk9IjU2Ii8+PHBhdGggZD0iTTE2MS4wMTQsNDY0LjAxM2MxOTMuMjA4LDAgMjk4Ljg4NSwtMTYwLjA3MSAyOTguODg1LC0yOTguODg1YzAsLTQuNTQ2IDAsLTkuMDcyIC0wLjMwNywtMTMuNTc4YzIwLjU1OCwtMTQuODcxIDM4LjMwNSwtMzMuMjgyIDUyLjQwOCwtNTQuMzc0Yy0xOS4xNzEsOC40OTUgLTM5LjUxLDE0LjA2NSAtNjAuMzM0LDE2LjUyN2MyMS45MjQsLTEzLjEyNCAzOC4zNDMsLTMzLjc4MiA0Ni4xODIsLTU4LjEwMmMtMjAuNjE5LDEyLjIzNSAtNDMuMTgsMjAuODU5IC02Ni43MDMsMjUuNDk4Yy0xOS44NjIsLTIxLjEyMSAtNDcuNjAyLC0zMy4xMTIgLTc2LjU5MywtMzMuMTEyYy01Ny42ODIsMCAtMTA1LjE0NSw0Ny40NjQgLTEwNS4xNDUsMTA1LjE0NGMwLDguMDAyIDAuOTE0LDE1Ljk3OSAyLjcyMiwyMy43NzNjLTg0LjQxOCwtNC4yMzEgLTE2My4xOCwtNDQuMTYxIC0yMTYuNDk0LC0xMDkuNzUyYy0yNy43MjQsNDcuNzI2IC0xMy4zNzksMTA5LjU3NiAzMi41MjIsMTQwLjIyNmMtMTYuNzE1LC0wLjQ5NSAtMzMuMDcxLC01LjAwNSAtNDcuNjc3LC0xMy4xNDhsMCwxLjMzMWMwLjAxNCw0OS44MTQgMzUuNDQ3LDkzLjExMSA4NC4yNzUsMTAyLjk3NGMtMTUuNDY0LDQuMjE3IC0zMS42OTMsNC44MzMgLTQ3LjQzMSwxLjgwMmMxMy43MjcsNDIuNjg1IDUzLjMxMSw3Mi4xMDggOTguMTQsNzIuOTVjLTM3LjE5LDI5LjIyNyAtODMuMTU3LDQ1LjEwMyAtMTMwLjQ1OCw0NS4wNTZjLTguMzU4LC0wLjAxNiAtMTYuNzA4LC0wLjUyMiAtMjUuMDA2LC0xLjUxNmM0OC4wMzQsMzAuODI1IDEwMy45NCw0Ny4xOCAxNjEuMDE0LDQ3LjEwNCIgc3R5bGU9ImZpbGw6IzFkYTFmMjtmaWxsLXJ1bGU6bm9uemVybzsiLz48L3N2Zz4="
+                                title="X"
+                                src="data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+WDwvdGl0bGU+PHBhdGggZD0iTTE4LjkwMSAxLjE1M2gzLjY4bC04LjA0IDkuMTlMMjQgMjIuODQ2aC03LjQwNmwtNS44LTcuNTg0LTYuNjM4IDcuNTg0SC40NzRsOC42LTkuODNMMCAxLjE1NGg3LjU5NGw1LjI0MyA2LjkzMlpNMTcuNjEgMjAuNjQ0aDIuMDM5TDYuNDg2IDMuMjRINC4yOThaIi8+PC9zdmc+"
                                 alt="Tw"
                                 width="32"
                                 style="display: block" />

diff --git a/package.json b/package.json
@@ -5,88 +5,89 @@
   "private": false,
   "license": "MIT",
   "dependencies": {
-    "@prisma/client": "^5.1.1",
-    "@sentry/node": "^7.64.0",
+    "@prisma/client": "^5.4.2",
+    "@sentry/node": "^7.74.0",
     "@slack/web-api": "^6.9.0",
-    "@types/multer": "^1.4.7",
-    "@types/qs": "^6.9.7",
+    "@types/multer": "^1.4.8",
+    "@types/qs": "^6.9.8",
     "@ung/node-etupay": "^3.0.0",
-    "axios": "^1.4.0",
+    "axios": "^1.5.1",
     "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "helmet": "^7.0.0",
-    "joi": "^17.9.2",
-    "jsonwebtoken": "^9.0.1",
+    "joi": "^17.11.0",
+    "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
-    "logform": "^2.5.1",
+    "logform": "^2.6.0",
     "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
     "mustache": "^4.2.0",
     "nanoid": "^3.3.6",
-    "nodemailer": "^6.9.4",
+    "nodemailer": "^6.9.6",
     "pdfkit": "^0.13.0",
-    "prisma": "^5.1.1",
+    "prisma": "^5.4.2",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
-    "sharp": "^0.32.5",
+    "sharp": "^0.32.6",
     "split": "^1.0.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",
-    "winston": "^3.10.0"
+    "ts-node": "^10.9.1",
+    "winston": "^3.11.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@faker-js/faker": "^8.0.2",
-    "@types/bcryptjs": "^2.4.2",
-    "@types/chai": "^4.3.5",
-    "@types/chai-string": "^1.4.2",
-    "@types/cors": "^2.8.13",
-    "@types/express": "^4.17.17",
-    "@types/jsonwebtoken": "^9.0.2",
-    "@types/lodash": "^4.14.197",
-    "@types/mocha": "^10.0.1",
-    "@types/morgan": "^1.9.4",
-    "@types/mustache": "^4.2.2",
-    "@types/nodemailer": "^6.4.9",
-    "@types/pdfkit": "^0.12.10",
-    "@types/qrcode": "^1.5.1",
-    "@types/sinon": "^10.0.16",
-    "@types/smtp-server": "^3.5.7",
-    "@types/split": "^1.0.2",
-    "@types/supertest": "^2.0.12",
+    "@commitlint/cli": "^17.8.0",
+    "@commitlint/config-conventional": "^17.8.0",
+    "@faker-js/faker": "^8.1.0",
+    "@types/bcryptjs": "^2.4.4",
+    "@types/chai": "^4.3.8",
+    "@types/chai-string": "^1.4.3",
+    "@types/cors": "^2.8.14",
+    "@types/express": "^4.17.19",
+    "@types/jsonwebtoken": "^9.0.3",
+    "@types/lodash": "^4.14.199",
+    "@types/mocha": "^10.0.2",
+    "@types/morgan": "^1.9.6",
+    "@types/mustache": "^4.2.3",
+    "@types/nodemailer": "^6.4.11",
+    "@types/pdfkit": "^0.12.12",
+    "@types/qrcode": "^1.5.2",
+    "@types/sinon": "^10.0.19",
+    "@types/smtp-server": "^3.5.8",
+    "@types/split": "^1.0.3",
+    "@types/supertest": "^2.0.14",
     "@types/swagger-jsdoc": "^6.0.1",
-    "@types/swagger-ui-express": "^4.1.3",
-    "@types/yamljs": "^0.2.31",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "chai": "^4.3.7",
+    "@types/swagger-ui-express": "^4.1.4",
+    "@types/yamljs": "^0.2.32",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
+    "chai": "^4.3.10",
     "chai-string": "^1.5.0",
     "cpy-cli": "^5.0.0",
-    "dbdocs": "^0.8.0",
-    "eslint": "^8.47.0",
+    "dbdocs": "^0.8.3",
+    "eslint": "^8.51.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.0",
-    "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-mocha": "^10.2.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-security": "^1.7.1",
     "eslint-plugin-unicorn": "^48.0.1",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "nock": "^13.3.2",
+    "nock": "^13.3.4",
     "nyc": "^15.1.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.0.3",
     "prisma-dbml-generator": "^0.10.0",
     "sinon": "^15.2.0",
     "smtp-server": "^3.13.0",
     "supertest": "^6.3.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "postinstall": "husky install",