Merge branch 'admin-Yunus-2' into develop

Cassianky · Nov 6, 2023 · 3b763d5 · 3b763d5
2 parents a2906a8 + f589cb1
commit 3b763d5
Show file tree

Hide file tree

Showing 18 changed files with 4,623 additions and 3,861 deletions.
diff --git a/admin-frontend/src/App.js b/admin-frontend/src/App.js
diff --git a/client-frontend/package-lock.json b/client-frontend/package-lock.json
diff --git a/client-frontend/package.json b/client-frontend/package.json
@@ -18,6 +18,7 @@
     "axios": "^1.5.0",
     "date-holidays": "^3.22.1",
     "dayjs": "^1.11.10",
+    "downloadjs": "^1.4.7",
     "react": "^18.2.0",
     "react-autosuggest": "^10.1.0",
     "react-dom": "^18.2.0",