From 6a5f667336d7a382e8bc5458af0fdf04f05ab803 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 13:20:26 -0300
Subject: [PATCH 01/14] hover, menu order

---
 .../coral-admin/src/components/ui/Header.css  |  6 ++-
 .../components/ModerationMenu.js              | 48 +++++++++++++------
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index e30cb46d7e..eba94d8925 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -74,8 +74,12 @@
   background-color: transparent;
   transition: background-color 200ms;
 
+  &:hover {
+    background-color: #232323;
+  }
+
   &.active {
-     background-color: #232323;
+    background-color: #232323;
   }
 }
 
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
index b8160e21b3..e428f6a526 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js
@@ -1,35 +1,53 @@
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
 import CommentCount from './CommentCount';
 import styles from './styles.css';
-import {SelectField, Option} from 'react-mdl-selectfield';
+import { SelectField, Option } from 'react-mdl-selectfield';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from 'coral-admin/src/translations.json';
-import {Link} from 'react-router';
+import { Link } from 'react-router';
 
 const lang = new I18n(translations);
 
-const ModerationMenu = ({asset, premodCount, rejectedCount, flaggedCount, selectSort, sort}) => {
-  const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod';
-  const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected';
-  const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged';
+const ModerationMenu = (
+  { asset, premodCount, rejectedCount, flaggedCount, selectSort, sort }
+) => {
+  const premodPath = asset
+    ? `/admin/moderate/premod/${asset.id}`
+    : '/admin/moderate/premod';
+  const rejectPath = asset
+    ? `/admin/moderate/rejected/${asset.id}`
+    : '/admin/moderate/rejected';
+  const flagPath = asset
+    ? `/admin/moderate/flagged/${asset.id}`
+    : '/admin/moderate/flagged';
+
   return (
-    <div className='mdl-tabs'>
+    <div className="mdl-tabs">
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <div className={styles.tabBarPadding}/>
+        <div className={styles.tabBarPadding} />
         <div>
-          <Link to={premodPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+          <Link
+            to={premodPath}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
             {lang.t('modqueue.premod')} <CommentCount count={premodCount} />
           </Link>
-          <Link to={rejectPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('modqueue.rejected')} <CommentCount count={rejectedCount} />
-          </Link>
-          <Link to={flagPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+          <Link
+            to={flagPath}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
             {lang.t('modqueue.flagged')} <CommentCount count={flaggedCount} />
           </Link>
+          <Link
+            to={rejectPath}
+            className={`mdl-tabs__tab ${styles.tab}`}
+            activeClassName={styles.active}>
+            {lang.t('modqueue.rejected')} <CommentCount count={rejectedCount} />
+          </Link>
         </div>
         <SelectField
           className={styles.selectField}
-          label='Sort'
+          label="Sort"
           value={sort}
           onChange={sort => selectSort(sort)}>
           <Option value={'REVERSE_CHRONOLOGICAL'}>Newest First</Option>

From cd27ffe86a46e929d8882807105e35dc837059b4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 13:37:44 -0300
Subject: [PATCH 02/14] wip

---
 .../src/containers/ModerationQueue/components/styles.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 9576045def..61902240b6 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -216,10 +216,12 @@ span {
     justify-content: space-between;
 
     .author {
-      font-weight: 600;
+      font-weight: 300;
       min-width: 230px;
       display: flex;
       align-items: center;
+      color: #262626;
+      font-size: 16px;
     }
   }
 
@@ -242,10 +244,11 @@ span {
   }
 
   .created {
-    color: #666;
-    font-size: 13px;
+    color: #262626;
+    font-size: 14px;
     margin-left: 15px;
     line-height: 1px;
+    font-weight: 300;
   }
 
   .actionButton {

From 71415877b3afb5a37cff53be598f5b1a2e15768c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 14:04:08 -0300
Subject: [PATCH 03/14] comment tweaks

---
 .../src/containers/ModerationQueue/components/styles.css     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
index 61902240b6..51086dfd4b 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css
+++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css
@@ -170,7 +170,7 @@ span {
   border-bottom: 1px solid #e0e0e0;
   font-size: 18px;
   width: 100%;
-  max-width: 660px;
+  max-width: 700px;
   min-width: 400px;
   margin: 0 auto;
   position: relative;
@@ -192,7 +192,7 @@ span {
   }
 
   &.selected {
-    max-width: 670px;
+    max-width: 720px;
     max-height: 410px;
   }
 
@@ -263,6 +263,7 @@ span {
     max-width: 500px;
     word-wrap: break-word;
     font-weight: 300;
+    font-size: 16px;
   }
 
   .flagged {

From 5729b03656b2f1bbfa242b21137eb4892be8a3bf Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 15:35:40 -0300
Subject: [PATCH 04/14] my-comments-ux

---
 client/coral-framework/actions/asset.js       |  2 +-
 client/coral-framework/actions/auth.js        |  2 +-
 .../coral-framework/actions/notification.js   |  2 +-
 client/coral-framework/translations.json      |  2 +
 client/coral-plugin-history/Comment.css       | 60 ++++++++++++++++-
 client/coral-plugin-history/Comment.js        | 39 +++++++++--
 client/coral-ui/components/TabBar.css         |  2 +-
 package.json                                  |  7 +-
 yarn.lock                                     | 65 ++++++++++---------
 9 files changed, 139 insertions(+), 42 deletions(-)

diff --git a/client/coral-framework/actions/asset.js b/client/coral-framework/actions/asset.js
index 02e72ea98a..609525986f 100644
--- a/client/coral-framework/actions/asset.js
+++ b/client/coral-framework/actions/asset.js
@@ -2,7 +2,7 @@ import * as actions from '../constants/asset';
 import coralApi from '../helpers/response';
 import {addNotification} from '../actions/notification';
 
-import I18n from 'coral-framework/modules/i18n/i18n';
+import I18n from '../../coral-framework/modules/i18n/i18n';
 import translations from './../translations';
 const lang = new I18n(translations);
 
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 9dedaa2f2d..8dc47136c0 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,4 +1,4 @@
-import I18n from 'coral-framework/modules/i18n/i18n';
+import I18n from '../../coral-framework/modules/i18n/i18n';
 import translations from './../translations';
 const lang = new I18n(translations);
 import * as actions from '../constants/auth';
diff --git a/client/coral-framework/actions/notification.js b/client/coral-framework/actions/notification.js
index f2cc053ec4..cb1aee5dd8 100644
--- a/client/coral-framework/actions/notification.js
+++ b/client/coral-framework/actions/notification.js
@@ -1,4 +1,4 @@
-import {pym} from 'coral-framework';
+import {pym} from '../../coral-framework';
 
 export const addNotification = (notifType, text) => {
   pym.sendMessage('coral-alert', `${notifType}|${text}`);
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index b327a70974..d3e063a60a 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -1,5 +1,6 @@
 {
   "en": {
+    "MY_COMMENTS": "My Comments",
     "profile": "Profile",
     "successUpdateSettings": "The changes you have made have been applied to the comment stream on this article",
     "successNameUpdate": "Your username has been updated",
@@ -40,6 +41,7 @@
     }
   },
   "es": {
+    "MY_COMMENTS": "Mis Comentarios",
     "profile": "Perfil",
     "successUpdateSettings": "La configuración de este articulo fue actualizada",
     "successBioUpdate": "Tu bio fue actualizada",
diff --git a/client/coral-plugin-history/Comment.css b/client/coral-plugin-history/Comment.css
index f54b0ad29a..2c0dee0948 100644
--- a/client/coral-plugin-history/Comment.css
+++ b/client/coral-plugin-history/Comment.css
@@ -1,16 +1,74 @@
+@custom-media --big-viewport (min-width: 780px);
+
 .myComment {
   border-bottom: 1px solid lightgrey;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
 }
 
 .myComment:last-child {
-  border-bottom: none;
+  border-bottom: solid 1px #EBEBEB;
 }
 
 .assetURL {
   font-size: 16px;
   color: black;
+  text-decoration: none;
+  font-weight: bold;
 }
 
 .commentBody {
 
 }
+
+.sidebar {
+  ul {
+    min-width: 136px;
+  }
+
+  li {
+    margin-bottom: 10px;
+
+    &:nth-child(1) {
+      color: #5394D7;
+    }
+
+    &:nth-child(2) {
+      color: #909090;
+    }
+
+
+    i {
+      margin-right: 5px;
+      font-size: 15px;
+      vertical-align: bottom;
+    }
+
+    a:hover {
+      cursor: pointer;
+    }
+  }
+}
+
+@custom-media --mobile-viewport (max-width: 480px);
+
+@media (--mobile-viewport) {
+  .myComment {
+    flex-direction: column;
+  }
+
+  .sidebar ul {
+    display: flex;
+    li {
+      margin-right: 20px;
+    }
+  }
+}
+
+.pubdate {
+  display: inline-block;
+  font-size: inherit;
+  margin: inherit;
+  color: inherit;
+}
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index 00dcc40c7b..707939536e 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -1,13 +1,42 @@
-import React, {PropTypes} from 'react';
+import React, { PropTypes } from 'react';
+import { Icon } from '../coral-ui';
 import styles from './Comment.css';
+import PubDate from '../coral-plugin-pubdate/PubDate';
+import Content from '../coral-plugin-commentcontent/CommentContent';
 
 const Comment = props => {
   return (
     <div className={styles.myComment}>
-      <p className="myCommentAsset">
-        <a className={`${styles.assetURL} myCommentAnchor`} href='#' onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>{props.asset.title ? props.asset.title : props.asset.url}</a>
-      </p>
-      <p className={`${styles.commentBody} myCommentBody`}>{props.comment.body}</p>
+      <div>
+        <Content
+          className={`${styles.commentBody} myCommentBody`}
+          body={props.comment.body}
+        />
+        <p className="myCommentAsset">
+          <a
+            className={`${styles.assetURL} myCommentAnchor`}
+            href="#"
+            onClick={props.link(`${props.asset.url}`)}>
+            Story: {props.asset.title ? props.asset.title : props.asset.url}
+          </a>
+        </p>
+      </div>
+      <div className={styles.sidebar}>
+        <ul>
+          <li>
+            <a onClick={props.link(`${props.asset.url}#${props.comment.id}`)}>
+              <Icon name="open_in_new" />View Conversation
+            </a>
+          </li>
+          <li>
+            <Icon name="schedule" />
+            <PubDate
+              className={styles.pubdate}
+              created_at={props.comment.created_at}
+            />
+          </li>
+        </ul>
+      </div>
     </div>
   );
 };
diff --git a/client/coral-ui/components/TabBar.css b/client/coral-ui/components/TabBar.css
index 33a4c6d8b1..b5d44d5703 100644
--- a/client/coral-ui/components/TabBar.css
+++ b/client/coral-ui/components/TabBar.css
@@ -19,7 +19,7 @@
 }
 
 .base li:hover {
-  background: #f3f3f3;
+  background: #d5d5d5;
   cursor: pointer;
 }
 
diff --git a/package.json b/package.json
index 9094522316..ab7a789e0d 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "build-watch": "NODE_ENV=development webpack --progress --config webpack.config.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint bin/* . --fix",
-    "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
+    "test": "TEST_MODE=unit NODE_ENV=test mocha -r jsdom-global/register ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "pree2e": "NODE_ENV=test TALK_PORT=3011 scripts/pree2e.sh",
     "e2e": "NODE_ENV=test nightwatch",
@@ -62,14 +62,15 @@
     "env-rewrite": "^1.0.2",
     "express": "^4.14.0",
     "express-session": "^1.14.2",
-    "gql-merge": "^0.0.4",
     "form-data": "^2.1.2",
+    "gql-merge": "^0.0.4",
     "graphql": "^0.8.2",
     "graphql-errors": "^2.1.0",
     "graphql-server-express": "^0.5.0",
     "graphql-tools": "^0.9.0",
     "helmet": "^3.1.0",
     "inquirer": "^3.0.1",
+    "jsdom-global": "^2.1.1",
     "jsonwebtoken": "^7.1.9",
     "kue": "^0.11.5",
     "linkify-it": "^2.0.3",
@@ -133,7 +134,7 @@
     "immutable": "^3.8.1",
     "imports-loader": "^0.6.5",
     "istanbul": "^1.1.0-alpha.1",
-    "jsdom": "^9.8.3",
+    "jsdom": "^9.12.0",
     "json-loader": "^0.5.4",
     "keymaster": "^1.6.2",
     "license-webpack-plugin": "^0.4.2",
diff --git a/yarn.lock b/yarn.lock
index 25171f74d7..ef0b4fa822 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -49,7 +49,7 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-abab@^1.0.0:
+abab@^1.0.0, abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
@@ -76,7 +76,7 @@ acorn-globals@^1.0.4:
   dependencies:
     acorn "^2.1.0"
 
-acorn-globals@^3.0.0:
+acorn-globals@^3.0.0, acorn-globals@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
@@ -2022,11 +2022,11 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
-"cssstyle@>= 0.2.29 < 0.3.0", "cssstyle@>= 0.2.36 < 0.3.0":
+"cssstyle@>= 0.2.29 < 0.3.0", "cssstyle@>= 0.2.37 < 0.3.0":
   version "0.2.37"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
   dependencies:
@@ -3635,7 +3635,7 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@0.4.15, iconv-lite@^0.4.13, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+iconv-lite@0.4.15, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -4188,6 +4188,10 @@ jsbn@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
 
+jsdom-global@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-2.1.1.tgz#47d46fe77f6167baf5d34431d3bb59fc41b0915a"
+
 jsdom@^7.0.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-7.2.2.tgz#40b402770c2bda23469096bee91ab675e3b1fc6e"
@@ -4208,30 +4212,29 @@ jsdom@^7.0.2:
     whatwg-url-compat "~0.6.5"
     xml-name-validator ">= 2.0.1 < 3.0.0"
 
-jsdom@^9.8.3:
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.9.1.tgz#84f3972ad394ab963233af8725211bce4d01bfd5"
+jsdom@^9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
   dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
     array-equal "^1.0.0"
     content-type-parser "^1.0.1"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.36 < 0.3.0"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
     escodegen "^1.6.1"
     html-encoding-sniffer "^1.0.1"
-    iconv-lite "^0.4.13"
     nwmatcher ">= 1.3.9 < 2.0.0"
     parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.3.1"
-    webidl-conversions "^3.0.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
     whatwg-encoding "^1.0.1"
-    whatwg-url "^4.1.0"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
 
 jsesc@^1.3.0:
   version "1.3.0"
@@ -6919,7 +6922,7 @@ sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
-sax@^1.1.4, sax@~1.2.1:
+sax@^1.1.4, sax@^1.2.1, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
@@ -7401,7 +7404,7 @@ symbol-observable@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
-"symbol-tree@>= 3.1.0 < 4.0.0":
+"symbol-tree@>= 3.1.0 < 4.0.0", symbol-tree@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.1.tgz#8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"
 
@@ -7565,7 +7568,7 @@ touch@1.0.0:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^2.0.0, tough-cookie@^2.2.0, tough-cookie@^2.3.1, tough-cookie@~2.3.0:
+tough-cookie@^2.0.0, tough-cookie@^2.2.0, tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -7801,10 +7804,14 @@ webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
 
-webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
+webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
+webidl-conversions@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+
 webpack-sources@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
@@ -7853,9 +7860,9 @@ whatwg-url-compat@~0.6.5:
   dependencies:
     tr46 "~0.0.1"
 
-whatwg-url@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.3.0.tgz#92aaee21f4f2a642074357d70ef8500a7cbb171a"
+whatwg-url@^4.3.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.6.0.tgz#ef98da442273be04cf9632e176f257d2395a1ae4"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -7956,7 +7963,7 @@ xdg-basedir@^2.0.0:
   dependencies:
     os-homedir "^1.0.0"
 
-"xml-name-validator@>= 2.0.1 < 3.0.0":
+"xml-name-validator@>= 2.0.1 < 3.0.0", xml-name-validator@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 

From 4f50e8f19c3de4a72a211aa786b0fc0d768ebc06 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 16:19:05 -0300
Subject: [PATCH 05/14] Removing tests for now until we find a better solution
 for this

---
 package.json                                  |  7 ++--
 .../coral-plugin-history/Comment.spec.js      | 30 --------------
 .../CommentHistory.spec.js                    | 39 -------------------
 3 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 test/client/coral-plugin-history/Comment.spec.js
 delete mode 100644 test/client/coral-plugin-history/CommentHistory.spec.js

diff --git a/package.json b/package.json
index ab7a789e0d..9094522316 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "build-watch": "NODE_ENV=development webpack --progress --config webpack.config.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint bin/* . --fix",
-    "test": "TEST_MODE=unit NODE_ENV=test mocha -r jsdom-global/register ${MOCHA_REPORTER:-spec}",
+    "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "pree2e": "NODE_ENV=test TALK_PORT=3011 scripts/pree2e.sh",
     "e2e": "NODE_ENV=test nightwatch",
@@ -62,15 +62,14 @@
     "env-rewrite": "^1.0.2",
     "express": "^4.14.0",
     "express-session": "^1.14.2",
-    "form-data": "^2.1.2",
     "gql-merge": "^0.0.4",
+    "form-data": "^2.1.2",
     "graphql": "^0.8.2",
     "graphql-errors": "^2.1.0",
     "graphql-server-express": "^0.5.0",
     "graphql-tools": "^0.9.0",
     "helmet": "^3.1.0",
     "inquirer": "^3.0.1",
-    "jsdom-global": "^2.1.1",
     "jsonwebtoken": "^7.1.9",
     "kue": "^0.11.5",
     "linkify-it": "^2.0.3",
@@ -134,7 +133,7 @@
     "immutable": "^3.8.1",
     "imports-loader": "^0.6.5",
     "istanbul": "^1.1.0-alpha.1",
-    "jsdom": "^9.12.0",
+    "jsdom": "^9.8.3",
     "json-loader": "^0.5.4",
     "keymaster": "^1.6.2",
     "license-webpack-plugin": "^0.4.2",
diff --git a/test/client/coral-plugin-history/Comment.spec.js b/test/client/coral-plugin-history/Comment.spec.js
deleted file mode 100644
index 6d69d54cdf..0000000000
--- a/test/client/coral-plugin-history/Comment.spec.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import {shallow, mount} from 'enzyme';
-import {expect} from 'chai';
-import Comment from '../../../client/coral-plugin-history/Comment';
-
-describe('coral-plugin-history/Comment', () => {
-  let render;
-  const comment = {body: 'this is a comment', id: '123'};
-  const asset = {url: 'https://google.com'};
-
-  beforeEach(() => {
-    render = shallow(<Comment asset={asset} comment={comment} link={()=>{}}/>);
-  });
-
-  it('should render the provided comment body', () => {
-    const wrapper = mount(<Comment asset={asset} comment={comment} link={()=>{}}/>);
-    expect(wrapper.find('.myCommentBody')).to.have.length(1);
-    expect(wrapper.find('.myCommentBody').text()).to.equal('this is a comment');
-  });
-
-  it('should render the asset url as a link', () => {
-    const wrapper = mount(<Comment asset={asset} comment={comment} link={()=>{}}/>);
-    expect(wrapper.find('.myCommentAnchor')).to.have.length(1);
-    expect(wrapper.find('.myCommentAnchor').text()).to.equal('https://google.com');
-  });
-
-  it('should render the comment with styles', () => {
-    expect(render.props().style).to.be.defined;
-  });
-});
diff --git a/test/client/coral-plugin-history/CommentHistory.spec.js b/test/client/coral-plugin-history/CommentHistory.spec.js
deleted file mode 100644
index 671a50137f..0000000000
--- a/test/client/coral-plugin-history/CommentHistory.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import {shallow, mount} from 'enzyme';
-import {expect} from 'chai';
-import CommentHistory from '../../../client/coral-plugin-history/CommentHistory';
-
-describe('coral-plugin-history/CommentHistory', () => {
-  let render;
-  const comments = [{body: 'a comment or something', 'status_history':[{'type':'premod', 'created_at':'2016-12-09T01:40:53.327Z', 'assigned_by':null}, {'created_at':'2016-12-09T22:52:44.888Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-09T01:40:53.360Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T22:52:44.893Z', 'id':'3962c2ea-4ec4-42e4-b9bd-c571ff30f56b'}, {'body':'another comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-09T22:53:43.148Z', 'assigned_by':null}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-09T22:53:43.158Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'premod', '__v':0, 'updated_at':'2016-12-09T22:53:43.158Z', 'id':'b51e27af-bcfd-4932-91be-e3f01a4802e6'}, {'body':'can I comment?', 'status_history':[{'type':'premod', 'created_at':'2016-12-13T23:23:47.123Z', 'assigned_by':null}, {'created_at':'2016-12-13T23:23:58.487Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'cef81015-1b53-4d70-b9af-6eca680f22fc', 'created_at':'2016-12-13T23:23:47.131Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-13T23:23:58.493Z', 'id':'dc9d7be1-b911-4dc3-8e1e-400e8b8d110e'}, {'body':'pre-mod comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T21:34:56.994Z', 'assigned_by':null}, {'created_at':'2016-12-08T21:38:04.961Z', 'type':'rejected', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T21:34:56.997Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'rejected', '__v':0, 'updated_at':'2016-12-08T21:38:04.965Z', 'id':'6f02af16-a8f8-4ead-80ea-0d48824eb74d'}, {'body':'a flagged  commetn', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T21:38:26.342Z', 'assigned_by':null}, {'created_at':'2016-12-09T23:47:27.009Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T21:38:26.344Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T23:47:27.018Z', 'id':'784c5f91-36b9-4bda-b4ca-a114cef2c9f0'}, {'body':'a post mod comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T22:19:05.870Z', 'assigned_by':null}, {'created_at':'2016-12-09T23:26:41.427Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T22:19:05.874Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T23:26:41.450Z', 'id':'e8b86039-f850-4e53-bd9d-f8c9186a9637'}, {'body':'an actual post-mod comment here', 'status_history':[], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T22:20:11.147Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':null, '__v':0, 'updated_at':'2016-12-08T22:20:11.147Z', 'id':'cff1a318-50c6-431e-9a63-de7a7b7136bf'}];
-  const asset = {
-    'settings': null,
-    'created_at':'2016-12-06T21:36:09.302Z',
-    'url':'localhost:3000/',
-    'scraped':null,
-    'status':'open',
-    'updated_at':'2016-12-08T02:11:15.943Z',
-    '_id':'58472f499e775a38f23d5da0',
-    'type':'article',
-    'closedMessage':null,
-    'id':'7302e637-f884-47c0-9723-02cc10a18617',
-    'closedAt':null
-  };
-
-  comments.forEach((comment) => {
-    comment.asset = asset;
-  });
-
-  beforeEach(() => {
-    render = shallow(<CommentHistory comments={comments} asset={asset} link={()=>{}}/>);
-  });
-
-  it('should render Comments as children when given comments and assets', () => {
-    const wrapper = mount(<CommentHistory comments={comments} asset={asset} link={()=>{}}/>);
-    expect(wrapper.find('.commentHistory__list').children()).to.have.length(7);
-  });
-
-  it('should render with styles', () => {
-    expect(render.props().style).to.be.defined;
-  });
-});

From 0bae6fe76c36e1af18ce0828f7a32338e838efdd Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Wed, 22 Mar 2017 17:06:41 -0300
Subject: [PATCH 06/14] design tweaks

---
 client/coral-embed-stream/src/Comment.css   |  3 ++-
 client/coral-embed-stream/src/LoadMore.js   | 17 +++++++++--------
 client/coral-embed-stream/style/default.css | 11 ++++++++---
 client/coral-framework/translations.json    |  4 ++--
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/client/coral-embed-stream/src/Comment.css b/client/coral-embed-stream/src/Comment.css
index 6966d82abb..01022ae66a 100644
--- a/client/coral-embed-stream/src/Comment.css
+++ b/client/coral-embed-stream/src/Comment.css
@@ -1,9 +1,10 @@
 .Reply {
   position: relative;
+  margin-bottom: 15px;
 }
 
 .Comment {
-
+  margin-bottom: 15px;
 }
 
 .pendingComment {
diff --git a/client/coral-embed-stream/src/LoadMore.js b/client/coral-embed-stream/src/LoadMore.js
index 942a53b279..89dc0104c2 100644
--- a/client/coral-embed-stream/src/LoadMore.js
+++ b/client/coral-embed-stream/src/LoadMore.js
@@ -44,14 +44,15 @@ class LoadMore extends React.Component {
   render () {
     const {assetId, comments, loadMore, moreComments, parentId, replyCount, topLevel} = this.props;
     return moreComments
-      ? <Button
-        className='coral-load-more'
-        onClick={() => {
-          this.initialState = false;
-          loadMoreComments(assetId, comments, loadMore, parentId);
-        }}>
-        {topLevel ? lang.t('viewMoreComments') : this.replyCountFormat(replyCount)}
-      </Button>
+      ? <div className='coral-load-more'>
+        <Button
+          onClick={() => {
+            this.initialState = false;
+            loadMoreComments(assetId, comments, loadMore, parentId);
+          }}>
+          {topLevel ? lang.t('viewMoreComments') : this.replyCountFormat(replyCount)}
+        </Button>
+      </div>
       : null;
   }
 }
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 629efd29fd..4c427543ee 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -212,6 +212,7 @@ hr {
 
 .coral-plugin-commentcontent-text {
   margin-bottom: 7px;
+  font-size: 16px;
 }
 
 .coral-plugin-author-name-text {
@@ -417,8 +418,11 @@ button.comment__action-button[disabled],
 
 /* Load More */
 
-button.coral-load-more {
-  width: 100%;
+.coral-load-more {
+  text-align: center;
+}
+
+.coral-load-more button {
   text-align: center;
   color: #FFF;
   background-color: #2376D8;
@@ -427,9 +431,10 @@ button.coral-load-more {
   border-radius: 2px;
   line-height: 1em;
   text-transform: capitalize;
+  display: inline-block;
 }
 
-button.coral-load-more:hover {
+.coral-load-more:hover button {
   background-color: #4399FF;
 }
 
diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json
index b327a70974..e37d92bfcd 100644
--- a/client/coral-framework/translations.json
+++ b/client/coral-framework/translations.json
@@ -15,7 +15,7 @@
     "viewReply": "view reply",
     "viewAllRepliesInitial": "view all {0} replies",
     "viewAllReplies": "view {0} replies",
-    "newCount": "View {0} more {1}",
+    "newCount": "View {0} new {1}",
     "comment": "comment",
     "comments": "comments",
     "error": {
@@ -46,7 +46,7 @@
     "contentNotAvailable": "El contenido no se encuentra disponible",
     "bannedAccountMsg": "Tu cuenta se encuentra suspendida. Esto significa que no puedes dar Like, Marcar o escribir commentarios.",
     "editNameMsg": "",
-    "viewMoreComments": "Var commentarios más",
+    "viewMoreComments": "Ver commentarios más",
     "viewReply": "ver respuesta",
     "viewAllRepliesInitial": "ver todas las {0} respuestas",
     "viewAllReplies": "ver {0} respuestas",

From fb2f8ef07485a1532e99772ac9d4ec6cd31a61f2 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Mar 2017 16:48:28 -0600
Subject: [PATCH 07/14] redirect to the parent url when resetting your password

---
 client/coral-framework/actions/auth.js |  4 +++-
 routes/admin/index.js                  |  2 +-
 routes/api/account/index.js            | 12 ++++++------
 services/users.js                      |  7 +++++--
 views/admin/password-reset.ejs         |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 9dedaa2f2d..2a0c2a4973 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -3,6 +3,7 @@ import translations from './../translations';
 const lang = new I18n(translations);
 import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
+import {pym} from 'coral-framework';
 
 // Dialog Actions
 export const showSignInDialog = (offset = 0) => ({type: actions.SHOW_SIGNIN_DIALOG, offset});
@@ -135,7 +136,8 @@ const forgotPassowordFailure = () => ({type: actions.FETCH_FORGOT_PASSWORD_FAILU
 
 export const fetchForgotPassword = email => (dispatch) => {
   dispatch(forgotPassowordRequest(email));
-  coralApi('/account/password/reset', {method: 'POST', body: {email}})
+  const redirectUri = pym.parentUrl || location.href;
+  coralApi('/account/password/reset', {method: 'POST', body: {email, loc: redirectUri}})
     .then(() => dispatch(forgotPassowordSuccess()))
     .catch(error => dispatch(forgotPassowordFailure(error)));
 };
diff --git a/routes/admin/index.js b/routes/admin/index.js
index d250ea32a6..1a97695915 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -12,7 +12,7 @@ router.get('/password-reset', (req, res) => {
 
   // TODO: store the redirect uri in the token or something fancy.
   // admins and regular users should probably be redirected to different places.
-  res.render('admin/password-reset', {redirectUri: process.env.TALK_ROOT_URL});
+  res.render('admin/password-reset');
 });
 
 router.get('*', (req, res) => {
diff --git a/routes/api/account/index.js b/routes/api/account/index.js
index 44b4b39534..3761aef95d 100644
--- a/routes/api/account/index.js
+++ b/routes/api/account/index.js
@@ -41,14 +41,14 @@ router.post('/email/verify', (req, res, next) => {
  * if it does, create a JWT and send an email
  */
 router.post('/password/reset', (req, res, next) => {
-  const {email} = req.body;
+  const {email, loc} = req.body;
 
   if (!email) {
     return next('you must submit an email when requesting a password.');
   }
 
   UsersService
-    .createPasswordResetToken(email)
+    .createPasswordResetToken(email, loc)
     .then((token) => {
 
       // Check to see if the token isn't defined.
@@ -101,11 +101,11 @@ router.put('/password/reset', (req, res, next) => {
 
   UsersService
     .verifyPasswordResetToken(token)
-    .then((user) => {
-      return UsersService.changePassword(user.id, password);
+    .then(([user, loc]) => {
+      return Promise.all([UsersService.changePassword(user.id, password), loc]);
     })
-    .then(() => {
-      res.status(204).end();
+    .then(([_, loc]) => {
+      res.json({redirect: loc});
     })
     .catch(() => {
       next(authorization.ErrNotAuthorized);
diff --git a/services/users.js b/services/users.js
index 4e11962522..7f83da9f96 100644
--- a/services/users.js
+++ b/services/users.js
@@ -524,7 +524,7 @@ module.exports = class UsersService {
    * Creates a JWT from a user email. Only works for local accounts.
    * @param {String} email of the local user
    */
-  static createPasswordResetToken(email) {
+  static createPasswordResetToken(email, loc) {
     if (!email || typeof email !== 'string') {
       return Promise.reject('email is required when creating a JWT for resetting passord');
     }
@@ -544,6 +544,7 @@ module.exports = class UsersService {
         const payload = {
           jti: uuid.v4(),
           email,
+          loc,
           userId: user.id,
           version: user.__v
         };
@@ -588,7 +589,9 @@ module.exports = class UsersService {
       })
 
       // TODO: add search by __v as well
-      .then((decoded) => UsersService.findById(decoded.userId));
+      .then((decoded) => {
+        return Promise.all([UsersService.findById(decoded.userId), decoded.loc]);
+      });
   }
 
   /**
diff --git a/views/admin/password-reset.ejs b/views/admin/password-reset.ejs
index 06b9d2a869..4b25d1279f 100644
--- a/views/admin/password-reset.ejs
+++ b/views/admin/password-reset.ejs
@@ -126,7 +126,7 @@
             },
             data: JSON.stringify({password: password, token: location.hash.replace('#', '')})
           }).then(function (success) {
-            location.href = '<%= redirectUri %>';
+            location.href = success.redirect;
           }).catch(function (error) {
             showError(error.responseText);
           });

From 4b0d0fed534ef90c19846bdd573ca8e7171cb374 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Wed, 22 Mar 2017 17:10:11 -0600
Subject: [PATCH 08/14] unused variable

---
 routes/api/account/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/api/account/index.js b/routes/api/account/index.js
index 3761aef95d..e1c73d6385 100644
--- a/routes/api/account/index.js
+++ b/routes/api/account/index.js
@@ -104,7 +104,7 @@ router.put('/password/reset', (req, res, next) => {
     .then(([user, loc]) => {
       return Promise.all([UsersService.changePassword(user.id, password), loc]);
     })
-    .then(([_, loc]) => {
+    .then(([ , loc]) => {
       res.json({redirect: loc});
     })
     .catch(() => {

From 464539d6a321ff50979f276818b07466e8230db0 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 23 Mar 2017 09:50:18 -0300
Subject: [PATCH 09/14] missing tab name

---
 client/coral-embed-stream/src/Embed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 4722a44b1d..e9ed0511b2 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -121,7 +121,7 @@ class Embed extends Component {
         <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
             <Tab><Count count={asset.commentCount}/></Tab>
-            <Tab>{lang.t('profile')}</Tab>
+            <Tab>{lang.t('MY_COMMENTSg')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
           {loggedIn && <UserBox user={user} logout={() => this.props.logout().then(refetch)}  changeTab={this.changeTab}/>}

From 23833886bb59780e0a2996de092f1bbe463896f9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 23 Mar 2017 09:51:26 -0300
Subject: [PATCH 10/14] missing tab name

---
 client/coral-embed-stream/src/Embed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index e9ed0511b2..52fdf06f52 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -121,7 +121,7 @@ class Embed extends Component {
         <div className="commentStream">
           <TabBar onChange={this.changeTab} activeTab={activeTab}>
             <Tab><Count count={asset.commentCount}/></Tab>
-            <Tab>{lang.t('MY_COMMENTSg')}</Tab>
+            <Tab>{lang.t('MY_COMMENTS')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
           {loggedIn && <UserBox user={user} logout={() => this.props.logout().then(refetch)}  changeTab={this.changeTab}/>}

From 903aa23f193b3d74b95c4205966bccead4111bed Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 23 Mar 2017 11:18:55 -0400
Subject: [PATCH 11/14] Revert "Story 138187767  - Moderate Flag User Names"

---
 .gitignore                                    |   2 -
 client/coral-admin/src/AppRouter.js           |  15 -
 client/coral-admin/src/actions/community.js   |  29 +-
 client/coral-admin/src/components/Modal.js    |   1 +
 .../SuspendUserModal.css}                     |   0
 .../src/components/SuspendUserModal.js        | 106 ++++++
 client/coral-admin/src/components/User.js     |  50 +++
 client/coral-admin/src/constants/comments.js  |   1 +
 client/coral-admin/src/constants/community.js |  10 -
 client/coral-admin/src/constants/users.js     |   1 +
 .../src/containers/Community/Community.css    | 230 ------------
 .../Community/{People.js => Community.js}     |   6 +-
 .../Community/CommunityContainer.js           | 117 ++----
 .../containers/Community/CommunityLayout.js   |   9 -
 .../containers/Community/FlaggedAccounts.js   |  45 ---
 .../src/containers/Community/Table.js         |   2 +-
 .../Community/components/ActionButton.js      |  24 --
 .../Community/components/BanUserDialog.css    | 164 ---------
 .../Community/components/BanUserDialog.js     |  54 ---
 .../Community/components/CommunityMenu.js     |  31 --
 .../Community/components/SuspendUserDialog.js | 115 ------
 .../containers/Community/components/User.js   |  90 -----
 .../Community/components/styles.css           | 339 ------------------
 .../ModerationQueue/components/Comment.js     |  20 +-
 .../src/graphql/mutations/index.js            |  32 +-
 .../src/graphql/mutations/suspendUser.graphql |   7 -
 .../coral-admin/src/graphql/queries/index.js  |   3 -
 .../queries/modUserFlaggedQuery.graphql       |  26 --
 client/coral-admin/src/reducers/community.js  |  72 ++--
 client/coral-admin/src/translations.json      |  51 +--
 client/coral-plugin-flags/FlagComment.js      |   4 +-
 graph/loaders/users.js                        |  41 ---
 graph/mutators/user.js                        |  30 +-
 graph/resolvers/flag_action.js                |  12 +-
 graph/resolvers/root_mutation.js              |   3 -
 graph/resolvers/root_query.js                 |  22 --
 graph/typeDefs.graphql                        |  31 --
 models/user.js                                |   5 +-
 services/email/suspension.ejs                 |   1 -
 services/email/suspension.txt.ejs             |   1 -
 services/users.js                             |  46 ---
 test/graph/mutations/addCommentTag.js         |   2 +-
 42 files changed, 246 insertions(+), 1604 deletions(-)
 rename client/coral-admin/src/{containers/Community/components/SuspendUserDialog.css => components/SuspendUserModal.css} (100%)
 create mode 100644 client/coral-admin/src/components/SuspendUserModal.js
 create mode 100644 client/coral-admin/src/components/User.js
 rename client/coral-admin/src/containers/Community/{People.js => Community.js} (94%)
 delete mode 100644 client/coral-admin/src/containers/Community/CommunityLayout.js
 delete mode 100644 client/coral-admin/src/containers/Community/FlaggedAccounts.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/ActionButton.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/BanUserDialog.css
 delete mode 100644 client/coral-admin/src/containers/Community/components/BanUserDialog.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/CommunityMenu.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/SuspendUserDialog.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/User.js
 delete mode 100644 client/coral-admin/src/containers/Community/components/styles.css
 delete mode 100644 client/coral-admin/src/graphql/mutations/suspendUser.graphql
 delete mode 100644 client/coral-admin/src/graphql/queries/modUserFlaggedQuery.graphql
 delete mode 100644 services/email/suspension.ejs
 delete mode 100644 services/email/suspension.txt.ejs

diff --git a/.gitignore b/.gitignore
index d91635c941..8775ac4879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@ dump.rdb
 *.cfg
 .idea/
 coverage/
-.tags
-.tags1
 
 # remove plugin folders
 plugins
diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 2bd59b79d3..a2990677fe 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -5,13 +5,10 @@ import Stories from 'containers/Stories/Stories';
 import Configure from 'containers/Configure/Configure';
 import LayoutContainer from 'containers/LayoutContainer';
 import InstallContainer from 'containers/Install/InstallContainer';
-
-import CommunityLayout from 'containers/Community/CommunityLayout';
 import CommunityContainer from 'containers/Community/CommunityContainer';
 
 import ModerationLayout from 'containers/ModerationQueue/ModerationLayout';
 import ModerationContainer from 'containers/ModerationQueue/ModerationContainer';
-
 import Dashboard from 'containers/Dashboard/Dashboard';
 
 const routes = (
@@ -24,18 +21,6 @@ const routes = (
       <Route path='stories' component={Stories} />
       <Route path='dashboard' component={Dashboard} />
 
-      {/* Community Routes */}
-
-      <Route path='community' component={CommunityLayout}>
-        <Route path='flagged' components={CommunityContainer}>
-          <Route path=':id' components={CommunityContainer} />
-        </Route>
-        <Route path='people' components={CommunityContainer}>
-          <Route path=':id' components={CommunityContainer} />
-        </Route>
-        <IndexRedirect to='flagged' />
-      </Route>
-
       {/* Moderation Routes */}
 
       <Route path='moderate' component={ModerationLayout}>
diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index 0f53ea3dab..c2d7384606 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -7,33 +7,28 @@ import {
   SORT_UPDATE,
   COMMENTERS_NEW_PAGE,
   SET_ROLE,
-  SET_COMMENTER_STATUS,
-  SHOW_BANUSER_DIALOG,
-  HIDE_BANUSER_DIALOG,
-  SHOW_SUSPENDUSER_DIALOG,
-  HIDE_SUSPENDUSER_DIALOG
+  SET_COMMENTER_STATUS
 } from '../constants/community';
 
 import coralApi from '../../../coral-framework/helpers/response';
 
-export const fetchAccounts = (query = {}) => dispatch => {
-
-  dispatch(requestFetchAccounts());
+export const fetchCommenters = (query = {}) => dispatch => {
+  dispatch(requestFetchCommenters());
   coralApi(`/users?${qs.stringify(query)}`)
-    .then(({result, page, count, limit, totalPages}) =>{
+    .then(({result, page, count, limit, totalPages}) =>
       dispatch({
         type: FETCH_COMMENTERS_SUCCESS,
-        accounts: result,
+        commenters: result,
         page,
         count,
         limit,
         totalPages
-      });
-    })
+      })
+    )
     .catch(error => dispatch({type: FETCH_COMMENTERS_FAILURE, error}));
 };
 
-const requestFetchAccounts = () => ({
+const requestFetchCommenters = () => ({
   type: FETCH_COMMENTERS_REQUEST
 });
 
@@ -60,11 +55,3 @@ export const setCommenterStatus = (id, status) => (dispatch) => {
     return dispatch({type: SET_COMMENTER_STATUS, id, status});
   });
 };
-
-// Ban User Dialog
-export const showBanUserDialog = (user) => ({type: SHOW_BANUSER_DIALOG, user});
-export const hideBanUserDialog = () => ({type: HIDE_BANUSER_DIALOG});
-
-// Suspend User Dialog
-export const showSuspendUserDialog = (user) => ({type: SHOW_SUSPENDUSER_DIALOG, user});
-export const hideSuspendUserDialog = () => ({type: HIDE_SUSPENDUSER_DIALOG});
diff --git a/client/coral-admin/src/components/Modal.js b/client/coral-admin/src/components/Modal.js
index b667258c29..99c27c3a17 100644
--- a/client/coral-admin/src/components/Modal.js
+++ b/client/coral-admin/src/components/Modal.js
@@ -1,3 +1,4 @@
+
 import React from 'react';
 import {Button, Icon} from 'react-mdl';
 import styles from './Modal.css';
diff --git a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.css b/client/coral-admin/src/components/SuspendUserModal.css
similarity index 100%
rename from client/coral-admin/src/containers/Community/components/SuspendUserDialog.css
rename to client/coral-admin/src/components/SuspendUserModal.css
diff --git a/client/coral-admin/src/components/SuspendUserModal.js b/client/coral-admin/src/components/SuspendUserModal.js
new file mode 100644
index 0000000000..5afb8ffee4
--- /dev/null
+++ b/client/coral-admin/src/components/SuspendUserModal.js
@@ -0,0 +1,106 @@
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../translations.json';
+import React, {Component, PropTypes} from 'react';
+import Modal from 'components/Modal';
+import styles from './SuspendUserModal.css';
+import {Button} from 'coral-ui';
+
+const stages = [
+  {
+    title: 'suspenduser.title_0',
+    description: 'suspenduser.description_0',
+    options: {
+      'j': 'suspenduser.no_cancel',
+      'k': 'suspenduser.yes_suspend'
+    }
+  },
+  {
+    title: 'suspenduser.title_1',
+    description: 'suspenduser.description_1',
+    options: {
+      'j': 'bandialog.cancel',
+      'k': 'suspenduser.send'
+    }
+  }
+];
+
+class SuspendUserModal extends Component  {
+
+  state = {email: '', stage: 0}
+
+  static propTypes = {
+    stage: PropTypes.number,
+    actionType: PropTypes.string,
+    onClose: PropTypes.func.isRequired,
+    suspendUser: PropTypes.func.isRequired
+  }
+
+  componentDidMount() {
+    const about = lang.t('suspenduser.username');
+    this.setState({email: lang.t('suspenduser.email', about)});
+  }
+
+  /*
+  * When an admin clicks to suspend a user a dialog is shown, this function
+  * handles the possible actions for that dialog.
+  */
+  onActionClick = (stage, menuOption) => () => {
+    const {suspendUser, action} = this.props;
+    const {stage, email} = this.state;
+    const cancel = this.props.onClose;
+    const next = () => this.setState({stage: stage + 1});
+    const suspend = () => suspendUser(action.item_id, lang.t('suspenduser.email_subject'), email)
+      .then(this.props.onClose);
+    const suspendModalActions = [
+      [ cancel, next ],
+      [ cancel, suspend ]
+    ];
+    return suspendModalActions[stage][menuOption]();
+  }
+
+  onEmailChange = (e) => this.setState({email: e.target.value})
+
+  render () {
+    const {action, onClose} = this.props;
+
+    if (!action) {
+      return null;
+    }
+
+    const {stage} = this.state;
+    const actionType = action.actionType;
+    const about = actionType === 'flag_bio' ? lang.t('suspenduser.bio') : lang.t('suspenduser.username');
+    return <Modal open={true} onClose={onClose}>
+        <div className={styles.title}>{lang.t(stages[stage].title, about)}</div>
+        <div className={styles.container}>
+          <div className={styles.description}>
+            {lang.t(stages[stage].description, about)}
+          </div>
+          {
+            stage === 1 &&
+            <div className={styles.writeContainer}>
+              <div className={styles.emailMessage}>{lang.t('suspenduser.write_message')}</div>
+              <div className={styles.emailContainer}>
+                <textarea
+                  rows={5}
+                  className={styles.emailInput}
+                  value={this.state.email}
+                  onChange={this.onEmailChange}/>
+              </div>
+            </div>
+          }
+          <div className={styles.modalButtons}>
+            {Object.keys(stages[stage].options).map((key, i) => (
+              <Button key={i} onClick={this.onActionClick(stage, i)}>
+                {lang.t(stages[stage].options[key], about)}
+              </Button>
+            ))}
+        </div>
+        </div>
+      </Modal>;
+  }
+}
+
+export default SuspendUserModal;
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/components/User.js b/client/coral-admin/src/components/User.js
new file mode 100644
index 0000000000..129524993d
--- /dev/null
+++ b/client/coral-admin/src/components/User.js
@@ -0,0 +1,50 @@
+import React from 'react';
+import styles from './ModerationList.css';
+
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../translations.json';
+
+import {Icon} from 'react-mdl';
+import ActionButton from './ActionButton';
+
+// Render a single comment for the list
+const User = props => {
+  const {action, user} = props;
+  let userStatus = user.status;
+
+  // Do not display unless the user status is 'pending' or 'banned'.
+  // This means that they have already been reviewed and approved.
+  return (userStatus === 'PENDING' ||  userStatus === 'BANNED') &&
+    <li tabIndex={props.index} className={`mdl-card mdl-shadow--2dp ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
+      <div className={styles.itemHeader}>
+        <div className={styles.author}>
+          <span>{user.username}</span>
+          </div>
+        <div className={styles.sideActions}>
+          <div className={`actions ${styles.actions}`}>
+            {props.modActions.map(
+              (action, i) =>
+              <ActionButton
+                type={action.toUpperCase()}
+                key={i}
+                user={user}
+                menuOptionsMap={props.menuOptionsMap}
+                onClickAction={props.onClickAction}
+                onClickShowBanDialog={props.onClickShowBanDialog}/>
+            )}
+          </div>
+        </div>
+        <div>
+          {userStatus === 'banned' ?
+          <span className={styles.banned}><Icon name='error_outline'/> {lang.t('comment.banned_user')}</span> : null}
+        </div>
+      </div>
+      <div className={styles.flagCount}>
+        {`${action.count} ${action.action_type === 'flag_bio' ? lang.t('user.bio_flags') : lang.t('user.username_flags')}`}
+      </div>
+    </li>;
+};
+
+export default User;
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/constants/comments.js b/client/coral-admin/src/constants/comments.js
index 603a3ce003..35a915a1b0 100644
--- a/client/coral-admin/src/constants/comments.js
+++ b/client/coral-admin/src/constants/comments.js
@@ -1,5 +1,6 @@
 export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
 export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
+export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
 export const COMMENTS_MODERATION_QUEUE_FETCH_REQUEST = 'COMMENTS_MODERATION_QUEUE_FETCH_REQUEST';
 export const COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS = 'COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS';
 export const COMMENT_CREATE_SUCCESS = 'COMMENT_CREATE_SUCCESS';
diff --git a/client/coral-admin/src/constants/community.js b/client/coral-admin/src/constants/community.js
index a46e721a66..e3fd88a717 100644
--- a/client/coral-admin/src/constants/community.js
+++ b/client/coral-admin/src/constants/community.js
@@ -5,13 +5,3 @@ export const SORT_UPDATE = 'SORT_UPDATE';
 export const COMMENTERS_NEW_PAGE = 'COMMENTERS_NEW_PAGE';
 export const SET_ROLE = 'SET_ROLE';
 export const SET_COMMENTER_STATUS = 'SET_COMMENTER_STATUS';
-
-export const FETCH_FLAGGED_COMMENTERS_REQUEST = 'FETCH_FLAGGED_COMMENTERS_REQUEST';
-export const FETCH_FLAGGED_COMMENTERS_SUCCESS = 'FETCH_FLAGGED_COMMENTERS_SUCCESS';
-export const FETCH_FLAGGED_COMMENTERS_FAILURE = 'FETCH_FLAGGED_COMMENTERS_FAILURE';
-
-export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
-export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
-
-export const SHOW_SUSPENDUSER_DIALOG = 'SHOW_SUSPENDUSER_DIALOG';
-export const HIDE_SUSPENDUSER_DIALOG = 'HIDE_SUSPENDUSER_DIALOG';
diff --git a/client/coral-admin/src/constants/users.js b/client/coral-admin/src/constants/users.js
index 6e8d173c0f..9cd7e20934 100644
--- a/client/coral-admin/src/constants/users.js
+++ b/client/coral-admin/src/constants/users.js
@@ -3,3 +3,4 @@ export const UPDATE_STATUS_SUCCESS = 'UPDATE_STATUS_SUCCESS';
 export const UPDATE_STATUS_FAILURE = 'UPDATE_STATUS_FAILURE';
 export const USER_EMAIL_FAILURE = 'USER_EMAIL_FAILURE';
 export const USERNAME_ENABLE_FAILURE = 'USERNAME_ENABLE_FAILURE';
+export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css
index 958e41ccbd..6c101fcaf2 100644
--- a/client/coral-admin/src/containers/Community/Community.css
+++ b/client/coral-admin/src/containers/Community/Community.css
@@ -1,5 +1,3 @@
-@custom-media --big-viewport (min-width: 780px);
-
 .container {
   padding: 10px;
   display: flex;
@@ -17,12 +15,6 @@
   box-sizing: border-box;
 }
 
-.mainFlaggedContent {
-  width: 100%;
-  padding: 34px 14px;
-  box-sizing: border-box;
-}
-
 .roleButton {
   display: block;
 }
@@ -102,225 +94,3 @@
     cursor: pointer;
    }
 }
-
-.list {
-  padding: 8px 0;
-  list-style: none;
-  display: block;
-
-  &.singleView .listItem {
-    display: none;
-  }
-
-  &.singleView .listItem.activeItem {
-    display: block;
-    height: 100%;
-    font-size: 1.5em;
-    line-height: 1.5em;
-    border: none;
-
-    .actions {
-      position: fixed;
-      bottom: 60px;
-      left: 25%;
-      margin: 0 auto;
-      display: flex;
-      justify-content: space-around;
-      width: 50%;
-      margin: 0;
-    }
-
-    .actionButton {
-      transform: scale(1.4);
-    }
-  }
-}
-
-.listItem {
-  border-bottom: 1px solid #e0e0e0;
-  font-size: 18px;
-  width: 100%;
-  max-width: 660px;
-  min-width: 400px;
-  margin: 0 auto;
-  position: relative;
-  transition: all 200ms;
-  padding: 10px 0 0;
-  min-height: 220px;
-
-  .container {
-    display: block;
-    padding: 0 14px;
-    min-height: 180px;
-  }
-
-  &:hover {
-     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-  }
-
-  &:last-child {
-    border-bottom: none;
-  }
-
-  .context {
-    a {
-      color: #f36451;
-      text-decoration: underline;
-      float: right;
-    }
-  }
-
-   .sideActions {
-     position: absolute;
-     right: 0;
-     height: 100%;
-     top: 0;
-     padding: 40px 18px;
-     box-sizing: border-box;
-   }
-
-  .itemHeader {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .author {
-      min-width: 230px;
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .itemBody {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    margin-right: 16px;
-    height: 40px;
-    width: 40px;
-    border-radius: 50%;
-    background-color: #757575;
-    font-size: 40px;
-    color: #fff;
-  }
-
-  .created {
-    color: #666;
-    font-size: 13px;
-    margin-left: 40px;
-  }
-
-  .actionButton {
-    transform: scale(.8);
-    margin: 0;
-  }
-
-  .body {
-    margin-top: 0px;
-    flex: 1;
-    color: black;
-    max-width: 500px;
-    word-wrap: break-word;
-    font-weight: 300;
-  }
-
-  .flagged {
-    color: rgba(255, 0, 0, .5);
-    padding-top: 15px;
-    padding-left: 10px;
-  }
-
-  .flagCount{
-    font-size: 12px;
-    color: #d32f2f;
-  }
-
-}
-
-.empty {
-  color: #444;
-  margin-top: 50px;
-  text-align: center;
-}
-
-
-@media (--big-viewport) {
-  .listItem {
-    border: 1px solid #e0e0e0;
-    margin-bottom: 30px;
-
-    &:last-child {
-      border-bottom: 1px solid #e0e0e0;
-    }
-
-    &.activeItem {
-      border: 2px solid #333;
-    }
-  }
-
-}
-
-.hasLinks {
-  color: #f00;
-  text-align: right;
-  display: flex;
-  align-items: center;
-
-  i {
-    margin-right: 5px;
-  }
-}
-
-.banned {
-  color: #f00;
-  text-align: left;
-  display: flex;
-  align-items: center;
-
-  i {
-    margin-right: 5px;
-  }
-}
-
-.ban {
-  display: block;
-  text-align: center;
-  margin-top: 5px;
-}
-
-.banButton {
-  width: 114px;
-  letter-spacing: 1px;
-
-  i {
-    vertical-align: middle;
-    margin-right: 10px;
-    font-size: 14px;
-  }
-}
-
-
-.actionButton {
-  transform: scale(.8);
-  margin: 0;
-}
-
-.flaggedByCount {
-  display: block;
-  text-align: left;
-}
-
-.flaggedBy {
-  display: inline;
-  padding: 3px;
-}
-
-.flaggedByLabel {
-  font-weight: bold;
-}
-
-.flaggedReasons {
-  padding-top: 15px;
-}
diff --git a/client/coral-admin/src/containers/Community/People.js b/client/coral-admin/src/containers/Community/Community.js
similarity index 94%
rename from client/coral-admin/src/containers/Community/People.js
rename to client/coral-admin/src/containers/Community/Community.js
index b5701b5a46..08a962c34d 100644
--- a/client/coral-admin/src/containers/Community/People.js
+++ b/client/coral-admin/src/containers/Community/Community.js
@@ -29,7 +29,7 @@ const tableHeaders = [
   }
 ];
 
-const People = ({isFetching, commenters, ...props}) => {
+const Community = ({isFetching, commenters, ...props}) => {
   const hasResults = !isFetching && !!commenters.length;
   return (
     <div className={styles.container}>
@@ -58,7 +58,7 @@ const People = ({isFetching, commenters, ...props}) => {
           hasResults
           ? <Table
               headers={tableHeaders}
-              commenters={commenters}
+              data={commenters}
               onHeaderClickHandler={props.onHeaderClickHandler}
             />
           : <EmptyCard>{lang.t('community.no-results')}</EmptyCard>
@@ -73,4 +73,4 @@ const People = ({isFetching, commenters, ...props}) => {
   );
 };
 
-export default People;
+export default Community;
diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js
index 4f65303ffe..e4263cc060 100644
--- a/client/coral-admin/src/containers/Community/CommunityContainer.js
+++ b/client/coral-admin/src/containers/Community/CommunityContainer.js
@@ -1,29 +1,14 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
-import {compose} from 'react-apollo';
-
-import {modUserFlaggedQuery} from 'coral-admin/src/graphql/queries';
-import {banUser, setUserStatus, suspendUser} from 'coral-admin/src/graphql/mutations';
-
 import {
-  fetchAccounts,
+  fetchCommenters,
   updateSorting,
   newPage,
-  showBanUserDialog,
-  hideBanUserDialog,
-  showSuspendUserDialog,
-  hideSuspendUserDialog
 } from '../../actions/community';
 
-import CommunityMenu from './components/CommunityMenu';
-import BanUserDialog from './components/BanUserDialog';
-import SuspendUserDialog from './components/SuspendUserDialog';
-
-import People from './People';
-import FlaggedAccounts from './FlaggedAccounts';
+import Community from './Community';
 
 class CommunityContainer extends Component {
-
   constructor(props) {
     super(props);
 
@@ -37,10 +22,6 @@ class CommunityContainer extends Component {
     this.onNewPageHandler = this.onNewPageHandler.bind(this);
   }
 
-  componentWillMount() {
-    this.props.fetchAccounts({});
-  }
-
   onKeyDownHandler(e) {
     if (e.key === 'Enter') {
       e.preventDefault();
@@ -57,13 +38,16 @@ class CommunityContainer extends Component {
   search(query = {}) {
     const {community} = this.props;
 
-    this.props.fetchAccounts({
+    this.props.dispatch(fetchCommenters({
       value: this.state.searchValue,
-      field: community.fieldPeople,
-      asc: community.ascPeople,
+      field: community.field,
+      asc: community.asc,
       ...query
-    });
+    }));
+  }
 
+  componentDidMount() {
+    this.search();
   }
 
   onHeaderClickHandler(sort) {
@@ -76,66 +60,19 @@ class CommunityContainer extends Component {
     this.search({page});
   }
 
-  getTabContent(searchValue, props) {
-    const {community, data} = props;
-    const activeTab = props.route.path === ':id' ? 'flagged' : props.route.path;
-
-    if (activeTab === 'people') {
-      return (
-        <People
-          isFetching={community.isFetchingPeople}
-          commenters={community.accounts}
-          searchValue={searchValue}
-          error={community.errorPeople}
-          totalPages={community.totalPagesPeople}
-          page={community.pagePeople}
-          onKeyDown={this.onKeyDownHandler}
-          onChange={this.onChangeHandler}
-          onHeaderClickHandler={this.onHeaderClickHandler}
-          onNewPageHandler={this.onNewPageHandler}
-        />
-      );
-    }
-
-    return (
-      <div>
-        <FlaggedAccounts
-          commenters={data.users}
-          isFetching={data.loading}
-          error={data.error}
-          showBanUserDialog={props.showBanUserDialog}
-          approveUser={props.approveUser}
-          suspendUser={props.suspendUser}
-          showSuspendUserDialog={props.showSuspendUserDialog}
-        />
-        <BanUserDialog
-          open={community.banDialog}
-          user={community.user}
-          handleClose={props.hideBanUserDialog}
-          handleBanUser={props.banUser}
-        />
-        <SuspendUserDialog
-          open={community.suspendDialog}
-          handleClose={props.hideSuspendUserDialog}
-          user={community.user}
-          suspendUser={props.suspendUser}
-        />
-      </div>
-    );
-  }
-
   render() {
     const {searchValue} = this.state;
-
-    const tab = this.getTabContent(searchValue, this.props);
-
+    const {community} = this.props;
     return (
-      <div>
-        <CommunityMenu />
-        <div>
-          { tab }
-        </div>
-      </div>
+      <Community
+        searchValue={searchValue}
+        commenters={community.commenters}
+        isFetching={community.isFetching}
+        error={community.error}
+        totalPages={community.totalPages}
+        page={community.page}
+        {...this}
+      />
     );
   }
 }
@@ -144,18 +81,4 @@ const mapStateToProps = state => ({
   community: state.community.toJS()
 });
 
-const mapDispatchToProps = dispatch => ({
-  fetchAccounts: query => dispatch(fetchAccounts(query)),
-  showBanUserDialog: (user) => dispatch(showBanUserDialog(user)),
-  hideBanUserDialog: () => dispatch(hideBanUserDialog(false)),
-  showSuspendUserDialog: (user) => dispatch(showSuspendUserDialog(user)),
-  hideSuspendUserDialog: () => dispatch(hideSuspendUserDialog())
-});
-
-export default compose(
-  connect(mapStateToProps, mapDispatchToProps),
-  modUserFlaggedQuery,
-  banUser,
-  setUserStatus,
-  suspendUser
-)(CommunityContainer);
+export default connect(mapStateToProps)(CommunityContainer);
diff --git a/client/coral-admin/src/containers/Community/CommunityLayout.js b/client/coral-admin/src/containers/Community/CommunityLayout.js
deleted file mode 100644
index d6022fed94..0000000000
--- a/client/coral-admin/src/containers/Community/CommunityLayout.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-
-const CommunityLayout = props => (
-  <div>
-    {props.children}
-  </div>
-);
-
-export default CommunityLayout;
diff --git a/client/coral-admin/src/containers/Community/FlaggedAccounts.js b/client/coral-admin/src/containers/Community/FlaggedAccounts.js
deleted file mode 100644
index 1a6d349c8c..0000000000
--- a/client/coral-admin/src/containers/Community/FlaggedAccounts.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations.json';
-const lang = new I18n(translations);
-
-import styles from './Community.css';
-
-import Loading from './Loading';
-import EmptyCard from '../../components/EmptyCard';
-import User from './components/User';
-
-const FlaggedAccounts = ({...props}) => {
-  const {commenters, isFetching} = props;
-  const hasResults = !isFetching && commenters && !!commenters.length;
-
-  return (
-    <div className={styles.container}>
-      <div className={styles.mainFlaggedContent}>
-        { isFetching && <Loading /> }
-        {
-          hasResults
-          ? commenters.map((commenter, index) => {
-            if (commenter.status === 'PENDING' && commenter.actions.length > 0) {
-              return <User
-                user={commenter}
-                key={index}
-                index={index}
-                modActionButtons={['REJECT', 'APPROVE']}
-                showBanUserDialog={props.showBanUserDialog}
-                showSuspendUserDialog={props.showSuspendUserDialog}
-                approveUser={props.approveUser}
-                suspendUser={props.suspendUser}
-                />;
-            }
-            return null;
-          })
-          : <EmptyCard>{lang.t('community.no-flagged-accounts')}</EmptyCard>
-        }
-      </div>
-    </div>
-  );
-};
-
-export default FlaggedAccounts;
diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js
index aacc9c82f1..480ce72bfa 100644
--- a/client/coral-admin/src/containers/Community/Table.js
+++ b/client/coral-admin/src/containers/Community/Table.js
@@ -77,4 +77,4 @@ class Table extends Component {
   }
 }
 
-export default connect(state => ({commenters: state.community.get('accounts')}))(Table);
+export default connect(state => ({commenters: state.community.get('commenters')}))(Table);
diff --git a/client/coral-admin/src/containers/Community/components/ActionButton.js b/client/coral-admin/src/containers/Community/components/ActionButton.js
deleted file mode 100644
index 6352480fd9..0000000000
--- a/client/coral-admin/src/containers/Community/components/ActionButton.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import styles from '../Community.css';
-import BanUserButton from '../../../components/BanUserButton';
-import {Button} from 'coral-ui';
-import {menuActionsMap} from '../../../containers/ModerationQueue/helpers/moderationQueueActionsMap';
-
-const ActionButton = ({type = '', user, ...props}) => {
-  if (type === 'BAN') {
-    return <BanUserButton icon='not interested' user={user} onClick={() => props.showBanUserDialog(user)} />;
-  }
-
-  return (
-    <Button
-      className={`${type.toLowerCase()} ${styles.actionButton}`}
-      cStyle={type.toLowerCase()}
-      icon={menuActionsMap[type].icon}
-      onClick={() => {
-        type === 'APPROVE' ? props.approveUser({userId: user.id}) : props.showSuspendUserDialog({user: user});
-      }}
-    >{menuActionsMap[type].text}</Button>
-  );
-};
-
-export default ActionButton;
diff --git a/client/coral-admin/src/containers/Community/components/BanUserDialog.css b/client/coral-admin/src/containers/Community/components/BanUserDialog.css
deleted file mode 100644
index a46b9da32e..0000000000
--- a/client/coral-admin/src/containers/Community/components/BanUserDialog.css
+++ /dev/null
@@ -1,164 +0,0 @@
-.dialog {
-  border: none;
-  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
-  width: 500px;
-  top: 50%;
-  transform: translateY(-50%);
-  height: 184px;
-  padding: 20px;
-
-  h2 {
-    color: black;
-    font-size: 1.76em;
-    font-weight: 500;
-    margin: 0;
-  }
-
-  h3 {
-    color: black;
-    font-size: 1.4em;
-    font-weight: 500;
-    margin: 0;
-  }
-}
-
-.textField {
-    margin-top: 15px;
-}
-
-.textField label {
-    font-size: 1.08em;
-    font-weight: bold;
-    margin-bottom: 5px;
-}
-
-.textField input {
-    width: 100%;
-    display: block;
-    border: none;
-    outline: none;
-    border: 1px solid rgba(0,0,0,.12);
-    padding: 10px 6px;
-    box-sizing: border-box;
-    border-radius: 2px;
-    margin: 5px auto;
-}
-
-.footer {
-    margin: 20px auto 10px;
-    text-align: center;
-}
-
-.footer span {
-    display: block;
-    margin-bottom: 5px;
-}
-
-.footer a {
-    color: #2c69b6;
-    cursor: pointer;
-    margin: 0 5px;
-}
-
-.socialConnections {
-    margin-bottom: 20px;
-}
-
-.signInButton {
-    margin-top: 10px;
-}
-
-.close {
-    font-size: 20px;
-    line-height: 14px;
-    top: 10px;
-    right: 10px;
-    position: absolute;
-    display: block;
-    font-weight: bold;
-    color: #363636;
-    cursor: pointer;
-}
-
-.close:hover {
-    color: #6b6b6b;
-}
-
-input.error{
-    border: solid 2px #f44336;
-}
-
-.errorMsg, .hint {
-    color: grey;
-    font-weight: 600;
-    padding: 3px 0 16px;
-}
-
-.alert {
-    padding: 10px;
-    margin-bottom: 20px;
-    border-radius: 2px;
-}
-
-.alert--success {
-    border: solid 1px #1ec00e;
-    background: #cbf1b8;
-    color: #006900;
-}
-
-.alert--error {
-    background: #FFEBEE;
-    color: #B71C1C;
-}
-
-.userBox a {
-    color: #2c69b6;
-    cursor: pointer;
-    margin: 0px;
-}
-
-.attention {
-    display: inline-block;
-    width: 15px;
-    height: 15px;
-    background: #B71C1C;
-    color: #FFEBEE;
-    font-weight: bolder;
-    padding: 4px;
-    vertical-align: middle;
-    border-radius: 20px;
-    box-sizing: border-box;
-    font-size: 9px;
-    line-height: 7px;
-    text-align: center;
-    margin-right: 5px;
-}
-
-.action {
-    margin-top: 15px;
-}
-
-.passwordRequestSuccess {
-    border: 1px solid green;
-    background-color: lightgreen;
-    padding: 10px;
-}
-
-.passwordRequestFailure {
-    border: 1px solid orange;
-    background-color: 1px solid coral;
-    padding: 10px;
-}
-
-.cancel {
-  margin-right: 10px;
-  width: 47%;
-}
-
-.ban {
-  width: 47%;
-}
-
-.buttons {
-  margin: 20px 0;
-}
diff --git a/client/coral-admin/src/containers/Community/components/BanUserDialog.js b/client/coral-admin/src/containers/Community/components/BanUserDialog.js
deleted file mode 100644
index affffcd548..0000000000
--- a/client/coral-admin/src/containers/Community/components/BanUserDialog.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, {PropTypes} from 'react';
-import {Dialog} from 'coral-ui';
-import styles from './BanUserDialog.css';
-
-import Button from 'coral-ui/components/Button';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations.json';
-
-const lang = new I18n(translations);
-
-const BanUserDialog = ({open, handleClose, handleBanUser, user}) => (
-  <Dialog
-    className={styles.dialog}
-    id="banuserDialog"
-    open={open}
-    onClose={handleClose}
-    onCancel={handleClose}
-    title={lang.t('community.ban_user')}>
-    <span className={styles.close} onClick={handleClose}>×</span>
-    <div>
-      <div className={styles.header}>
-        <h2>{lang.t('community.ban_user')}</h2>
-      </div>
-      <div className={styles.separator}>
-        <h3>{lang.t('community.are_you_sure', user.username)}</h3>
-        <i>{lang.t('community.note')}</i>
-      </div>
-      <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={handleClose} raised>
-          {lang.t('community.cancel')}
-        </Button>
-        <Button
-          cStyle="black" className={styles.ban}
-          onClick={() => {
-            handleBanUser({userId: user.id}).then(() => {
-              handleClose();
-            });
-          }}
-          raised>
-          {lang.t('community.yes_ban_user')}
-        </Button>
-      </div>
-    </div>
-  </Dialog>
-);
-
-BanUserDialog.propTypes = {
-  handleBanUser: PropTypes.func.isRequired,
-  handleClose: PropTypes.func.isRequired,
-  user: PropTypes.object.isRequired,
-};
-
-export default BanUserDialog;
diff --git a/client/coral-admin/src/containers/Community/components/CommunityMenu.js b/client/coral-admin/src/containers/Community/components/CommunityMenu.js
deleted file mode 100644
index 9a51798ec1..0000000000
--- a/client/coral-admin/src/containers/Community/components/CommunityMenu.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-
-import styles from './styles.css';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations.json';
-
-import {Link} from 'react-router';
-
-const lang = new I18n(translations);
-
-const CommunityMenu = () => {
-  const flaggedPath = '/admin/community/flagged';
-  const peoplePath = '/admin/community/people';
-  return (
-    <div className='mdl-tabs'>
-      <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <div>
-          <Link to={flaggedPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('community.flaggedaccounts')}
-          </Link>
-          <Link to={peoplePath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
-            {lang.t('community.people')}
-          </Link>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default CommunityMenu;
diff --git a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js
deleted file mode 100644
index 44f38f7966..0000000000
--- a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, {Component, PropTypes} from 'react';
-
-import {Dialog, Button} from 'coral-ui';
-import styles from './SuspendUserDialog.css';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-admin/src/translations.json';
-
-const lang = new I18n(translations);
-
-const stages = [
-  {
-    title: 'suspenduser.title_0',
-    description: 'suspenduser.description_0',
-    options: {
-      'j': 'suspenduser.no_cancel',
-      'k': 'suspenduser.yes_suspend'
-    }
-  },
-  {
-    title: 'suspenduser.title_1',
-    description: 'suspenduser.description_1',
-    options: {
-      'j': 'bandialog.cancel',
-      'k': 'suspenduser.send'
-    }
-  }
-];
-
-class SuspendUserDialog extends Component  {
-
-  state = {email: '', stage: 0}
-
-  static propTypes = {
-    stage: PropTypes.number,
-    handleClose: PropTypes.func.isRequired,
-    suspendUser: PropTypes.func.isRequired
-  }
-
-  componentDidMount() {
-    this.setState({email: lang.t('suspenduser.email'), about: lang.t('suspenduser.username')});
-  }
-
-  /*
-  * When an admin clicks to suspend a user a dialog is shown, this function
-  * handles the possible actions for that dialog.
-  */
-  onActionClick = (stage, menuOption) => () => {
-    const {suspendUser, user} = this.props;
-    const {stage} = this.state;
-
-    const cancel = this.props.onClose;
-    const next = () => this.setState({stage: stage + 1});
-    const suspend = () => {
-      suspendUser({userId: user.user.id, message: this.state.email})
-      .then(() => {
-        this.props.handleClose();
-      });
-    };
-
-    const suspendModalActions = [
-      [ cancel, next ],
-      [ cancel, suspend ]
-    ];
-    return suspendModalActions[stage][menuOption]();
-  }
-
-  onEmailChange = (e) => {
-    this.setState({email: e.target.value});
-  }
-
-  render () {
-    const {open, handleClose} = this.props;
-    const {stage} = this.state;
-
-    return <Dialog
-            className={styles.suspendDialog}
-            id="suspendUserDialog"
-            open={open}
-            onClose={handleClose}
-            onCancel={handleClose}
-            title={lang.t('suspenduser.title')}>
-            <div className={styles.title}>
-              {lang.t(stages[stage].title, lang.t('suspenduser.username'))}
-            </div>
-            <div className={styles.container}>
-              <div className={styles.description}>
-                {lang.t(stages[stage].description, lang.t('suspenduser.username'))}
-              </div>
-              {
-                stage === 1 &&
-                <div className={styles.writeContainer}>
-                  <div className={styles.emailMessage}>{lang.t('suspenduser.write_message')}</div>
-                  <div className={styles.emailContainer}>
-                    <textarea
-                      rows={5}
-                      className={styles.emailInput}
-                      value={this.state.email}
-                      onChange={this.onEmailChange}/>
-                  </div>
-                </div>
-              }
-              <div className={styles.modalButtons}>
-                {Object.keys(stages[stage].options).map((key, i) => (
-                  <Button key={i} onClick={this.onActionClick(stage, i)}>
-                    {lang.t(stages[stage].options[key], lang.t('suspenduser.username'))}
-                  </Button>
-                ))}
-              </div>
-            </div>
-          </Dialog>;
-  }
-}
-
-export default SuspendUserDialog;
diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js
deleted file mode 100644
index 71598e3525..0000000000
--- a/client/coral-admin/src/containers/Community/components/User.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import styles from '../Community.css';
-
-import ActionButton from './ActionButton';
-
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../../translations.json';
-
-const lang = new I18n(translations);
-
-// Render a single user for the list
-const User = props => {
-  const {user, modActionButtons} = props;
-  let userStatus = user.status;
-
-  // Do not display unless the user status is 'pending' or 'banned'.
-  // This means that they have already been reviewed and approved.
-  return (userStatus === 'PENDING' ||  userStatus === 'BANNED') &&
-    <li tabIndex={props.index} className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
-      <div className={styles.container}>
-        <div className={styles.itemHeader}>
-          <div className={styles.author}>
-            <span>
-              {user.username}
-            </span>
-            <ActionButton
-              className={styles.banButton}
-              type='BAN'
-              user={user}
-              showBanUserDialog={props.showBanUserDialog}
-            />
-          </div>
-        </div>
-
-        <div className={styles.itemBody}>
-          <div className={styles.body}>
-            <div className={styles.flaggedByCount}>
-              <i className="material-icons">flag</i><span className={styles.flaggedByLabel}>Flags({ user.actions.length })</span>:
-                { user.action_summaries.map(
-                (action, i ) => {
-                  return <span className={styles.flaggedBy} key={i}>
-                    {lang.t(`community.${action.reason}`)} ({action.count})
-                  </span>;
-                }
-              )}
-            </div>
-            <div className={styles.flaggedReasons}>
-              { user.action_summaries.map(
-                (action_sum, i ) => {
-                  return <div key={i}>
-                    <span className={styles.flaggedByLabel}>
-                      {lang.t(`community.${action_sum.reason}`)} ({action_sum.count})
-                    </span>
-                    {user.actions.map(
-
-                      // find the action by action_sum.reason
-                      (action, j) => {
-                        if (action.reason === action_sum.reason) {
-                          return <p className={styles.flaggedByReason} key={j}>
-                            {action.user && action.user.username}: {action.message ? action.message : 'n/a'}
-                          </p>;
-                        }
-                        return null;
-                      }
-                    )}
-                  </div>;
-                }
-              )}
-
-          </div>
-        </div>
-          <div className={styles.sideActions}>
-            <div className={`actions ${styles.actions}`}>
-              {modActionButtons.map((action, i) =>
-                <ActionButton key={i}
-                              type={action.toUpperCase()}
-                              user={user}
-                              approveUser={props.approveUser}
-                              suspendUser={props.suspendUser}
-                              showSuspendUserDialog={props.showSuspendUserDialog}
-                />
-              )}
-            </div>
-          </div>
-        </div>
-      </div>
-    </li>;
-};
-
-export default User;
diff --git a/client/coral-admin/src/containers/Community/components/styles.css b/client/coral-admin/src/containers/Community/components/styles.css
deleted file mode 100644
index 2cd3f7b503..0000000000
--- a/client/coral-admin/src/containers/Community/components/styles.css
+++ /dev/null
@@ -1,339 +0,0 @@
-@custom-media --big-viewport (min-width: 780px);
-
-.listContainer {
-  max-width: 860px;
-  margin: 0 auto;
-}
-
-.tabBar {
-  background-color: rgba(44, 44, 44, 0.89);
-  z-index: 5;
-}
-
-.tab {
-  flex: 1;
-  color: white;
-  text-transform: capitalize;
-  font-weight: 500;
-  font-size: 15px;
-  letter-spacing: 1px;
-  transition: border-bottom 200ms;
-}
-
-.active {
-  color: white;
-  box-sizing: border-box;
-  border-bottom: solid 5px #F36451;
-}
-
-.active > span {
-  color: white;
-}
-
-.active:after {
-  background: transparent !important;
-}
-
-.showShortcuts {
-  position: absolute;
-  right: 130px;
-  display: flex;
-  align-items: center;
-  font-size: 13px;
-
-span {
-  margin-left: 7px;
-}
-}
-
-@media (--big-viewport) {
-  .tab {
-    flex: none;
-  }
-}
-
-.notFound {
-  position: relative;
-  margin: 20px auto;
-  text-align: center;
-  padding: 68px 45px;
-  vertical-align: middle;
-  min-width: 500px;
-
-  a {
-    color: rgb(244, 126, 107);
-    font-weight: 500;
-
-    &.goToStreams {
-      position: absolute;
-      right: 10px;
-      bottom: 10px;
-    }
-  }
-}
-
-.header {
-  background-color: #2c2c2c;
-  color: white;
-  margin-bottom: -1px;
-
-  .settingsButton {
-    i {
-      vertical-align: middle;
-      margin-left: 10px;
-      margin-top: -4px;
-    }
-  }
-
-  .moderateAsset {
-    a {
-      -webkit-box-flex: 1;
-      -ms-flex: 1;
-      flex: 1;
-      color: white;
-      text-transform: capitalize;
-      font-weight: 500;
-      font-size: 15px;
-      letter-spacing: 1px;
-      transition: opacity 200ms;
-      opacity: 1;
-
-      &:hover {
-          opacity: .8;
-         cursor: pointer;
-      }
-
-      &:first-child {
-        text-align: left;
-      }
-
-      &:nth-child(2) {
-       text-align: center;
-      }
-
-      &:last-child {
-        text-align: right;
-      }
-    }
-  }
-}
-
-
-@custom-media --big-viewport (min-width: 780px);
-
-.list {
-  padding: 8px 0;
-  list-style: none;
-  display: block;
-
-  &.singleView .listItem {
-    display: none;
-  }
-
-  &.singleView .listItem.activeItem {
-    display: block;
-    height: 100%;
-    font-size: 1.5em;
-    line-height: 1.5em;
-    border: none;
-
-    .actions {
-      position: fixed;
-      bottom: 60px;
-      left: 25%;
-      display: flex;
-      justify-content: space-around;
-      width: 50%;
-      margin: 0;
-    }
-
-    .actionButton {
-      transform: scale(1.4);
-    }
-  }
-}
-
-.listItem {
-  border-bottom: 1px solid #e0e0e0;
-  font-size: 18px;
-  width: 100%;
-  max-width: 660px;
-  min-width: 400px;
-  margin: 0 auto;
-  position: relative;
-  transition: all 200ms;
-  padding: 10px 0 0;
-  min-height: 220px;
-
-  .container {
-    padding: 0 14px;
-    min-height: 180px;
-  }
-
-  &:hover {
-     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-  }
-
-  &:last-child {
-    border-bottom: none;
-  }
-
-  .context {
-    a {
-      color: #f36451;
-      text-decoration: underline;
-      float: right;
-    }
-  }
-
-   .sideActions {
-     position: absolute;
-     right: 0;
-     height: 100%;
-     top: 0;
-     padding: 40px 18px;
-     box-sizing: border-box;
-   }
-
-  .itemHeader {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .author {
-      min-width: 230px;
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .itemBody {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    margin-right: 16px;
-    height: 40px;
-    width: 40px;
-    border-radius: 50%;
-    background-color: #757575;
-    font-size: 40px;
-    color: #fff;
-  }
-
-  .created {
-    color: #666;
-    font-size: 13px;
-    margin-left: 40px;
-  }
-
-  .actionButton {
-    transform: scale(.8);
-    margin: 0;
-  }
-
-  .body {
-    margin-top: 0px;
-    flex: 1;
-    color: black;
-    max-width: 500px;
-    word-wrap: break-word;
-    font-weight: 300;
-  }
-
-  .flagged {
-    color: rgba(255, 0, 0, .5);
-    padding-top: 15px;
-    padding-left: 10px;
-  }
-
-  .flagCount{
-    font-size: 12px;
-    color: #d32f2f;
-  }
-
-}
-
-.empty {
-  color: #444;
-  margin-top: 50px;
-  text-align: center;
-}
-
-
-@media (--big-viewport) {
-  .listItem {
-    border: 1px solid #e0e0e0;
-    margin-bottom: 30px;
-
-    &:last-child {
-      border-bottom: 1px solid #e0e0e0;
-    }
-
-    &.activeItem {
-      border: 2px solid #333;
-    }
-  }
-
-}
-
-.hasLinks {
-  color: #f00;
-  text-align: right;
-  display: flex;
-  align-items: center;
-
-  i {
-    margin-right: 5px;
-  }
-}
-
-.banned {
-  color: #f00;
-  text-align: left;
-  display: flex;
-  align-items: center;
-
-  i {
-    margin-right: 5px;
-  }
-}
-
-.ban {
-  display: block;
-  text-align: center;
-  margin-top: 5px;
-}
-
-.Comment {
-  .moderateArticle {
-    font-size: 12px;
-    a {
-      display: inline-block;
-      color: #679af3;
-      text-decoration: none;
-      font-size: 1em;
-      font-weight: 400;
-      letter-spacing: .5px;
-      font-size: 12px;
-      margin-left: 10px;
-
-      &:hover {
-        text-decoration: underline;
-        opacity: .9;
-        cursor: pointer;
-       }
-    }
-  }
-}
-
-.flagBox {
-  max-width: 480px;
-  border-top: 1px solid rgba(66, 66, 66, 0.12);
-  h3 {
-    font-size: 14px;
-    margin: 0;
-    font-weight: 500;
-  }
-}
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index f68bab2b7f..36ff7763a1 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -21,19 +21,19 @@ const Comment = ({actions = [], ...props}) => {
   const links = linkify.getMatches(props.comment.body);
   const actionSummaries = props.comment.action_summaries;
   return (
-    <li tabIndex={props.index} className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem}`}>
+    <li tabIndex={props.index} className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
       <div className={styles.container}>
         <div className={styles.itemHeader}>
           <div className={styles.author}>
-            <span>
-              {props.comment.user.name}
-            </span>
-            <span className={styles.created}>
-              {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
-            </span>
-            <BanUserButton user={props.comment.user} onClick={() => props.showBanUserDialog(props.comment.user, props.comment.id, props.comment.status !== 'REJECTED')} />
-            <CommentType type={props.commentType} />
-          </div>
+          <span>
+            {props.comment.user.name}
+          </span>
+          <span className={styles.created}>
+            {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}
+          </span>
+          <BanUserButton user={props.comment.user} onClick={() => props.showBanUserDialog(props.comment.user, props.comment.id, props.comment.status !== 'REJECTED')} />
+          <CommentType type={props.commentType} />
+        </div>
           {props.comment.user.status === 'banned' ?
             <span className={styles.banned}>
               <Icon name='error_outline'/>
diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js
index 7ca1b078fa..884e30e0c3 100644
--- a/client/coral-admin/src/graphql/mutations/index.js
+++ b/client/coral-admin/src/graphql/mutations/index.js
@@ -1,7 +1,6 @@
 import {graphql} from 'react-apollo';
 import SET_USER_STATUS from './setUserStatus.graphql';
 import SET_COMMENT_STATUS from './setCommentStatus.graphql';
-import SUSPEND_USER from './suspendUser.graphql';
 
 export const banUser = graphql(SET_USER_STATUS, {
   props: ({mutate}) => ({
@@ -10,40 +9,11 @@ export const banUser = graphql(SET_USER_STATUS, {
         variables: {
           userId,
           status: 'BANNED'
-        },
-        refetchQueries: ['Users']
+        }
       });
     }}),
 });
 
-export const setUserStatus = graphql(SET_USER_STATUS, {
-  props: ({mutate}) => ({
-    approveUser: ({userId}) => {
-      return mutate({
-        variables: {
-          userId,
-          status: 'APPROVED'
-        },
-        refetchQueries: ['Users']
-      });
-    }
-  })
-});
-
-export const suspendUser = graphql(SUSPEND_USER, {
-  props: ({mutate}) => ({
-    suspendUser: ({userId, message}) => {
-      return mutate({
-        variables: {
-          userId,
-          message
-        },
-        refetchQueries: ['Users']
-      });
-    }
-  })
-});
-
 export const setCommentStatus = graphql(SET_COMMENT_STATUS, {
   props: ({mutate}) => ({
     acceptComment: ({commentId}) => {
diff --git a/client/coral-admin/src/graphql/mutations/suspendUser.graphql b/client/coral-admin/src/graphql/mutations/suspendUser.graphql
deleted file mode 100644
index 0d56a3cc0e..0000000000
--- a/client/coral-admin/src/graphql/mutations/suspendUser.graphql
+++ /dev/null
@@ -1,7 +0,0 @@
-mutation suspendUser($userId: ID!, $message: String) {
-  suspendUser(id: $userId, message: $message) {
-    errors {
-      translation_key
-    }
-  }
-}
diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js
index 291ea6bc5d..13164bca26 100644
--- a/client/coral-admin/src/graphql/queries/index.js
+++ b/client/coral-admin/src/graphql/queries/index.js
@@ -2,7 +2,6 @@ import {graphql} from 'react-apollo';
 
 import MOD_QUEUE_QUERY from './modQueueQuery.graphql';
 import MOD_QUEUE_LOAD_MORE from './loadMore.graphql';
-import MOD_USER_FLAGGED_QUERY from './modUserFlaggedQuery.graphql';
 import METRICS from './metricsQuery.graphql';
 
 export const modQueueQuery = graphql(MOD_QUEUE_QUERY, {
@@ -67,8 +66,6 @@ export const loadMore = (fetchMore) => ({limit, cursor, sort, tab, asset_id}) =>
   });
 };
 
-export const modUserFlaggedQuery  = graphql(MOD_USER_FLAGGED_QUERY);
-
 export const modQueueResort = (id, fetchMore) => (sort) => {
   return fetchMore({
     query: MOD_QUEUE_QUERY,
diff --git a/client/coral-admin/src/graphql/queries/modUserFlaggedQuery.graphql b/client/coral-admin/src/graphql/queries/modUserFlaggedQuery.graphql
deleted file mode 100644
index 98f2191ebb..0000000000
--- a/client/coral-admin/src/graphql/queries/modUserFlaggedQuery.graphql
+++ /dev/null
@@ -1,26 +0,0 @@
-query Users ($n: ACTION_TYPE) {
-  users (query:{action_type: $n}){
-    id
-    username
-    status
-    roles
-    actions{
-      id
-      created_at
-      ... on FlagAction {
-        reason
-        message
-        user {
-          id
-          username
-        }
-      }
-    }
-    action_summaries {
-      count
-    	... on FlagActionSummary {
-      	reason
-      }
-    }
-  }
-}
diff --git a/client/coral-admin/src/reducers/community.js b/client/coral-admin/src/reducers/community.js
index d051ae0ffe..367e67b2a3 100644
--- a/client/coral-admin/src/reducers/community.js
+++ b/client/coral-admin/src/reducers/community.js
@@ -6,88 +6,58 @@ import {
   FETCH_COMMENTERS_SUCCESS,
   SORT_UPDATE,
   SET_ROLE,
-  SET_COMMENTER_STATUS,
-  SHOW_BANUSER_DIALOG,
-  HIDE_BANUSER_DIALOG,
-  SHOW_SUSPENDUSER_DIALOG,
-  HIDE_SUSPENDUSER_DIALOG
+  SET_COMMENTER_STATUS
 } from '../constants/community';
 
 const initialState = Map({
   community: Map(),
-  isFetchingPeople: false,
-  errorPeople: '',
-  accounts: [],
-  fieldPeople: 'created_at',
-  ascPeople: false,
-  totalPagesPeople: 0,
-  pagePeople: 0,
-  user: Map({}),
-  banDialog: false,
-  suspendDialog: false
+  isFetching: false,
+  error: '',
+  commenters: [],
+  field: 'created_at',
+  asc: false,
+  totalPages: 0,
+  page: 0
 });
 
 export default function community (state = initialState, action) {
   switch (action.type) {
   case FETCH_COMMENTERS_REQUEST :
     return state
-      .set('isFetchingPeople', true);
+      .set('isFetching', true);
   case FETCH_COMMENTERS_FAILURE :
     return state
-      .set('isFetchingPeople', false)
-      .set('errorPeople', action.error);
-
+      .set('isFetching', false)
+      .set('error', action.error);
   case FETCH_COMMENTERS_SUCCESS : {
-    const {accounts, type, page, count, limit, totalPages, ...rest} = action; // eslint-disable-line
+    const {commenters, type, ...rest} = action; // eslint-disable-line
     return state
       .merge({
-        isFetchingPeople: false,
-        errorPeople: '',
-        pagePeople: page,
-        countPeople: count,
-        limitPeople: limit,
-        totalPagesPeople: totalPages,
+        isFetching: false,
+        error: '',
         ...rest
       })
-      .set('accounts', accounts); // Sets to normal array
+      .set('commenters', commenters); // Sets to normal array
   }
   case SET_ROLE : {
-    const commenters = state.get('accounts');
+    const commenters = state.get('commenters');
     const idx = commenters.findIndex(el => el.id === action.id);
 
     commenters[idx].roles[0] = action.role;
-    return state.set('accounts', commenters.map(id => id));
+    return state.set('commenters', commenters.map(id => id));
   }
   case SET_COMMENTER_STATUS: {
-    const commenters = state.get('accounts');
+    const commenters = state.get('commenters');
     const idx = commenters.findIndex(el => el.id === action.id);
 
     commenters[idx].status = action.status;
-    return state.set('accounts', commenters.map(id => id));
+    return state.set('commenters', commenters.map(id => id));
 
   }
   case SORT_UPDATE :
     return state
-      .set('fieldPeople', action.sort.field)
-      .set('ascPeople', !state.get('ascPeople'));
-  case HIDE_BANUSER_DIALOG:
-    return state
-      .set('banDialog', false);
-  case SHOW_BANUSER_DIALOG:
-    return state
-      .merge({
-        user: Map(action.user),
-        banDialog: true
-      });
-  case HIDE_SUSPENDUSER_DIALOG:
-    return state
-      .set('suspendDialog', false);
-  case SHOW_SUSPENDUSER_DIALOG:
-    return state
-      .merge({
-        user: Map(action.user),
-        suspendDialog: true
-      });
+      .set('field', action.sort.field)
+      .set('asc', !state.get('asc'));
   default :
     return state;
   }
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index f59499e50b..13538e2248 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -17,20 +17,7 @@
       "active": "Active",
       "banned": "Banned",
       "banned-user": "Banned User",
-      "loading": "Loading results",
-      "flaggedaccounts": "Flagged Usernames",
-      "people": "People",
-      "no-flagged-accounts": "The Account Flags queue is currently empty.",
-      "I don't like this username": "I don't like this username",
-      "This user is impersonating": "Impersonation",
-      "This looks like an ad/marketing": "Spam/Ads",
-      "This username is offensive": "Offensive",
-      "Other": "Other",
-      "ban_user": "Ban User?",
-      "are_you_sure": "Are you sure you would like to ban {0}?",
-      "note": "Note: Banning this user will not let them edit, comment or remove anything.",
-      "cancel": "Cancel",
-      "yes_ban_user": "Yes, Ban User"
+      "loading": "Loading results"
     },
     "modqueue": {
       "likes": "likes",
@@ -117,9 +104,8 @@
       "yes_ban_user": "Yes, Ban User"
     },
     "suspenduser": {
-      "title": "Suspend a user",
-      "title_0": "We noticed you rejected a username",
-      "description_0": "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}.",
+      "title_0": "We noticed you rejected a {0}",
+      "description_0": "Would you like to temporarily ban this user becuase of their {0}? Doing so will temporarily hide their comments until they rewrite their {0}.",
       "title_1": "Notify the user of their temporary suspension",
       "description_1": "Suspending this user will temporarily disable their account and hide all of their comments on the site.",
       "no_cancel": "No, cancel",
@@ -128,7 +114,7 @@
       "bio": "bio",
       "username": "username",
       "email_subject": "Your account has been suspended",
-      "email": "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns.",
+      "email": "Another member of the community recently flagged your {0} for review. Because of its content your {0} was rejected. This means you can no longer comment, like, or flag content until you rewrite your {0}. Please e-mail moderator@newsorg.com if you have any questions or concerns.",
       "write_message": "Write a message"
     },
     "dashboard": {
@@ -176,34 +162,7 @@
       "active": "Activa",
       "banned": "Suspendido",
       "banned-user": "Usuario Suspendido",
-      "loading": "Cargando resultados",
-      "flaggedaccounts": "Nombres de Usuario Reportados",
-      "people": "Gente",
-      "no-flagged-accounts": "No hay ninguna cuenta reportada.",
-      "I don't like this username": "No me gusta ese nombre de usuario",
-      "This user is impersonating": "Suplantación",
-      "This looks like an ad/marketing": "Spam/Propaganda",
-      "This username is offensive": "Ofensivo",
-      "Other": "Otros",
-      "ban_user": "Quieres suspender el Usuario?",
-      "are_you_sure": "Estas segura que quieres suspender a {0}?",
-      "note": "Nota: Suspender a este usuario no le va a permitir borrar ni editar ni comentar.",
-      "cancel": "Cancelar",
-      "yes_ban_user": "Si, Suspendan el usuario"
-    },
-    "suspenduser": {
-      "title": "Suspendiendo un usuario",
-      "title_0": "Esta queriendo suspender un usuario?",
-      "description_0": "Le gustaria suspender a esta usuaria temporarianmente por su nombre de usuario? Si lo hace sus comentarios serán escondidos temporariamente hasta que puedan reescribir su nombre de usuario.",
-      "title_1": "Enviarle una nota al usuario sobre su cuenta suspendida",
-      "description_1": "Si suspende a este usuario, su cuenta va a ser deshabilitada y todos sus comentarios escondidos del sitio.",
-      "no_cancel": "No, cancelar",
-      "yes_suspend": "Si, suspender",
-      "send": "Enviar",
-      "username": "nombre de usuario",
-      "email_subject": "Su cuenta ha sido suspendida temporariamente",
-      "email": "Otra persona de la comunidad recientemente marcó su nombre de usuario para ser revisado. Por su contenido, el nombre de usuario ha sido rechazado. Esto quiere decir que no puede comentar, gustar o marcar contenido hasta que modifique su nombre de usuario. Por favor, envienos un correo a moderator@newsorg.com si tiene alguna pregunta o preocupación",
-      "write_message": "Escribir un mensaje"
+      "loading": "Cargando resultados"
     },
     "modqueue": {
       "likes": "gustos",
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 3f3051f285..24fde6b0f5 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -23,14 +23,14 @@ const getPopupMenu = [
       {val: 'This comment is offensive', text: lang.t('comment-offensive')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
-      {val: 'Other', text: lang.t('other')}
+      {val: 'other', text: lang.t('other')}
     ]
     : [
       {val: 'This username is offensive', text: lang.t('username-offensive')},
       {val: 'I don\'t like this username', text: lang.t('no-like-username')},
       {val: 'This user is impersonating', text: lang.t('user-impersonating')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
-      {val: 'Other', text: lang.t('other')}
+      {val: 'other', text: lang.t('other')}
     ];
     return {
       header: lang.t('step-2-header'),
diff --git a/graph/loaders/users.js b/graph/loaders/users.js
index 145b0dfdb3..90c661f719 100644
--- a/graph/loaders/users.js
+++ b/graph/loaders/users.js
@@ -3,51 +3,11 @@ const DataLoader = require('dataloader');
 const util = require('./util');
 
 const UsersService = require('../../services/users');
-const UserModel = require('../../models/user');
 
 const genUserByIDs = (context, ids) => UsersService
   .findByIdArray(ids)
   .then(util.singleJoinBy(ids, 'id'));
 
-/**
- * Retrieves users based on the passed in query that is filtered by the
- * current used passed in via the context.
- * @param  {Object} context   graph context
- * @param  {Object} query     query terms to apply to the users query
- */
-const getUsersByQuery = ({user}, {ids, limit, cursor, sort}) => {
-
-  let users = UserModel.find();
-
-  if (ids) {
-    users = users.find({
-      id: {
-        $in: ids
-      }
-    });
-  }
-
-  if (cursor) {
-    if (sort === 'REVERSE_CHRONOLOGICAL') {
-      users = users.where({
-        created_at: {
-          $lt: cursor
-        }
-      });
-    } else {
-      users = users.where({
-        created_at: {
-          $gt: cursor
-        }
-      });
-    }
-  }
-
-  return users
-    .sort({created_at: sort === 'REVERSE_CHRONOLOGICAL' ? -1 : 1})
-    .limit(limit);
-};
-
 /**
  * Creates a set of loaders based on a GraphQL context.
  * @param  {Object} context the context of the GraphQL request
@@ -55,7 +15,6 @@ const getUsersByQuery = ({user}, {ids, limit, cursor, sort}) => {
  */
 module.exports = (context) => ({
   Users: {
-    getByQuery: (query) => getUsersByQuery(context, query),
     getByID: new DataLoader((ids) => genUserByIDs(context, ids))
   }
 });
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index 48966c5e8c..3f87c1fb53 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -6,28 +6,18 @@ const setUserStatus = ({user}, {id, status}) => {
   .then(res => res);
 };
 
-const suspendUser = ({user}, {id, message}) => {
-  return UsersService.suspendUser(id, message)
-  .then(res => {
-    return res;
-  });
-};
-
 module.exports = (context) => {
-  let mutators = {
-    User: {
-      setUserStatus: () => Promise.reject(errors.ErrNotAuthorized),
-      suspendUser: () => Promise.reject(errors.ErrNotAuthorized)
-    }
-  };
-
   if (context.user && context.user.can('mutation:setUserStatus')) {
-    mutators.User.setUserStatus = (action) => setUserStatus(context, action);
+    return {
+      User: {
+        setUserStatus: (action) => setUserStatus(context, action)
+      }
+    };
   }
 
-  if (context.user && context.user.can('mutation:suspendUser')) {
-    mutators.User.suspendUser = (action) => suspendUser(context, action);
-  }
-
-  return mutators;
+  return {
+    User: {
+      setUserStatus: () => Promise.reject(errors.ErrNotAuthorized)
+    }
+  };
 };
diff --git a/graph/resolvers/flag_action.js b/graph/resolvers/flag_action.js
index 80d1583adf..44cf7a4101 100644
--- a/graph/resolvers/flag_action.js
+++ b/graph/resolvers/flag_action.js
@@ -1,15 +1,9 @@
 const FlagAction = {
 
   // Stored in the metadata, extract and return.
-  message({metadata: {message}}) {
-    return message;
-  },
-  reason({group_id}) {
-    return group_id;
-  },
-  user({user_id}, _, {loaders: {Users}}) {
-    return Users.getByID.load(user_id);
-  },
+  reason({metadata: {reason}}) {
+    return reason;
+  }
 };
 
 module.exports = FlagAction;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index a474407d2b..dc540b2024 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -47,9 +47,6 @@ const RootMutation = {
   setUserStatus(_, {id, status}, {mutators: {User}}) {
     return wrapResponse(null)(User.setUserStatus({id, status}));
   },
-  suspendUser(_, {id, message}, {mutators: {User}}) {
-    return wrapResponse(null)(User.suspendUser({id, message}));
-  },
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },
diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js
index ce11fcae9e..e2836c51dc 100644
--- a/graph/resolvers/root_query.js
+++ b/graph/resolvers/root_query.js
@@ -86,28 +86,6 @@ const RootQuery = {
     }
 
     return user;
-  },
-
-  // This endpoint is used for loading the user moderation queues (users whose username has been flagged),
-  // so hide it in the event that we aren't an admin.
-  users(_, {query: {action_type, limit, cursor, sort}}, {user, loaders: {Users, Actions}}) {
-
-    if (user == null || !user.hasRoles('ADMIN')) {
-      return null;
-    }
-
-    const query = {limit, cursor, sort};
-
-    if (action_type) {
-      return Actions.getByTypes({action_type, item_type: 'USERS'})
-        .then((ids) => {
-
-          // Perform the query using the available resolver.
-          return Users.getByQuery({ids, limit, cursor, sort});
-        });
-    }
-
-    return Users.getByQuery(query);
   }
 };
 
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 8b07c2ab2d..e656d0183c 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -45,9 +45,6 @@ type User {
   # returns all comments based on a query.
   comments(query: CommentsQuery): [Comment]
 
-  # returns all users based on a query.
-  users(query: UsersQuery): [User]
-
   # returns user status
   status: USER_STATUS
 }
@@ -63,20 +60,6 @@ type Tag {
   created_at: Date!
 }
 
-# UsersQuery allows the ability to query users by a specific fields.
-input UsersQuery {
-  action_type: ACTION_TYPE
-
-  # Limit the number of results to be returned.
-  limit: Int = 10
-
-  # Skip results from the last created_at timestamp.
-  cursor: Date
-
-  # Sort the results by created_at.
-  sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
-}
-
 ################################################################################
 ## Comments
 ################################################################################
@@ -537,9 +520,6 @@ type RootQuery {
   # role.
   me: User
 
-  # Users returned based on a query.
-  users(query: UsersQuery): [User]
-
   # Asset metrics related to user actions are saturated into the assets
   # returned.
   assetMetrics(from: Date!, to: Date!, sort: ASSET_METRICS_SORT!, limit: Int = 10): [Asset!]
@@ -673,14 +653,6 @@ type SetUserStatusResponse implements Response {
   errors: [UserError]
 }
 
-# SuspendUserResponse is the response returned with possibly some errors
-# relating to the suspend action attempt.
-type SuspendUserResponse implements Response {
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError]
-}
-
 # SetCommentStatusResponse is the response returned with possibly some errors
 # relating to the delete action attempt.
 type SetCommentStatusResponse implements Response {
@@ -724,9 +696,6 @@ type RootMutation {
   # Sets User status. Requires the `ADMIN` role.
   setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse
 
-  # Sets User status to BANNED and canEditName to true. It sends a message to the banned User. Requires the `ADMIN` role.
-  suspendUser(id: ID!, message: String): SuspendUserResponse
-
   # Sets Comment status. Requires the `ADMIN` role.
   setCommentStatus(id: ID!, status: COMMENT_STATUS!): SetCommentStatusResponse
 
diff --git a/models/user.js b/models/user.js
index e1cbb466b6..e23acaa569 100644
--- a/models/user.js
+++ b/models/user.js
@@ -176,10 +176,9 @@ const USER_GRAPH_OPERATIONS = [
   'mutation:deleteAction',
   'mutation:editName',
   'mutation:setUserStatus',
-  'mutation:suspendUser',
   'mutation:setCommentStatus',
   'mutation:addCommentTag',
-  'mutation:removeCommentTag'
+  'mutation:removeCommentTag',
 ];
 
 /**
@@ -195,7 +194,7 @@ UserSchema.method('can', function(...actions) {
     return false;
   }
 
-  if (actions.some((action) => action === 'mutation:setUserStatus' || action === 'mutation:suspendUser' || action === 'mutation:setCommentStatus') && !this.hasRoles('ADMIN')) {
+  if (actions.some((action) => action === 'mutation:setUserStatus' || action === 'mutation:setCommentStatus') && !this.hasRoles('ADMIN')) {
     return false;
   }
 
diff --git a/services/email/suspension.ejs b/services/email/suspension.ejs
deleted file mode 100644
index b36560ec5f..0000000000
--- a/services/email/suspension.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/email/suspension.txt.ejs b/services/email/suspension.txt.ejs
deleted file mode 100644
index b36560ec5f..0000000000
--- a/services/email/suspension.txt.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<%= body %>
diff --git a/services/users.js b/services/users.js
index 4e11962522..1810cf2a5c 100644
--- a/services/users.js
+++ b/services/users.js
@@ -1,11 +1,8 @@
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const Wordlist = require('./wordlist');
-
 const errors = require('../errors');
-
 const uuid = require('uuid');
-
 const redis = require('./redis');
 const redisClient = redis.createClient();
 
@@ -17,7 +14,6 @@ const RECAPTCHA_WINDOW_SECONDS = 60 * 10; // 10 minutes.
 const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha will be required.
 
 const ActionsService = require('./actions');
-const MailerService = require('./mailer');
 
 // In the event that the TALK_SESSION_SECRET is missing but we are testing, then
 // set the process.env.TALK_SESSION_SECRET.
@@ -450,48 +446,6 @@ module.exports = class UsersService {
     });
   }
 
-  /**
-   * Suspend a user. It changes the status to BANNED and canEditName to True.
-   * @param  {String}   id   id of a user
-   * @param  {Function} done callback after the operation is complete
-   */
-  static suspendUser(id, message) {
-    return UserModel.update({
-      id
-    }, {
-      $set: {
-        status: 'BANNED',
-        canEditName: true
-      }
-    })
-    .then(() => {
-      return UsersService.findById(id)
-      .then((user) => {
-        if (message) {
-          let localProfile = user.profiles.find((profile) => profile.provider === 'local');
-
-          if (localProfile) {
-            const options =
-              {
-                template: 'suspension',              // needed to know which template to render!
-                locals: {                                  // specifies the template locals.
-                  body: message
-                },
-                subject: 'Email Suspension',
-                to: localProfile.id  // This only works if the user has registered via e-mail.
-                                     // We may want a standard way to access a user's e-mail address in the future
-              };
-
-            return MailerService.sendSimple(options);
-          } else {
-            return Promise.reject(errors.ErrMissingEmail);
-          }
-        }
-      });
-
-    });
-  }
-
   /**
    * Finds a user with the id.
    * @param {String} id  user id (uuid)
diff --git a/test/graph/mutations/addCommentTag.js b/test/graph/mutations/addCommentTag.js
index 0835e81bc9..14a7467058 100644
--- a/test/graph/mutations/addCommentTag.js
+++ b/test/graph/mutations/addCommentTag.js
@@ -54,7 +54,7 @@ describe('graph.mutations.addCommentTag', () => {
         }
         expect(response.errors).to.be.empty;
         expect(response.data.addCommentTag.errors).to.deep.equal([{'translation_key':'NOT_AUTHORIZED'}]);
-        expect(response.data.addCommentTag.comment).to.be.null;
+        expect(response.data.addCommentTag.comment).to.be.null;        
       });
     });
   });

From 984514d7ebdf0f76c1cc66fc24b8d98fadb97018 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Mar 2017 12:46:20 -0600
Subject: [PATCH 12/14] check whitelist before redirecting

---
 services/users.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/services/users.js b/services/users.js
index ac1280664d..0bce64425c 100644
--- a/services/users.js
+++ b/services/users.js
@@ -1,4 +1,5 @@
 const bcrypt = require('bcrypt');
+const url = require('url');
 const jwt = require('jsonwebtoken');
 const Wordlist = require('./wordlist');
 const errors = require('../errors');
@@ -13,6 +14,7 @@ const USER_ROLES = require('../models/user').USER_ROLES;
 const RECAPTCHA_WINDOW_SECONDS = 60 * 10; // 10 minutes.
 const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha will be required.
 
+const SettingsService = require('./settings');
 const ActionsService = require('./actions');
 
 // In the event that the TALK_SESSION_SECRET is missing but we are testing, then
@@ -485,8 +487,11 @@ module.exports = class UsersService {
 
     email = email.toLowerCase();
 
-    return UserModel.findOne({profiles: {$elemMatch: {id: email}}})
-      .then((user) => {
+    return Promise.all([
+      UserModel.findOne({profiles: {$elemMatch: {id: email}}}),
+      SettingsService.retrieve()
+    ])
+      .then(([user, settings]) => {
         if (!user) {
 
           // Since we don't want to reveal that the email does/doesn't exist
@@ -495,6 +500,17 @@ module.exports = class UsersService {
           return;
         }
 
+        let redirectDomain;
+        try {
+          redirectDomain = url.parse(loc).hostname;
+        } catch (e) {
+          return Promise.reject('redirect location is invalid');
+        }
+
+        if (settings.domains.whitelist.indexOf(redirectDomain) === -1) {
+          return Promise.reject('redirect location is not on the list of acceptable domains');
+        }
+
         const payload = {
           jti: uuid.v4(),
           email,

From 7f1b993ea6e0378270d3b379ad902a5a8d622aa9 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Thu, 23 Mar 2017 13:04:37 -0600
Subject: [PATCH 13/14] always show moderation link to admins

---
 client/coral-embed-stream/src/Embed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js
index 52fdf06f52..a3d2a24a91 100644
--- a/client/coral-embed-stream/src/Embed.js
+++ b/client/coral-embed-stream/src/Embed.js
@@ -160,7 +160,6 @@ class Embed extends Component {
                         charCount={asset.settings.charCountEnable && asset.settings.charCount} />
                      : null
                    }
-                   <ModerationLink assetId={asset.id} isAdmin={isAdmin} />
                  </RestrictedContent>
                  </div>
                : <p>{asset.settings.closedMessage}</p>
@@ -170,6 +169,7 @@ class Embed extends Component {
               refetch={refetch}
               offset={signInOffset}/>}
             {loggedIn &&  user && <ChangeUsernameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
+            {loggedIn && <ModerationLink assetId={asset.id} isAdmin={isAdmin} />}
             {
               highlightedComment &&
               <Comment

From 6b6d3d8bbbc70e3e3586101620c91f627c52c7fd Mon Sep 17 00:00:00 2001
From: riley <riley.davis@gmail.com>
Date: Thu, 23 Mar 2017 16:09:36 -0600
Subject: [PATCH 14/14] highlight suspect, banned words and links

---
 .../ModerationQueue/ModerationContainer.js          |  1 +
 .../containers/ModerationQueue/ModerationQueue.js   |  2 ++
 .../ModerationQueue/components/Comment.js           | 13 +++++--------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
index a6d3527c7a..61352b9212 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
@@ -163,6 +163,7 @@ class ModerationContainer extends Component {
           activeTab={activeTab}
           singleView={moderation.singleView}
           selectedIndex={this.state.selectedIndex}
+          bannedWords={settings.wordlist.banned}
           suspectWords={settings.wordlist.suspect}
           showBanUserDialog={props.showBanUserDialog}
           acceptComment={props.acceptComment}
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index b90b59f812..79b4ce7e42 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -24,6 +24,7 @@ const ModerationQueue = ({comments, selectedIndex, commentCount, singleView, loa
             commentType={activeTab}
             selected={i === selectedIndex}
             suspectWords={props.suspectWords}
+            bannedWords={props.bannedWords}
             actions={actionsMap[status]}
             showBanUserDialog={props.showBanUserDialog}
             acceptComment={props.acceptComment}
@@ -47,6 +48,7 @@ const ModerationQueue = ({comments, selectedIndex, commentCount, singleView, loa
 };
 
 ModerationQueue.propTypes = {
+  bannedWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
   showBanUserDialog: PropTypes.func.isRequired,
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
index 36ff7763a1..3dd5526fee 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js
@@ -19,6 +19,7 @@ const lang = new I18n(translations);
 
 const Comment = ({actions = [], ...props}) => {
   const links = linkify.getMatches(props.comment.body);
+  const linkText = links ? links.map(link => link.raw) : [];
   const actionSummaries = props.comment.action_summaries;
   return (
     <li tabIndex={props.index} className={`mdl-card ${props.selected ? 'mdl-shadow--8dp' : 'mdl-shadow--2dp'} ${styles.Comment} ${styles.listItem} ${props.selected ? styles.selected : ''}`}>
@@ -49,9 +50,9 @@ const Comment = ({actions = [], ...props}) => {
         </div>
         <div className={styles.itemBody}>
           <p className={styles.body}>
-            <Linkify component='span' properties={{style: linkStyles}}>
-              <Highlighter searchWords={props.suspectWords} textToHighlight={props.comment.body}/>
-            </Linkify>
+            <Highlighter
+              searchWords={[...props.suspectWords, ...props.bannedWords, ...linkText]}
+              textToHighlight={props.comment.body} />
           </p>
           <div className={styles.sideActions}>
             {links ? <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
@@ -77,6 +78,7 @@ Comment.propTypes = {
   acceptComment: PropTypes.func.isRequired,
   rejectComment: PropTypes.func.isRequired,
   suspectWords: PropTypes.arrayOf(PropTypes.string).isRequired,
+  bannedWords: PropTypes.arrayOf(PropTypes.string).isRequired,
   currentAsset: PropTypes.object,
   comment: PropTypes.shape({
     body: PropTypes.string.isRequired,
@@ -92,9 +94,4 @@ Comment.propTypes = {
   })
 };
 
-const linkStyles = {
-  backgroundColor: 'rgb(255, 219, 135)',
-  padding: '1px 2px'
-};
-
 export default Comment;