Merge pull request #63 from Dreallers/dev

Dev
Dreallers · Jan 12, 2024 · 7b2d302 · 7b2d302
2 parents ecefd48 + 8aee1b9
commit 7b2d302
Show file tree

Hide file tree

Showing 115 changed files with 5,755 additions and 13,423 deletions.
diff --git a/backend/database/schema.sql b/backend/database/schema.sql
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -3,17 +3,21 @@
     "dev": "nodemon index.js",
     "db:migrate": "node migrate.js",
     "db:seed": "node seed.js",
-    "build": "node migrate.js",
     "start": "node index.js",
     "test": "jest",
-    "prettier": "npx prettier --write ."
+    "prettier": "npx prettier --write .",
+    "lint": "npx eslint . --fix",
+    "build": "npm run db:migrate ; npm run db:seed"
   },
   "dependencies": {
+    "argon2": "^0.31.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
-    "mysql2": "^3.5.2"
+    "multer": "^1.4.5-lts.1",
+    "mysql2": "^3.5.2",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.0.2",
@@ -31,4 +35,4 @@
     "*.sql": "prettier --check",
     "*.js": "eslint"
   }
-}
+}
diff --git a/backend/public/avatars/FemaleAvatar.svg b/backend/public/avatars/FemaleAvatar.svg
diff --git a/backend/public/avatars/FemaleAvatar2.svg b/backend/public/avatars/FemaleAvatar2.svg