Fix merge issues

web/react/components/center_panel.jsx

@@ -1,17 +1,47 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var CreatePost = require('../components/create_post.jsx');
-var PostsViewContainer = require('../components/posts_view_container.jsx');
-var ChannelHeader = require('../components/channel_header.jsx');
-var Navbar = require('../components/navbar.jsx');
-var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
+const TutorialIntroScreens = require('./tutorial/tutorial_intro_screens.jsx');
+const CreatePost = require('./create_post.jsx');
+const PostsViewContainer = require('./posts_view_container.jsx');
+const ChannelHeader = require('./channel_header.jsx');
+const Navbar = require('./navbar.jsx');
+const FileUploadOverlay = require('./file_upload_overlay.jsx');
+
+const PreferenceStore = require('../stores/preference_store.jsx');
+const UserStore = require('../stores/user_store.jsx');
+
+const Constants = require('../utils/constants.jsx');
+const TutorialSteps = Constants.TutorialSteps;
+const Preferences = Constants.Preferences;
 
 export default class CenterPanel extends React.Component {
     constructor(props) {
         super(props);
+
+        this.onPreferenceChange = this.onPreferenceChange.bind(this);
+
+        const tutorialPref = PreferenceStore.getPreference(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), {value: '0'});
+        this.state = {showTutorialScreens: parseInt(tutorialPref.value, 10) === TutorialSteps.INTRO_SCREENS};
+    }
+    componentDidMount() {
+        PreferenceStore.addChangeListener(this.onPreferenceChange);
+    }
+    componentWillUnmount() {
+        PreferenceStore.removeChangeListener(this.onPreferenceChange);
+    }
+    onPreferenceChange() {
+        const tutorialPref = PreferenceStore.getPreference(Preferences.TUTORIAL_STEP, UserStore.getCurrentId(), {value: '0'});
+        this.setState({showTutorialScreens: parseInt(tutorialPref.value, 10) <= TutorialSteps.INTRO_SCREENS});
     }
     render() {
+        let postsContainer
+        if (this.state.showTutorialScreens) {
+            postsContainer = <TutorialIntroScreens />;
+        } else {
+            postsContainer = <PostsViewContainer />;
+        }
+
         return (
             <div className='inner__wrap channel__wrap'>
                 <div className='row header'>
@@ -32,7 +62,7 @@ export default class CenterPanel extends React.Component {
                             <ChannelHeader />
                         </div>
                         <div id='post-list'>
-                            <PostsViewContainer />
+                            {postsContainer}
                         </div>
                         <div
                             className='post-create__container'