Merge branch 'dev' into features/notifications

# Conflicts: # package-lock.json # package.json # src/components/Header/Header.jsx
2026-01-12 00:15:16 +01:00
parent 69e7fdb35c 007ba0b758
commit 6da4880f0d
42 changed files with 2469 additions and 1656 deletions
@@ -13,11 +13,16 @@
    "test": "vitest"
  },
  "dependencies": {
-    "@laravel/echo-react": "^2.2.6",
+    "@emotion/react": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
+    "@floating-ui/react": "^0.27.16",
+    "@mui/material": "^7.3.6",
+    "bootstrap": "^5.3.8",
    "chart.js": "^4.5.1",
    "laravel-echo": "^2.2.7",
    "pusher-js": "^8.4.0",
    "react": "^19.1.1",
+    "react-bootstrap": "^2.10.10",
    "react-chartjs-2": "^5.3.1",
    "react-dom": "^19.1.1",
    "react-router": "^7.9.4",
@@ -35,6 +40,7 @@
    "@vitejs/plugin-react": "^5.0.4",
    "@vitest/browser-playwright": "^4.0.8",
    "@vitest/coverage-v8": "^4.0.8",
+    "baseline-browser-mapping": "^2.9.7",
    "eslint": "^9.36.0",
    "eslint-plugin-react-hooks": "^5.2.0",
    "eslint-plugin-react-refresh": "^0.4.22",