From a31a63e1c88530cfdb9ba6bd87435826b7cca888 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 7 Sep 2017 10:12:49 -0300 Subject: [PATCH] Working Tooltip --- .../client/components/Tag.css | 8 ++- .../client/components/Tag.js | 4 +- .../client/components/ModerationActions.css | 14 ++++- .../client/components/ModerationActions.js | 13 ++-- .../client/components/RejectCommentAction.css | 2 - .../client/components/Tooltip.css | 4 +- .../talk-plugin-ignore-user/client/.babelrc | 14 ----- .../client/.eslintrc.json | 23 ------- .../client/components/IgnoreUserAction.css | 17 ------ .../client/components/IgnoreUserAction.js | 12 ---- .../components/IgnoreUserConfirmation.css | 45 -------------- .../components/IgnoreUserConfirmation.js | 23 ------- .../client/components/IgnoredUserSection.css | 22 ------- .../client/components/IgnoredUserSection.js | 23 ------- .../client/containers/IgnoreUserAction.js | 53 ---------------- .../containers/IgnoreUserConfirmation.js | 60 ------------------- .../client/containers/IgnoredUserSection.js | 36 ----------- .../talk-plugin-ignore-user/client/index.js | 43 ------------- .../client/translations.yml | 25 -------- .../talk-plugin-ignore-user/index.js | 1 - 20 files changed, 26 insertions(+), 416 deletions(-) delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.babelrc delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.eslintrc.json delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.css delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.css delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/index.js delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/translations.yml delete mode 100644 plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/index.js diff --git a/plugins/talk-plugin-featured-comments/client/components/Tag.css b/plugins/talk-plugin-featured-comments/client/components/Tag.css index 7ade3d968..0e8c8ae60 100644 --- a/plugins/talk-plugin-featured-comments/client/components/Tag.css +++ b/plugins/talk-plugin-featured-comments/client/components/Tag.css @@ -34,9 +34,9 @@ } .tooltip { - top: 36px; + top: 33px; left: auto; - right: 10px; + right: 5px; } .tooltip::before{ @@ -48,4 +48,8 @@ left: auto; right: 16px; top: -20px; +} + +.tagContainer { + position: relative; } \ No newline at end of file diff --git a/plugins/talk-plugin-featured-comments/client/components/Tag.js b/plugins/talk-plugin-featured-comments/client/components/Tag.js index 57a871ee9..e7e75a0e6 100644 --- a/plugins/talk-plugin-featured-comments/client/components/Tag.js +++ b/plugins/talk-plugin-featured-comments/client/components/Tag.js @@ -31,9 +31,9 @@ export default class Tag extends React.Component { render() { const {tooltip} = this.state; return( - + onTouchEnd={this.hideTooltip} > {t('talk-plugin-featured-comments.featured')} diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.css b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.css index fd841e1cd..1fc461afb 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.css +++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.css @@ -1,8 +1,18 @@ .moderationActions { - display: inline; + position: relative; + display: inline-block; padding: 0 4px; } -.moderationActions:hover { +.arrow { + -ms-user-select:none; + -moz-user-select: none; + -webkit-user-select: none; + -webkit-touch-callout:none; + user-select: none; + -webkit-tap-highlight-color:rgba(0,0,0,0); +} + +.arrow:hover { cursor: pointer; } \ No newline at end of file diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js index 1b7b35948..d893fae84 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js +++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js @@ -14,13 +14,10 @@ export default class Tag extends React.Component { this.state = { tooltip: false }; - } - toggleTooltip = (e) => { - e.preventDefault(); + toogleTooltip = (e) => { const {tooltip} = this.state; - this.setState({ tooltip: !tooltip }); @@ -36,14 +33,12 @@ export default class Tag extends React.Component { const {tooltip} = this.state; return( -
- - +
+ {tooltip ? : } - {tooltip && ( - + )} diff --git a/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.css b/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.css index ac818278c..fb18e3a18 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.css +++ b/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.css @@ -4,8 +4,6 @@ .button { composes: buttonReset from "coral-framework/styles/reset.css"; - border: 1px solid rgba(1, 1, 1, 0.8); - border-radius: 1px; padding: 3px 6px; font-size: 12px; transition: color 100ms, background 100ms; diff --git a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css b/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css index 63e0a1e1b..905dd9f13 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css +++ b/plugins/talk-plugin-moderation-actions/client/components/Tooltip.css @@ -7,9 +7,9 @@ -webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2); box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2); z-index: 10; - top: 26px; + top: 32px; right: 0px; - width: 200px; + width: 160px; text-align: left; color: #616161; } diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.babelrc b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.babelrc deleted file mode 100644 index 60be246eb..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.babelrc +++ /dev/null @@ -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" - ] -} \ No newline at end of file diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.eslintrc.json b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.eslintrc.json deleted file mode 100644 index 9fe56bd14..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/.eslintrc.json +++ /dev/null @@ -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"] }] - } -} diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.css b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.css deleted file mode 100644 index ac818278c..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.css +++ /dev/null @@ -1,17 +0,0 @@ -.root { - white-space: nowrap; -} - -.button { - composes: buttonReset from "coral-framework/styles/reset.css"; - border: 1px solid rgba(1, 1, 1, 0.8); - border-radius: 1px; - padding: 3px 6px; - font-size: 12px; - transition: color 100ms, background 100ms; - - &:hover { - background-color: rgba(1, 1, 1, 0.8); - color: white; - } -} diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.js deleted file mode 100644 index 19319ec9c..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserAction.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import styles from './IgnoreUserAction.css'; -import {t} from 'plugin-api/beta/client/services'; -import cn from 'classnames'; - -export default ({ignoreUser}) => ( - -); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css deleted file mode 100644 index 4f3d8e9da..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.css +++ /dev/null @@ -1,45 +0,0 @@ -.root { - width: 200px; -} - -.actions { - display: flex; - justify-content: flex-end; - margin-top: 8px; -} - -.message { - font-size: 13px; -} - -.title { - padding: 0; - margin: 0 0 8px 0; - font-size: 15px; -} - -.button { - composes: buttonReset from "coral-framework/styles/reset.css"; - border: 1px solid rgba(1, 1, 1, 0.8); - border-radius: 1px; - padding: 3px 6px; - font-size: 12px; - transition: color 100ms, background 100ms; - - &:hover { - background-color: rgba(1, 1, 1, 0.8); - color: white; - } -} - -.cancel { - composes: buttonReset from "coral-framework/styles/reset.css"; - padding: 3px 6px; - font-size: 12px; - transition: color 100ms; - margin-right: 4px; - - &:hover { - color: rgba(1, 1, 1, 0.75); - } -} diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.js deleted file mode 100644 index 8da879f62..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoreUserConfirmation.js +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react'; -import styles from './IgnoreUserConfirmation.css'; -import {t} from 'plugin-api/beta/client/services'; -import cn from 'classnames'; - -export default ({ignoreUser, cancel, username}) => ( - -); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.css b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.css deleted file mode 100644 index b279101ea..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.css +++ /dev/null @@ -1,22 +0,0 @@ -.list { - display: table; - list-style-type: none; - margin-left: 0; - padding-left: 0; -} - -.listItem { - display: table-row; -} - -.username { - display: table-cell; -} - -.button { - composes: buttonReset from "coral-framework/styles/reset.css"; - - margin-left: 16px; - color: #D0011B; - text-decoration: underline; -} diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.js deleted file mode 100644 index 3946626cd..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/components/IgnoredUserSection.js +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react'; -import styles from './IgnoredUserSection.css'; -import {t} from 'plugin-api/beta/client/services'; - -export default ({ignoredUsers, stopIgnoringUser}) => ( -
-

{t('talk-plugin-ignore-user.section_title')}

-

{t('talk-plugin-ignore-user.section_info')}

-
    - {ignoredUsers.map(({username, id}) => ( -
  • - {username} - -
  • - ))} -
-
-); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js deleted file mode 100644 index d7e9d38b5..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserAction.js +++ /dev/null @@ -1,53 +0,0 @@ -import React from 'react'; -import IgnoreUserAction from '../components/IgnoreUserAction'; -import {compose, gql} from 'react-apollo'; -import {connect, withFragments, excludeIf} from 'plugin-api/beta/client/hocs'; -import {bindActionCreators} from 'redux'; -import {setContentSlot} from 'plugins/talk-plugin-author-menu/client/actions'; -import IgnoreUserConfirmation from './IgnoreUserConfirmation'; -import {getDefinitionName} from 'plugin-api/beta/client/utils'; - -class IgnoreUserActionContainer extends React.Component { - - ignoreUser = () => { - this.props.setContentSlot('ignoreUserConfirmation'); - }; - - render() { - return ; - } -} - -const mapDispatchToProps = (dispatch) => - bindActionCreators({ - setContentSlot, - }, dispatch); - -const withIgnoreUserActionFragments = withFragments({ - root: gql` - fragment TalkIgnoreUser_IgnoreUserAction_root on RootQuery { - me { - id - } - } - `, - comment: gql` - fragment TalkIgnoreUser_IgnoreUserAction_comment on Comment { - user { - id - } - ...${getDefinitionName(IgnoreUserConfirmation.fragments.comment)} - } - ${IgnoreUserConfirmation.fragments.comment} - `, -}); - -const enhance = compose( - connect(null, mapDispatchToProps), - withIgnoreUserActionFragments, - excludeIf(({root: {me}, comment}) => !me || me.id === comment.user.id), -); - -export default enhance(IgnoreUserActionContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js deleted file mode 100644 index fdf6d1986..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js +++ /dev/null @@ -1,60 +0,0 @@ -import React from 'react'; -import IgnoreUserConfirmation from '../components/IgnoreUserConfirmation'; -import {compose, gql} from 'react-apollo'; -import {connect, withFragments, withIgnoreUser} from 'plugin-api/beta/client/hocs'; -import {bindActionCreators} from 'redux'; -import {closeMenu} from 'plugins/talk-plugin-author-menu/client/actions'; -import {notify} from 'plugin-api/beta/client/actions/notification'; -import {t} from 'plugin-api/beta/client/services'; -import {getErrorMessages} from 'plugin-api/beta/client/utils'; - -class IgnoreUserConfirmationContainer extends React.Component { - - ignoreUser = () => { - const {ignoreUser, notify, comment, closeMenu} = this.props; - ignoreUser(comment.user.id) - .then(() => { - notify('success', t('talk-plugin-ignore-user.notify_success', comment.user.username)); - }) - .catch((err) => { - notify('error', getErrorMessages(err)); - }); - closeMenu(); - }; - - cancel = () => { - this.props.closeMenu(); - } - - render() { - return ; - } -} - -const mapDispatchToProps = (dispatch) => - bindActionCreators({ - closeMenu, - notify, - }, dispatch); - -const withIgnoreUserConfirmationFragments = withFragments({ - comment: gql` - fragment TalkIgnoreUser_IgnoreUserConfirmation_comment on Comment { - user { - id - username - } - }`, -}); - -const enhance = compose( - connect(null, mapDispatchToProps), - withIgnoreUserConfirmationFragments, - withIgnoreUser, -); - -export default enhance(IgnoreUserConfirmationContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js deleted file mode 100644 index e420f180b..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/containers/IgnoredUserSection.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react'; -import IgnoredUserSection from '../components/IgnoredUserSection'; -import {compose, gql} from 'react-apollo'; -import {withFragments, excludeIf, withStopIgnoringUser} from 'plugin-api/beta/client/hocs'; - -class IgnoredUserSectionContainer extends React.Component { - - render() { - return ; - } -} - -const withIgnoredUserSectionFragments = withFragments({ - root: gql` - fragment TalkIgnoreUser_IgnoredUserSection_root on RootQuery { - me { - id - ignoredUsers { - id, - username, - } - } - } - `, -}); - -const enhance = compose( - withIgnoredUserSectionFragments, - withStopIgnoringUser, - excludeIf(({root: {me}}) => me.ignoredUsers.length === 0), -); - -export default enhance(IgnoredUserSectionContainer); diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/index.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/index.js deleted file mode 100644 index 6583f68e6..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/index.js +++ /dev/null @@ -1,43 +0,0 @@ -import IgnoreUserAction from './containers/IgnoreUserAction'; -import IgnoreUserConfirmation from './containers/IgnoreUserConfirmation'; -import IgnoredUserSection from './containers/IgnoredUserSection'; -import translations from './translations.yml'; -import update from 'immutability-helper'; - -export default { - slots: { - authorMenuActions: [IgnoreUserAction], - ignoreUserConfirmation: [IgnoreUserConfirmation], - profileSections: [IgnoredUserSection], - }, - translations, - mutations: { - IgnoreUser: ({variables}) => ({ - updateQueries: { - CoralEmbedStream_Embed: (previousData) => { - const ignoredUserId = variables.id; - const updated = update(previousData, {me: {ignoredUsers: {$push: [{ - id: ignoredUserId, - __typename: 'User', - }]}}}); - return updated; - } - } - }), - StopIgnoringUser: ({variables}) => ({ - updateQueries: { - CoralEmbedStream_Profile: (previousData) => { - const noLongerIgnoredUserId = variables.id; - - // remove noLongerIgnoredUserId from ignoredUsers - const updated = update(previousData, {me: {ignoredUsers: { - $apply: (ignoredUsers) => { - return ignoredUsers.filter((u) => u.id !== noLongerIgnoredUserId); - } - }}}); - return updated; - } - } - }), - }, -}; diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/translations.yml b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/translations.yml deleted file mode 100644 index a6c051ada..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/client/translations.yml +++ /dev/null @@ -1,25 +0,0 @@ -en: - talk-plugin-ignore-user: - section_title: Ignored users - section_info: Because you ignored the following commenters, their comments are hidden. - stop_ignoring: Stop ignoring - ignore_user: Ignore User - cancel: Cancel - confirmation: | - When you ignore a user, all comments they wrote on the site will be hidden from you. You can - undo this later from My Profile. - notify_success: | - You are now ignoring {0}. You can undo this action from My Profile. - confirmation_title: Ignore {0}? -es: - talk-plugin-ignore-user: - section_title: "Usuarios ignorados" - stop_ignoring: "No ignorar más" -fr: - talk-plugin-ignore-user: - section_title: "Utilisateurs ignorés" -pt_Br: - talk-plugin-ignore-user: - section_title: "Usuários ignorados" - section_info: "Porque você ignorou os seguintes comentadores, seus comentários estão ocultos." - stop_ignoring: "Pare de ignorar" diff --git a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/index.js b/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/index.js deleted file mode 100644 index f053ebf79..000000000 --- a/plugins/talk-plugin-moderation-actions/client/components/talk-plugin-ignore-user/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = {};