Fix double notification
Deploy Frontend / build-and-deploy (push) Successful in 36s
Details
Deploy Frontend / build-and-deploy (push) Successful in 36s
Details
This commit is contained in:
parent
64ca5fd015
commit
3f2db09bba
67
src/App.tsx
67
src/App.tsx
|
|
@ -6,21 +6,20 @@ import UsersPage from './pages/users/UsersPage'
|
|||
import RolesPage from './pages/roles/RolesPage'
|
||||
import ApprovalsPage from './pages/approvals/ApprovalsPage'
|
||||
import { useAuth } from './hooks/useAuth'
|
||||
import { Loader, Center, Text, MantineProvider } from '@mantine/core'
|
||||
import DepartmentsPage from "@/pages/DepartmentsPage.tsx";
|
||||
import { Loader, Center, Text } from '@mantine/core'
|
||||
import DepartmentsPage from "@/pages/DepartmentsPage.tsx"
|
||||
import PermissionsPage from './pages/permissions/PermissionsPage'
|
||||
import HierarchiesPage from './pages/hierarchies/HierarchiesPage'
|
||||
import TopicExecutorsPage from "@/pages/topicExecutors/TopicExecutorsPage.tsx";
|
||||
import CategoriesPage from "@/pages/categories/CategoriesPage.tsx";
|
||||
import React from "react";
|
||||
import TopicsPage from "@/pages/topics/TopicsPage.tsx";
|
||||
import TopicExecutorsPage from "@/pages/topicExecutors/TopicExecutorsPage.tsx"
|
||||
import CategoriesPage from "@/pages/categories/CategoriesPage.tsx"
|
||||
import React from "react"
|
||||
import TopicsPage from "@/pages/topics/TopicsPage.tsx"
|
||||
import SettingsPage from './pages/settings/SettingsPage'
|
||||
import AdminsPage from './pages/admins/AdminsPage'
|
||||
import ApprovalTasksPage from './pages/approvalTasks/ApprovalTasksPage'
|
||||
import FlowTreePage from "@/pages/flowNodes/FlowTreePage.tsx";
|
||||
import FlowTreePage from "@/pages/flowNodes/FlowTreePage.tsx"
|
||||
import FlowTreeGuidePage from './pages/flowNodes/FlowTreeGuidePage'
|
||||
import NotificationsPage from "@/pages/notifications/NotificationsPage.tsx";
|
||||
import {ModalsProvider} from "@mantine/modals";
|
||||
import NotificationsPage from "@/pages/notifications/NotificationsPage.tsx"
|
||||
import AdminLogsPage from './pages/adminLogs/AdminLogsPage'
|
||||
|
||||
const Placeholder = ({ title }: { title: string }) => (
|
||||
|
|
@ -50,34 +49,30 @@ function ProtectedRoute({ children }: { children: React.ReactNode }) {
|
|||
|
||||
function App() {
|
||||
return (
|
||||
<MantineProvider>
|
||||
<ModalsProvider>
|
||||
<Routes>
|
||||
<Route path="/login" element={<Login />} />
|
||||
<Routes>
|
||||
<Route path="/login" element={<Login />} />
|
||||
|
||||
<Route element={<ProtectedRoute><MainLayout /></ProtectedRoute>}>
|
||||
<Route path="/" element={<Placeholder title="Главная" /> } />
|
||||
<Route path="/notifications" element={<NotificationsPage />} />
|
||||
<Route path="/approval-dash" element={<Dashboard />} />
|
||||
<Route path="/nodes" element={<FlowTreePage/>} />
|
||||
<Route path="/users" element={<UsersPage />} />
|
||||
<Route path="/departments" element={<DepartmentsPage />} />
|
||||
<Route path="/roles" element={<RolesPage />} />
|
||||
<Route path="/approvals" element={<ApprovalsPage />} />
|
||||
<Route path="/permissions" element={<PermissionsPage />} />
|
||||
<Route path="/categories" element={<CategoriesPage />} />
|
||||
<Route path="/topics" element={<TopicsPage />} />
|
||||
<Route path="/executors" element={<TopicExecutorsPage />} />
|
||||
<Route path="/hierarchies" element={<HierarchiesPage />} />
|
||||
<Route path="/settings" element={<SettingsPage />} />
|
||||
<Route path="/admins" element={<AdminsPage />} />
|
||||
<Route path="/logs" element={<AdminLogsPage />} />
|
||||
<Route path="/approval-tasks" element={<ApprovalTasksPage />} />
|
||||
<Route path="/guide/flow-trees" element={<FlowTreeGuidePage />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
</ModalsProvider>
|
||||
</MantineProvider>
|
||||
<Route element={<ProtectedRoute><MainLayout /></ProtectedRoute>}>
|
||||
<Route path="/" element={<Placeholder title="Главная" />} />
|
||||
<Route path="/notifications" element={<NotificationsPage />} />
|
||||
<Route path="/approval-dash" element={<Dashboard />} />
|
||||
<Route path="/nodes" element={<FlowTreePage />} />
|
||||
<Route path="/users" element={<UsersPage />} />
|
||||
<Route path="/departments" element={<DepartmentsPage />} />
|
||||
<Route path="/roles" element={<RolesPage />} />
|
||||
<Route path="/approvals" element={<ApprovalsPage />} />
|
||||
<Route path="/permissions" element={<PermissionsPage />} />
|
||||
<Route path="/categories" element={<CategoriesPage />} />
|
||||
<Route path="/topics" element={<TopicsPage />} />
|
||||
<Route path="/executors" element={<TopicExecutorsPage />} />
|
||||
<Route path="/hierarchies" element={<HierarchiesPage />} />
|
||||
<Route path="/settings" element={<SettingsPage />} />
|
||||
<Route path="/admins" element={<AdminsPage />} />
|
||||
<Route path="/logs" element={<AdminLogsPage />} />
|
||||
<Route path="/approval-tasks" element={<ApprovalTasksPage />} />
|
||||
<Route path="/guide/flow-trees" element={<FlowTreeGuidePage />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue