Skip to content

Update DashboardLayout and RoleBasedMenu #8

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

Open
ayishanishana21 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update DashboardLayout and RoleBasedMenu #8

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
f1d2e90
Update DashboardLayout and RoleBasedMenu
ayishanishana21 Nov 13, 2025
e5efc74
Updated RegisterPage, Footer, schema, AppBar, CascadingFilters, and App
ayishanishana21 Nov 17, 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
102 changes: 52 additions & 50 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@

import { Routes, Route } from "react-router-dom";
import MegaMenu from "./components/homepage/AppBar";
// import FeatureTiles from "./components/homepage/HomeComponents";
import HomePage from "./pages/home/Homepage";
import DomainPage from "./pages/public/DomainsPage";
import CoursePage from "./pages/public/CoursePage";
import TutorialSearch from "./pages/public/TutorialSearch";
import SubscriptionPage from "./pages/public/SubscriptionPage";
import LoginPage from "./features/auth/pages/LoginPage";
import DashboardLayout from "./features/dashboard/pages/DashboardLayout";
import PublicLayout from "./pages/public/PublicLayout";
import Dashboard from "./features/dashboard/pages/Dashboard";
import TrainingPlanner from "./features/training/pages/TrainingPlanner";
import TrainingAttendance from "./features/training/pages/TrainingAttendance";


export default function App(){

return (
<>
{/* <ResponsiveAppBar/> */}
{/* <MegaMenu/> */}
{/* <HomePage /> */}

<Routes>
{/* Public routes */}
<Route element={<PublicLayout />}>
<Route path="/" element={<HomePage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/domains" element={<DomainPage />} />
<Route path="/tutorial-search" element={<TutorialSearch />} />
<Route path="/domains/:slug" element={<CoursePage />} />
<Route path="/subscription" element={<SubscriptionPage />} />
</Route>

{/* Dashboard routes */}
<Route path="dashboard" element={<DashboardLayout />}>
<Route index element={<Dashboard />} />
<Route path="training-planner" element={<TrainingPlanner />} />
<Route path="training-attendance" element={<TrainingAttendance />} />
{/* <Route path="academic-subscription" element={<AcademicSubscription />} /> */}
</Route>

{/* catch-all for 404 */}
<Route path="*" element={<h1>Page Not Found</h1>} />
</Routes>
</>
)
}

import { Routes, Route } from "react-router-dom";
import MegaMenu from "./components/homepage/AppBar";
// import FeatureTiles from "./components/homepage/HomeComponents";
import HomePage from "./pages/home/Homepage";
import DomainPage from "./pages/public/DomainsPage";
import CoursePage from "./pages/public/CoursePage";
import TutorialSearch from "./pages/public/TutorialSearch";
import SubscriptionPage from "./pages/public/SubscriptionPage";
import LoginPage from "./features/auth/pages/LoginPage";
import DashboardLayout from "./features/dashboard/pages/DashboardLayout";
import PublicLayout from "./pages/public/PublicLayout";
import Dashboard from "./features/dashboard/pages/Dashboard";
import TrainingPlanner from "./features/training/pages/TrainingPlanner";
import TrainingAttendance from "./features/training/pages/TrainingAttendance";
import RegisterPage from "./features/auth/pages/RegisterPage";


export default function App(){

return (
<>
{/* <ResponsiveAppBar/> */}
{/* <MegaMenu/> */}
{/* <HomePage /> */}

<Routes>
{/* Public routes */}
<Route element={<PublicLayout />}>
<Route path="/" element={<HomePage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/register" element={<RegisterPage />} />
<Route path="/domains" element={<DomainPage />} />
<Route path="/tutorial-search" element={<TutorialSearch />} />
<Route path="/domains/:slug" element={<CoursePage />} />
<Route path="/subscription" element={<SubscriptionPage />} />
</Route>

{/* Dashboard routes */}
<Route path="dashboard" element={<DashboardLayout />}>
<Route index element={<Dashboard />} />
<Route path="training-planner" element={<TrainingPlanner />} />
<Route path="training-attendance" element={<TrainingAttendance />} />
{/* <Route path="academic-subscription" element={<AcademicSubscription />} /> */}
</Route>

{/* catch-all for 404 */}
<Route path="*" element={<h1>Page Not Found</h1>} />
</Routes>
</>
)
}
Loading