resolving conflicts

This commit is contained in:
Caio Cabral committed 2024-12-12 09:20:24 -05:00
1 parent 788ffc92c8
commit ee4ef15874
3 files changed
+10 -11

No files matched your search

+9 -9
View File
@@ -6,8 +6,8 @@ import NotFound from "../Pages/NotFound";
import Login from "../Pages/Auth/Login";
import Register from "../Pages/Auth/Register/Register";
import Account from "../Pages/Account";
import Monitors from "../Pages/Monitors/Home";
import CreateMonitor from "../Pages/Monitors/CreateMonitor";
import Monitors from "../Pages/Uptime/Home";
import CreateMonitor from "../Pages/Uptime/CreateUptime";
import CreateInfrastructureMonitor from "../Pages/Infrastructure/CreateMonitor";
import Incidents from "../Pages/Incidents";
import Status from "../Pages/Status";
@@ -18,10 +18,10 @@ import CheckEmail from "../Pages/Auth/CheckEmail";
import SetNewPassword from "../Pages/Auth/SetNewPassword";
import NewPasswordConfirmed from "../Pages/Auth/NewPasswordConfirmed";
import ProtectedRoute from "../Components/ProtectedRoute";
import Details from "../Pages/Monitors/Details";
import Details from "../Pages/Uptime/Details";
import AdvancedSettings from "../Pages/AdvancedSettings";
import Maintenance from "../Pages/Maintenance";
import Configure from "../Pages/Monitors/Configure";
import Configure from "../Pages/Uptime/Configure";
import PageSpeed from "../Pages/PageSpeed";
import CreatePageSpeed from "../Pages/PageSpeed/CreatePageSpeed";
import CreateNewMaintenanceWindow from "../Pages/Maintenance/CreateMaintenance";
@@ -39,22 +39,22 @@ const Routes = () => {
>
<Route
path="/"
element={<Navigate to="/monitors" />}
element={<Navigate to="/uptime" />}
/>
<Route
path="/monitors"
path="/uptime"
element={<Monitors />}
/>
<Route
path="/monitors/create/:monitorId?"
path="/uptime/create/:monitorId?"
element={<CreateMonitor />}
/>
<Route
path="/monitors/:monitorId/"
path="/uptime/:monitorId/"
element={<Details />}
/>
<Route
path="/monitors/configure/:monitorId/"
path="/uptime/configure/:monitorId/"
element={<Configure />}
/>
<Route