diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-04-16 11:53:30 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-04-16 11:53:30 +0200 |
commit | 03950e3f8a43691bdb1371625b860b29f40a6e60 (patch) | |
tree | 4765ba98e1e3dade746a7d0216b6bde6c9d1cce6 /src/app.js | |
parent | Merge branch 'feature/announcements' into develop (diff) | |
parent | Merge pull request #1393 from meetfranz/chore/streamline-dashboard (diff) | |
download | ferdium-app-03950e3f8a43691bdb1371625b860b29f40a6e60.tar.gz ferdium-app-03950e3f8a43691bdb1371625b860b29f40a6e60.tar.zst ferdium-app-03950e3f8a43691bdb1371625b860b29f40a6e60.zip |
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
Diffstat (limited to 'src/app.js')
-rw-r--r-- | src/app.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app.js b/src/app.js index fb9f1c6ab..f6092bf60 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -27,6 +27,7 @@ import RecipesScreen from './containers/settings/RecipesScreen'; | |||
27 | import ServicesScreen from './containers/settings/ServicesScreen'; | 27 | import ServicesScreen from './containers/settings/ServicesScreen'; |
28 | import EditServiceScreen from './containers/settings/EditServiceScreen'; | 28 | import EditServiceScreen from './containers/settings/EditServiceScreen'; |
29 | import AccountScreen from './containers/settings/AccountScreen'; | 29 | import AccountScreen from './containers/settings/AccountScreen'; |
30 | import TeamScreen from './containers/settings/TeamScreen'; | ||
30 | import EditUserScreen from './containers/settings/EditUserScreen'; | 31 | import EditUserScreen from './containers/settings/EditUserScreen'; |
31 | import EditSettingsScreen from './containers/settings/EditSettingsScreen'; | 32 | import EditSettingsScreen from './containers/settings/EditSettingsScreen'; |
32 | import InviteSettingsScreen from './containers/settings/InviteScreen'; | 33 | import InviteSettingsScreen from './containers/settings/InviteScreen'; |
@@ -82,6 +83,7 @@ window.addEventListener('load', () => { | |||
82 | <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} /> | 83 | <Route path={WORKSPACES_ROUTES.EDIT} component={EditWorkspaceScreen} /> |
83 | <Route path="/settings/user" component={AccountScreen} /> | 84 | <Route path="/settings/user" component={AccountScreen} /> |
84 | <Route path="/settings/user/edit" component={EditUserScreen} /> | 85 | <Route path="/settings/user/edit" component={EditUserScreen} /> |
86 | <Route path="/settings/team" component={TeamScreen} /> | ||
85 | <Route path="/settings/app" component={EditSettingsScreen} /> | 87 | <Route path="/settings/app" component={EditSettingsScreen} /> |
86 | <Route path="/settings/invite" component={InviteSettingsScreen} /> | 88 | <Route path="/settings/invite" component={InviteSettingsScreen} /> |
87 | </Route> | 89 | </Route> |