From b1e2f3ecbf1c056763b03a35a17f0b3b198c8ba2 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Feb 13 2018 12:32:53 +0000 Subject: use the fontawesome spinner rather than GIFs --- diff --git a/js/app/components/CompletionInput.js b/js/app/components/CompletionInput.js index 1817bb2..d50e56c 100644 --- a/js/app/components/CompletionInput.js +++ b/js/app/components/CompletionInput.js @@ -131,7 +131,7 @@ export default class CompletionInput extends React.Component { inputProps={inputProps} /> {this.state.isLoading && - + } ); diff --git a/js/app/components/HubConfig/HubConfigDialog.js b/js/app/components/HubConfig/HubConfigDialog.js index 5e9d02c..acf160e 100644 --- a/js/app/components/HubConfig/HubConfigDialog.js +++ b/js/app/components/HubConfig/HubConfigDialog.js @@ -82,7 +82,7 @@ export default class HubConfigDialog extends React.Component { const footer = (
{ this.props.isLoading && - + } { this.props.hub.error &&
diff --git a/js/app/components/HubHeader/index.js b/js/app/components/HubHeader/index.js index cdef55a..f5fe120 100644 --- a/js/app/components/HubHeader/index.js +++ b/js/app/components/HubHeader/index.js @@ -33,7 +33,7 @@ class HubHeader extends React.Component { return (
{ this.props.isLoading && - + } { isLoaded &&
diff --git a/js/app/components/Spinner/Spinner.css b/js/app/components/Spinner/Spinner.css deleted file mode 100644 index 9a7ba7c..0000000 --- a/js/app/components/Spinner/Spinner.css +++ /dev/null @@ -1,15 +0,0 @@ -.Spinner { - width: 50px; - height: 10px; - vertical-align: bottom; -} -.Spinner img { - display: block; -} - -.SpinnerCircle { - width: 32px; - height: 32px; - line-height: 32px; - vertical-align: bottom; -} diff --git a/js/app/components/Spinner/index.js b/js/app/components/Spinner/index.js index c88246d..92513b9 100644 --- a/js/app/components/Spinner/index.js +++ b/js/app/components/Spinner/index.js @@ -1,33 +1,19 @@ import React from 'react'; import PropTypes from 'prop-types'; -import "./Spinner.css"; -import SpinnerImg from "./spinner.gif"; -import SpinnerCircleImg from "./spinner-circle.gif"; - export default class Spinner extends React.Component { render() { - let img, className; - if (this.props.circle) { - className = `SpinnerCircle ${this.props.className}`; - img = SpinnerCircleImg; - } else { - className = `Spinner ${this.props.className}`; - img = SpinnerImg; - } return ( -
- loading... +
+
); } } Spinner.propTypes = { - circle: PropTypes.bool, className: PropTypes.string, } Spinner.defaultProps = { - circle: false, className: "", } diff --git a/js/app/components/Spinner/spinner-circle.gif b/js/app/components/Spinner/spinner-circle.gif deleted file mode 100644 index d0bce15..0000000 Binary files a/js/app/components/Spinner/spinner-circle.gif and /dev/null differ diff --git a/js/app/components/Spinner/spinner.gif b/js/app/components/Spinner/spinner.gif deleted file mode 100644 index 8a3ea9f..0000000 Binary files a/js/app/components/Spinner/spinner.gif and /dev/null differ diff --git a/js/app/components/feed/ItemsGetter.js b/js/app/components/feed/ItemsGetter.js index 2e2a146..13d455c 100644 --- a/js/app/components/feed/ItemsGetter.js +++ b/js/app/components/feed/ItemsGetter.js @@ -100,7 +100,7 @@ class ItemsGetter extends React.Component {
{this.props.children} { this.state.isLoading && - + } { this.state.errorMessage &&
diff --git a/js/app/widgets/halp/ModalAllRequests.js b/js/app/widgets/halp/ModalAllRequests.js index 2a8eb19..8d6c02f 100644 --- a/js/app/widgets/halp/ModalAllRequests.js +++ b/js/app/widgets/halp/ModalAllRequests.js @@ -213,7 +213,7 @@ export default class ModalAllRequests extends React.Component { { this.state.isLoading && - + }
diff --git a/js/app/widgets/library/SelectLinkForm.js b/js/app/widgets/library/SelectLinkForm.js index 6a0f81f..2e140cb 100644 --- a/js/app/widgets/library/SelectLinkForm.js +++ b/js/app/widgets/library/SelectLinkForm.js @@ -45,7 +45,7 @@ export default class SelectLinkForm extends React.Component { Fetch URL { this.props.isLoading && - + } { this.props.error &&