Skip to content

Commit 8b6cc79

Browse files
authored
Merge pull request #2005 from happyesthete/dev
Fixed code to make maintenance and error pages visible
2 parents c3e4dcb + 42a0a3b commit 8b6cc79

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/components/Maintenance/Maintenance.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import React from 'react'
12
import './Maintenance.scss'
23

34
const Maintenance = () => {

src/routes/settings/routes.jsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Settings routes
33
*/
44
import React from 'react'
5-
import { Route, Switch } from 'react-router-dom'
5+
import { Route } from 'react-router-dom'
66
import { renderApp } from '../../components/App/App'
77
import TopBarContainer from '../../components/TopBar/TopBarContainer'
88
import NotificationsToolBar from '../notifications/components/NotificationsToolBar'
@@ -12,9 +12,7 @@ import NotificationSettingsContainer from './routes/notifications/containers/Not
1212
// import ProfileSettingsContainer from './routes/profile/containers/ProfileSettingsContainer'
1313

1414
export default (
15-
<Switch>
16-
{/*<Route path="/settings/profile" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <ProfileSettingsContainer />)} />*/}
17-
{/*<Route path="/settings/system" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <SystemSettingsContainer />)} />*/}
18-
<Route path="/settings/notifications" render={renderApp(<TopBarContainer toolbar={NotificationsToolBar} />, <NotificationSettingsContainer />)} />
19-
</Switch>
15+
{/*<Route path="/settings/profile" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <ProfileSettingsContainer />)} />*/},
16+
{/*<Route path="/settings/system" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <SystemSettingsContainer />)} />*/},
17+
<Route path="/settings/notifications" render={renderApp(<TopBarContainer toolbar={NotificationsToolBar} />, <NotificationSettingsContainer />)} />
2018
)

0 commit comments

Comments
 (0)