diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-04-12 13:32:19 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-04-12 13:32:19 +0200 |
commit | f941074dd7520efb63e9507294df8c420715b9df (patch) | |
tree | 614d03296254f02fe93a67a5c3b2feef1446e3aa /src/app.js | |
parent | Don't invalidate user request on componentWillMount (diff) | |
parent | feat(App): Update electron to 4.1.4 (diff) | |
download | ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.gz ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.tar.zst ferdium-app-f941074dd7520efb63e9507294df8c420715b9df.zip |
Merge branch 'develop' into chore/streamline-dashboard
Diffstat (limited to 'src/app.js')
-rw-r--r-- | src/app.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/app.js b/src/app.js index 96454779e..f6092bf60 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -40,6 +40,9 @@ import PricingScreen from './containers/auth/PricingScreen'; | |||
40 | import InviteScreen from './containers/auth/InviteScreen'; | 40 | import InviteScreen from './containers/auth/InviteScreen'; |
41 | import AuthLayoutContainer from './containers/auth/AuthLayoutContainer'; | 41 | import AuthLayoutContainer from './containers/auth/AuthLayoutContainer'; |
42 | import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen'; | 42 | import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopupScreen'; |
43 | import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'; | ||
44 | import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen'; | ||
45 | import { WORKSPACES_ROUTES } from './features/workspaces'; | ||
43 | 46 | ||
44 | // Add Polyfills | 47 | // Add Polyfills |
45 | smoothScroll.polyfill(); | 48 | smoothScroll.polyfill(); |
@@ -76,6 +79,8 @@ window.addEventListener('load', () => { | |||
76 | <Route path="/settings/recipes/:filter" component={RecipesScreen} /> | 79 | <Route path="/settings/recipes/:filter" component={RecipesScreen} /> |
77 | <Route path="/settings/services" component={ServicesScreen} /> | 80 | <Route path="/settings/services" component={ServicesScreen} /> |
78 | <Route path="/settings/services/:action/:id" component={EditServiceScreen} /> | 81 | <Route path="/settings/services/:action/:id" component={EditServiceScreen} /> |
82 | <Route path={WORKSPACES_ROUTES.ROOT} component={WorkspacesScreen} /> | ||
83 | <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} /> | ||
79 | <Route path="/settings/user" component={AccountScreen} /> | 84 | <Route path="/settings/user" component={AccountScreen} /> |
80 | <Route path="/settings/user/edit" component={EditUserScreen} /> | 85 | <Route path="/settings/user/edit" component={EditUserScreen} /> |
81 | <Route path="/settings/team" component={TeamScreen} /> | 86 | <Route path="/settings/team" component={TeamScreen} /> |