Merge branch 'master' into ci-fixes

TERMINOLOGY.md

@@ -0,0 +1,66 @@
+# Product's Terminology
+
+This is a guide to have a common language to talk about "Talk".
+
+## Definitions
+
+* Site - a top level site, aka nytimes.com
+* Section - the section of a site, aka, Politics.
+* Subsection - the section of a site, aka, Politics.
+* Asset - An article/video/etc identified by URL.
+
+* Embed - Things we put on a asset: comment box, ToS, Stream, etc…
+* Stream - All the activity on a certain asset. Container for Comments, actions, user
+* Thread - defined by a parent and everything below. All replies to a comment and their replies, etc…
+* Comment - a kind of user-generated content submitted by a comment author
+  * A parent comment has replies to it
+  * A child comments is a reply to another comment
+  * A comment can be both a parent comment and a child of another comment
+  * A top-level comment is a comment that is not a reply to any other comment
+  * A nth-level comment refers to the number of replies away from the top-level comment
+
+* User - an item to represent a person using Talk. It could be a moderator, reader, etc.
+* User Roles:
+  * Active: some who takes action (logged in or not)
+  * Passive: some who just reads, no actions performed
+  * Comment Author: The user who wrote the comment
+  * Staff Member: someone who works for an organization (tagged for leverage in trust)
+  * Moderator: someone with the ability to access the moderation queue and perform moderation actions
+  * Administrator: has the ability to change the setup of their coral space
+* Public Profile: information about users shown in public
+* Private Profile: information about users shown only to user about themselves
+* Protected Profile: information about users that only moderators and admins can see
+
+* Queue - Group of items based on a query, aka - moderation queue
+* Target - The item/s on which an action is performed..
+
+##  Actions
+
+Actions are performed by users on items. Actions themselves are items. This requires two relationships: action on item, and user performs action.
+
+### Flag
+* A Flagger(user) performs a Flag
+* A Flag is performed on a Comment or a username or profile content
+
+
+## Moderation Actions and Status
+
+Comments contain a field `status`. As moderation actions are peformed, the status changes.
+
+* Initial status is empty.
+* When a moderator Approves, the status is set to 'approved'.
+* When a moderator Rejects, the status is set to 'reject'.
+
+### Pre and post moderation
+
+Comments can be set to be premoderated or postmoderated. 
+
+Premoderation means that moderation has to occur _before_ a comment is shown on the site:
+
+* New comments are shown in the moderator queues immediately. 
+* The are not shown to users until (aka in streams) until they are approved by a moderator.
+
+Postmoderation means that comments appear on the site _before_ any moderation action is taken.
+
+* New comments appear in comment streams immediately.
+* New comments do not appear in moderation queues unless they are flagged by other users.

app.js

@@ -17,7 +17,7 @@ app.use('/api/v1', require('./routes/api'));
 // Static Routes.
 app.use('/client/', express.static(path.join(__dirname, 'dist')));
 
-app.get('/admin/*', (req, res) => {
+app.get('/admin*', (req, res) => {
   res.render('admin', {basePath: '/client/coral-admin'});
 });
 

client/coral-admin/config.sample.json

@@ -1,3 +0,0 @@
-{
-  "basePath": "client/coral-admin"
-}

client/coral-admin/src/containers/Configure.js

@@ -12,6 +12,8 @@ import {
 } from 'react-mdl'
 import Page from 'components/Page'
 import styles from './Configure.css'
+import I18n from 'coral-framework/i18n/i18n'
+import translations from '../translations'
 
 class Configure extends React.Component {
   constructor (props) {
@@ -40,12 +42,28 @@ class Configure extends React.Component {
     </List>
   }
 
+  copyToClipBoard (event) {
+    const copyTextarea = document.querySelector('.' + styles.embedInput)
+    copyTextarea.select()
+
+    try {
+      document.execCommand('copy')
+    } catch (err) {
+      console.error('Unable to copy')
+    }
+  }
+
   getEmbed () {
+    const embedText =
+    `<div id='coralStreamEmbed'></div><script type='text/javascript' src='https://pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/client/coral-embed-stream/', {title: 'comments'});</script>`
+
     return <List>
       <ListItem className={styles.configSettingEmbed}>
         <p>Copy and paste code below into your CMS to embed your comment box in your articles</p>
-        <input type='text' className={styles.embedInput} />
-        <Button raised colored>Copy</Button>
+        <textarea type='text' className={styles.embedInput}>
+          {embedText}
+        </textarea>
+        <Button raised colored>{lang.t('embedlink.copy')}</Button>
       </ListItem>
     </List>
   }
@@ -94,3 +112,5 @@ class Configure extends React.Component {
 }
 
 export default connect(x => x)(Configure)
+
+const lang = new I18n(translations)

client/coral-admin/webpack.config.dev.js

@@ -14,7 +14,7 @@ module.exports = {
     loaders: [
       { test: /.js$/, loader: 'babel', include: path.join(__dirname, 'src'), exclude: /node_modules/ },
       { test: /\.json$/, loaders: 'json', include: __dirname, exclude: /node_modules/ },
-      { test: /.css$/, loaders: ['style-loader', 'css-loader?importLoaders=1', 'postcss-loader'] }
+      { test: /.css$/, loaders: ['style-loader', 'css-loader?modules&localIdentName=[name]__[local]___[hash:base64:5]', 'postcss-loader'] }
     ]
   },
   plugins: [ autoprefixer, precss ],

client/coral-admin/webpack.config.js

@@ -10,14 +10,10 @@ module.exports = Object.assign({}, devConfig, {
     loaders: [
       { test: /.js$/, loader: 'babel', include: [path.join(__dirname, 'src'), path.join(__dirname, '../', 'coral-framework')], exclude: /node_modules/ },
       { test: /.json$/, loader: 'json', include: __dirname, exclude: /node_modules/ },
-      { test: /.css$/, loaders: ['style-loader', 'css-loader?importLoaders=1', 'postcss-loader'] }
+      { test: /.css$/, loaders: ['style-loader', 'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]', 'postcss-loader'] }
     ]
   },
   plugins: [
-    new Copy([{
-      from: path.join(__dirname, '..', 'coral-embed-stream', 'dist'),
-      to: './embed/comment-stream'
-    }]),
     autoprefixer, precss
   ]
 })

package.json

@@ -10,7 +10,7 @@
     "pretest": "npm install",
     "test": "mocha tests --recursive",
     "test-watch": "mocha tests --recursive -w",
-    "embed-start": "./node_modules/webpack/bin/webpack.js --config ./client/coral-embed-stream/webpack.config.dev.js && ./bin/www"
+    "embed-start": "npm run build && ./bin/www"
   },
   "config": {
     "pre-git": {
@@ -52,6 +52,7 @@
     "uuid": "^2.0.3"
   },
   "devDependencies": {
+    "autoprefixer": "6.5.0",
     "babel-core": "6.14.0",
     "babel-jest": "^15.0.0",
     "babel-loader": "6.2.5",
@@ -66,6 +67,7 @@
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
     "copy-webpack-plugin": "^3.0.1",
+    "css-loader": "0.25.0",
     "eslint": "^3.9.1",
     "exports-loader": "^0.6.3",
     "immutable": "^3.8.1",
@@ -73,6 +75,9 @@
     "json-loader": "^0.5.4",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
+    "postcss-loader": "0.13.0",
+    "postcss-modules": "0.5.2",
+    "precss": "1.4.0",
     "pre-git": "^3.10.0",
     "pym.js": "^1.1.1",
     "react": "15.3.2",
@@ -81,6 +86,7 @@
     "redux": "^3.6.0",
     "redux-thunk": "^2.1.0",
     "regenerator": "^0.8.46",
+    "style-loader": "0.13.1",
     "supertest": "^2.0.1",
     "timeago.js": "^2.0.3",
     "webpack": "^1.13.2",