summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/common/loader.component.js21
-rw-r--r--client/faceSearch/faceSearch.result.js1
-rw-r--r--package-lock.json13
-rw-r--r--package.json1
4 files changed, 28 insertions, 8 deletions
diff --git a/client/common/loader.component.js b/client/common/loader.component.js
index 5930c63e..df25dd39 100644
--- a/client/common/loader.component.js
+++ b/client/common/loader.component.js
@@ -1,11 +1,18 @@
import React from 'react'
+import Spinner from 'react-spin'
export default function Loader() {
- return (
- <div className='loaderWrapper'>
- <div className='loader'>
- <img src="/assets/img/loader.gif" />
- </div>
- </div>
- )
+ const spinCfg = {
+ width: 5,
+ radius: 20,
+ color: 'white',
+ }
+ return <Spinner config={spinCfg} />
+ // return (
+ // <div className='loaderWrapper'>
+ // <div className='loader'>
+ // <img src="/assets/img/loader.gif" />
+ // </div>
+ // </div>
+ // )
}
diff --git a/client/faceSearch/faceSearch.result.js b/client/faceSearch/faceSearch.result.js
index c2509033..00dec160 100644
--- a/client/faceSearch/faceSearch.result.js
+++ b/client/faceSearch/faceSearch.result.js
@@ -49,7 +49,6 @@ class FaceSearchResult extends Component {
return (
<div className='result'>
<div>
- <Loader /><br />
<h2>Searching...</h2>
</div>
</div>
diff --git a/package-lock.json b/package-lock.json
index 60a74ece..72d44774 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7163,6 +7163,14 @@
}
}
},
+ "react-spin": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/react-spin/-/react-spin-0.6.2.tgz",
+ "integrity": "sha1-56+crRWLjGAdg6qtXbSr0b9CuMk=",
+ "requires": {
+ "spin.js": "^2.0.1"
+ }
+ },
"read-pkg": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -8419,6 +8427,11 @@
}
}
},
+ "spin.js": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz",
+ "integrity": "sha1-bKpW1SBnNFD9XPvGlx5tB3LDeho="
+ },
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
diff --git a/package.json b/package.json
index fcabb7e1..d007cf2e 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
"react-dom": "^16.3.0",
"react-hot-loader": "^4.3.0",
"react-redux": "^5.0.7",
+ "react-spin": "^0.6.2",
"redux": "^4.0.0",
"redux-thunk": "^2.3.0",
"snapsvg": "^0.5.1",