From 02c05e8ae157f985a12f12a31ddf29dff0fbfb24 Mon Sep 17 00:00:00 2001 From: gaba Date: Tue, 21 Feb 2017 12:43:02 -0800 Subject: [PATCH 01/12] CSS, translations and code for new create username dialog. --- .../components/CreateUsernameDialog.js | 25 ++++++------ client/coral-sign-in/components/styles.css | 39 ++++++++++++++++++- client/coral-sign-in/translations.js | 14 ++++--- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js index d245b38ac..457641089 100644 --- a/client/coral-sign-in/components/CreateUsernameDialog.js +++ b/client/coral-sign-in/components/CreateUsernameDialog.js @@ -10,7 +10,7 @@ const lang = new I18n(translations); const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmitUsername, handleChange, ...props}) => (
- +

{lang.t('createdisplay.yourusername')}

+
Example
+

{lang.t('createdisplay.ifyoudontchangeyourname')}

{ props.auth.error && {props.auth.error} }
- - { props.errors.username && {lang.t('createdisplay.specialCharacters')} } -
+ { props.errors.username && {lang.t('createdisplay.specialCharacters')} } +
+
+
diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css index 60a252a20..77282d388 100644 --- a/client/coral-sign-in/components/styles.css +++ b/client/coral-sign-in/components/styles.css @@ -117,7 +117,7 @@ input.error{ } .action { - margin-top: 15px; + margin-top: 0px; } .passwordRequestSuccess { @@ -140,6 +140,41 @@ input.error{ display: block; } -.confirmSubmit { +/* Change username Dialog*/ +.dialogusername { + 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: 400px; + top: 10px; +} + +.yourusername { + display: block; +} + +.example { + display: block; +} + +.ifyoudont { + display: block; +} + +.saveusername { + display: block; + width: 100%; +} + +.savebutton { + display: inline; + background-color: rgb(105,105,105); + color: white; +} + +.continuebutton { + background-color: black; + font-weight: bold; + color: white; + min-width: 200px; } diff --git a/client/coral-sign-in/translations.js b/client/coral-sign-in/translations.js index a2bb60819..4826f2f2c 100644 --- a/client/coral-sign-in/translations.js +++ b/client/coral-sign-in/translations.js @@ -30,9 +30,11 @@ export default { checkTheForm: 'Invalid Form. Please, check the fields' }, 'createdisplay': { - writeyourusername: 'Write your username', - yourusername: 'Your username is publicly visible on all comments you post. A username is needed before you can post your first comment.', + writeyourusername: 'Edit your username', + yourusername: 'Your username appears on every comment you post.', + ifyoudontchangeyourname: 'If you don\'t change your username at this step, your Facebook display name will appear alongside of all your comments.', username: 'Username', + continue: 'Continue with the same Facebook username', save: 'Save', requiredField: 'Required field', errorCreate: 'Error when changing username', @@ -71,9 +73,11 @@ export default { checkTheForm: 'Formulario Inválido. Por favor, completa los campos' }, 'createdisplay': { - writeyourusername: 'Escribe tu nombre', - yourusername: 'Tu nombre es visible publicamente en todos los comentarios que publiques. Es necesario tener un nombre de usuario antes de poder publicar tu primer comentario.', - username: 'Nombre a mostrar', + writeyourusername: 'Edita tu nombre', + yourusername: 'Tu nombre aparece en cada comentario que publiques.', + ifyoudontchangeyourname: 'Si no modificas tu nombre de usuario en este paso, tu nombre de Facebook aparecera al lado de cada comentario que publiques.', + username: 'Nombre', + continue: 'Continuar con nombre de Facebook', save: 'Guardar', requiredField: 'Campo necesario', errorCreate: 'Hubo un error al cambiar el nombre de usuario', From 5d0730b4d5f8d5078d65cf824e67c1afd86c2521 Mon Sep 17 00:00:00 2001 From: gaba Date: Tue, 21 Feb 2017 14:52:19 -0800 Subject: [PATCH 02/12] Adds fake comment component. --- .../components/CreateUsernameDialog.js | 14 +++-- .../coral-sign-in/components/FakeComment.js | 54 +++++++++++++++++++ client/coral-sign-in/components/styles.css | 6 +++ client/coral-sign-in/translations.js | 4 ++ 4 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 client/coral-sign-in/components/FakeComment.js diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js index 457641089..a01137733 100644 --- a/client/coral-sign-in/components/CreateUsernameDialog.js +++ b/client/coral-sign-in/components/CreateUsernameDialog.js @@ -3,7 +3,10 @@ import TextField from 'coral-ui/components/TextField'; import Alert from './Alert'; import Button from 'coral-ui/components/Button'; import {Dialog} from 'coral-ui'; +import FakeComment from './FakeComment'; + import styles from './styles.css'; + import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); @@ -25,9 +28,14 @@ const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmit
-

{lang.t('createdisplay.yourusername')}

-
Example
-

{lang.t('createdisplay.ifyoudontchangeyourname')}

+

{lang.t('createdisplay.yourusername')}

+ +

{lang.t('createdisplay.ifyoudontchangeyourname')}

{ props.auth.error && {props.auth.error} }
{ props.errors.username && {lang.t('createdisplay.specialCharacters')} } diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js new file mode 100644 index 000000000..97afa59fa --- /dev/null +++ b/client/coral-sign-in/components/FakeComment.js @@ -0,0 +1,54 @@ +import React from 'react'; +import styles from 'coral-embed-stream/src/Comment.css'; + +import PermalinkButton from 'coral-plugin-permalinks/PermalinkButton'; +import AuthorName from 'coral-plugin-author-name/AuthorName'; +import Content from 'coral-plugin-commentcontent/CommentContent'; +import PubDate from 'coral-plugin-pubdate/PubDate'; +import {ReplyButton} from 'coral-plugin-replies'; +import FlagComment from 'coral-plugin-flags/FlagComment'; +import LikeButton from 'coral-plugin-likes/LikeButton'; + +class FakeComment extends React.Component { + constructor (props) { + super(props); + } + + render () { + const {username, created_at, body} = this.props; + + return ( +
+
+ + + +
+ {return;}} + deleteAction={()=>{return;}} + showSignInDialog={()=>{return;}} + currentUser={{}} + /> + {}} + parentCommentId={'commentID'} + currentUserId={{}} + banned={false} + /> +
+
+ + +
+
+ ); + } +} + +export default FakeComment; diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css index 77282d388..81afe75e5 100644 --- a/client/coral-sign-in/components/styles.css +++ b/client/coral-sign-in/components/styles.css @@ -159,6 +159,7 @@ input.error{ .ifyoudont { display: block; + margin-top: 15px; } .saveusername { @@ -178,3 +179,8 @@ input.error{ color: white; min-width: 200px; } + +.fakeComment { + display: block; + margin-bottom: 5px; +} diff --git a/client/coral-sign-in/translations.js b/client/coral-sign-in/translations.js index 4826f2f2c..5693939af 100644 --- a/client/coral-sign-in/translations.js +++ b/client/coral-sign-in/translations.js @@ -36,6 +36,8 @@ export default { username: 'Username', continue: 'Continue with the same Facebook username', save: 'Save', + fakecommentdate: '1 minute ago', + fakecommentbody: 'This is an example comment. Readers can share their thoughts and opinions with newsrooms in the comments section.', requiredField: 'Required field', errorCreate: 'Error when changing username', checkTheForm: 'Invalid Form. Please, check the fields', @@ -79,6 +81,8 @@ export default { username: 'Nombre', continue: 'Continuar con nombre de Facebook', save: 'Guardar', + fakecommentdate: 'hace un minuto', + fakecommentbody: 'Este es un comentario de ejemplo. Las lectoras pueden compartir sus ideas y opiniones con los periodistas en la sección de comentarios.', requiredField: 'Campo necesario', errorCreate: 'Hubo un error al cambiar el nombre de usuario', checkTheForm: 'Formulario Invalido. Por favor, verifica los campos', From 1b79a105802ab456b16ecf6af3dc7f396e5dd398 Mon Sep 17 00:00:00 2001 From: gaba Date: Tue, 21 Feb 2017 16:36:50 -0800 Subject: [PATCH 03/12] Change username when it changes. --- client/coral-sign-in/components/CreateUsernameDialog.js | 8 +++++--- client/coral-sign-in/components/FakeComment.js | 1 - .../coral-sign-in/containers/ChangeUsernameContainer.js | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js index a01137733..f0edc7398 100644 --- a/client/coral-sign-in/components/CreateUsernameDialog.js +++ b/client/coral-sign-in/components/CreateUsernameDialog.js @@ -11,7 +11,8 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); -const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmitUsername, handleChange, ...props}) => ( +const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmitUsername, handleChange, ...props}) => { + return ( {lang.t('createdisplay.yourusername')}

@@ -54,6 +55,7 @@ const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmit
-); + ); +}; export default CreateUsernameDialog; diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index 97afa59fa..c496e69d9 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -39,7 +39,6 @@ class FakeComment extends React.Component { onClick={() => {}} parentCommentId={'commentID'} currentUserId={{}} - banned={false} />
diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js index 33ae63614..ca065169f 100644 --- a/client/coral-sign-in/containers/ChangeUsernameContainer.js +++ b/client/coral-sign-in/containers/ChangeUsernameContainer.js @@ -29,6 +29,7 @@ class ChangeUsernameContainer extends Component { constructor(props) { super(props); + this.initialState.formData.username = props.user.username; this.state = this.initialState; this.handleChange = this.handleChange.bind(this); this.handleSubmitUsername = this.handleSubmitUsername.bind(this); From 2c60285981581b4d3777f95fe6eacc95f43ff18a Mon Sep 17 00:00:00 2001 From: gaba Date: Wed, 22 Feb 2017 07:00:15 -0800 Subject: [PATCH 04/12] The component needs the banned value. --- client/coral-sign-in/components/FakeComment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index c496e69d9..97afa59fa 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -39,6 +39,7 @@ class FakeComment extends React.Component { onClick={() => {}} parentCommentId={'commentID'} currentUserId={{}} + banned={false} />
From 32bc754bf7435e3caa92c466f79a912c208052a4 Mon Sep 17 00:00:00 2001 From: gaba Date: Wed, 22 Feb 2017 11:22:51 -0800 Subject: [PATCH 05/12] It needs to send the translation key --- client/coral-framework/helpers/response.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-framework/helpers/response.js b/client/coral-framework/helpers/response.js index 64803faef..0fce878cd 100644 --- a/client/coral-framework/helpers/response.js +++ b/client/coral-framework/helpers/response.js @@ -45,7 +45,7 @@ const handleResp = res => { } if (err.error && err.error.translation_key) { - message = err.error.translation_key; + error.translation_key = err.error.translation_key; } error.message = message; From 5d0ea6a880c20e0655e2df080adbd3caefd24a22 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 23 Feb 2017 09:48:59 -0800 Subject: [PATCH 06/12] Rmove continue button, fix bug with facebook signup. --- .../components/CreateUsernameDialog.js | 1 - client/coral-sign-in/components/styles.css | 7 ------ .../containers/ChangeUsernameContainer.js | 2 +- routes/api/auth/index.js | 23 ++++++++----------- services/users.js | 5 +++- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js index f0edc7398..d0e348046 100644 --- a/client/coral-sign-in/components/CreateUsernameDialog.js +++ b/client/coral-sign-in/components/CreateUsernameDialog.js @@ -50,7 +50,6 @@ const CreateUsernameDialog = ({open, handleClose, offset, formData, handleSubmit />
- diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css index 81afe75e5..617c8d1cb 100644 --- a/client/coral-sign-in/components/styles.css +++ b/client/coral-sign-in/components/styles.css @@ -173,13 +173,6 @@ input.error{ color: white; } -.continuebutton { - background-color: black; - font-weight: bold; - color: white; - min-width: 200px; -} - .fakeComment { display: block; margin-bottom: 5px; diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js index ca065169f..c4450aa56 100644 --- a/client/coral-sign-in/containers/ChangeUsernameContainer.js +++ b/client/coral-sign-in/containers/ChangeUsernameContainer.js @@ -104,7 +104,7 @@ class ChangeUsernameContainer extends Component { return (
(err, user) => { /** * Returns the response to the login attempt via a popup callback with some JS. */ + const HandleAuthPopupCallback = (req, res, next) => (err, user) => { if (err) { return res.render('auth-callback', {err: JSON.stringify(err), data: null}); @@ -70,20 +70,15 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => { return res.render('auth-callback', {err: JSON.stringify(errors.ErrNotAuthorized), data: null}); } - // Authorize the user to edit their username. - UsersService.toggleNameEdit(user.id, true) - .then(() => { - - // Perform the login of the user! - req.logIn(user, (err) => { - if (err) { - return res.render('auth-callback', {err: JSON.stringify(err), data: null}); - } + // Perform the login of the user! + req.logIn(user, (err) => { + if (err) { + return res.render('auth-callback', {err: JSON.stringify(err), data: null}); + } - // We logged in the user! Let's send back the user data. - res.render('auth-callback', {err: null, data: JSON.stringify(user)}); - }); - }); + // We logged in the user! Let's send back the user data. + res.render('auth-callback', {err: null, data: JSON.stringify(user), changeusername: true}); + }); }; /** diff --git a/services/users.js b/services/users.js index cf3a0063d..b58776a75 100644 --- a/services/users.js +++ b/services/users.js @@ -124,6 +124,8 @@ module.exports = class UsersService { return user; } + // User does not exist and need to be created. + let username = UsersService.castUsername(displayName); // The user was not found, lets create them! @@ -131,7 +133,8 @@ module.exports = class UsersService { username, lowercaseUsername: username.toLowerCase(), roles: [], - profiles: [{id, provider}] + profiles: [{id, provider}], + canEditName: true }); return user.save(); From 022667c9aed1f778f2a07a1171116ba2e7fd2dd5 Mon Sep 17 00:00:00 2001 From: gaba Date: Thu, 23 Feb 2017 13:55:51 -0800 Subject: [PATCH 07/12] Brings some of the components into FakeComment --- .../coral-sign-in/components/FakeComment.js | 38 ++++++++++++------- client/coral-sign-in/translations.js | 12 +++++- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index 97afa59fa..75d4e51f1 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -1,13 +1,15 @@ import React from 'react'; import styles from 'coral-embed-stream/src/Comment.css'; -import PermalinkButton from 'coral-plugin-permalinks/PermalinkButton'; import AuthorName from 'coral-plugin-author-name/AuthorName'; import Content from 'coral-plugin-commentcontent/CommentContent'; import PubDate from 'coral-plugin-pubdate/PubDate'; import {ReplyButton} from 'coral-plugin-replies'; -import FlagComment from 'coral-plugin-flags/FlagComment'; -import LikeButton from 'coral-plugin-likes/LikeButton'; + +import I18n from 'coral-framework/modules/i18n/i18n'; +import translations from '../translations'; + +const lang = new I18n(translations); class FakeComment extends React.Component { constructor (props) { @@ -27,14 +29,13 @@ class FakeComment extends React.Component {
- {return;}} - deleteAction={()=>{return;}} - showSignInDialog={()=>{return;}} - currentUser={{}} - /> +
+ +
; {}} parentCommentId={'commentID'} @@ -43,8 +44,19 @@ class FakeComment extends React.Component { />
- - +
+ +
+
+ +
); diff --git a/client/coral-sign-in/translations.js b/client/coral-sign-in/translations.js index 5693939af..7a946c0bb 100644 --- a/client/coral-sign-in/translations.js +++ b/client/coral-sign-in/translations.js @@ -42,7 +42,12 @@ export default { errorCreate: 'Error when changing username', checkTheForm: 'Invalid Form. Please, check the fields', specialCharacters: 'Usernames can contain letters, numbers and _ only' - } + }, + 'permalink': { + permalink: 'Link' + }, + 'report': 'Report', + 'like': 'Like', }, es: { 'signIn': { @@ -88,5 +93,10 @@ export default { checkTheForm: 'Formulario Invalido. Por favor, verifica los campos', specialCharacters: 'Sólo pueden contener letras, números y _' }, + 'permalink': { + permalink: 'Enlace' + }, + 'report': 'Informe', + 'like': 'Me gusta', } }; From 886240a7bc4240b7e44763deb6ee3ef1e04082d8 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 24 Feb 2017 11:11:18 -0700 Subject: [PATCH 08/12] translations. remove console.log on frontend. remove notification on POST moderation --- .../containers/Configure/CommentSettings.js | 1 - .../ModerationQueue/ModerationContainer.js | 1 - client/coral-embed-stream/src/Embed.js | 9 +- client/coral-framework/actions/auth.js | 3 +- client/coral-framework/translations.json | 2 + client/coral-plugin-commentbox/CommentBox.js | 3 - .../RileysAwesomeCommentBox.js | 58 ---------- client/coral-plugin-stream/Stream.js | 100 ------------------ .../coral-settings/components/NotLoggedIn.js | 1 - .../{SettingsHeader.css => ProfileHeader.css} | 0 .../components/ProfileHeader.js | 12 +++ .../components/SettingsHeader.js | 14 --- ...ttingsContainer.js => ProfileContainer.js} | 8 +- client/coral-settings/translations.json | 8 +- client/coral-sign-in/translations.js | 4 +- 15 files changed, 32 insertions(+), 192 deletions(-) delete mode 100644 client/coral-plugin-stream/RileysAwesomeCommentBox.js delete mode 100644 client/coral-plugin-stream/Stream.js rename client/coral-settings/components/{SettingsHeader.css => ProfileHeader.css} (100%) create mode 100644 client/coral-settings/components/ProfileHeader.js delete mode 100644 client/coral-settings/components/SettingsHeader.js rename client/coral-settings/containers/{SettingsContainer.js => ProfileContainer.js} (92%) diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js index 5a14cf565..90057c5fe 100644 --- a/client/coral-admin/src/containers/Configure/CommentSettings.js +++ b/client/coral-admin/src/containers/Configure/CommentSettings.js @@ -52,7 +52,6 @@ const updateClosedMessage = (updateSettings) => (event) => { }; const updateCustomCssUrl = (updateSettings) => (event) => { - console.log('updateCustomCssUrl', event.target.value); const customCssUrl = event.target.value; updateSettings({customCssUrl}); }; diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index f685ac094..b1a44533e 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -54,7 +54,6 @@ class ModerationContainer extends Component { } if (data.error) { - console.log(data); return
Error
; } diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index 5e979d243..5c72e65d6 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -2,6 +2,9 @@ import React, {Component} from 'react'; import {compose} from 'react-apollo'; import {connect} from 'react-redux'; import isEqual from 'lodash/isEqual'; +import I18n from 'coral-framework/modules/i18n/i18n'; +import translations from 'coral-framework/translations'; +const lang = new I18n(translations); import {TabBar, Tab, TabContent, Spinner} from 'coral-ui'; @@ -25,7 +28,7 @@ import UserBox from 'coral-sign-in/components/UserBox'; import SignInContainer from 'coral-sign-in/containers/SignInContainer'; import SuspendedAccount from 'coral-framework/components/SuspendedAccount'; import ChangeUsernameContainer from '../../coral-sign-in/containers/ChangeUsernameContainer'; -import SettingsContainer from 'coral-settings/containers/SettingsContainer'; +import ProfileContainer from 'coral-settings/containers/ProfileContainer'; import RestrictedContent from 'coral-framework/components/RestrictedContent'; import ConfigureStreamContainer from 'coral-configure/containers/ConfigureStreamContainer'; import LoadMore from './LoadMore'; @@ -110,7 +113,7 @@ class Embed extends Component {
- Settings + {lang.t('profile')} Configure Stream {loggedIn && } @@ -190,7 +193,7 @@ class Embed extends Component { loadMore={this.props.loadMore}/> - dispatch => { dispatch(verifyEmailSuccess()); }) .catch(err => { - console.log('failed to send email verification', err); // email might have already been verifyed - dispatch(verifyEmailFailure()); + dispatch(verifyEmailFailure(err)); }); }; diff --git a/client/coral-framework/translations.json b/client/coral-framework/translations.json index c817925eb..d115aedca 100644 --- a/client/coral-framework/translations.json +++ b/client/coral-framework/translations.json @@ -1,5 +1,6 @@ { "en": { + "profile": "Profile", "successUpdateSettings": "The changes you have made have been applied to the comment stream on this article", "successNameUpdate": "Your username has been updated", "contentNotAvailable": "This content is not available", @@ -36,6 +37,7 @@ } }, "es": { + "profile": "Perfil", "successUpdateSettings": "La configuración de este articulo fue actualizada", "successBioUpdate": "Tu bio fue actualizada", "contentNotAvailable": "El contenido no se encuentra disponible", diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js index 3d895df07..e1b04582c 100644 --- a/client/coral-plugin-commentbox/CommentBox.js +++ b/client/coral-plugin-commentbox/CommentBox.js @@ -57,8 +57,6 @@ class CommentBox extends Component { } else if (postedComment.status === 'PREMOD') { addNotification('success', lang.t('comment-post-notif-premod')); updateCountCache(assetId, countCache); - } else { - addNotification('success', 'Your comment has been posted.'); } if (commentPostedHandler) { @@ -110,7 +108,6 @@ class CommentBox extends Component { cStyle='darkGrey' className={`${name}-cancel-button`} onClick={() => { - console.log('cancel button in comment box'); cancelButtonClicked(''); }}> {lang.t('cancel')} diff --git a/client/coral-plugin-stream/RileysAwesomeCommentBox.js b/client/coral-plugin-stream/RileysAwesomeCommentBox.js deleted file mode 100644 index 73fa6407d..000000000 --- a/client/coral-plugin-stream/RileysAwesomeCommentBox.js +++ /dev/null @@ -1,58 +0,0 @@ -import React, {Component} from 'react'; -import {graphql} from 'react-apollo'; -import gql from 'graphql-tag'; - -export class RileysAwesomeCommentBox extends Component { - - postComment() { - console.log(this.props); - console.log('postComment', this.props.asset_id); - this.props.mutate({ - variables: { - asset_id: this.props.asset_id, - body: this.textarea.value, - parent_id: null - } - }).then(({data}) => { - console.log('it workt'); - console.log(data); - }); - } - - render() { - return
- - -
; - } -} - -const postComment = gql` - fragment commentView on Comment { - id - body - user { - name: username - } - actions { - type: action_type - count - current: current_user { - id - created_at - } - } - } - - mutation CreateComment ($asset_id: ID!, $parent_id: ID, $body: String!) { - createComment(asset_id:$asset_id, parent_id:$parent_id, body:$body) { - ...commentView - } - } -`; - -const RileysAwesomeCommentBoxWithData = graphql( - postComment -)(RileysAwesomeCommentBox); - -export default RileysAwesomeCommentBoxWithData; diff --git a/client/coral-plugin-stream/Stream.js b/client/coral-plugin-stream/Stream.js deleted file mode 100644 index 72e03d4ae..000000000 --- a/client/coral-plugin-stream/Stream.js +++ /dev/null @@ -1,100 +0,0 @@ -import React, {Component} from 'react'; -import {graphql} from 'react-apollo'; -import gql from 'graphql-tag'; -import {fetchSignIn} from 'coral-framework/actions/auth'; -import RileysAwesomeCommentBox from 'coral-plugin-stream/RileysAwesomeCommentBox'; - -const assetID = '6187a94b-0b6d-4a96-ac6b-62b529cd8410'; - -// MyComponent is a "presentational" or apollo-unaware component, -// It could be a simple React class: -class Stream extends Component { - - constructor(props) { - super(props); - } - - logMeIn() { - fetchSignIn({email: 'your@example.com', password: 'dfasidfaisdufoiausdfoiuaspdoifas'})(() => {}); - } - - render() { - const {data} = this.props; - return
- - { - data.loading - ? 'loading!' - :
- -

Asset ID: {data.asset.id}

-
    - { - data.asset.comments.map(comment => { - return
  • - {comment.body} [{comment.id}] -
      - { - comment.replies.map(reply => { - return
    • {reply.body}
      • ; - }) - } -
    -
    • ; - }) - } -
-
- } -
; - } -} - -// Initialize GraphQL queries or mutations with the gql tag -const StreamQuery = gql`fragment commentView on Comment { - id - body - user { - name: username - } - tags { - name - } - actions { - type: action_type - count - current: current_user { - id - created_at - } - } -} - -query AssetQuery($asset_id: ID!) { - asset(id: $asset_id) { - id - title - url - commentCount - comments { - ...commentView - replies { - ...commentView - } - } - } -}`; - -// We then can use `graphql` to pass the query results returned by MyQuery -// to MyComponent as a prop (and update them as the results change) -const StreamWithData = graphql( - StreamQuery, { - options: { - variables: { - asset_id: assetID - } - } - } -)(Stream); - -export default StreamWithData; diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js index 2e2b64181..acd3ae7e6 100644 --- a/client/coral-settings/components/NotLoggedIn.js +++ b/client/coral-settings/components/NotLoggedIn.js @@ -10,7 +10,6 @@ export default ({showSignInDialog}) => ( diff --git a/client/coral-settings/components/SettingsHeader.css b/client/coral-settings/components/ProfileHeader.css similarity index 100% rename from client/coral-settings/components/SettingsHeader.css rename to client/coral-settings/components/ProfileHeader.css diff --git a/client/coral-settings/components/ProfileHeader.js b/client/coral-settings/components/ProfileHeader.js new file mode 100644 index 000000000..24b2222bd --- /dev/null +++ b/client/coral-settings/components/ProfileHeader.js @@ -0,0 +1,12 @@ +import React, {PropTypes} from 'react'; +import styles from './ProfileHeader.css'; + +const ProfileHeader = ({username}) => ( +
+

{username}

+
+); + +ProfileHeader.propTypes = {username: PropTypes.string.isRequired}; + +export default ProfileHeader; diff --git a/client/coral-settings/components/SettingsHeader.js b/client/coral-settings/components/SettingsHeader.js deleted file mode 100644 index 34d347314..000000000 --- a/client/coral-settings/components/SettingsHeader.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import styles from './SettingsHeader.css'; - -export default ({userData}) => ( -
-

{userData.username}

- - { - - // Hiding display of users ID unless there's a use case for it. - //

{userData.profiles.map(profile => profile.id)}

- } -
-); diff --git a/client/coral-settings/containers/SettingsContainer.js b/client/coral-settings/containers/ProfileContainer.js similarity index 92% rename from client/coral-settings/containers/SettingsContainer.js rename to client/coral-settings/containers/ProfileContainer.js index 9e72cdadc..4a98ed8ff 100644 --- a/client/coral-settings/containers/SettingsContainer.js +++ b/client/coral-settings/containers/ProfileContainer.js @@ -8,13 +8,13 @@ import {myCommentHistory} from 'coral-framework/graphql/queries'; import {link} from 'coral-framework/services/PymConnection'; import NotLoggedIn from '../components/NotLoggedIn'; import {Spinner} from 'coral-ui'; -import SettingsHeader from '../components/SettingsHeader'; +import ProfileHeader from '../components/ProfileHeader'; import CommentHistory from 'coral-plugin-history/CommentHistory'; import translations from '../translations'; const lang = new I18n(translations); -class SettingsContainer extends Component { +class ProfileContainer extends Component { constructor (props) { super(props); this.state = { @@ -44,7 +44,7 @@ class SettingsContainer extends Component { return (
- + { // Hiding bio until moderation can get figured out @@ -88,4 +88,4 @@ const mapDispatchToProps = () => ({ export default compose( connect(mapStateToProps, mapDispatchToProps), myCommentHistory -)(SettingsContainer); +)(ProfileContainer); diff --git a/client/coral-settings/translations.json b/client/coral-settings/translations.json index c8398bd7b..945d71b87 100644 --- a/client/coral-settings/translations.json +++ b/client/coral-settings/translations.json @@ -1,20 +1,22 @@ { "en":{ + "profile": "Profile", "userNoComment": "You've never left a comment. Join the conversation!", "allComments": "All Comments", "profileSettings": "Profile Settings", "myCommentHistory": "My comment History", "signIn": "Sign in", - "toAccess": " to access Settings", - "fromSettingsPage": "From the Settings Page you can see your comment history." + "toAccess": " to access Profile", + "fromSettingsPage": "From the Profile Page you can see your comment history." }, "es":{ + "profile": "Perfil", "userNoComment": "No has dejado áun ningún comentario. ¡Unete a la conversación!", "allComments": "Todos los comentarios", "profileSettings": "Configuración del perfil", "myCommentHistory": "Mi historial de comentarios", "signIn": "Entrar", - "toAccess": "para acceder a la configuración", + "toAccess": "para acceder a al perfil", "fromSettingsPage": "Desde la peagina de configuración puede ver su historia de comentarios." } } diff --git a/client/coral-sign-in/translations.js b/client/coral-sign-in/translations.js index a2bb60819..08c8bbd3f 100644 --- a/client/coral-sign-in/translations.js +++ b/client/coral-sign-in/translations.js @@ -10,7 +10,7 @@ export default { facebookSignIn: 'Sign in with Facebook', facebookSignUp: 'Sign up with Facebook', logout: 'Logout', - signIn: 'Sign In', + signIn: 'Sign in to join the conversation', or: 'Or', email: 'E-mail Address', password: 'Password', @@ -51,7 +51,7 @@ export default { facebookSignIn: 'Entrar con Facebook', facebookSignUp: 'Regístrate con Facebook', logout: 'Salir', - signIn: 'Entrar', + signIn: 'Entrar para Unirte a la Conversación', or: 'o', email: 'E-mail', password: 'Contraseña', From 6566505fc1ccbb0ec256381338a4446f351cee99 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 24 Feb 2017 11:15:46 -0700 Subject: [PATCH 09/12] Adjusted route --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index e498c5168..5faa23bc2 100644 --- a/app.json +++ b/app.json @@ -29,5 +29,5 @@ "as": "POSTMARK" }], "image": "heroku/nodejs", - "success_url": "/admin/setup" + "success_url": "/admin/install" } From 5c441e90e7cf932de9103b13399ea8b65e36a6e5 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 24 Feb 2017 13:08:48 -0700 Subject: [PATCH 10/12] do not update countCache if the CommentBox is in a reply --- client/coral-plugin-commentbox/CommentBox.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js index 3d895df07..f7444437e 100644 --- a/client/coral-plugin-commentbox/CommentBox.js +++ b/client/coral-plugin-commentbox/CommentBox.js @@ -30,6 +30,7 @@ class CommentBox extends Component { postItem, assetId, updateCountCache, + isReply, countCache, parentId, addNotification, @@ -46,17 +47,17 @@ class CommentBox extends Component { if (this.props.charCount && this.state.body.length > this.props.charCount) { return; } - updateCountCache(assetId, countCache + 1); + !isReply && updateCountCache(assetId, countCache + 1); postItem(comment, 'comments') .then(({data}) => { const postedComment = data.createComment.comment; if (postedComment.status === 'REJECTED') { addNotification('error', lang.t('comment-post-banned-word')); - updateCountCache(assetId, countCache); + !isReply && updateCountCache(assetId, countCache); } else if (postedComment.status === 'PREMOD') { addNotification('success', lang.t('comment-post-notif-premod')); - updateCountCache(assetId, countCache); + !isReply && updateCountCache(assetId, countCache); } else { addNotification('success', 'Your comment has been posted.'); } From d650779c1a3b83ea035ff9b0705874f15cf96996 Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 24 Feb 2017 16:08:25 -0800 Subject: [PATCH 11/12] Removes ; --- client/coral-sign-in/components/FakeComment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index 75d4e51f1..b5af6bf1c 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -35,7 +35,7 @@ class FakeComment extends React.Component { thumb_up -
; +
{}} parentCommentId={'commentID'} From a429af3c0e9da6b9c7ab981ca8dabeab8fa969d2 Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 24 Feb 2017 16:09:22 -0800 Subject: [PATCH 12/12] Removes varialbe not used. --- routes/api/auth/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js index 8bd7a1263..fc3b87e51 100644 --- a/routes/api/auth/index.js +++ b/routes/api/auth/index.js @@ -77,7 +77,7 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => { } // We logged in the user! Let's send back the user data. - res.render('auth-callback', {err: null, data: JSON.stringify(user), changeusername: true}); + res.render('auth-callback', {err: null, data: JSON.stringify(user)}); }); };