Skip to content

Commit 46dae7c

Browse files
committed
Merge branch 'develop'
2 parents d978de4 + c12d06e commit 46dae7c

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

src/frontend/src/app/AppAuthenticated.tsx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ import SetUserPreferences from '../pages/HomePage/SetUserPreferences';
2323
import Finance from '../pages/FinancePage/Finance';
2424
import Sidebar from '../layouts/Sidebar/Sidebar';
2525
import { Box } from '@mui/system';
26-
import { Container, Typography } from '@mui/material';
26+
import { Container } from '@mui/material';
2727
import ErrorPage from '../pages/ErrorPage';
28-
import { Role, RoleEnum, isGuest } from 'shared';
28+
import { Role, isGuest } from 'shared';
2929
import Calendar from '../pages/CalendarPage/Calendar';
3030
import { useState } from 'react';
31-
import PageBlock from '../layouts/PageBlock';
3231

3332
interface AppAuthenticatedProps {
3433
userId: number;
@@ -50,14 +49,6 @@ const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId, userRole })
5049
}
5150
}
5251

53-
const Maintainenance = () => {
54-
return (
55-
<PageBlock>
56-
<Typography>This Page is Currently Undergoing Maintainenance</Typography>
57-
</PageBlock>
58-
);
59-
};
60-
6152
return userSettingsData.slackId || isGuest(userRole) ? (
6253
<AppContextUser>
6354
<Box display={'flex'}>
@@ -67,7 +58,7 @@ const AppAuthenticated: React.FC<AppAuthenticatedProps> = ({ userId, userRole })
6758
<Route path={routes.PROJECTS} component={Projects} />
6859
<Redirect from={routes.CR_BY_ID} to={routes.CHANGE_REQUESTS_BY_ID} />
6960
<Route path={routes.CHANGE_REQUESTS} component={ChangeRequests} />
70-
<Route path={routes.GANTT} component={userRole === RoleEnum.APP_ADMIN ? GanttChartPage : Maintainenance} />
61+
<Route path={routes.GANTT} component={GanttChartPage} />
7162
<Route path={routes.TEAMS} component={Teams} />
7263
<Route path={routes.SETTINGS} component={Settings} />
7364
<Route path={routes.ADMIN_TOOLS} component={AdminTools} />

0 commit comments

Comments
 (0)