diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-24 20:04:40 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-29 09:54:55 -0400 |
commit | 5ce1a4368bafbd2ed50b1953658fca285cfd349b (patch) | |
tree | 9609d2ee90371ee0393a95f5fe67d27b5621257c /webapp/components/logged_in.jsx | |
parent | bf636404d25e943d869a32d8fe145eaa57a64039 (diff) | |
download | chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.tar.gz chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.tar.bz2 chat-5ce1a4368bafbd2ed50b1953658fca285cfd349b.zip |
Refactoring center panel away. Moving tutorial to a route. Fixing a
bunch of bugs.
Diffstat (limited to 'webapp/components/logged_in.jsx')
-rw-r--r-- | webapp/components/logged_in.jsx | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index c6f7b50b1..53db501bf 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -10,6 +10,8 @@ import BrowserStore from 'stores/browser_store.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; +const TutorialSteps = Constants.TutorialSteps; +const Preferences = Constants.Preferences; import ErrorBar from 'components/error_bar.jsx'; import * as Websockets from 'action_creators/websocket_actions.jsx'; @@ -17,6 +19,7 @@ import {browserHistory} from 'react-router'; import SidebarRight from 'components/sidebar_right.jsx'; import SidebarRightMenu from 'components/sidebar_right_menu.jsx'; +import Navbar from 'components/navbar.jsx'; // Modals import GetPostLinkModal from 'components/get_post_link_modal.jsx'; @@ -66,6 +69,12 @@ export default class LoggedIn extends React.Component { Utils.applyTheme(Constants.THEMES.default); } } + + // Go to tutorial if we are first arrivign + const tutorialStep = PreferenceStore.getInt(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), 999); + if (tutorialStep <= TutorialSteps.INTRO_SCREENS) { + browserHistory.push(Utils.getTeamURLFromAddressBar() + '/tutorial'); + } } componentWillMount() { // Emit view action @@ -186,14 +195,36 @@ export default class LoggedIn extends React.Component { $(window).off('keydown.preventBackspace'); } render() { + let content = []; + if (this.props.children) { + content = this.props.children; + } else { + content.push( + this.props.sidebar + ); + content.push( + <div + key='inner-wrap' + className='inner-wrap channel__wrap' + > + <div className='row header'> + <div id='navbar'> + <Navbar/> + </div> + </div> + <div className='row main'> + {this.props.center} + </div> + </div> + ); + } return ( <div className='channel-view'> <ErrorBar/> <div className='container-fluid'> <SidebarRight/> <SidebarRightMenu/> - {this.props.sidebar} - {this.props.center} + {content} <GetPostLinkModal/> <GetTeamInviteLinkModal/> |