Merge pull request #43 from chqy24/dev

 SERVICE REQUEST

Author: gondzo

config/default.js

@@ -7,5 +7,5 @@ module.exports = {
   PORT: process.env.PORT || 3000,
 
   // below env variables are visible in frontend
-  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
 };

config/development.js

@@ -7,5 +7,5 @@ module.exports = {
   PORT: process.env.PORT || 3000,
 
   // below env variables are visible in frontend
-  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
 };

config/production.js

@@ -7,5 +7,5 @@ module.exports = {
   PORT: process.env.PORT || 3000,
 
   // below env variables are visible in frontend
-  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
 };

config/staging.js

@@ -7,5 +7,5 @@ module.exports = {
   PORT: process.env.PORT || 3000,
 
   // below env variables are visible in frontend
-  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
 };

config/test.js

@@ -7,5 +7,5 @@ module.exports = {
   PORT: process.env.PORT || 3000,
 
   // below env variables are visible in frontend
-  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
 };

src/components/Header/Header.scss

@@ -3,7 +3,7 @@
   width: 100%;
   color: white;
   position: relative;
-  z-index: 2;
+  z-index: 1001;
 
   > ul {
     padding: 0;

src/components/Pagination/Pagination.jsx

@@ -31,4 +31,4 @@ Pagination.propTypes = {
   onPageChange: PropTypes.func.isRequired,
 };
 
-export default CSSModules(Pagination, styles);
+export default CSSModules(Pagination, styles, {allowMultiple: true});

src/components/Pagination/Pagination.scss

@@ -37,7 +37,6 @@
   > a {
     color: #fff;
   }
-}
 
 .break,
 .next,
@@ -73,3 +72,5 @@
 .next {
   background-image: url('icon-pagination-next.png');
 }
+
+}

src/components/Spinner/Spinner.jsx

@@ -0,0 +1,52 @@
+import React, {PropTypes} from 'react';
+import CSSModules from 'react-css-modules';
+import Modal from 'react-modal';
+import styles from './Spinner.scss';
+
+const customStyles = {
+  overlay: {
+    position: 'fixed',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    backgroundColor: 'rgba(9, 9, 9, 0.58)',
+    zIndex: '9999',
+  },
+  content: {
+    top: '50%',
+    left: '50%',
+    right: 'auto',
+    bottom: 'auto',
+    marginRight: '-50%',
+    transform: 'translate(-50%, -50%)',
+    padding: '20px',
+    minWidth: '217px',
+    textAlign: 'center',
+    borderRadius: '5px',
+    fontWeight: 'bold',
+    fontSize: '20px',
+    zIndex: '99999',
+  },
+};
+
+const Spinner = ({content, isOpen, error}) => (
+  <Modal
+    style={customStyles}
+    isOpen={isOpen}
+    shouldCloseOnOverlayClick={false}
+    contentLabel="Spinner"
+  >
+    <div styleName={error ? 'error' : ''}>
+      {content}
+    </div>
+  </Modal>
+  );
+
+Spinner.propTypes = {
+  content: PropTypes.string,
+  isOpen: PropTypes.bool.isRequired,
+  error: PropTypes.bool,
+};
+
+export default CSSModules(Spinner, styles);

src/components/Spinner/Spinner.scss

@@ -0,0 +1,3 @@
+.error{
+  color:red;
+}