diff options
author | Corey Hulen <corey@hulen.com> | 2016-03-29 08:08:25 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-03-29 08:08:25 -0700 |
commit | d921c112de622c1919650bc919d32681112cf3a9 (patch) | |
tree | 9103b0d16fa676f15591f9704fa62f673aa23cac /webapp/components/tutorial | |
parent | 4a6edbfd0854c097cf8fb64a3ddd75b43dfcd401 (diff) | |
parent | 5ce1a4368bafbd2ed50b1953658fca285cfd349b (diff) | |
download | chat-d921c112de622c1919650bc919d32681112cf3a9.tar.gz chat-d921c112de622c1919650bc919d32681112cf3a9.tar.bz2 chat-d921c112de622c1919650bc919d32681112cf3a9.zip |
Merge pull request #2558 from mattermost/center-panel-refactor
PLT-2382, PLT-2386, PLT-2455 Channel/permalink view cleanup and fixes.
Diffstat (limited to 'webapp/components/tutorial')
-rw-r--r-- | webapp/components/tutorial/tutorial_intro_screens.jsx | 6 | ||||
-rw-r--r-- | webapp/components/tutorial/tutorial_view.jsx | 19 |
2 files changed, 23 insertions, 2 deletions
diff --git a/webapp/components/tutorial/tutorial_intro_screens.jsx b/webapp/components/tutorial/tutorial_intro_screens.jsx index 913a30483..bad426cfc 100644 --- a/webapp/components/tutorial/tutorial_intro_screens.jsx +++ b/webapp/components/tutorial/tutorial_intro_screens.jsx @@ -2,7 +2,6 @@ // See License.txt for license information. import UserStore from 'stores/user_store.jsx'; -import ChannelStore from 'stores/channel_store.jsx'; import TeamStore from 'stores/team_store.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -11,6 +10,7 @@ import * as AsyncClient from 'utils/async_client.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; +import {browserHistory} from 'react-router'; const Preferences = Constants.Preferences; @@ -34,7 +34,7 @@ export default class TutorialIntroScreens extends React.Component { return; } - Utils.switchChannel(ChannelStore.getByName(Constants.DEFAULT_CHANNEL)); + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); const step = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 0); @@ -52,6 +52,8 @@ export default class TutorialIntroScreens extends React.Component { UserStore.getCurrentId(), '999' ); + + browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); } createScreen() { switch (this.state.currentScreen) { diff --git a/webapp/components/tutorial/tutorial_view.jsx b/webapp/components/tutorial/tutorial_view.jsx new file mode 100644 index 000000000..d9e0ef40d --- /dev/null +++ b/webapp/components/tutorial/tutorial_view.jsx @@ -0,0 +1,19 @@ +// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +import React from 'react'; + +import TutorialIntroScreens from './tutorial_intro_screens.jsx'; + +export default class TutorialView extends React.Component { + render() { + return ( + <div + id='app-content' + className='app__content' + > + <TutorialIntroScreens/> + </div> + ); + } +} |