Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/app/src/routeTree.gen.ts

src/app/package.json

@@ -11,6 +11,7 @@
         "preview": "cross-env NODE_ENV=production node server"
     },
     "dependencies": {
+        "@radix-ui/react-icons": "^1.3.0",
         "@radix-ui/react-switch": "^1.1.0",
         "@reduxjs/toolkit": "^2.2.7",
         "@tanstack/react-router": "^1.46.8",
@@ -22,12 +23,13 @@
         "clsx": "^2.1.1",
         "compression": "^1.7.4",
         "express": "^4.19.2",
+        "lucide-react": "^0.451.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-redux": "^9.1.2",
         "sirv": "^2.0.4",
         "styled-components": "^6.1.12",
-        "tailwind-merge": "^2.5.2",
+        "tailwind-merge": "^2.5.3",
         "tailwindcss-animate": "^1.0.7",
         "uuid": "^10.0.0"
     },
@@ -47,7 +49,10 @@
         "@types/superagent": "^8.1.9",
         "@types/uuid": "^10.0.0",
         "@vitejs/plugin-react": "^4.2.1",
+        "autoprefixer": "^10.4.20",
         "cross-env": "^7.0.3",
+        "postcss": "^8.4.47",
+        "tailwindcss": "^3.4.13",
         "typescript": "^5.4.5",
         "vite": "^5.4.2",
         "vite-tsconfig-paths": "^5.0.1"

src/app/src/App.tsx

@@ -8,6 +8,7 @@ import { sagaMiddleware } from 'app/store/redux/sagas';
 import store from 'app/store';
 import * as user from 'app/lib/user';
 import controller from 'app/lib/controller';
+import ConfirmationDialog from 'app/components/ConfirmationDialog/ConfirmationDialog';
 import { createRouter } from './router';
 
 const router = createRouter();
@@ -39,6 +40,7 @@ function App() {
     return (
         <>
             <ReduxProvider store={reduxStore}>
+                <ConfirmationDialog />
                 <RouterProvider router={router} />
             </ReduxProvider>
         </>