Skip to content

Commit 508391d

Browse files
Riyad-MuradRiyad-Murad
authored
Merge pull request #155 from Riyad-Murad/staging
Staging
2 parents b38de9c + 6b44e17 commit 508391d

File tree

2 files changed

+52
-45
lines changed

2 files changed

+52
-45
lines changed

‎amp-client/src/App.jsx‎

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,8 @@
11
import "./App.css";
2-
import Home from "./Pages/CommonPages/Home/Home";
3-
import { Route, Routes } from "react-router-dom";
4-
import ClientDashboard from "./Pages/ClientPages/ClientDashboard/ClientDashboard";
5-
import ClientPowerPlan from "./Pages/ClientPages/ClientPowerPlan/ClientPowerPlan";
6-
import ClientProfile from "./Pages/ClientPages/ClientProfile/ClientProfile";
7-
8-
import ProviderUsers from "./Pages/ProviderPages/ProviderUsers/ProviderUsers";
9-
import ProviderProfile from "./Pages/ProviderPages/ProviderProfile/ProviderProfile";
10-
import ProviderDashboard from "./Pages/ProviderPages/ProviderDashboard/ProviderDashboard";
11-
import ProviderPowerPrediction from "./Pages/ProviderPages/ProviderPowerPrediction/ProviderPowerPrediction";
12-
13-
import AdminEditProvider from "./Pages/AdminPages/AdminEditProvider/AdminEditProvider";
14-
import AdminViewProviders from "./Pages/AdminPages/AdminViewProviders/AdminViewProviders";
15-
import AdminNavigationPage from "./Pages/AdminPages/AdminNavigationPage/AdminNavigationPage";
16-
import AdminContactMessages from "./Pages/AdminPages/AdminContactMessages/AdminContactMessages";
17-
18-
import ProtectedRoute from "./Components/CommonComponents/ProtectedRoutes/ProtectedRoute";
2+
import AppRoutes from "./Routes/AppRoutes";
193

204
function App() {
21-
return (
22-
<Routes>
23-
<Route path="/" element={<Home />} />
24-
25-
{/* Client Protected Routes */}
26-
<Route path="/client" element={<ProtectedRoute requiredRole="Client" />}>
27-
<Route path="/client/dashboard" element={<ClientDashboard />} />
28-
<Route path="/client/power-plan" element={<ClientPowerPlan />} />
29-
<Route path="/client/profile" element={<ClientProfile />} />
30-
</Route>
31-
32-
{/* Provider Protected Routes */}
33-
<Route path="/provider" element={<ProtectedRoute requiredRole="Provider" />}>
34-
<Route path="/provider/users" element={<ProviderUsers />} />
35-
<Route path="/provider/profile" element={<ProviderProfile />} />
36-
<Route path="/provider/dashboard" element={<ProviderDashboard />} />
37-
<Route path="/provider/power-prediction" element={<ProviderPowerPrediction />} />
38-
</Route>
39-
40-
{/* Admin Protected Routes */}
41-
<Route path="/admin" element={<ProtectedRoute requiredRole="Admin" />}>
42-
<Route path="/admin/edit-provider" element={<AdminEditProvider />} />
43-
<Route path="/admin/view-providers" element={<AdminViewProviders />} />
44-
<Route path="/admin/navigation-page" element={<AdminNavigationPage />} />
45-
<Route path="/admin/contact-messages" element={<AdminContactMessages />} />
46-
</Route>
47-
</Routes>
48-
);
5+
return <AppRoutes />;
496
}
507

518
export default App;

‎amp-client/src/Routes/AppRoutes.jsx‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import { Route, Routes } from "react-router-dom";
2+
import Home from "../Pages/CommonPages/Home/Home";
3+
import ClientDashboard from "../Pages/ClientPages/ClientDashboard/ClientDashboard";
4+
import ClientPowerPlan from "../Pages/ClientPages/ClientPowerPlan/ClientPowerPlan";
5+
import ClientProfile from "../Pages/ClientPages/ClientProfile/ClientProfile";
6+
7+
import ProviderUsers from "../Pages/ProviderPages/ProviderUsers/ProviderUsers";
8+
import ProviderProfile from "../Pages/ProviderPages/ProviderProfile/ProviderProfile";
9+
import ProviderDashboard from "../Pages/ProviderPages/ProviderDashboard/ProviderDashboard";
10+
import ProviderPowerPrediction from "../Pages/ProviderPages/ProviderPowerPrediction/ProviderPowerPrediction";
11+
12+
import AdminEditProvider from "../Pages/AdminPages/AdminEditProvider/AdminEditProvider";
13+
import AdminViewProviders from "../Pages/AdminPages/AdminViewProviders/AdminViewProviders";
14+
import AdminNavigationPage from "../Pages/AdminPages/AdminNavigationPage/AdminNavigationPage";
15+
import AdminContactMessages from "../Pages/AdminPages/AdminContactMessages/AdminContactMessages";
16+
17+
import ProtectedRoute from "../Components/CommonComponents/ProtectedRoutes/ProtectedRoute";
18+
19+
const AppRoutes = () => {
20+
return (
21+
<Routes>
22+
<Route path="/" element={<Home />} />
23+
24+
{/* Client Protected Routes */}
25+
<Route path="/client" element={<ProtectedRoute requiredRole="Client" />}>
26+
<Route path="/client/dashboard" element={<ClientDashboard />} />
27+
<Route path="/client/power-plan" element={<ClientPowerPlan />} />
28+
<Route path="/client/profile" element={<ClientProfile />} />
29+
</Route>
30+
31+
{/* Provider Protected Routes */}
32+
<Route path="/provider" element={<ProtectedRoute requiredRole="Provider" />}>
33+
<Route path="/provider/users" element={<ProviderUsers />} />
34+
<Route path="/provider/profile" element={<ProviderProfile />} />
35+
<Route path="/provider/dashboard" element={<ProviderDashboard />} />
36+
<Route path="/provider/power-prediction" element={<ProviderPowerPrediction />} />
37+
</Route>
38+
39+
{/* Admin Protected Routes */}
40+
<Route path="/admin" element={<ProtectedRoute requiredRole="Admin" />}>
41+
<Route path="/admin/edit-provider" element={<AdminEditProvider />} />
42+
<Route path="/admin/view-providers" element={<AdminViewProviders />} />
43+
<Route path="/admin/navigation-page" element={<AdminNavigationPage />} />
44+
<Route path="/admin/contact-messages" element={<AdminContactMessages />} />
45+
</Route>
46+
</Routes>
47+
);
48+
};
49+
50+
export default AppRoutes;

0 commit comments

Comments
 (0)