diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-09-04 17:03:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-04 17:03:53 +0200 |
commit | f39cbe7d803245702885b308ab1cee4551aea9a1 (patch) | |
tree | 56d2e5dbe6242bb64b03ba5028b8bac39ea0c7ed /src/routes.js | |
parent | Use namespaces when pulling docker base images since this is reqd for podman (diff) | |
download | ferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.tar.gz ferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.tar.zst ferdium-app-f39cbe7d803245702885b308ab1cee4551aea9a1.zip |
chore: remove what's new functionality (#1864)
Diffstat (limited to 'src/routes.js')
-rw-r--r-- | src/routes.js | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/routes.js b/src/routes.js index d67ccee13..5af0c4db9 100644 --- a/src/routes.js +++ b/src/routes.js | |||
@@ -1,9 +1,7 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { | 4 | import { Router, Route, IndexRedirect } from 'react-router'; |
5 | Router, Route, IndexRedirect, | ||
6 | } from 'react-router'; | ||
7 | 5 | ||
8 | import AppLayoutContainer from './containers/layout/AppLayoutContainer'; | 6 | import AppLayoutContainer from './containers/layout/AppLayoutContainer'; |
9 | import SettingsWindow from './containers/settings/SettingsWindow'; | 7 | import SettingsWindow from './containers/settings/SettingsWindow'; |
@@ -29,38 +27,39 @@ import AuthLayoutContainer from './containers/auth/AuthLayoutContainer'; | |||
29 | import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'; | 27 | import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'; |
30 | import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen'; | 28 | import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen'; |
31 | import { WORKSPACES_ROUTES } from './features/workspaces/constants'; | 29 | import { WORKSPACES_ROUTES } from './features/workspaces/constants'; |
32 | import AnnouncementScreen from './features/announcements/components/AnnouncementScreen'; | ||
33 | import { ANNOUNCEMENTS_ROUTES } from './features/announcements/constants'; | ||
34 | 30 | ||
35 | import SettingsStore from './stores/SettingsStore'; | 31 | import SettingsStore from './stores/SettingsStore'; |
36 | 32 | ||
37 | export default @inject('stores', 'actions') @observer class Routes extends Component { | 33 | export default |
34 | @inject('stores', 'actions') | ||
35 | @observer | ||
36 | class Routes extends Component { | ||
38 | render() { | 37 | render() { |
39 | const { | 38 | const { locked, lockingFeatureEnabled } = this.props.stores.settings.app; |
40 | locked, | ||
41 | lockingFeatureEnabled, | ||
42 | } = this.props.stores.settings.app; | ||
43 | 39 | ||
44 | const { history } = this.props; | 40 | const { history } = this.props; |
45 | 41 | ||
46 | if (lockingFeatureEnabled && locked) { | 42 | if (lockingFeatureEnabled && locked) { |
47 | return ( | 43 | return <LockedScreen />; |
48 | <LockedScreen /> | ||
49 | ); | ||
50 | } | 44 | } |
51 | 45 | ||
52 | return ( | 46 | return ( |
53 | <Router history={history}> | 47 | <Router history={history}> |
54 | <Route path="/" component={AppLayoutContainer}> | 48 | <Route path="/" component={AppLayoutContainer}> |
55 | <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} /> | ||
56 | <Route path="/settings" component={SettingsWindow}> | 49 | <Route path="/settings" component={SettingsWindow}> |
57 | <IndexRedirect to="/settings/recipes" /> | 50 | <IndexRedirect to="/settings/recipes" /> |
58 | <Route path="/settings/recipes" component={RecipesScreen} /> | 51 | <Route path="/settings/recipes" component={RecipesScreen} /> |
59 | <Route path="/settings/recipes/:filter" component={RecipesScreen} /> | 52 | <Route path="/settings/recipes/:filter" component={RecipesScreen} /> |
60 | <Route path="/settings/services" component={ServicesScreen} /> | 53 | <Route path="/settings/services" component={ServicesScreen} /> |
61 | <Route path="/settings/services/:action/:id" component={EditServiceScreen} /> | 54 | <Route |
55 | path="/settings/services/:action/:id" | ||
56 | component={EditServiceScreen} | ||
57 | /> | ||
62 | <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} /> | 58 | <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} /> |
63 | <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} /> | 59 | <Route |
60 | path={WORKSPACES_ROUTES.EDIT} | ||
61 | component={EditWorkspaceScreen} | ||
62 | /> | ||
64 | <Route path="/settings/user" component={AccountScreen} /> | 63 | <Route path="/settings/user" component={AccountScreen} /> |
65 | <Route path="/settings/user/edit" component={EditUserScreen} /> | 64 | <Route path="/settings/user/edit" component={EditUserScreen} /> |
66 | <Route path="/settings/team" component={TeamScreen} /> | 65 | <Route path="/settings/team" component={TeamScreen} /> |