Skip to content

Staging #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Riyad-Murad merged 2 commits into from
May 18, 2025
Merged

Staging #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a48f0b
frontend_structure_adjustment: Moved the Routes to AppRoutes.jsx and …
Riyad-Murad May 18, 2025
6b44e17
Merge pull request #154 from Riyad-Murad/frontend_structure_adjustment
Riyad-Murad May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 2 additions & 45 deletions amp-client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,8 @@
import "./App.css";
import Home from "./Pages/CommonPages/Home/Home";
import { Route, Routes } from "react-router-dom";
import ClientDashboard from "./Pages/ClientPages/ClientDashboard/ClientDashboard";
import ClientPowerPlan from "./Pages/ClientPages/ClientPowerPlan/ClientPowerPlan";
import ClientProfile from "./Pages/ClientPages/ClientProfile/ClientProfile";

import ProviderUsers from "./Pages/ProviderPages/ProviderUsers/ProviderUsers";
import ProviderProfile from "./Pages/ProviderPages/ProviderProfile/ProviderProfile";
import ProviderDashboard from "./Pages/ProviderPages/ProviderDashboard/ProviderDashboard";
import ProviderPowerPrediction from "./Pages/ProviderPages/ProviderPowerPrediction/ProviderPowerPrediction";

import AdminEditProvider from "./Pages/AdminPages/AdminEditProvider/AdminEditProvider";
import AdminViewProviders from "./Pages/AdminPages/AdminViewProviders/AdminViewProviders";
import AdminNavigationPage from "./Pages/AdminPages/AdminNavigationPage/AdminNavigationPage";
import AdminContactMessages from "./Pages/AdminPages/AdminContactMessages/AdminContactMessages";

import ProtectedRoute from "./Components/CommonComponents/ProtectedRoutes/ProtectedRoute";
import AppRoutes from "./Routes/AppRoutes";

function App() {
return (
<Routes>
<Route path="/" element={<Home />} />

{/* Client Protected Routes */}
<Route path="/client" element={<ProtectedRoute requiredRole="Client" />}>
<Route path="/client/dashboard" element={<ClientDashboard />} />
<Route path="/client/power-plan" element={<ClientPowerPlan />} />
<Route path="/client/profile" element={<ClientProfile />} />
</Route>

{/* Provider Protected Routes */}
<Route path="/provider" element={<ProtectedRoute requiredRole="Provider" />}>
<Route path="/provider/users" element={<ProviderUsers />} />
<Route path="/provider/profile" element={<ProviderProfile />} />
<Route path="/provider/dashboard" element={<ProviderDashboard />} />
<Route path="/provider/power-prediction" element={<ProviderPowerPrediction />} />
</Route>

{/* Admin Protected Routes */}
<Route path="/admin" element={<ProtectedRoute requiredRole="Admin" />}>
<Route path="/admin/edit-provider" element={<AdminEditProvider />} />
<Route path="/admin/view-providers" element={<AdminViewProviders />} />
<Route path="/admin/navigation-page" element={<AdminNavigationPage />} />
<Route path="/admin/contact-messages" element={<AdminContactMessages />} />
</Route>
</Routes>
);
return <AppRoutes />;
}

export default App;
50 changes: 50 additions & 0 deletions amp-client/src/Routes/AppRoutes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { Route, Routes } from "react-router-dom";
import Home from "../Pages/CommonPages/Home/Home";
import ClientDashboard from "../Pages/ClientPages/ClientDashboard/ClientDashboard";
import ClientPowerPlan from "../Pages/ClientPages/ClientPowerPlan/ClientPowerPlan";
import ClientProfile from "../Pages/ClientPages/ClientProfile/ClientProfile";

import ProviderUsers from "../Pages/ProviderPages/ProviderUsers/ProviderUsers";
import ProviderProfile from "../Pages/ProviderPages/ProviderProfile/ProviderProfile";
import ProviderDashboard from "../Pages/ProviderPages/ProviderDashboard/ProviderDashboard";
import ProviderPowerPrediction from "../Pages/ProviderPages/ProviderPowerPrediction/ProviderPowerPrediction";

import AdminEditProvider from "../Pages/AdminPages/AdminEditProvider/AdminEditProvider";
import AdminViewProviders from "../Pages/AdminPages/AdminViewProviders/AdminViewProviders";
import AdminNavigationPage from "../Pages/AdminPages/AdminNavigationPage/AdminNavigationPage";
import AdminContactMessages from "../Pages/AdminPages/AdminContactMessages/AdminContactMessages";

import ProtectedRoute from "../Components/CommonComponents/ProtectedRoutes/ProtectedRoute";

const AppRoutes = () => {
return (
<Routes>
<Route path="/" element={<Home />} />

{/* Client Protected Routes */}
<Route path="/client" element={<ProtectedRoute requiredRole="Client" />}>
<Route path="/client/dashboard" element={<ClientDashboard />} />
<Route path="/client/power-plan" element={<ClientPowerPlan />} />
<Route path="/client/profile" element={<ClientProfile />} />
</Route>

{/* Provider Protected Routes */}
<Route path="/provider" element={<ProtectedRoute requiredRole="Provider" />}>
<Route path="/provider/users" element={<ProviderUsers />} />
<Route path="/provider/profile" element={<ProviderProfile />} />
<Route path="/provider/dashboard" element={<ProviderDashboard />} />
<Route path="/provider/power-prediction" element={<ProviderPowerPrediction />} />
</Route>

{/* Admin Protected Routes */}
<Route path="/admin" element={<ProtectedRoute requiredRole="Admin" />}>
<Route path="/admin/edit-provider" element={<AdminEditProvider />} />
<Route path="/admin/view-providers" element={<AdminViewProviders />} />
<Route path="/admin/navigation-page" element={<AdminNavigationPage />} />
<Route path="/admin/contact-messages" element={<AdminContactMessages />} />
</Route>
</Routes>
);
};

export default AppRoutes;
Loading