Skip to content

Wire missing page routes and catch-all 404 (Closes #143) #211

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
matthewrball wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Wire missing page routes and catch-all 404 (Closes #143) #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion client/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ import { AnalyticsDashboardPage } from './pages/AnalyticsDashboardPage';
import { AdminDashboardPage } from './pages/AdminDashboardPage';
import { ActivityFeedPage } from './pages/ActivityFeedPage';
import { CampaignDetailPage } from './pages/CampaignDetailPage';
import { CreateCampaignPage } from './pages/CreateCampaignPage';
import { InvestorDashboardPage } from './pages/InvestorDashboardPage';
import {
CampaignsPage,
FarmerDashboardPage,
ProfilePage,
NotFoundPage,
} from './pages';
import './App.css';

export default function App() {
Expand Down Expand Up @@ -49,10 +57,19 @@ export default function App() {
<Route path="/admin" element={<AdminDashboardPage />} />
<Route path="/dev/components" element={<Playground />} />

{/* AppLayout routes */}
{/* AppLayout routes. HomePage from pages/index is intentionally unrouted; `/` stays DesignFoundationsPage. */}
<Route element={<AppLayout />}>
<Route path="/activity" element={<ActivityFeedPage />} />
<Route path="/campaigns" element={<CampaignsPage />} />
<Route path="/campaigns/new" element={<CreateCampaignPage />} />
<Route path="/campaigns/:id" element={<CampaignDetailPage />} />
<Route path="/investor" element={<InvestorDashboardPage />} />
<Route path="/farmer" element={<FarmerDashboardPage />} />
<Route path="/profile" element={<ProfilePage />} />
<Route path="/dashboard/investor" element={<InvestorDashboardPage />} />
<Route path="/dashboard/farmer" element={<FarmerDashboardPage />} />
<Route path="/dashboard/admin" element={<AdminDashboardPage />} />
<Route path="*" element={<NotFoundPage />} />
</Route>
</Routes>
);
Expand Down
7 changes: 4 additions & 3 deletions client/src/components/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { Link, NavLink, Outlet, useLocation } from 'react-router-dom';
const navigation = [
{ label: 'Home', to: '/', end: true },
{ label: 'Campaigns', to: '/campaigns' },
{ label: 'Farmer', to: '/dashboard/farmer' },
{ label: 'Investor', to: '/dashboard/investor' },
{ label: 'Admin', to: '/dashboard/admin' },
{ label: 'New campaign', to: '/campaigns/new' },
{ label: 'Farmer', to: '/farmer' },
{ label: 'Investor', to: '/investor' },
{ label: 'Admin', to: '/admin' },
{ label: 'Activity', to: '/activity' },
{ label: 'Profile', to: '/profile' },
];
Expand Down