From b5b6b113d4119d189adb611d64108860b999b8ff Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 16 Nov 2017 10:57:16 +0100 Subject: [PATCH] Restructure coral-embed-stream --- client/coral-embed-stream/src/components/Embed.js | 2 +- client/coral-embed-stream/src/containers/Embed.js | 2 +- .../src/{ => tabs/stream}/components/AllCommentsPane.js | 0 .../src/{ => tabs/stream}/components/Comment.css | 0 .../src/{ => tabs/stream}/components/Comment.js | 4 ++-- .../src/{ => tabs/stream}/components/CommentTombstone.css | 0 .../src/{ => tabs/stream}/components/CommentTombstone.js | 0 .../src/{ => tabs/stream}/components/CountdownSeconds.js | 0 .../{ => tabs/stream}/components/EditableCommentContent.js | 0 .../src/{ => tabs/stream}/components/IgnoreUserWizard.js | 0 .../{ => tabs/stream}/components/InactiveCommentLabel.css | 0 .../{ => tabs/stream}/components/InactiveCommentLabel.js | 0 .../src/{ => tabs/stream}/components/LoadMore.js | 0 .../src/{ => tabs/stream}/components/NewCount.js | 0 .../src/{ => tabs/stream}/components/NoComments.css | 0 .../src/{ => tabs/stream}/components/NoComments.js | 0 .../src/{ => tabs/stream}/components/Stream.css | 0 .../src/{ => tabs/stream}/components/Stream.js | 4 ++-- .../src/{ => tabs/stream}/components/StreamError.css | 0 .../src/{ => tabs/stream}/components/StreamError.js | 0 .../stream/components/SuspendedAccount.css} | 0 .../src/{ => tabs/stream}/components/SuspendedAccount.js | 2 +- .../src/{ => tabs/stream}/components/util.js | 0 .../{ => tabs/stream}/containers/AutomaticAssetClosure.js | 0 .../src/{ => tabs/stream}/containers/Comment.js | 4 ++-- .../src/{ => tabs/stream}/containers/Stream.js | 6 +++--- 26 files changed, 12 insertions(+), 12 deletions(-) rename client/coral-embed-stream/src/{ => tabs/stream}/components/AllCommentsPane.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/Comment.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/Comment.js (99%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/CommentTombstone.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/CommentTombstone.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/CountdownSeconds.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/EditableCommentContent.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/IgnoreUserWizard.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/InactiveCommentLabel.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/InactiveCommentLabel.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/LoadMore.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/NewCount.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/NoComments.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/NoComments.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/Stream.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/Stream.js (98%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/StreamError.css (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/StreamError.js (100%) rename client/coral-embed-stream/src/{components/SuspendAccount.css => tabs/stream/components/SuspendedAccount.css} (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/SuspendedAccount.js (98%) rename client/coral-embed-stream/src/{ => tabs/stream}/components/util.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/containers/AutomaticAssetClosure.js (100%) rename client/coral-embed-stream/src/{ => tabs/stream}/containers/Comment.js (96%) rename client/coral-embed-stream/src/{ => tabs/stream}/containers/Stream.js (98%) diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js index 132b3be7f..e12201805 100644 --- a/client/coral-embed-stream/src/components/Embed.js +++ b/client/coral-embed-stream/src/components/Embed.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import Stream from '../containers/Stream'; +import Stream from '../tabs/stream/containers/Stream'; import Slot from 'coral-framework/components/Slot'; import {can} from 'coral-framework/services/perms'; import t from 'coral-framework/services/i18n'; diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js index 3fef8872d..4c65d8fde 100644 --- a/client/coral-embed-stream/src/containers/Embed.js +++ b/client/coral-embed-stream/src/containers/Embed.js @@ -13,7 +13,7 @@ import * as assetActions from '../actions/asset'; import {getDefinitionName, getSlotFragmentSpreads} from 'coral-framework/utils'; import {withQuery} from 'coral-framework/hocs'; import Embed from '../components/Embed'; -import Stream from './Stream'; +import Stream from '../tabs/stream/containers/Stream'; import {notify} from 'coral-framework/actions/notification'; import t from 'coral-framework/services/i18n'; import PropTypes from 'prop-types'; diff --git a/client/coral-embed-stream/src/components/AllCommentsPane.js b/client/coral-embed-stream/src/tabs/stream/components/AllCommentsPane.js similarity index 100% rename from client/coral-embed-stream/src/components/AllCommentsPane.js rename to client/coral-embed-stream/src/tabs/stream/components/AllCommentsPane.js diff --git a/client/coral-embed-stream/src/components/Comment.css b/client/coral-embed-stream/src/tabs/stream/components/Comment.css similarity index 100% rename from client/coral-embed-stream/src/components/Comment.css rename to client/coral-embed-stream/src/tabs/stream/components/Comment.css diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js similarity index 99% rename from client/coral-embed-stream/src/components/Comment.js rename to client/coral-embed-stream/src/tabs/stream/components/Comment.js index 7ae36b5fa..3da59afdc 100644 --- a/client/coral-embed-stream/src/components/Comment.js +++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js @@ -9,13 +9,13 @@ import {can} from 'coral-framework/services/perms'; import {TransitionGroup} from 'react-transition-group'; import cn from 'classnames'; import styles from './Comment.css'; -import {THREADING_LEVEL} from '../constants/stream'; +import {THREADING_LEVEL} from '../../../constants/stream'; import merge from 'lodash/merge'; import mapValues from 'lodash/mapValues'; import LoadMore from './LoadMore'; import {getEditableUntilDate} from './util'; -import {findCommentWithId} from '../graphql/utils'; +import {findCommentWithId} from '../../../graphql/utils'; import CommentContent from 'coral-framework/components/CommentContent'; import Slot from 'coral-framework/components/Slot'; import CommentTombstone from './CommentTombstone'; diff --git a/client/coral-embed-stream/src/components/CommentTombstone.css b/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.css similarity index 100% rename from client/coral-embed-stream/src/components/CommentTombstone.css rename to client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.css diff --git a/client/coral-embed-stream/src/components/CommentTombstone.js b/client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js similarity index 100% rename from client/coral-embed-stream/src/components/CommentTombstone.js rename to client/coral-embed-stream/src/tabs/stream/components/CommentTombstone.js diff --git a/client/coral-embed-stream/src/components/CountdownSeconds.js b/client/coral-embed-stream/src/tabs/stream/components/CountdownSeconds.js similarity index 100% rename from client/coral-embed-stream/src/components/CountdownSeconds.js rename to client/coral-embed-stream/src/tabs/stream/components/CountdownSeconds.js diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js similarity index 100% rename from client/coral-embed-stream/src/components/EditableCommentContent.js rename to client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js diff --git a/client/coral-embed-stream/src/components/IgnoreUserWizard.js b/client/coral-embed-stream/src/tabs/stream/components/IgnoreUserWizard.js similarity index 100% rename from client/coral-embed-stream/src/components/IgnoreUserWizard.js rename to client/coral-embed-stream/src/tabs/stream/components/IgnoreUserWizard.js diff --git a/client/coral-embed-stream/src/components/InactiveCommentLabel.css b/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.css similarity index 100% rename from client/coral-embed-stream/src/components/InactiveCommentLabel.css rename to client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.css diff --git a/client/coral-embed-stream/src/components/InactiveCommentLabel.js b/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js similarity index 100% rename from client/coral-embed-stream/src/components/InactiveCommentLabel.js rename to client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js diff --git a/client/coral-embed-stream/src/components/LoadMore.js b/client/coral-embed-stream/src/tabs/stream/components/LoadMore.js similarity index 100% rename from client/coral-embed-stream/src/components/LoadMore.js rename to client/coral-embed-stream/src/tabs/stream/components/LoadMore.js diff --git a/client/coral-embed-stream/src/components/NewCount.js b/client/coral-embed-stream/src/tabs/stream/components/NewCount.js similarity index 100% rename from client/coral-embed-stream/src/components/NewCount.js rename to client/coral-embed-stream/src/tabs/stream/components/NewCount.js diff --git a/client/coral-embed-stream/src/components/NoComments.css b/client/coral-embed-stream/src/tabs/stream/components/NoComments.css similarity index 100% rename from client/coral-embed-stream/src/components/NoComments.css rename to client/coral-embed-stream/src/tabs/stream/components/NoComments.css diff --git a/client/coral-embed-stream/src/components/NoComments.js b/client/coral-embed-stream/src/tabs/stream/components/NoComments.js similarity index 100% rename from client/coral-embed-stream/src/components/NoComments.js rename to client/coral-embed-stream/src/tabs/stream/components/NoComments.js diff --git a/client/coral-embed-stream/src/components/Stream.css b/client/coral-embed-stream/src/tabs/stream/components/Stream.css similarity index 100% rename from client/coral-embed-stream/src/components/Stream.css rename to client/coral-embed-stream/src/tabs/stream/components/Stream.css diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js similarity index 98% rename from client/coral-embed-stream/src/components/Stream.js rename to client/coral-embed-stream/src/tabs/stream/components/Stream.js index 084586eeb..f2b45d47d 100644 --- a/client/coral-embed-stream/src/components/Stream.js +++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js @@ -16,10 +16,10 @@ import {isCommentActive} from 'coral-framework/utils'; import {Button, Tab, TabCount, TabPane} from 'coral-ui'; import cn from 'classnames'; -import {getTopLevelParent, attachCommentToParent} from '../graphql/utils'; +import {getTopLevelParent, attachCommentToParent} from '../../../graphql/utils'; import AllCommentsPane from './AllCommentsPane'; import AutomaticAssetClosure from '../containers/AutomaticAssetClosure'; -import ExtendableTabPanel from '../containers/ExtendableTabPanel'; +import ExtendableTabPanel from '../../../containers/ExtendableTabPanel'; import styles from './Stream.css'; diff --git a/client/coral-embed-stream/src/components/StreamError.css b/client/coral-embed-stream/src/tabs/stream/components/StreamError.css similarity index 100% rename from client/coral-embed-stream/src/components/StreamError.css rename to client/coral-embed-stream/src/tabs/stream/components/StreamError.css diff --git a/client/coral-embed-stream/src/components/StreamError.js b/client/coral-embed-stream/src/tabs/stream/components/StreamError.js similarity index 100% rename from client/coral-embed-stream/src/components/StreamError.js rename to client/coral-embed-stream/src/tabs/stream/components/StreamError.js diff --git a/client/coral-embed-stream/src/components/SuspendAccount.css b/client/coral-embed-stream/src/tabs/stream/components/SuspendedAccount.css similarity index 100% rename from client/coral-embed-stream/src/components/SuspendAccount.css rename to client/coral-embed-stream/src/tabs/stream/components/SuspendedAccount.css diff --git a/client/coral-embed-stream/src/components/SuspendedAccount.js b/client/coral-embed-stream/src/tabs/stream/components/SuspendedAccount.js similarity index 98% rename from client/coral-embed-stream/src/components/SuspendedAccount.js rename to client/coral-embed-stream/src/tabs/stream/components/SuspendedAccount.js index ce9a1c23c..0369ef559 100644 --- a/client/coral-embed-stream/src/components/SuspendedAccount.js +++ b/client/coral-embed-stream/src/tabs/stream/components/SuspendedAccount.js @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import cn from 'classnames'; import t from 'coral-framework/services/i18n'; -import styles from './SuspendAccount.css'; +import styles from './SuspendedAccount.css'; import {Button} from 'coral-ui'; import validate from 'coral-framework/helpers/validate'; import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox'; diff --git a/client/coral-embed-stream/src/components/util.js b/client/coral-embed-stream/src/tabs/stream/components/util.js similarity index 100% rename from client/coral-embed-stream/src/components/util.js rename to client/coral-embed-stream/src/tabs/stream/components/util.js diff --git a/client/coral-embed-stream/src/containers/AutomaticAssetClosure.js b/client/coral-embed-stream/src/tabs/stream/containers/AutomaticAssetClosure.js similarity index 100% rename from client/coral-embed-stream/src/containers/AutomaticAssetClosure.js rename to client/coral-embed-stream/src/tabs/stream/containers/AutomaticAssetClosure.js diff --git a/client/coral-embed-stream/src/containers/Comment.js b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js similarity index 96% rename from client/coral-embed-stream/src/containers/Comment.js rename to client/coral-embed-stream/src/tabs/stream/containers/Comment.js index 26fc872d5..eb27517f7 100644 --- a/client/coral-embed-stream/src/containers/Comment.js +++ b/client/coral-embed-stream/src/tabs/stream/containers/Comment.js @@ -4,9 +4,9 @@ import Comment from '../components/Comment'; import {withFragments} from 'coral-framework/hocs'; import {getSlotFragmentSpreads} from 'coral-framework/utils'; import {withSetCommentStatus} from 'coral-framework/graphql/mutations'; -import {THREADING_LEVEL} from '../constants/stream'; +import {THREADING_LEVEL} from '../../../constants/stream'; import hoistStatics from 'recompose/hoistStatics'; -import {nest} from '../graphql/utils'; +import {nest} from '../../../graphql/utils'; const slots = [ 'streamQuestionArea', diff --git a/client/coral-embed-stream/src/containers/Stream.js b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js similarity index 98% rename from client/coral-embed-stream/src/containers/Stream.js rename to client/coral-embed-stream/src/tabs/stream/containers/Stream.js index 464ce31fc..8798a51ae 100644 --- a/client/coral-embed-stream/src/containers/Stream.js +++ b/client/coral-embed-stream/src/tabs/stream/containers/Stream.js @@ -2,7 +2,7 @@ import React from 'react'; import {gql, compose} from 'react-apollo'; import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; -import {ADDTL_COMMENTS_ON_LOAD_MORE, THREADING_LEVEL} from '../constants/stream'; +import {ADDTL_COMMENTS_ON_LOAD_MORE, THREADING_LEVEL} from '../../../constants/stream'; import { withPostComment, withPostFlag, withPostDontAgree, withDeleteAction, withEditComment @@ -10,7 +10,7 @@ import { import * as authActions from 'coral-embed-stream/src/actions/auth'; import * as notificationActions from 'coral-framework/actions/notification'; -import {setActiveReplyBox, setActiveTab, viewAllComments} from '../actions/stream'; +import {setActiveReplyBox, setActiveTab, viewAllComments} from '../../../actions/stream'; import Stream from '../components/Stream'; import Comment from './Comment'; import {withFragments, withEmit} from 'coral-framework/hocs'; @@ -23,7 +23,7 @@ import { removeCommentFromEmbedQuery, insertFetchedCommentsIntoEmbedQuery, nest, -} from '../graphql/utils'; +} from '../../../graphql/utils'; const {showSignInDialog, editName} = authActions; const {notify} = notificationActions;