Skip to content

Commit f510b2e

Browse files
authored
Update routes.js
1 parent 648bd99 commit f510b2e

1 file changed

Lines changed: 57 additions & 25 deletions

File tree

src/routes.js

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// Delete these two lines:
2+
import FormEditor from 'components/Forms/FormEditor';
3+
import FormViewer from 'components/Forms/FormViewer';
4+
15
import { lazy } from 'react';
26
import { Route, Switch } from 'react-router-dom';
37
import SetupProfile from 'components/SetupProfile/SetupProfile';
@@ -10,6 +14,15 @@ import RoleInfoCollections from 'components/UserProfile/EditableModal/RoleInfoMo
1014
import LessonList from 'components/BMDashboard/LessonList/LessonListForm';
1115
import AddEquipmentType from 'components/BMDashboard/Equipment/Add/AddEquipmentType';
1216
import Announcements from 'components/Announcements';
17+
import JobFormBuilder from 'components/Collaboration/JobFormbuilder';
18+
import JobCCDashboard from 'components/JobCCDashboard/JobCCDashboard';
19+
import WeeklyProjectSummary from 'components/BMDashboard/WeeklyProjectSummary/WeeklyProjectSummary';
20+
import Page1 from './components/HGNForm/pages/Page1';
21+
import Page2 from './components/HGNForm/pages/Page2';
22+
import Page3 from './components/HGNForm/pages/Page3';
23+
import Page4 from './components/HGNForm/pages/Page4';
24+
import Page5 from './components/HGNForm/pages/Page5';
25+
import Page6 from './components/HGNForm/pages/Page6';
1326
import Timelog from './components/Timelog';
1427
import LessonForm from './components/BMDashboard/Lesson/LessonForm';
1528
import UserProfileEdit from './components/UserProfile/UserProfileEdit';
@@ -32,8 +45,11 @@ import { EmailSender } from './components/common/EmailSender/EmailSender';
3245
import Collaboration from './components/Collaboration';
3346

3447
// LB Dashboard
35-
import LBRegister from './components/LBDashboard/Auth/Register';
36-
import LBLogin from './components/LBDashboard/Auth/Login';
48+
import LBProtectedRoute from './components/common/LBDashboard/LBProtectedRoute';
49+
import LBLogin from './components/LBDashboard/Login';
50+
import LBDashboard from './components/LBDashboard';
51+
import ListOveriew from './components/LBDashboard/ListingOverview/ListOverview';
52+
import LBBidOverview from './components/LBDashboard/BiddingOverview/BiddingOverview';
3753

3854
// BM Dashboard
3955
import BMProtectedRoute from './components/common/BMDashboard/BMProtectedRoute';
@@ -57,6 +73,11 @@ import ActivityList from './components/CommunityPortal/Activities/ActivityList';
5773
// import ActvityDetailPage from './components/CommunityPortal/Activities/ActivityDetailPage';
5874
import Resources from './components/CommunityPortal/Activities/:activityid/Resources';
5975

76+
import EPProtectedRoute from './components/common/EPDashboard/EPProtectedRoute';
77+
import EPLogin from './components/EductionPortal/Login';
78+
import EPDashboard from './components/EductionPortal';
79+
80+
6081

6182

6283
// eslint-disable-next-line import/order, import/no-unresolved
@@ -114,30 +135,13 @@ const PermissionsManagement = lazy(() =>
114135
const UserRoleTab = lazy(() => import('./components/PermissionsManagement/UserRoleTab'));
115136
const Teams = lazy(() => import('./components/Teams/Teams'));
116137

138+
117139
export default (
118140
<Switch>
119141
{/* ----- LB Dashboard Routing ----- */}
120142
{/* If it's possible incorporate this route with others without the header, please do */}
121-
<Route
122-
path="/lbdashboard/register"
123-
render={() => (
124-
<>
125-
<AutoUpdate />
126-
<ToastContainer />
127-
<LBRegister />
128-
</>
129-
)}
130-
/>
131-
<Route
132-
path="/lbdashboard/login"
133-
render={() => (
134-
<>
135-
<AutoUpdate />
136-
<ToastContainer />
137-
<LBLogin />
138-
</>
139-
)}
140-
/>
143+
<Route path="/form" component={FormEditor} />
144+
<Route path="/formviewer" component={FormViewer} />
141145
<Route path="/ProfileInitialSetup/:token" component={SetupProfile} />
142146
<>
143147
{/* Comment out the Header component and its import during phase 2 development. */}
@@ -309,6 +313,7 @@ export default (
309313
// setting permission as Weeklysummariesreport for now. Later it will be changed to weeklyVolunteerSummary. - H
310314
routePermissions={RoutePermissions.weeklySummariesReport}
311315
/>
316+
<ProtectedRoute path="/job-notification-dashboard" exact component={JobCCDashboard} fallback allowedRoles={[UserRole.Owner]}/>
312317

313318
{/* ----- BEGIN BM Dashboard Routing ----- */}
314319
<BMProtectedRoute path="/bmdashboard" exact component={BMDashboard} />
@@ -383,18 +388,38 @@ export default (
383388
fallback
384389
component={InventoryTypesList}
385390
/>
391+
<BMProtectedRoute
392+
path="/bmdashboard/totalconstructionsummary"
393+
fallback
394+
exact
395+
component={WeeklyProjectSummary}
396+
/>
386397

387398
{/* Community Portal Routes */}
388399
<CPProtectedRoute path="/communityportal" exact component={CPDashboard} />
389400
<Route path="/communityportal/login" component={CPLogin} />
390401
<CPProtectedRoute path="/communityportal/Activities" exact component={ActivityList} />
391-
{/* <BMProtectedRoute path="/bmdashboard/tools/add" exact component={AddTool} /> */}
392-
<BMProtectedRoute
393-
path="/CommunityPortal/Activities/:activityid/Resources"
402+
<CPProtectedRoute
403+
path="/communityportal/Activities/:activityid/Resources"
394404
exact component={Resources}
395405
/>
396406

397407

408+
{/* Listing and Bidding Routes */}
409+
<LBProtectedRoute path="/lbdashboard" exact component={LBDashboard} />
410+
<LBProtectedRoute path="/lbdashboard/listOverview" exact component={ListOveriew} />
411+
<Route path="/lbdashboard/login" component={LBLogin} />
412+
<Route path="/lbdashboard/bidoverview" exact component={LBBidOverview} />
413+
414+
{/* Good Education Portal Routes */}
415+
<EPProtectedRoute path="/educationportal" exact component={EPDashboard} />
416+
<Route path="/educationportal/login" component={EPLogin} />
417+
418+
419+
{/* <BMProtectedRoute path="/bmdashboard/tools/add" exact component={AddTool} /> */}
420+
421+
422+
398423
{/* Temporary route to redirect all subdirectories to login if unauthenticated */}
399424
{/* <BMProtectedRoute path="/bmdashboard/:path" component={BMDashboard} /> */}
400425
{/* ----- END BM Dashboard Routing ----- */}
@@ -403,13 +428,20 @@ export default (
403428
<Route path="/email-subscribe" component={EmailSubscribeForm} />
404429
<Route path="/email-unsubscribe" component={UnsubscribeForm} />
405430
<Route path="/collaboration" component={Collaboration} />
431+
<ProtectedRoute path="/jobformbuilder" fallback component={JobFormBuilder} />
406432
<ProtectedRoute path="/infoCollections" component={EditableInfoModal} />
407433
<ProtectedRoute path="/infoCollections" component={RoleInfoCollections} />
408434
<ProtectedRoute path="/userprofile/:userId" fallback component={UserProfile} />
409435
<ProtectedRoute path="/userprofileedit/:userId" component={UserProfileEdit} />
410436
<ProtectedRoute path="/updatepassword/:userId" component={UpdatePassword} />
411437
<Route path="/Logout" component={Logout} />
412438
<Route path="/forcePasswordUpdate/:userId" component={ForcePasswordUpdate} />
439+
<ProtectedRoute path="/hgnform" exact component={Page1}/>
440+
<ProtectedRoute path="/hgnform/page2" exact component={Page2}/>
441+
<ProtectedRoute path="/hgnform/page3" exact component={Page3}/>
442+
<ProtectedRoute path="/hgnform/page4" exact component={Page4}/>
443+
<ProtectedRoute path="/hgnform/page5" exact component={Page5}/>
444+
<ProtectedRoute path="/hgnform/page6" exact component={Page6}/>
413445
<ProtectedRoute path="/" exact component={Dashboard} />
414446
<Route path="*" component={NotFoundPage} />
415447
</Switch>

0 commit comments

Comments
 (0)