From f582cc2534198ce5a75bbea68cda14505a42c94a Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 30 Aug 2017 22:25:03 +0700 Subject: [PATCH] Add transition effect --- .../Community/components/FlaggedAccounts.css | 18 +++ .../Community/components/FlaggedAccounts.js | 109 ++++++++++-------- .../Community/components/FlaggedUser.css | 2 +- .../routes/Moderation/components/styles.css | 4 +- 4 files changed, 83 insertions(+), 50 deletions(-) diff --git a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.css b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.css index fef9aabd8..4e9600cbd 100644 --- a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.css +++ b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.css @@ -14,3 +14,21 @@ margin: 0; padding: 0; } + +.userLeave { + opacity: 1.0; +} + +.userLeaveActive { + opacity: 0; + transition: opacity 800ms; +} + +.userEnter { + opacity: 0; +} + +.userEnterActive { + opacity: 1.0; + transition: opacity 800ms; +} diff --git a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js index 8687226db..328e1789d 100644 --- a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js +++ b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js @@ -1,59 +1,74 @@ import React from 'react'; import t from 'coral-framework/services/i18n'; -import styles from './FlaggedAccounts.css'; import EmptyCard from 'coral-admin/src/components/EmptyCard'; import LoadMore from '../../../components/LoadMore'; import FlaggedUser from '../containers/FlaggedUser'; +import {CSSTransitionGroup} from 'react-transition-group'; +import styles from './FlaggedAccounts.css'; -const FlaggedAccounts = (props) => { - const { - users, - loadMore, - showBanUserDialog, - showSuspendUserDialog, - showRejectUsernameDialog, - approveUser, - me, - viewUserDetail, - } = props; +class FlaggedAccounts extends React.Component { + render() { + const { + users, + loadMore, + showBanUserDialog, + showSuspendUserDialog, + showRejectUsernameDialog, + approveUser, + me, + viewUserDetail, + } = this.props; - const hasResults = users.nodes && !!users.nodes.length; + const hasResults = users.nodes && !!users.nodes.length; - return ( -
-
- { - hasResults - ?
    - { - users.nodes.map((user, index) => { - return ( - - ); - }) - } -
- : {t('community.no_flagged_accounts')} - } - + return ( +
+
+ { + hasResults + ? + { + users.nodes.map((user) => { + return ( + + ); + }) + } + + : {t('community.no_flagged_accounts')} + } + +
-
- ); -}; + ); + } +} export default FlaggedAccounts; diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.css b/client/coral-admin/src/routes/Community/components/FlaggedUser.css index 615b00e21..aaaaee3a3 100644 --- a/client/coral-admin/src/routes/Community/components/FlaggedUser.css +++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.css @@ -9,7 +9,7 @@ min-width: 400px; margin: 0 auto; position: relative; - transition: all 200ms; + transition: box-shadow 200ms, margin-bottom 200ms; padding: 10px 0 0; min-height: 220px; diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css index fe9c66580..6f27e0b94 100644 --- a/client/coral-admin/src/routes/Moderation/components/styles.css +++ b/client/coral-admin/src/routes/Moderation/components/styles.css @@ -449,20 +449,20 @@ span { .commentLeave { opacity: 1.0; - transition: opacity 800ms; } .commentLeaveActive { opacity: 0; + transition: opacity 800ms; } .commentEnter { opacity: 0; - transition: opacity 800ms; } .commentEnterActive { opacity: 1.0; + transition: opacity 800ms; } .editedMarker {