diff --git a/public/index.html b/public/index.html index fb4cd42f9..612cefda0 100644 --- a/public/index.html +++ b/public/index.html @@ -12,7 +12,7 @@ --> - + - + diff --git a/src/components/Loading/Loading.js b/src/components/Loading/Loading.js index f45ca172d..96f0332f7 100644 --- a/src/components/Loading/Loading.js +++ b/src/components/Loading/Loading.js @@ -1,21 +1,12 @@ import React from 'react'; -import { FormattedMessage } from 'react-intl'; export default function({ page }) { if (page) { return (
-
-

-   -

-
+
); } - return ( -
- -
- ); + return
; } diff --git a/src/components/Reports/Reports.js b/src/components/Reports/Reports.js index c09627a8c..0f5cdb904 100644 --- a/src/components/Reports/Reports.js +++ b/src/components/Reports/Reports.js @@ -9,6 +9,7 @@ import { SiteTrackingNotAvailableReasons, } from '../SiteTrackingRequired/SiteTrackingRequired'; import { Helmet } from 'react-helmet'; +import Loading from '../Loading/Loading'; class Reports extends React.Component { /** @@ -77,7 +78,7 @@ class Reports extends React.Component { changePeriod={this.changePeriod} /> {!this.state.domains ? ( -
+ ) : (
diff --git a/src/components/Reports/ReportsPageRanking/ReportsPageRanking.js b/src/components/Reports/ReportsPageRanking/ReportsPageRanking.js index 1cd28f4b3..5a76e1f6d 100644 --- a/src/components/Reports/ReportsPageRanking/ReportsPageRanking.js +++ b/src/components/Reports/ReportsPageRanking/ReportsPageRanking.js @@ -1,6 +1,7 @@ import React from 'react'; import { InjectAppServices } from '../../../services/pure-di'; import { FormattedMessage } from 'react-intl'; +import Loading from '../../Loading/Loading'; class ReportsPageRanking extends React.Component { constructor({ dependencies: { datahubClient } }) { @@ -68,10 +69,10 @@ class ReportsPageRanking extends React.Component { return ( <> - {pages === null ? ( -
- ) : ( -
+
+ {pages === null ? ( + + ) : (

@@ -100,8 +101,8 @@ class ReportsPageRanking extends React.Component {

))}
-
- )} + )} +
); }