rebase & resolve conflicts

package.json

@@ -13,8 +13,14 @@
     "test": "vitest"
   },
   "dependencies": {
+    "@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",
     "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",