Merge branch 'master' into docs-update

This commit is contained in:
Kim Gardner
2017-07-27 11:05:06 -04:00
committed by GitHub
142 changed files with 204 additions and 314 deletions
+9 -9
View File
@@ -3,15 +3,15 @@ docs
client/lib
**/*.html
plugins/*
!plugins/coral-plugin-facebook-auth
!plugins/coral-plugin-auth
!plugins/coral-plugin-respect
!plugins/coral-plugin-offtopic
!plugins/coral-plugin-like
!plugins/coral-plugin-mod
!plugins/coral-plugin-love
!plugins/coral-plugin-viewing-options
!plugins/coral-plugin-comment-content
!plugins/talk-plugin-facebook-auth
!plugins/talk-plugin-auth
!plugins/talk-plugin-respect
!plugins/talk-plugin-offtopic
!plugins/talk-plugin-like
!plugins/talk-plugin-mod
!plugins/talk-plugin-love
!plugins/talk-plugin-viewing-options
!plugins/talk-plugin-comment-content
!plugins/talk-plugin-permalink
!plugins/talk-plugin-featured-comments
+9 -9
View File
@@ -18,15 +18,15 @@ coverage/
plugins.json
plugins/*
!plugins/coral-plugin-facebook-auth
!plugins/coral-plugin-auth
!plugins/coral-plugin-respect
!plugins/coral-plugin-offtopic
!plugins/coral-plugin-like
!plugins/coral-plugin-mod
!plugins/coral-plugin-love
!plugins/coral-plugin-viewing-options
!plugins/coral-plugin-comment-content
!plugins/talk-plugin-facebook-auth
!plugins/talk-plugin-auth
!plugins/talk-plugin-respect
!plugins/talk-plugin-offtopic
!plugins/talk-plugin-like
!plugins/talk-plugin-mod
!plugins/talk-plugin-love
!plugins/talk-plugin-viewing-options
!plugins/talk-plugin-comment-content
!plugins/talk-plugin-permalink
!plugins/talk-plugin-featured-comments
+3 -1
View File
@@ -96,12 +96,14 @@ app.use(passport.initialize());
// (if present) the JWT on the request.
app.use('/api', authentication);
const pubsubClient = pubsub.createClientFactory();
// To handle dependancy injection safer, we inject the pubsub handle onto the
// request object.
app.use('/api', (req, res, next) => {
// Attach the pubsub handle to the requests.
req.pubsub = pubsub.createClient();
req.pubsub = pubsubClient();
// Forward on the request.
next();
+2 -2
View File
@@ -4,11 +4,11 @@
#
# ```
# en:
# coral-plugin-respect:
# talk-plugin-respect:
# respect: Respect
# respected: Respected
# es:
# coral-plugin-respect:
# talk-plugin-respect:
# respect: Respetar
# respected: Respetado
# ```
@@ -2,7 +2,7 @@ import React from 'react';
import styles from './Community.css';
import ActionButton from './ActionButton';
import {username} from 'coral-plugin-flags/helpers/flagReasons';
import {username} from 'talk-plugin-flags/helpers/flagReasons';
import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
@@ -1,11 +1,11 @@
import React from 'react';
import PropTypes from 'prop-types';
import AuthorName from 'coral-plugin-author-name/AuthorName';
import TagLabel from 'coral-plugin-tag-label/TagLabel';
import PubDate from 'coral-plugin-pubdate/PubDate';
import {ReplyBox, ReplyButton} from 'coral-plugin-replies';
import {FlagComment} from 'coral-plugin-flags';
import AuthorName from 'talk-plugin-author-name/AuthorName';
import TagLabel from 'talk-plugin-tag-label/TagLabel';
import PubDate from 'talk-plugin-pubdate/PubDate';
import {ReplyBox, ReplyButton} from 'talk-plugin-replies';
import {FlagComment} from 'talk-plugin-flags';
import {can} from 'coral-framework/services/perms';
import {TransitionGroup} from 'react-transition-group';
import cn from 'classnames';
@@ -1,6 +1,6 @@
import React, {PropTypes} from 'react';
import {notifyForNewCommentStatus} from 'coral-plugin-commentbox/CommentBox';
import {CommentForm} from 'coral-plugin-commentbox/CommentForm';
import {notifyForNewCommentStatus} from 'talk-plugin-commentbox/CommentBox';
import {CommentForm} from 'talk-plugin-commentbox/CommentForm';
import styles from './Comment.css';
import {CountdownSeconds} from './CountdownSeconds';
import {getEditableUntilDate} from './util';
@@ -4,15 +4,15 @@ import {StreamError} from './StreamError';
import Comment from '../components/Comment';
import SuspendedAccount from './SuspendedAccount';
import Slot from 'coral-framework/components/Slot';
import InfoBox from 'coral-plugin-infobox/InfoBox';
import InfoBox from 'talk-plugin-infobox/InfoBox';
import {can} from 'coral-framework/services/perms';
import {ModerationLink} from 'coral-plugin-moderation';
import {ModerationLink} from 'talk-plugin-moderation';
import RestrictedMessageBox
from 'coral-framework/components/RestrictedMessageBox';
import t, {timeago} from 'coral-framework/services/i18n';
import {getSlotComponents} from 'coral-framework/helpers/plugins';
import CommentBox from 'coral-plugin-commentbox/CommentBox';
import QuestionBox from 'coral-plugin-questionbox/QuestionBox';
import CommentBox from 'talk-plugin-commentbox/CommentBox';
import QuestionBox from 'talk-plugin-questionbox/QuestionBox';
import {Button, TabBar, Tab, TabCount, TabContent, TabPane} from 'coral-ui';
import cn from 'classnames';
+22 -22
View File
@@ -79,7 +79,7 @@ body {
}
/* Info Box Styles */
.coral-plugin-infobox-info {
.talk-plugin-infobox-info {
top: 0;
border: 0;
background: #DEEDFF;
@@ -94,26 +94,26 @@ body {
}
.coral-plugin-infobox-info em{
.talk-plugin-infobox-info em{
font-style: italic;
}
.coral-plugin-infobox-info strong{
.talk-plugin-infobox-info strong{
font-weight: bold;
}
.coral-plugin-infobox-info blockquote{
.talk-plugin-infobox-info blockquote{
border-left: solid 2px #2a2a2a;
padding-left: 10px;
}
.coral-plugin-infobox-info a{
.talk-plugin-infobox-info a{
color: #2a2a2a;
}
/* Question Box Styles */
.coral-plugin-questionbox-info {
.talk-plugin-questionbox-info {
top: 0;
border: 0;
background: #F0F0F0;
@@ -129,7 +129,7 @@ body {
display: flex;
}
.coral-plugin-questionbox-icon.bubble{
.talk-plugin-questionbox-icon.bubble{
position: absolute;
top: 8px;
left: 10px;
@@ -138,7 +138,7 @@ body {
z-index: 0;
}
.coral-plugin-questionbox-icon.person{
.talk-plugin-questionbox-icon.person{
z-index: 2;
top: 12px;
left: 12px;
@@ -147,7 +147,7 @@ body {
color: #262626;
}
.coral-plugin-questionbox-box {
.talk-plugin-questionbox-box {
position: relative;
border: 0;
color: white;
@@ -161,7 +161,7 @@ body {
vertical-align: middle;
}
.coral-plugin-questionbox-content {
.talk-plugin-questionbox-content {
padding: 5px;
display: flex;
align-items: center;
@@ -231,26 +231,26 @@ body {
position: relative;
}
.coral-plugin-commentcontent-text {
.talk-plugin-commentcontent-text {
margin-bottom: 7px;
font-size: 16px;
font-weight: 100;
line-height: 1.3;
}
.coral-plugin-author-name-text {
.talk-plugin-author-name-text {
display: inline-block;
margin: 10px 5px 10px 0;
font-weight: bold;
}
.coral-plugin-author-name-bio-flag {
.talk-plugin-author-name-bio-flag {
float: right;
}
/* Tag Labels */
.coral-plugin-tag-label {
.talk-plugin-tag-label {
background-color: #4C1066;
color: white;
display: inline-block;
@@ -293,44 +293,44 @@ button.comment__action-button[disabled],
color: #F00;
}
.coral-plugin-pubdate-text {
.talk-plugin-pubdate-text {
display: inline-block;
}
/* Flag Styles */
.coral-plugin-flags-popup-form {
.talk-plugin-flags-popup-form {
margin-bottom: 10px;
}
.coral-plugin-flags-popup-header {
.talk-plugin-flags-popup-header {
font-weight: bolder;
font-size: 1.33rem;
margin-bottom: 10px;
}
.coral-plugin-flags-popup-radio {
.talk-plugin-flags-popup-radio {
margin:5px;
}
.coral-plugin-flags-popup-radio-label {
.talk-plugin-flags-popup-radio-label {
margin:5px;
font-weight: 400;
font-size: .9rem;
}
.coral-plugin-flags-popup-counter {
.talk-plugin-flags-popup-counter {
float: left;
margin-top: 21px;
color: #999;
}
.coral-plugin-flags-popup-button {
.talk-plugin-flags-popup-button {
float: right;
margin-top: 10px;
}
.coral-plugin-flags-reason-text {
.talk-plugin-flags-reason-text {
margin-left: 20px;
margin-top: 5px;
width: 75%;
+1 -1
View File
@@ -1,7 +1,7 @@
import auth from './auth';
import user from './user';
import asset from './asset';
import {reducer as commentBox} from '../../coral-plugin-commentbox';
import {reducer as commentBox} from '../../talk-plugin-commentbox';
export default {
auth,
@@ -9,7 +9,7 @@ import {link} from 'coral-framework/services/pym';
import NotLoggedIn from '../components/NotLoggedIn';
import IgnoredUsers from '../components/IgnoredUsers';
import {Spinner} from 'coral-ui';
import CommentHistory from 'coral-plugin-history/CommentHistory';
import CommentHistory from 'talk-plugin-history/CommentHistory';
import {showSignInDialog, checkLogin} from 'coral-framework/actions/auth';
import t from 'coral-framework/services/i18n';
@@ -1,5 +1,5 @@
import React, {Component} from 'react';
const packagename = 'coral-plugin-author-name';
const packagename = 'talk-plugin-author-name';
export default class AuthorName extends Component {
@@ -8,7 +8,7 @@ import ClickOutside from 'coral-framework/components/ClickOutside';
import cn from 'classnames';
import styles from './styles.css';
const name = 'coral-plugin-flags';
const name = 'talk-plugin-flags';
export default class FlagButton extends Component {
@@ -2,7 +2,7 @@ import React, {PropTypes} from 'react';
import {Icon} from '../coral-ui';
import styles from './Comment.css';
import Slot from 'coral-framework/components/Slot';
import PubDate from '../coral-plugin-pubdate/PubDate';
import PubDate from '../talk-plugin-pubdate/PubDate';
import CommentContent from '../coral-embed-stream/src/components/CommentContent';
import t from 'coral-framework/services/i18n';
@@ -1,7 +1,7 @@
import React from 'react';
import Markdown from './Markdown';
const packagename = 'coral-plugin-infobox';
const packagename = 'talk-plugin-infobox';
const InfoBox = ({enable, content}) =>
<div
@@ -1,7 +1,7 @@
import React from 'react';
import {timeago} from 'coral-framework/services/i18n';
const name = 'coral-plugin-pubdate';
const name = 'talk-plugin-pubdate';
const PubDate = ({created_at}) => <div className={`${name}-text`}>
{timeago(created_at)}
@@ -1,5 +1,5 @@
import React from 'react';
const packagename = 'coral-plugin-questionbox';
const packagename = 'talk-plugin-questionbox';
import Slot from 'coral-framework/components/Slot';
const QuestionBox = ({enable, content}) =>
@@ -1,7 +1,7 @@
import React, {Component, PropTypes} from 'react';
import CommentBox from '../coral-plugin-commentbox/CommentBox';
import CommentBox from '../talk-plugin-commentbox/CommentBox';
const name = 'coral-plugin-replies';
const name = 'talk-plugin-replies';
class ReplyBox extends Component {
@@ -5,7 +5,7 @@ import t from 'coral-framework/services/i18n';
import cn from 'classnames';
import styles from './ReplyButton.css';
const name = 'coral-plugin-replies';
const name = 'talk-plugin-replies';
const ReplyButton = ({onClick}) => {
return (
@@ -1,6 +1,6 @@
import React from 'react';
const TagLabel = ({children}) => <div className='coral-plugin-tag-label'>
const TagLabel = ({children}) => <div className='talk-plugin-tag-label'>
{children}
</div>;
+2 -2
View File
@@ -26,10 +26,10 @@ Tag Definitions must be created in order for the system to determine what tags a
Tag Definitions do not contain any logic themselves but provide information that other parts of the system can use to specify which models a tag can be applied to (models) and perform authorization logic (permissions).
Take the tag created by `coral-plugin-offtopic` as an example.
Take the tag created by `talk-plugin-offtopic` as an example.
```
// coral-plugin-offtopic/index.js
// talk-plugin-offtopic/index.js
module.exports = {
tags: [
{
+2 -2
View File
@@ -134,7 +134,7 @@ In this example we add our reaction component to the `commentReaction` Slot
```js
import React from 'react';
import {withReaction} from 'coral-plugin-api';
import {withReaction} from 'talk-plugin-api';
class LoveButton extends React.Component {
handleClick = () => {
@@ -177,7 +177,7 @@ This feature introduces `withReaction` HOC. `withReaction` takes, as argument,
* `count` - The reaction count
For full reference: Please, check `coral-plugin-love`: [LoveButton.js](https://github.com/coralproject/talk/blob/master/plugins/coral-plugin-love/client/LoveButton.js)
For full reference: Please, check `talk-plugin-love`: [LoveButton.js](https://github.com/coralproject/talk/blob/master/plugins/talk-plugin-love/client/LoveButton.js)
### Comment Stream
+1 -1
View File
@@ -43,7 +43,7 @@ We can easily trigger `Talk` actions in our plugin Components.
import React, {Component} from 'react';
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
import {addTag, removeTag} from 'coral-plugin-commentbox/actions';
import {addTag, removeTag} from 'talk-plugin-commentbox/actions';
class MyButton extends Component {
render() {
+3 -1
View File
@@ -127,13 +127,15 @@ const setupFunctions = plugins.get('server', 'setupFunctions').reduce((acc, {plu
}),
});
const pubsubClient = pubsub.createClientFactory();
/**
* This creates a new subscription manager.
*/
const createSubscriptionManager = (server) => new SubscriptionServer({
subscriptionManager: new SubscriptionManager({
schema,
pubsub: pubsub.createClient(),
pubsub: pubsubClient(),
setupFunctions,
}),
onConnect: ({token}, connection) => {
+1 -1
View File
@@ -1,2 +1,2 @@
export {addTag, removeTag} from 'coral-plugin-commentbox/actions';
export {addTag, removeTag} from 'talk-plugin-commentbox/actions';
export {addCommentClassName, removeCommentClassName} from 'coral-embed-stream/src/actions/stream';
+9 -9
View File
@@ -1,17 +1,17 @@
{
"server": [
"coral-plugin-auth",
"coral-plugin-respect",
"coral-plugin-offtopic",
"coral-plugin-facebook-auth",
"talk-plugin-auth",
"talk-plugin-respect",
"talk-plugin-offtopic",
"talk-plugin-facebook-auth",
"talk-plugin-featured-comments"
],
"client": [
"coral-plugin-respect",
"coral-plugin-auth",
"coral-plugin-offtopic",
"coral-plugin-viewing-options",
"coral-plugin-comment-content",
"talk-plugin-respect",
"talk-plugin-auth",
"talk-plugin-offtopic",
"talk-plugin-viewing-options",
"talk-plugin-comment-content",
"talk-plugin-permalink",
"talk-plugin-featured-comments"
]
@@ -1,9 +0,0 @@
import React from 'react';
import styles from './styles.css';
export default (props) => (
<div className={styles.box}>
Comment Status: {props.comment.status}
</div>
);
@@ -1,32 +0,0 @@
import React from 'react';
import Box from './Box';
import {Button} from 'plugin-api/beta/client/components/ui';
import styles from './styles.css';
export default class Footer extends React.Component {
constructor() {
super();
this.state = {
show: false
};
}
handleClick = () => {
this.setState((state) => ({
show: !state.show
}));
}
render() {
const {show} = this.state;
return (
<div className={styles.container}>
<Button cStyle="darkGrey" onClick={this.handleClick}>
Show Comment Status
</Button>
{show ? <Box comment={this.props.comment} /> : null}
</div>
);
}
}
@@ -1,8 +0,0 @@
.container {
padding: 0 14px 10px;
}
.box {
font-size: 12px;
padding: 10px 14px;
}
-7
View File
@@ -1,7 +0,0 @@
import Container from './components/Container';
export default {
slots: {
adminCommentDetailArea: [Container],
}
};
-2
View File
@@ -1,2 +0,0 @@
module.exports = {};
@@ -1,14 +0,0 @@
{
"presets": [
"es2015"
],
"plugins": [
"add-module-exports",
"transform-class-properties",
"transform-decorators-legacy",
"transform-object-assign",
"transform-object-rest-spread",
"transform-async-to-generator",
"transform-react-jsx"
]
}
@@ -1,23 +0,0 @@
{
"env": {
"browser": true,
"es6": true,
"mocha": true
},
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
}
},
"parser": "babel-eslint",
"plugins": [
"react"
],
"rules": {
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",
"no-console": ["warn", { "allow": ["warn", "error"] }]
}
}
@@ -1,9 +1,9 @@
import React from 'react';
import t from 'coral-framework/services/i18n';
import {ReplyButton} from 'coral-plugin-replies';
import PubDate from 'coral-plugin-pubdate/PubDate';
import {ReplyButton} from 'talk-plugin-replies';
import PubDate from 'talk-plugin-pubdate/PubDate';
import Slot from 'coral-framework/components/Slot';
import AuthorName from 'coral-plugin-author-name/AuthorName';
import AuthorName from 'talk-plugin-author-name/AuthorName';
import styles from 'coral-embed-stream/src/components/Comment.css';
export const FakeComment = ({username, created_at, comment}) => (
@@ -13,13 +13,13 @@ export const FakeComment = ({username, created_at, comment}) => (
<PubDate created_at={created_at} />
<Slot comment={comment} />
<div className="commentActionsLeft comment__action-container">
<div className={`${'coral-plugin-likes'}-container`}>
<button className={'coral-plugin-likes-button'}>
<span className={'coral-plugin-likes-button-text'}>
<div className={`${'talk-plugin-likes'}-container`}>
<button className={'talk-plugin-likes-button'}>
<span className={'talk-plugin-likes-button-text'}>
{t('like')}
</span>
<i
className={`${'coral-plugin-likes'}-icon material-icons`}
className={`${'talk-plugin-likes'}-icon material-icons`}
aria-hidden={true}
>
thumb_up
@@ -33,30 +33,30 @@ export const FakeComment = ({username, created_at, comment}) => (
/>
</div>
<div className="commentActionsRight comment__action-container">
<div className="coral-plugin-permalinks-container">
<button className="coral-plugin-permalinks-button">
<div className="talk-plugin-permalinks-container">
<button className="talk-plugin-permalinks-button">
<span
className={`comment__action-button comment__action-button--nowrap ${'coral-plugin-flags'}-button-text`}
className={`comment__action-button comment__action-button--nowrap ${'talk-plugin-flags'}-button-text`}
>
{t('permalink')}
</span>
<i
className="coral-plugin-permalinks-icon material-icons"
className="talk-plugin-permalinks-icon material-icons"
aria-hidden={true}
>
link
</i>
</button>
</div>
<div className={`${'coral-plugin-flags'}-container`}>
<button className={`${'coral-plugin-flags'}-button`}>
<div className={`${'talk-plugin-flags'}-container`}>
<button className={`${'talk-plugin-flags'}-button`}>
<span
className={`comment__action-button comment__action-button--nowrap ${'coral-plugin-flags'}-button-text`}
className={`comment__action-button comment__action-button--nowrap ${'talk-plugin-flags'}-button-text`}
>
{t('report')}
</span>
<i
className={`${'coral-plugin-flags'}-icon material-icons`}
className={`${'talk-plugin-flags'}-icon material-icons`}
aria-hidden={true}
>
flag
@@ -1,7 +1,7 @@
import React from 'react';
import Linkify from 'react-linkify';
const name = 'coral-plugin-comment-content';
const name = 'talk-plugin-comment-content';
const CommentContent = ({comment}) => {
const textbreaks = comment.body.split('\n');
@@ -1,5 +1,5 @@
{
"name": "coral-plugin-comment-content",
"name": "talk-plugin-comment-content",
"version": "1.0.0",
"description": "",
"main": "index.js",
@@ -1,4 +1,4 @@
# coral-plugin-facebook-auth
# talk-plugin-facebook-auth
This plugin provides facebook authentication support for Talk.
@@ -1,5 +1,5 @@
{
"name": "coral-plugin-facebook-auth",
"name": "talk-plugin-facebook-auth",
"version": "1.0.0",
"main": "index.js",
"license": "MIT",
@@ -5,7 +5,7 @@ import {t, can} from 'plugin-api/beta/client/services';
import {Icon} from 'plugin-api/beta/client/components/ui';
import cn from 'classnames';
const plugin = 'coral-plugin-like';
const plugin = 'talk-plugin-like';
class LikeButton extends React.Component {
handleClick = () => {
@@ -46,7 +46,7 @@ class LikeButton extends React.Component {
onClick={this.handleClick}
>
<span className={cn(`${plugin}-label`, styles.label)}>
{t(alreadyReacted ? 'coral-plugin-like.liked' : 'coral-plugin-like.like')}
{t(alreadyReacted ? 'talk-plugin-like.liked' : 'talk-plugin-like.like')}
</span>
<Icon name="thumb_up" className={cn(`${plugin}-icon`, styles.icon)} />
<span className={`${plugin}-count`}>{count > 0 && count}</span>
@@ -1,9 +1,9 @@
en:
coral-plugin-like:
talk-plugin-like:
like: Like
liked: Liked
es:
coral-plugin-like:
talk-plugin-like:
like: Me Gusta
liked: Me Gustó
@@ -5,7 +5,7 @@ import {t, can} from 'plugin-api/beta/client/services';
import {Icon} from 'plugin-api/beta/client/components/ui';
import cn from 'classnames';
const plugin = 'coral-plugin-love';
const plugin = 'talk-plugin-love';
class LoveButton extends React.Component {
handleClick = () => {
@@ -46,7 +46,7 @@ class LoveButton extends React.Component {
onClick={this.handleClick}
>
<span className={cn(`${plugin}-label`, styles.label)}>
{t(alreadyReacted ? 'coral-plugin-love.loved' : 'coral-plugin-love.love')}
{t(alreadyReacted ? 'talk-plugin-love.loved' : 'talk-plugin-love.love')}
</span>
<Icon name="favorite" className={cn(`${plugin}-icon`, styles.icon)} />
<span className={`${plugin}-count`}>{count > 0 && count}</span>
@@ -1,9 +1,9 @@
en:
coral-plugin-love:
talk-plugin-love:
love: Love
loved: Loved
es:
coral-plugin-love:
talk-plugin-love:
love: Amo
loved: Amé

Some files were not shown because too many files have changed in this diff Show More