Skip to content

Commit 681f01f

Browse files
gondzogondzo
authored
Merge pull request #43 from chqy24/dev
 SERVICE REQUEST
2 parents 1b39852 + 8b4eefd commit 681f01f

File tree

73 files changed

+2031
-1116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2031
-1116
lines changed

‎config/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
PORT: process.env.PORT || 3000,
88

99
// below env variables are visible in frontend
10-
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
10+
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
1111
};

‎config/development.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
PORT: process.env.PORT || 3000,
88

99
// below env variables are visible in frontend
10-
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
10+
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
1111
};

‎config/production.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
PORT: process.env.PORT || 3000,
88

99
// below env variables are visible in frontend
10-
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
10+
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
1111
};

‎config/staging.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
PORT: process.env.PORT || 3000,
88

99
// below env variables are visible in frontend
10-
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
10+
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
1111
};

‎config/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
PORT: process.env.PORT || 3000,
88

99
// below env variables are visible in frontend
10-
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
10+
GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyC9tPymo7xUlvPlK_yNulgXTZalxJM2Wv8',
1111
};

‎src/components/Header/Header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
width: 100%;
44
color: white;
55
position: relative;
6-
z-index: 2;
6+
z-index: 1001;
77

88
> ul {
99
padding: 0;

‎src/components/Pagination/Pagination.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ Pagination.propTypes = {
3131
onPageChange: PropTypes.func.isRequired,
3232
};
3333

34-
export default CSSModules(Pagination, styles);
34+
export default CSSModules(Pagination, styles, {allowMultiple: true});

‎src/components/Pagination/Pagination.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
> a {
3838
color: #fff;
3939
}
40-
}
4140

4241
.break,
4342
.next,
@@ -73,3 +72,5 @@
7372
.next {
7473
background-image: url('icon-pagination-next.png');
7574
}
75+
76+
}

‎src/components/Spinner/Spinner.jsx

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import React, {PropTypes} from 'react';
2+
import CSSModules from 'react-css-modules';
3+
import Modal from 'react-modal';
4+
import styles from './Spinner.scss';
5+
6+
const customStyles = {
7+
overlay: {
8+
position: 'fixed',
9+
top: 0,
10+
left: 0,
11+
right: 0,
12+
bottom: 0,
13+
backgroundColor: 'rgba(9, 9, 9, 0.58)',
14+
zIndex: '9999',
15+
},
16+
content: {
17+
top: '50%',
18+
left: '50%',
19+
right: 'auto',
20+
bottom: 'auto',
21+
marginRight: '-50%',
22+
transform: 'translate(-50%, -50%)',
23+
padding: '20px',
24+
minWidth: '217px',
25+
textAlign: 'center',
26+
borderRadius: '5px',
27+
fontWeight: 'bold',
28+
fontSize: '20px',
29+
zIndex: '99999',
30+
},
31+
};
32+
33+
const Spinner = ({content, isOpen, error}) => (
34+
<Modal
35+
style={customStyles}
36+
isOpen={isOpen}
37+
shouldCloseOnOverlayClick={false}
38+
contentLabel="Spinner"
39+
>
40+
<div styleName={error ? 'error' : ''}>
41+
{content}
42+
</div>
43+
</Modal>
44+
);
45+
46+
Spinner.propTypes = {
47+
content: PropTypes.string,
48+
isOpen: PropTypes.bool.isRequired,
49+
error: PropTypes.bool,
50+
};
51+
52+
export default CSSModules(Spinner, styles);

‎src/components/Spinner/Spinner.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.error{
2+
color:red;
3+
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy