Skip to content

Commit

Permalink
Add Sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
Pulkith committed Apr 30, 2024
2 parents d637cda + f759be5 commit af30b1c
Show file tree
Hide file tree
Showing 23 changed files with 1,926 additions and 461 deletions.
11 changes: 10 additions & 1 deletion client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ import AlertPopup from './components/AlertPopup';
import InviteRegisterPage from './Authentication/InviteRegisterPage';
import DonorProfilePage from './donorProfile/DonorProfilePage';
import ReportsPage from './Reports/ReportsPage';
import CommunicationsPage from './Communications/CommunicationsPage';
import HomeDashboardPage from './HomeDashboard/HomeDashboard';
import NewDonationPage from './NewDonation/NewDonationPage';
import Sidebar from './Sidebar/Sidebar';
import DonationInfoPage from './DonationInfo/DonationInfoPage';
import PopupPage from './Popup/PopupPage';

function App() {
return (
Expand All @@ -40,11 +43,11 @@ function App() {
<Routes>
<Route path="/test-sidebar" element={<Sidebar />} />
<Route path="/new-donation" element={<NewDonationPage />} />
<Route path="/popup" element={<PopupPage />} />
{/* Routes accessed only if user is not authenticated */}
<Route element={<UnauthenticatedRoutesWrapper />}>
<Route path="/login" element={<LoginPage />} />
<Route path="/register" element={<RegisterPage />} />
<Route path="/reports" element={<ReportsPage />} />
<Route
path="/verify-account/:token"
element={<VerifyAccountPage />}
Expand All @@ -68,9 +71,15 @@ function App() {
<Route element={<ProtectedRoutesWrapper />}>
<Route path="/home" element={<HomePage />} />
</Route>
<Route path="/donationInfo" element={<DonationInfoPage />} />
<Route element={<AdminRoutesWrapper />}>
<Route path="/users" element={<AdminDashboardPage />} />
</Route>
<Route path="/reports" element={<ReportsPage />} />
<Route
path="/communications"
element={<CommunicationsPage />}
/>
{/* <Route element={<ReportsPage />}>
<Route path="/reports" element={<ReportsPage />} />
</Route> */}
Expand Down
Loading

0 comments on commit af30b1c

Please sign in to comment.