From e21b59fa4c8bb6c3fa45f0915cceb983860774ba Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 3 Mar 2020 11:13:08 +0200 Subject: [PATCH] Animate dashboard loading to make it smoother (#38) --- assets/css/app.css | 4 +- assets/css/{coffee_cup.css => loader.css} | 7 +++ assets/css/modal.css | 27 ++++++-- assets/js/dashboard/fade-in.js | 8 +++ assets/js/dashboard/stats/countries.js | 26 +++++--- assets/js/dashboard/stats/devices.js | 63 +++++++++++-------- assets/js/dashboard/stats/modals/countries.js | 8 +-- .../dashboard/stats/modals/google-keywords.js | 10 +-- assets/js/dashboard/stats/modals/modal.js | 19 +++++- assets/js/dashboard/stats/modals/pages.js | 8 +-- .../stats/modals/referrer-drilldown.js | 8 +-- assets/js/dashboard/stats/modals/referrers.js | 9 +-- assets/js/dashboard/stats/pages.js | 26 +++++--- assets/js/dashboard/stats/referrers.js | 12 ++-- assets/js/dashboard/stats/visitor-graph.js | 12 ++-- 15 files changed, 150 insertions(+), 97 deletions(-) rename assets/css/{coffee_cup.css => loader.css} (75%) create mode 100644 assets/js/dashboard/fade-in.js diff --git a/assets/css/app.css b/assets/css/app.css index 7b4c20ece..d091e34c2 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -1,7 +1,7 @@ @tailwind preflight; @tailwind components; @import "modal.css"; -@import "coffee_cup.css"; +@import "loader.css"; @import "tooltip.css"; .button { @@ -253,5 +253,5 @@ a { } .fade-enter-active { opacity: 1; - transition: opacity 200ms ease-in; + transition: opacity 100ms ease-in; } diff --git a/assets/css/coffee_cup.css b/assets/css/loader.css similarity index 75% rename from assets/css/coffee_cup.css rename to assets/css/loader.css index a97d62fad..ad6eb9c66 100644 --- a/assets/css/coffee_cup.css +++ b/assets/css/loader.css @@ -1,6 +1,7 @@ .loading { width: 50px; height: 50px; + animation: loaderFadein .2s ease-in; } .loading div { @@ -20,3 +21,9 @@ @-webkit-keyframes spin { to { -webkit-transform: rotate(360deg); } } + +@keyframes loaderFadein { + 0% { opacity: 0; } + 50% { opacity: 0; } + 100% { opacity: 1; } +} diff --git a/assets/css/modal.css b/assets/css/modal.css index 79bdcf0bf..50f797349 100644 --- a/assets/css/modal.css +++ b/assets/css/modal.css @@ -7,11 +7,20 @@ } .modal[aria-hidden="false"] .modal__overlay { - animation: mmfadeIn .2s cubic-bezier(0.0, 0.0, 0.2, 1); + animation: mmfadeIn .2s ease-in; } .modal[aria-hidden="true"] .modal__overlay { - animation: mmfadeOut .2s cubic-bezier(0.0, 0.0, 0.2, 1); + animation: mmfadeOut .2s ease-in; +} + +.modal-enter { + opacity: 0; +} + +.modal-enter-active { + opacity: 1; + transition: opacity 100ms ease-in; } .modal__overlay { @@ -26,6 +35,17 @@ overflow-y: auto; } +.modal__loader { + margin: 300px auto 0 auto; + animation: loaderFadein .4s ease-in; +} + +@keyframes loaderFadein { + 0% { opacity: 0; } + 50% { opacity: 0; } + 100% { opacity: 1; } +} + .modal__container { background-color: #fff; padding: 1rem 2rem; @@ -34,6 +54,7 @@ margin: 50px auto; box-sizing: border-box; min-height: 509px; + transition: height 200ms ease-in; } .modal__header { @@ -54,9 +75,7 @@ .modal__close:before { content: "\2715"; } .modal__content { - margin-top: 2rem; margin-bottom: 2rem; - line-height: 1.5; } @keyframes mmfadeIn { diff --git a/assets/js/dashboard/fade-in.js b/assets/js/dashboard/fade-in.js new file mode 100644 index 000000000..57d8539f7 --- /dev/null +++ b/assets/js/dashboard/fade-in.js @@ -0,0 +1,8 @@ +import React from 'react'; + +export default function FadeIn({show, children}) { + const className = show ? "fade-enter-active" : "fade-enter" + + return
{children}
+} + diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/countries.js index 932c0ce79..002bcfcfa 100644 --- a/assets/js/dashboard/stats/countries.js +++ b/assets/js/dashboard/stats/countries.js @@ -1,6 +1,7 @@ import React from 'react'; import Datamap from 'datamaps' +import FadeIn from '../fade-in' import Bar from './bar' import MoreLink from './more-link' import * as api from '../api' @@ -79,21 +80,26 @@ export default class Countries extends React.Component { }); } - render() { - if (this.state.loading) { - return ( -
-
-
- ) - } else if (this.state.countries) { + renderBody() { + if (this.state.countries) { return ( -
+

Countries

-
+ ) } } + + render() { + return ( +
+ { this.state.loading &&
} + + { this.renderBody() } + +
+ ) + } } diff --git a/assets/js/dashboard/stats/devices.js b/assets/js/dashboard/stats/devices.js index be92bedd7..5b973a6fd 100644 --- a/assets/js/dashboard/stats/devices.js +++ b/assets/js/dashboard/stats/devices.js @@ -74,15 +74,18 @@ class ScreenSizes extends React.Component { render() { return ( - - -
- Screen size - Visitors -
- { this.state.sizes && this.state.sizes.map(this.renderScreenSize.bind(this)) } -
-
+ + { this.state.loading &&
} + + +
+ Screen size + Visitors +
+ { this.state.sizes && this.state.sizes.map(this.renderScreenSize.bind(this)) } +
+
+
) } } @@ -123,15 +126,18 @@ class Browsers extends React.Component { render() { return ( - -
-
- Browser - Visitors -
- { this.state.browsers && this.state.browsers.map(this.renderBrowser.bind(this)) } -
-
+ + { this.state.loading &&
} + + +
+ Browser + Visitors +
+ { this.state.browsers && this.state.browsers.map(this.renderBrowser.bind(this)) } +
+
+
) } } @@ -172,15 +178,18 @@ class OperatingSystems extends React.Component { render() { return ( - - -
- Operating system - Visitors -
- { this.state.operatingSystems && this.state.operatingSystems.map(this.renderOperatingSystem.bind(this)) } -
-
+ + { this.state.loading &&
} + + +
+ Operating system + Visitors +
+ { this.state.operatingSystems && this.state.operatingSystems.map(this.renderOperatingSystem.bind(this)) } +
+
+
) } } diff --git a/assets/js/dashboard/stats/modals/countries.js b/assets/js/dashboard/stats/modals/countries.js index e1def2039..f2be08748 100644 --- a/assets/js/dashboard/stats/modals/countries.js +++ b/assets/js/dashboard/stats/modals/countries.js @@ -30,11 +30,7 @@ class CountriesModal extends React.Component { } renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.countries) { + if (this.state.countries) { return (
@@ -63,7 +59,7 @@ class CountriesModal extends React.Component { render() { return ( - + { this.renderBody() } ) diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js index fe552c4c0..4cac6ebd6 100644 --- a/assets/js/dashboard/stats/modals/google-keywords.js +++ b/assets/js/dashboard/stats/modals/google-keywords.js @@ -93,11 +93,7 @@ class GoogleKeywordsModal extends React.Component { } renderBody() { - if (this.state.loading) { - return ( -
- ) - } else { + if (!this.state.loading) { return (
@@ -107,7 +103,7 @@ class GoogleKeywordsModal extends React.Component {

{this.state.totalVisitors} new visitors from Google

-

{toHuman(this.state.query)}

+

{toHuman(this.state.query)}

{ this.renderKeywords() }
@@ -117,7 +113,7 @@ class GoogleKeywordsModal extends React.Component { render() { return ( - + { this.renderBody() } ) diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.js index 9048980d9..58dc80b03 100644 --- a/assets/js/dashboard/stats/modals/modal.js +++ b/assets/js/dashboard/stats/modals/modal.js @@ -2,6 +2,12 @@ import React from "react"; import { createPortal } from "react-dom"; import { withRouter } from 'react-router-dom'; +function SlideIn({show, children}) { + const className = show ? "modal-enter-active" : "modal-enter" + + return
{children}
+} + class Modal extends React.Component { constructor(props) { super(props) @@ -47,9 +53,16 @@ class Modal extends React.Component {
-
- {this.props.children} -
+ { !this.props.show && +
+ } + + +
+ {this.props.children} +
+
+
, document.getElementById("modal_root"), diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js index 018fcafc4..aaa4aee50 100644 --- a/assets/js/dashboard/stats/modals/pages.js +++ b/assets/js/dashboard/stats/modals/pages.js @@ -45,11 +45,7 @@ class PagesModal extends React.Component { } renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.pages) { + if (this.state.pages) { return (
@@ -78,7 +74,7 @@ class PagesModal extends React.Component { render() { return ( - + { this.renderBody() } ) diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 9a5a74597..478e6a0aa 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -113,11 +113,7 @@ class ReferrerDrilldownModal extends React.Component { } renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.referrers) { + if (this.state.referrers) { return (
@@ -149,7 +145,7 @@ class ReferrerDrilldownModal extends React.Component { render() { return ( - + { this.renderBody() } ) diff --git a/assets/js/dashboard/stats/modals/referrers.js b/assets/js/dashboard/stats/modals/referrers.js index e91946d42..4dab26161 100644 --- a/assets/js/dashboard/stats/modals/referrers.js +++ b/assets/js/dashboard/stats/modals/referrers.js @@ -1,6 +1,7 @@ import React from "react"; import { Link, withRouter } from 'react-router-dom' +import FadeIn from '../../fade-in' import Modal from './modal' import * as api from '../../api' import numberFormatter from '../../number-formatter' @@ -52,11 +53,7 @@ class ReferrersModal extends React.Component { } renderBody() { - if (this.state.loading) { - return ( -
- ) - } else if (this.state.referrers) { + if (this.state.referrers) { return (
@@ -85,7 +82,7 @@ class ReferrersModal extends React.Component { render() { return ( - + { this.renderBody() } ) diff --git a/assets/js/dashboard/stats/pages.js b/assets/js/dashboard/stats/pages.js index 5ced8da2b..5e36ef318 100644 --- a/assets/js/dashboard/stats/pages.js +++ b/assets/js/dashboard/stats/pages.js @@ -1,5 +1,6 @@ import React from 'react'; +import FadeIn from '../fade-in' import Bar from './bar' import MoreLink from './more-link' import numberFormatter from '../number-formatter' @@ -42,16 +43,10 @@ export default class Pages extends React.Component { ) } - render() { - if (this.state.loading) { - return ( -
-
-
- ) - } else if (this.state.pages) { + renderContent() { + if (this.state.pages) { return ( -
+

Top Pages

@@ -61,8 +56,19 @@ export default class Pages extends React.Component { { this.state.pages.map(this.renderPage.bind(this)) } -
+
) } } + + render() { + return ( +
+ { this.state.loading &&
} + + { this.renderContent() } + +
+ ) + } } diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index 820c88536..a35db8c6c 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -1,6 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom' +import FadeIn from '../fade-in' import Bar from './bar' import MoreLink from './more-link' import numberFormatter from '../number-formatter' @@ -46,11 +47,10 @@ export default class Referrers extends React.Component { } renderContent() { - if (this.state.loading) { - return
- } else { + if (this.state.referrers) { return ( +

Top Referrers

Referrer @@ -67,8 +67,10 @@ export default class Referrers extends React.Component { render() { return (
-

Top Referrers

- { this.renderContent() } + { this.state.loading &&
} + + { this.renderContent() } +
) } diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 94872fa56..3c6e31b5d 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -1,6 +1,7 @@ import React from 'react'; import { withRouter } from 'react-router-dom' import Chart from 'chart.js' +import FadeIn from '../fade-in' import { eventName } from '../query' import numberFormatter from '../number-formatter' import { isToday, shiftMonths, formatMonth } from '../date' @@ -335,19 +336,20 @@ export default class VisitorGraph extends React.Component { } renderInner() { - if (this.state.loading) { + if (this.state.graphData) { return ( -
+ ) - } else if (this.state.graphData) { - return } } render() { return (
- { this.renderInner() } + { this.state.loading &&
} + + { this.renderInner() } +
) }