From 0799e9d8ee86b4c2374175ae29990116ceb6d8c5 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Mon, 29 Jan 2018 20:52:44 +0100 Subject: [PATCH] More refactor --- client/coral-embed-stream/src/components/Embed.js | 2 +- .../src/tabs/profile/components}/Comment.css | 0 .../src/tabs/profile/components}/Comment.js | 2 +- .../src/tabs/profile/components}/CommentHistory.js | 0 .../src/tabs/profile/components}/LoadMore.js | 0 .../src/tabs/profile}/components/NotLoggedIn.css | 0 .../src/tabs/profile}/components/NotLoggedIn.js | 0 .../src/tabs/profile}/containers/ProfileContainer.js | 2 +- services/comments.js | 2 ++ 9 files changed, 5 insertions(+), 3 deletions(-) rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/Comment.css (100%) rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/Comment.js (99%) rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/CommentHistory.js (100%) rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/LoadMore.js (100%) rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/components/NotLoggedIn.css (100%) rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/components/NotLoggedIn.js (100%) rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/containers/ProfileContainer.js (98%) diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js index e64a54caa..980e5745e 100644 --- a/client/coral-embed-stream/src/components/Embed.js +++ b/client/coral-embed-stream/src/components/Embed.js @@ -9,7 +9,7 @@ import AutomaticAssetClosure from '../containers/AutomaticAssetClosure'; import ExtendableTabPanel from '../containers/ExtendableTabPanel'; import { Tab, TabPane } from 'coral-ui'; -import ProfileContainer from 'coral-settings/containers/ProfileContainer'; +import ProfileContainer from '../tabs/profile/containers/ProfileContainer'; import Popup from 'coral-framework/components/Popup'; import IfSlotIsNotEmpty from 'coral-framework/components/IfSlotIsNotEmpty'; import cn from 'classnames'; diff --git a/client/talk-plugin-history/Comment.css b/client/coral-embed-stream/src/tabs/profile/components/Comment.css similarity index 100% rename from client/talk-plugin-history/Comment.css rename to client/coral-embed-stream/src/tabs/profile/components/Comment.css diff --git a/client/talk-plugin-history/Comment.js b/client/coral-embed-stream/src/tabs/profile/components/Comment.js similarity index 99% rename from client/talk-plugin-history/Comment.js rename to client/coral-embed-stream/src/tabs/profile/components/Comment.js index 015044b37..fec5863a2 100644 --- a/client/talk-plugin-history/Comment.js +++ b/client/coral-embed-stream/src/tabs/profile/components/Comment.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Icon } from '../coral-ui'; +import { Icon } from 'coral-ui'; import styles from './Comment.css'; import Slot from 'coral-framework/components/Slot'; import CommentTimestamp from 'coral-framework/components/CommentTimestamp'; diff --git a/client/talk-plugin-history/CommentHistory.js b/client/coral-embed-stream/src/tabs/profile/components/CommentHistory.js similarity index 100% rename from client/talk-plugin-history/CommentHistory.js rename to client/coral-embed-stream/src/tabs/profile/components/CommentHistory.js diff --git a/client/talk-plugin-history/LoadMore.js b/client/coral-embed-stream/src/tabs/profile/components/LoadMore.js similarity index 100% rename from client/talk-plugin-history/LoadMore.js rename to client/coral-embed-stream/src/tabs/profile/components/LoadMore.js diff --git a/client/coral-settings/components/NotLoggedIn.css b/client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.css similarity index 100% rename from client/coral-settings/components/NotLoggedIn.css rename to client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.css diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.js similarity index 100% rename from client/coral-settings/components/NotLoggedIn.js rename to client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.js diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js similarity index 98% rename from client/coral-settings/containers/ProfileContainer.js rename to client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js index e1bcf7f13..a818ebec4 100644 --- a/client/coral-settings/containers/ProfileContainer.js +++ b/client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js @@ -8,7 +8,7 @@ import cn from 'classnames'; import { link } from 'coral-framework/services/pym'; import NotLoggedIn from '../components/NotLoggedIn'; import { Spinner } from 'coral-ui'; -import CommentHistory from 'talk-plugin-history/CommentHistory'; +import CommentHistory from '../components/CommentHistory'; // TODO: Auth logic needs refactoring. import { diff --git a/services/comments.js b/services/comments.js index e18e04970..ea8f3bd96 100644 --- a/services/comments.js +++ b/services/comments.js @@ -84,6 +84,7 @@ module.exports = class CommentsService { * @param {String} status the new Comment status */ static async edit({ id, author_id, body, status }) { + console.log(status); const EDITABLE_STATUSES = ['NONE', 'PREMOD', 'ACCEPTED']; const query = { @@ -209,6 +210,7 @@ module.exports = class CommentsService { await events.emitAsync(COMMENTS_EDIT, originalComment, editedComment); + console.log(editedComment); return editedComment; }