From c355e10453e3fe6203847505f18017715cdcc9b8 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Mon, 29 Jan 2018 19:21:42 +0100 Subject: [PATCH] Refactor --- client/coral-embed-stream/src/AppRouter.js | 2 +- .../src}/containers/LoginContainer.js | 0 .../coral-embed-stream/src/tabs/stream/components/Comment.js | 2 +- .../src/tabs/stream/components}/InfoBox.js | 0 .../src/tabs/stream/components/ModerationLink.css} | 0 .../src/tabs/stream/components}/ModerationLink.js | 2 +- .../coral-embed-stream/src/tabs/stream/components/Stream.js | 4 ++-- .../src/tabs/stream/components}/TagLabel.js | 0 .../src/tabs/stream/components}/__tests__/InfoBox.spec.js | 0 .../components}/__tests__/__snapshots__/InfoBox.spec.js.snap | 0 client/talk-plugin-moderation/index.js | 1 - 11 files changed, 5 insertions(+), 6 deletions(-) rename client/{coral-sign-in => coral-embed-stream/src}/containers/LoginContainer.js (100%) rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/InfoBox.js (100%) rename client/{talk-plugin-moderation/styles.css => coral-embed-stream/src/tabs/stream/components/ModerationLink.css} (100%) rename client/{talk-plugin-moderation => coral-embed-stream/src/tabs/stream/components}/ModerationLink.js (94%) rename client/{talk-plugin-tag-label => coral-embed-stream/src/tabs/stream/components}/TagLabel.js (100%) rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/__tests__/InfoBox.spec.js (100%) rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/__tests__/__snapshots__/InfoBox.spec.js.snap (100%) delete mode 100644 client/talk-plugin-moderation/index.js diff --git a/client/coral-embed-stream/src/AppRouter.js b/client/coral-embed-stream/src/AppRouter.js index 4b101fb61..ec7b6300a 100644 --- a/client/coral-embed-stream/src/AppRouter.js +++ b/client/coral-embed-stream/src/AppRouter.js @@ -3,7 +3,7 @@ import { Router, Route } from 'react-router'; import PropTypes from 'prop-types'; import Embed from './containers/Embed'; -import { LoginContainer } from 'coral-sign-in/containers/LoginContainer'; +import { LoginContainer } from './containers/LoginContainer'; const routes = (
diff --git a/client/coral-sign-in/containers/LoginContainer.js b/client/coral-embed-stream/src/containers/LoginContainer.js similarity index 100% rename from client/coral-sign-in/containers/LoginContainer.js rename to client/coral-embed-stream/src/containers/LoginContainer.js diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js index cd0fab9e9..d285f9d83 100644 --- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js +++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import TagLabel from 'talk-plugin-tag-label/TagLabel'; +import TagLabel from './TagLabel'; import CommentTimestamp from 'coral-framework/components/CommentTimestamp'; import { ReplyBox, ReplyButton } from 'talk-plugin-replies'; import { FlagComment } from 'talk-plugin-flags'; diff --git a/client/talk-plugin-infobox/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js similarity index 100% rename from client/talk-plugin-infobox/InfoBox.js rename to client/coral-embed-stream/src/tabs/stream/components/InfoBox.js diff --git a/client/talk-plugin-moderation/styles.css b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.css similarity index 100% rename from client/talk-plugin-moderation/styles.css rename to client/coral-embed-stream/src/tabs/stream/components/ModerationLink.css diff --git a/client/talk-plugin-moderation/ModerationLink.js b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js similarity index 94% rename from client/talk-plugin-moderation/ModerationLink.js rename to client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js index c40c50b82..d33f18a5e 100644 --- a/client/talk-plugin-moderation/ModerationLink.js +++ b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import styles from './styles.css'; +import styles from './ModerationLink.css'; import cn from 'classnames'; import t from 'coral-framework/services/i18n'; diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js index 6288a2b6b..4a6edbfe0 100644 --- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js +++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js @@ -5,9 +5,9 @@ import Comment from '../containers/Comment'; import BannedAccount from '../../../components/BannedAccount'; import ChangeUsername from '../containers/ChangeUsername'; import Slot from 'coral-framework/components/Slot'; -import InfoBox from 'talk-plugin-infobox/InfoBox'; +import InfoBox from './InfoBox'; import { can } from 'coral-framework/services/perms'; -import { ModerationLink } from 'talk-plugin-moderation'; +import ModerationLink from './ModerationLink'; import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox'; import t, { timeago } from 'coral-framework/services/i18n'; import CommentBox from 'talk-plugin-commentbox/CommentBox'; diff --git a/client/talk-plugin-tag-label/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js similarity index 100% rename from client/talk-plugin-tag-label/TagLabel.js rename to client/coral-embed-stream/src/tabs/stream/components/TagLabel.js diff --git a/client/talk-plugin-infobox/__tests__/InfoBox.spec.js b/client/coral-embed-stream/src/tabs/stream/components/__tests__/InfoBox.spec.js similarity index 100% rename from client/talk-plugin-infobox/__tests__/InfoBox.spec.js rename to client/coral-embed-stream/src/tabs/stream/components/__tests__/InfoBox.spec.js diff --git a/client/talk-plugin-infobox/__tests__/__snapshots__/InfoBox.spec.js.snap b/client/coral-embed-stream/src/tabs/stream/components/__tests__/__snapshots__/InfoBox.spec.js.snap similarity index 100% rename from client/talk-plugin-infobox/__tests__/__snapshots__/InfoBox.spec.js.snap rename to client/coral-embed-stream/src/tabs/stream/components/__tests__/__snapshots__/InfoBox.spec.js.snap diff --git a/client/talk-plugin-moderation/index.js b/client/talk-plugin-moderation/index.js deleted file mode 100644 index 38426167a..000000000 --- a/client/talk-plugin-moderation/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default as ModerationLink } from './ModerationLink';