Merge pull request #2 from AkekoChan/dev

Dev -> Main (PROD)
AkekoChan · Mar 22, 2024 · e2b906f · e2b906f
2 parents bb2a606 + 851412f
commit e2b906f
Show file tree

Hide file tree

Showing 120 changed files with 1,557 additions and 361 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 
 server/request.rest
+server/data/parse.php
+server/data/badges_backup.json
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -28,7 +28,8 @@
     "react-qr-reader-es6": "^2.2.1-2",
     "react-router": "^6.21.3",
     "react-router-dom": "^6.22.1",
-    "yup": "^1.3.3"
+    "yup": "^1.3.3",
+    "phaser": "^3.80.1"
   },
   "devDependencies": {
     "@testing-library/react": "^14.1.2",

diff --git a/client/public/assets/game/javelin/gauge.png b/client/public/assets/game/javelin/gauge.png
diff --git a/client/public/assets/game/runner/audio/tap.mp3 b/client/public/assets/game/runner/audio/tap.mp3
diff --git a/...ic/assets/img/game/runner/PisteDépart.png → ...lic/assets/game/runner/bg-start-track.png b/...ic/assets/img/game/runner/PisteDépart.png → ...lic/assets/game/runner/bg-start-track.png
diff --git a/...c/assets/img/game/runner/PisteNormale.png → ...nt/public/assets/game/runner/bg-track.png b/...c/assets/img/game/runner/PisteNormale.png → ...nt/public/assets/game/runner/bg-track.png
diff --git a/client/public/assets/game/runner/flag-scratched-sprite.png b/client/public/assets/game/runner/flag-scratched-sprite.png
diff --git a/client/public/assets/game/runner/flag-scratching-sprite.png b/client/public/assets/game/runner/flag-scratching-sprite.png
diff --git a/client/public/assets/game/runner/flag.png b/client/public/assets/game/runner/flag.png
diff --git a/client/public/assets/game/runner/hidden-runner.png b/client/public/assets/game/runner/hidden-runner.png
diff --git a/client/public/assets/game/runner/prerun-anim-sprite.png b/client/public/assets/game/runner/prerun-anim-sprite.png
diff --git a/client/public/assets/game/runner/run-anim-sprite.png b/client/public/assets/game/runner/run-anim-sprite.png
diff --git a/...blic/assets/img/game/runner/TapSprite.png → client/public/assets/game/runner/tap.png b/...blic/assets/img/game/runner/TapSprite.png → client/public/assets/game/runner/tap.png
diff --git a/client/public/assets/img/badges/amiens_blason.svg b/client/public/assets/img/badges/amiens_blason.svg
diff --git a/client/public/assets/img/badges/angers_blason.png b/client/public/assets/img/badges/angers_blason.png
diff --git a/client/public/assets/img/badges/angouleme_blason.png b/client/public/assets/img/badges/angouleme_blason.png
diff --git a/client/public/assets/img/badges/aquitaine_cover.png b/client/public/assets/img/badges/aquitaine_cover.png
diff --git a/client/public/assets/img/badges/ara_cover.svg b/client/public/assets/img/badges/ara_cover.svg
diff --git a/client/public/assets/img/badges/arles_blason.png b/client/public/assets/img/badges/arles_blason.png
diff --git a/client/public/assets/img/badges/auch_blason.png b/client/public/assets/img/badges/auch_blason.png
diff --git a/client/public/assets/img/badges/avignon_blason.png b/client/public/assets/img/badges/avignon_blason.png
diff --git a/client/public/assets/img/badges/bastia_blason.svg b/client/public/assets/img/badges/bastia_blason.svg
diff --git a/client/public/assets/img/badges/beauvais_blason.svg b/client/public/assets/img/badges/beauvais_blason.svg