Skip to content

Fixed code to make maintenance and error pages visible #2005

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

Merged
RishiRajSahu merged 2 commits into from
May 20, 2018
Merged

Fixed code to make maintenance and error pages visible #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c9288a
Added missing import for react, without which page breaks - To see th…
n10l May 19, 2018
42a0a3b
Unlike src/routes/notifications/routes.jsx in this file a Switch is e…
n10l May 19, 2018
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
1 change: 1 addition & 0 deletions src/components/Maintenance/Maintenance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from 'react'
import './Maintenance.scss'

const Maintenance = () => {
Expand Down
10 changes: 4 additions & 6 deletions src/routes/settings/routes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Settings routes
*/
import React from 'react'
import { Route, Switch } from 'react-router-dom'
import { Route } from 'react-router-dom'
import { renderApp } from '../../components/App/App'
import TopBarContainer from '../../components/TopBar/TopBarContainer'
import NotificationsToolBar from '../notifications/components/NotificationsToolBar'
Expand All @@ -12,9 +12,7 @@ import NotificationSettingsContainer from './routes/notifications/containers/Not
// import ProfileSettingsContainer from './routes/profile/containers/ProfileSettingsContainer'

export default (
<Switch>
{/*<Route path="/settings/profile" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <ProfileSettingsContainer />)} />*/}
{/*<Route path="/settings/system" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <SystemSettingsContainer />)} />*/}
<Route path="/settings/notifications" render={renderApp(<TopBarContainer toolbar={NotificationsToolBar} />, <NotificationSettingsContainer />)} />
</Switch>
{/*<Route path="/settings/profile" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <ProfileSettingsContainer />)} />*/},
{/*<Route path="/settings/system" render={renderApp(<TopBarContainer toolbar={SettingsToolBar} />, <SystemSettingsContainer />)} />*/},
<Route path="/settings/notifications" render={renderApp(<TopBarContainer toolbar={NotificationsToolBar} />, <NotificationSettingsContainer />)} />
)