diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-04-26 15:49:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 15:49:15 -0400 |
| commit | 7307156c49b194c4afd946cd9e57715d45b5b21d (patch) | |
| tree | 1601a0026859ff40e631b4aee9632b022ed6f40f /webapp/routes | |
| parent | 1fef5bf5fe37f161959fbef5d53deccf0168cced (diff) | |
| download | chat-7307156c49b194c4afd946cd9e57715d45b5b21d.tar.gz chat-7307156c49b194c4afd946cd9e57715d45b5b21d.tar.bz2 chat-7307156c49b194c4afd946cd9e57715d45b5b21d.zip | |
PLT-6213 Move team store and actions over to use redux (#6222)
* Move team store and actions over to user redux
* Fix JS error when inviting by email
Diffstat (limited to 'webapp/routes')
| -rw-r--r-- | webapp/routes/route_admin_console.jsx | 4 | ||||
| -rw-r--r-- | webapp/routes/route_root.jsx | 2 | ||||
| -rw-r--r-- | webapp/routes/route_team.jsx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx index 7dde044cb..f7244f02b 100644 --- a/webapp/routes/route_admin_console.jsx +++ b/webapp/routes/route_admin_console.jsx @@ -41,8 +41,8 @@ import NativeAppLinkSettings from 'components/admin_console/native_app_link_sett import ComplianceSettings from 'components/admin_console/compliance_settings.jsx'; import RateSettings from 'components/admin_console/rate_settings.jsx'; import DeveloperSettings from 'components/admin_console/developer_settings.jsx'; -import SystemUsers from 'components/admin_console/system_users/system_users.jsx'; -import TeamAnalytics from 'components/analytics/team_analytics.jsx'; +import SystemUsers from 'components/admin_console/system_users'; +import TeamAnalytics from 'components/analytics/team_analytics'; import LicenseSettings from 'components/admin_console/license_settings.jsx'; import Audits from 'components/admin_console/audits.jsx'; import Logs from 'components/admin_console/logs.jsx'; diff --git a/webapp/routes/route_root.jsx b/webapp/routes/route_root.jsx index 4f22edb80..52727c275 100644 --- a/webapp/routes/route_root.jsx +++ b/webapp/routes/route_root.jsx @@ -149,7 +149,7 @@ export default { { path: 'select_team', getComponents: (location, callback) => { - System.import('components/select_team/select_team.jsx').then(RouteUtils.importComponentSuccess(callback)); + System.import('components/select_team').then(RouteUtils.importComponentSuccess(callback)); } }, { diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index e8ef3f410..0a3c0a59f 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -174,7 +174,7 @@ export default { onEnter: onChannelEnter, getComponents: (location, callback) => { Promise.all([ - System.import('components/team_sidebar/team_sidebar_controller.jsx'), + System.import('components/team_sidebar'), System.import('components/sidebar.jsx'), System.import('components/channel_view.jsx') ]).then( @@ -187,7 +187,7 @@ export default { onEnter: onPermalinkEnter, getComponents: (location, callback) => { Promise.all([ - System.import('components/team_sidebar/team_sidebar_controller.jsx'), + System.import('components/team_sidebar'), System.import('components/sidebar.jsx'), System.import('components/permalink_view.jsx') ]).then( @@ -199,7 +199,7 @@ export default { path: 'tutorial', getComponents: (location, callback) => { Promise.all([ - System.import('components/team_sidebar/team_sidebar_controller.jsx'), + System.import('components/team_sidebar'), System.import('components/sidebar.jsx'), System.import('components/tutorial/tutorial_view.jsx') ]).then( |