From d80cd6f0a2a11f95584f59a0929f7be9eba5872d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 15:49:28 +0100
Subject: [PATCH] More Refactor

---
 .../src/routes/Community/components/FlaggedUser.js           | 2 +-
 .../coral-embed-stream/src/tabs/stream/components/Comment.js | 2 +-
 .../src/tabs/stream/components/FlagButton.css}               | 0
 .../src/tabs/stream}/components/FlagButton.js                | 5 +++--
 .../src/tabs/stream}/components/FlagComment.js               | 2 +-
 .../helpers => coral-framework/graphql}/flagReasons.js       | 0
 client/talk-plugin-flags/index.js                            | 1 -
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename client/{talk-plugin-flags/components/styles.css => coral-embed-stream/src/tabs/stream/components/FlagButton.css} (100%)
 rename client/{talk-plugin-flags => coral-embed-stream/src/tabs/stream}/components/FlagButton.js (98%)
 rename client/{talk-plugin-flags => coral-embed-stream/src/tabs/stream}/components/FlagComment.js (95%)
 rename client/{talk-plugin-flags/helpers => coral-framework/graphql}/flagReasons.js (100%)
 delete mode 100644 client/talk-plugin-flags/index.js

diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index 00377e679..72a46e27e 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -3,7 +3,7 @@ import styles from './FlaggedUser.css';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
 import t from 'coral-framework/services/i18n';
-import { username } from 'talk-plugin-flags/helpers/flagReasons';
+import { username } from 'coral-framework/graphql/flagReasons';
 import ApproveButton from 'coral-admin/src/components/ApproveButton';
 import RejectButton from 'coral-admin/src/components/RejectButton';
 import { isFlaggedUserDangling } from '../utils';
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 34334567f..1b4beb14d 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -5,7 +5,7 @@ import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
 import ReplyButton from './ReplyButton';
 import ReplyBox from './ReplyBox';
-import { FlagComment } from 'talk-plugin-flags';
+import FlagComment from './FlagComment';
 import { can } from 'coral-framework/services/perms';
 import { TransitionGroup } from 'react-transition-group';
 import cn from 'classnames';
diff --git a/client/talk-plugin-flags/components/styles.css b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.css
similarity index 100%
rename from client/talk-plugin-flags/components/styles.css
rename to client/coral-embed-stream/src/tabs/stream/components/FlagButton.css
diff --git a/client/talk-plugin-flags/components/FlagButton.js b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
similarity index 98%
rename from client/talk-plugin-flags/components/FlagButton.js
rename to client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
index b2048e105..6ab4a8d74 100644
--- a/client/talk-plugin-flags/components/FlagButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
@@ -6,11 +6,12 @@ import { can } from 'coral-framework/services/perms';
 import { PopupMenu, Button } from 'coral-ui';
 import ClickOutside from 'coral-framework/components/ClickOutside';
 import cn from 'classnames';
-import styles from './styles.css';
-import * as REASONS from '../helpers/flagReasons';
+import styles from './FlagButton.css';
+import * as REASONS from 'coral-framework/graphql/flagReasons';
 
 import { getErrorMessages, forEachError } from 'coral-framework/utils';
 
+// TODO: remove this.
 const name = 'talk-plugin-flags';
 
 export default class FlagButton extends Component {
diff --git a/client/talk-plugin-flags/components/FlagComment.js b/client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
similarity index 95%
rename from client/talk-plugin-flags/components/FlagComment.js
rename to client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
index bd8607c6b..48379f7dd 100644
--- a/client/talk-plugin-flags/components/FlagComment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import FlagButton from './FlagButton';
 
 import t from 'coral-framework/services/i18n';
-import { username, comment } from '../helpers/flagReasons';
+import { username, comment } from 'coral-framework/graphql/flagReasons';
 
 const FlagComment = props => (
   <FlagButton {...props} getPopupMenu={getPopupMenu} />
diff --git a/client/talk-plugin-flags/helpers/flagReasons.js b/client/coral-framework/graphql/flagReasons.js
similarity index 100%
rename from client/talk-plugin-flags/helpers/flagReasons.js
rename to client/coral-framework/graphql/flagReasons.js
diff --git a/client/talk-plugin-flags/index.js b/client/talk-plugin-flags/index.js
deleted file mode 100644
index 8385ce482..000000000
--- a/client/talk-plugin-flags/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as FlagComment } from './components/FlagComment';