Working tabs

client/coral-embed-stream/src/CommentStream.js

@@ -3,7 +3,8 @@ import {
   itemActions,
   Notification,
   notificationActions,
-  authActions
+  authActions,
+  embedStream
 } from '../../coral-framework';
 import {connect} from 'react-redux';
 import CommentBox from '../../coral-plugin-commentbox/CommentBox';
@@ -19,17 +20,20 @@ import LikeButton from '../../coral-plugin-likes/LikeButton';
 import PermalinkButton from '../../coral-plugin-permalinks/PermalinkButton';
 import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
 import UserBox from '../../coral-sign-in/components/UserBox';
+import {TabBar, Tab, ContentBox} from '../../coral-ui';
 
 const {addItem, updateItem, postItem, getStream, postAction, deleteAction, appendItemArray} = itemActions;
 const {addNotification, clearNotification} = notificationActions;
 const {logout} = authActions;
+const {changeTab} = embedStream;
 
 const mapStateToProps = (state) => {
   return {
     config: state.config.toJS(),
     items: state.items.toJS(),
     notification: state.notification.toJS(),
-    auth: state.auth.toJS()
+    auth: state.auth.toJS(),
+    embedStream: state.embedStream.toJS()
   };
 };
 
@@ -46,7 +50,8 @@ const mapDispatchToProps = (dispatch) => ({
   },
   appendItemArray: (item, property, value, addToFront, itemType) =>
     dispatch(appendItemArray(item, property, value, addToFront, itemType)),
-  logout: () => dispatch(logout())
+  logout: () => dispatch(logout()),
+  changeTab: tab => dispatch(changeTab(tab))
 });
 
 class CommentStream extends Component {
@@ -86,137 +91,149 @@ class CommentStream extends Component {
     const rootItem = this.props.items.assets && this.props.items.assets[rootItemId];
     const {actions, users, comments} = this.props.items;
     const {loggedIn, user, showSignInDialog} = this.props.auth;
+    const {changeTab} = this.props.embedStream;
+
     return <div className={showSignInDialog ? 'expandForSignin' : ''}>
       {
         rootItem
         ? <div>
-          <div id="commentBox">
-            <InfoBox
-              content={this.props.config.infoBoxContent}
-              enable={this.props.config.infoBoxEnable}/>
-            <Count
-              id={rootItemId}
-              items={this.props.items}/>
-            {loggedIn && <UserBox user={user} logout={this.props.logout} />}
-            <CommentBox
-              addNotification={this.props.addNotification}
-              postItem={this.props.postItem}
-              appendItemArray={this.props.appendItemArray}
-              updateItem={this.props.updateItem}
-              id={rootItemId}
-              premod={this.props.config.moderation}
-              reply={false}
-              author={user}
-            />
-            {!loggedIn && <SignInContainer />}
-          </div>
-          {
-            rootItem.comments && rootItem.comments.map((commentId) => {
-              const comment = comments[commentId];
-              return <div className="comment" key={commentId}>
-                <hr aria-hidden={true}/>
-                <AuthorName author={users[comment.author_id]}/>
-                <PubDate created_at={comment.created_at}/>
-                <Content body={comment.body}/>
-                <div className="commentActionsLeft">
-                  <ReplyButton
-                    updateItem={this.props.updateItem}
-                    id={commentId}
-                    showReply={comment.showReply}/>
-                  <LikeButton
-                    addNotification={this.props.addNotification}
-                    id={commentId}
-                    like={actions[comment.like]}
-                    postAction={this.props.postAction}
-                    deleteAction={this.props.deleteAction}
-                    addItem={this.props.addItem}
-                    updateItem={this.props.updateItem}
-                    currentUser={this.props.auth.user}/>
-                </div>
-                <div className="commentActionsRight">
-                  <FlagButton
-                    addNotification={this.props.addNotification}
-                    id={commentId}
-                    flag={actions[comment.flag]}
-                    postAction={this.props.postAction}
-                    deleteAction={this.props.deleteAction}
-                    addItem={this.props.addItem}
-                    updateItem={this.props.updateItem}
-                    currentUser={this.props.auth.user}/>
-                    <PermalinkButton
-                      comment_id={commentId}
-                      asset_id={comment.asset_id}/>
-                </div>
-                  <ReplyBox
-                    addNotification={this.props.addNotification}
-                    postItem={this.props.postItem}
-                    appendItemArray={this.props.appendItemArray}
-                    updateItem={this.props.updateItem}
-                    id={rootItemId}
-                    author={user}
-                    parent_id={commentId}
-                    premod={this.props.config.moderation}
-                    showReply={comment.showReply}/>
-                  {
-                    comment.children &&
-                    comment.children.map((replyId) => {
-                      let reply = this.props.items.comments[replyId];
-                      return <div className="reply" key={replyId}>
-                        <hr aria-hidden={true}/>
-                        <AuthorName author={users[reply.author_id]}/>
-                        <PubDate created_at={reply.created_at}/>
-                        <Content body={reply.body}/>
-                        <div className="replyActionsLeft">
-                            <ReplyButton
+
+          <TabBar onClickTab={changeTab}>
+            <Tab><Count id={rootItemId} items={this.props.items}/></Tab>
+            <Tab>Settings</Tab>
+          </TabBar>
+
+          <ContentBox show={true}>
+            <div id="commentBox">
+              <InfoBox
+                content={this.props.config.infoBoxContent}
+                enable={this.props.config.infoBoxEnable}
+              />
+              {loggedIn && <UserBox user={user} logout={this.props.logout} />}
+              <CommentBox
+                addNotification={this.props.addNotification}
+                postItem={this.props.postItem}
+                appendItemArray={this.props.appendItemArray}
+                updateItem={this.props.updateItem}
+                id={rootItemId}
+                premod={this.props.config.moderation}
+                reply={false}
+                author={user}
+              />
+              {!loggedIn && <SignInContainer />}
+            </div>
+            {
+              rootItem.comments && rootItem.comments.map((commentId) => {
+                const comment = comments[commentId];
+                return <div className="comment" key={commentId}>
+                  <hr aria-hidden={true}/>
+                  <AuthorName author={users[comment.author_id]}/>
+                  <PubDate created_at={comment.created_at}/>
+                  <Content body={comment.body}/>
+                  <div className="commentActionsLeft">
+                    <ReplyButton
+                      updateItem={this.props.updateItem}
+                      id={commentId}
+                      showReply={comment.showReply}/>
+                    <LikeButton
+                      addNotification={this.props.addNotification}
+                      id={commentId}
+                      like={actions[comment.like]}
+                      postAction={this.props.postAction}
+                      deleteAction={this.props.deleteAction}
+                      addItem={this.props.addItem}
+                      updateItem={this.props.updateItem}
+                      currentUser={this.props.auth.user}/>
+                  </div>
+                  <div className="commentActionsRight">
+                    <FlagButton
+                      addNotification={this.props.addNotification}
+                      id={commentId}
+                      flag={actions[comment.flag]}
+                      postAction={this.props.postAction}
+                      deleteAction={this.props.deleteAction}
+                      addItem={this.props.addItem}
+                      updateItem={this.props.updateItem}
+                      currentUser={this.props.auth.user}/>
+                      <PermalinkButton
+                        comment_id={commentId}
+                        asset_id={comment.asset_id}/>
+                  </div>
+                    <ReplyBox
+                      addNotification={this.props.addNotification}
+                      postItem={this.props.postItem}
+                      appendItemArray={this.props.appendItemArray}
+                      updateItem={this.props.updateItem}
+                      id={rootItemId}
+                      author={user}
+                      parent_id={commentId}
+                      premod={this.props.config.moderation}
+                      showReply={comment.showReply}/>
+                    {
+                      comment.children &&
+                      comment.children.map((replyId) => {
+                        let reply = this.props.items.comments[replyId];
+                        return <div className="reply" key={replyId}>
+                          <hr aria-hidden={true}/>
+                          <AuthorName author={users[reply.author_id]}/>
+                          <PubDate created_at={reply.created_at}/>
+                          <Content body={reply.body}/>
+                          <div className="replyActionsLeft">
+                              <ReplyButton
+                                updateItem={this.props.updateItem}
+                                id={replyId}
+                                showReply={reply.showReply}/>
+                              <LikeButton
+                                addNotification={this.props.addNotification}
+                                id={replyId}
+                                like={this.props.items.actions[reply.like]}
+                                postAction={this.props.postAction}
+                                deleteAction={this.props.deleteAction}
+                                addItem={this.props.addItem}
+                                updateItem={this.props.updateItem}
+                                currentUser={this.props.auth.user}/>
+                            </div>
+                            <div className="replyActionsRight">
+                              <FlagButton
+                                addNotification={this.props.addNotification}
+                                id={replyId}
+                                flag={this.props.items.actions[reply.flag]}
+                                postAction={this.props.postAction}
+                                deleteAction={this.props.deleteAction}
+                                addItem={this.props.addItem}
+                                updateItem={this.props.updateItem}
+                                currentUser={this.props.auth.user}/>
+                                <PermalinkButton
+                                  comment_id={reply.parent_id}
+                                  asset_id={rootItemId}
+                                  />
+                            </div>
+                            <ReplyBox
+                              addNotification={this.props.addNotification}
+                              postItem={this.props.postItem}
+                              appendItemArray={this.props.appendItemArray}
                               updateItem={this.props.updateItem}
-                              id={replyId}
+                              id={rootItemId}
+                              author={user}
+                              parent_id={commentId}
+                              child_id={replyId}
+                              premod={this.props.config.moderation}
                               showReply={reply.showReply}/>
-                            <LikeButton
-                              addNotification={this.props.addNotification}
-                              id={replyId}
-                              like={this.props.items.actions[reply.like]}
-                              postAction={this.props.postAction}
-                              deleteAction={this.props.deleteAction}
-                              addItem={this.props.addItem}
-                              updateItem={this.props.updateItem}
-                              currentUser={this.props.auth.user}/>
-                          </div>
-                          <div className="replyActionsRight">
-                            <FlagButton
-                              addNotification={this.props.addNotification}
-                              id={replyId}
-                              flag={this.props.items.actions[reply.flag]}
-                              postAction={this.props.postAction}
-                              deleteAction={this.props.deleteAction}
-                              addItem={this.props.addItem}
-                              updateItem={this.props.updateItem}
-                              currentUser={this.props.auth.user}/>
-                              <PermalinkButton
-                                comment_id={reply.parent_id}
-                                asset_id={rootItemId}
-                                />
-                          </div>
-                          <ReplyBox
-                            addNotification={this.props.addNotification}
-                            postItem={this.props.postItem}
-                            appendItemArray={this.props.appendItemArray}
-                            updateItem={this.props.updateItem}
-                            id={rootItemId}
-                            author={user}
-                            parent_id={commentId}
-                            child_id={replyId}
-                            premod={this.props.config.moderation}
-                            showReply={reply.showReply}/>
-                      </div>;
-                    })
-                }
-              </div>;
-            })
-          }
-          <Notification
-            notifLength={4500}
-            clearNotification={this.props.clearNotification}
-            notification={this.props.notification}/>
+                        </div>;
+                      })
+                  }
+                </div>;
+              })
+            }
+            <Notification
+              notifLength={4500}
+              clearNotification={this.props.clearNotification}
+              notification={this.props.notification}
+            />
+          </ContentBox>
+          <ContentBox>
+            Bio!
+          </ContentBox>
         </div>
         : 'Loading'
       }

client/coral-embed-stream/style/default.css

@@ -154,11 +154,6 @@ hr {
   color: #F00;
 }
 
-/* Comment count styles */
-.coral-plugin-comment-count-text {
-  margin-bottom: 15px;
-}
-
 .coral-plugin-pubdate-text {
   color: #CCC;
   display: inline-block;

client/coral-framework/actions/embedStream.js

@@ -0,0 +1,7 @@
+import * as actions from '../constants/embedStream';
+
+export const changeTab = view => dispatch =>
+  dispatch({
+    type: actions.CHANGE_TAB,
+    view
+  });

client/coral-framework/constants/embedStream.js

@@ -0,0 +1 @@
+export const CHANGE_TAB = 'CHANGE_VIEW';

client/coral-framework/index.js

@@ -5,6 +5,7 @@ import * as itemActions from './actions/items';
 import I18n from './modules/i18n/i18n';
 import * as notificationActions from './actions/notification';
 import * as authActions from './actions/auth';
+import * as embedStream from './actions/embedStream';
 
 export {
   Notification,
@@ -13,5 +14,6 @@ export {
   itemActions,
   I18n,
   notificationActions,
-  authActions
+  authActions,
+  embedStream
 };

client/coral-framework/reducers/embedStream.js

@@ -0,0 +1,16 @@
+import {Map} from 'immutable';
+import * as actions from '../constants/embedStream';
+
+const initialState = Map({
+  tab: 'COMMENT_BOX'
+});
+
+export default function embedStream (state = initialState, action) {
+  switch (action.type) {
+  case actions.CHANGE_TAB :
+    return state
+      .set('tab', action.tab);
+  default :
+    return state;
+  }
+}

client/coral-framework/reducers/index.js

@@ -5,6 +5,7 @@ import config from './config';
 import items from './items';
 import notification from './notification';
 import auth from './auth';
+import embedStream from './embedStream';
 
 /**
  * Expose the combined main reducer
@@ -14,5 +15,6 @@ export default combineReducers({
   config,
   items,
   notification,
-  auth
+  auth,
+  embedStream
 });

client/coral-ui/components/ContentBox.js

@@ -0,0 +1,6 @@
+import React from 'react';
+
+export default ({children, show = true}) => (
+  show ? <div>{children}</div> : null
+);
+

client/coral-ui/components/Tab.css

@@ -0,0 +1,20 @@
+.active {
+  background: #F0F0F0;
+}
+
+.base {
+  color: #4E5259;
+  border: solid 1px #D8D8D8;
+  background: white;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+  display: inline-block;
+  border-bottom: none;
+  padding: 8px 10px;
+  margin-right: -1px;
+}
+
+.base:hover {
+  background: #f3f3f3;
+  cursor: pointer;
+}

client/coral-ui/components/Tab.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import styles from './Tab.css';
+
+export default ({children, tabId, active, onTabClick}) => (
+  <li
+    key={tabId}
+    className={`${styles.base} ${active && styles.active}`}
+    onClick={onTabClick}
+  >
+    {children}
+    </li>
+);
+

client/coral-ui/components/TabBar.css

@@ -0,0 +1,5 @@
+.base {
+  list-style: none;
+  border-bottom: solid 1px #D8D8D8;
+  padding: 0;
+}

client/coral-ui/components/TabBar.js

@@ -0,0 +1,33 @@
+import React from 'react';
+import styles from './TabBar.css';
+
+export class TabBar extends React.Component {
+  constructor(props) {
+    super(props);
+    this.handleClickTab = this.handleClickTab.bind(this);
+  }
+
+  handleClickTab (e) {
+    console.log(e);
+  }
+
+  render() {
+    const {children, activeTab = 0} = this.props;
+
+    return (
+      <div>
+        <ul className={styles.base}>
+        {React.Children.map(children, (child, tabId) =>
+          React.cloneElement(child, {
+            tabId,
+            active: tabId === activeTab,
+            onTabClick: this.handleClickTab,
+          })
+        )}
+        </ul>
+      </div>
+    );
+  }
+}
+
+export default TabBar;

client/coral-ui/index.js

@@ -1,3 +1,6 @@
 export {default as Dialog} from './components/Dialog';
 export {default as CoralLogo} from './components/CoralLogo';
 export {default as FabButton} from './components/FabButton';
+export {default as TabBar} from './components/TabBar';
+export {default as Tab} from './components/Tab';
+export {default as ContentBox} from './components/ContentBox';