Skip to content

Commit 136dcab

Browse files
author
gondzo
committed
Merge branch 'browseProvider' into dev
# Conflicts: # package.json # src/components/Button/Button.scss # src/components/Footer/Footer.jsx # src/components/Footer/Footer.scss # src/components/FormField/FormField.jsx # src/components/Header/Header.jsx # src/components/MapLegends/MapLegends.jsx # src/containers/AppContainer.jsx # src/layouts/CoreLayout/CoreLayout.jsx # src/routes/ServiceRequest/components/ContactDetails/ContactDetails.jsx # src/routes/ServiceRequest/components/EstimatedAmountToPay/EstimatedAmountToPay.jsx # src/routes/ServiceRequest/components/ItemRequest/ItemRequest.jsx # src/routes/ServiceRequest/components/ProviderMap/ProviderMap.jsx # src/routes/ServiceRequest/components/ServiceDetail/ServiceDetail.jsx # src/routes/index.js # src/styles/img/icon-dropdown-caret-sm.png # src/styles/main.scss
2 parents 047430b + d6c26ae commit 136dcab

File tree

304 files changed

+7040
-84
lines changed

Some content is hidden

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

304 files changed

+7040
-84
lines changed

‎.eslintrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
2,
2929
"always"
3030
],
31-
arrow-body-style: [2, "as-needed"],
3231
"import/extensions": 0,
3332
"import/no-unresolved": 0,
3433
"import/no-named-as-default": 0,
@@ -37,8 +36,6 @@
3736
"react/forbid-prop-types": 0,
3837
"no-unused-expressions": 0,
3938
"jsx-a11y/anchor-has-content": 0,
40-
"jsx-a11y/href-no-hash": 0,
41-
"jsx-a11y/label-has-for": 0,
4239
"no-plusplus": 0,
4340
"jsx-a11y/no-static-element-interactions": 0,
4441
"no-use-before-define": ["error", { "functions": false, "classes": true }],

‎package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@
4848
"node-sass": "^3.7.0",
4949
"postcss-flexboxfixer": "0.0.5",
5050
"postcss-loader": "^0.13.0",
51+
"rc-calendar": "^7.5.1",
5152
"rc-tooltip": "^3.4.2",
5253
"react": "^15.3.2",
5354
"react-breadcrumbs": "^1.5.1",
55+
"react-count-down": "^1.0.3",
5456
"react-css-modules": "^3.7.10",
5557
"react-date-picker": "^5.3.28",
5658
"react-dom": "^15.3.2",
@@ -69,6 +71,8 @@
6971
"react-slick": "^0.14.5",
7072
"react-star-rating-component": "^1.2.2",
7173
"react-timeago": "^3.1.3",
74+
"react-tabs": "^0.8.2",
75+
"reactable": "^0.14.1",
7276
"redbox-react": "^1.2.10",
7377
"redux": "^3.0.0",
7478
"redux-actions": "^0.10.1",
@@ -78,6 +82,7 @@
7882
"redux-thunk": "^2.0.0",
7983
"sass-loader": "^4.0.0",
8084
"socket.io-client": "^1.7.1",
85+
"slick-carousel": "^1.6.0",
8186
"style-loader": "^0.13.0",
8287
"superagent": "^2.3.0",
8388
"superagent-promise": "^1.1.0",

‎src/components/Accordion/Accordion.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
font-size: 16px;
1212
font-weight: bold;
1313
position: relative;
14+
background: #fff;
1415

1516
&:hover {
1617
cursor: pointer;

‎src/components/Button/Button.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@
2121
height: 38px;
2222
padding: 0 10px;
2323
}
24+
25+
.color-black {
26+
background: #4c4c4c;
27+
}

‎src/components/Checkbox/Checkbox.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import styles from './Checkbox.scss';
55

66
const Checkbox = ({ children, className, id, ...props }) => (
77
<div styleName="checkbox" className={className}>
8-
<input id={id} type="checkbox" {..._.pick(props, 'checked', 'onChange')} />
8+
<input id={id} type="checkbox" {..._.pick(props, 'checked', 'onChange', 'defaultChecked')} />
99
<label htmlFor={id}>
1010
<span /> {children}
1111
</label>

‎src/components/CountdownTimer/Countdown.jsx

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import React, { Component, PropTypes} from 'react';
2+
import DateBetween from './DateBetween';
3+
4+
/**
5+
* Count down module
6+
* A simple count down component.
7+
**/
8+
export default class Countdown extends Component {
9+
10+
constructor(props) {
11+
super(props);
12+
this.state = { remaining: null };
13+
}
14+
15+
componentDidMount() {
16+
this.tick();
17+
this.interval = setInterval(this.tick.bind(this), 1000);
18+
}
19+
20+
componentWillUnmount() {
21+
clearInterval(this.interval);
22+
}
23+
24+
tick() {
25+
const startDate = new Date();
26+
const endDate = new Date(this.props.options.endDate);
27+
const remaining = DateBetween(startDate, endDate);
28+
this.setState({remaining });
29+
}
30+
31+
render() {
32+
return (
33+
<div className="react-count-down">
34+
<span className="date"> {this.state.remaining}</span>
35+
<span className="prefix"> {this.props.options.prefix}</span>
36+
</div>
37+
);
38+
}
39+
}
40+
41+
Countdown.propTypes = {
42+
options: PropTypes.object.isRequired,
43+
};

‎src/components/CountdownTimer/CountdownTimer.jsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
import React, { Component } from 'react';
3+
import CSSModules from 'react-css-modules';
4+
import Countdown from './Countdown';
5+
6+
import styles from './CountdownTimer.scss';
7+
8+
class CountdownTimer extends Component {
9+
componentDidMount() {
10+
11+
}
12+
render() {
13+
const OPTIONS = { endDate: '12/20/2016 12:12 AM', prefix: '' };
14+
15+
return (
16+
<div>
17+
<Countdown options={OPTIONS} />
18+
</div>
19+
);
20+
}
21+
}
22+
export default CSSModules(CountdownTimer, styles);

‎src/components/CountdownTimer/CountdownTimer.scss

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.button {
2+
padding: 13px 10px;
3+
min-width: 115px;
4+
color: white;
5+
border: none;
6+
font-weight: bold;
7+
}
8+
9+
.color-gray {
10+
background: #4c4c4c;
11+
}
12+
13+
.color-blue {
14+
background: #315b95;
15+
}
16+
17+
.color-black {
18+
background: #4c4c4c;
19+
}

‎src/components/CountdownTimer/DateBetween.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
function DateBetween(startDate, endDate) {
2+
const second = 1000;
3+
const minute = second * 60;
4+
const hour = minute * 60;
5+
const day = hour * 24;
6+
const distance = endDate - startDate;
7+
8+
if (distance < 0) {
9+
return 'counter expired';
10+
}
11+
12+
function pad(num, size) {
13+
let s = String(num);
14+
while (s.length < (size || 2)) { s = `0${s}`; }
15+
return s;
16+
}
17+
18+
const hours = Math.floor((distance % day) / hour);
19+
pad(hours);
20+
const minutes = Math.floor((distance % hour) / minute);
21+
pad(minutes);
22+
const seconds = Math.floor((distance % minute) / second);
23+
pad(seconds);
24+
25+
let between = `${hours}:`;
26+
between += `${minutes}:`;
27+
between += seconds;
28+
29+
return between;
30+
}
31+
32+
module.exports = DateBetween;

‎src/components/CountdownTimer/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import CountdownTimer from './CountdownTimer';
2+
3+
export default CountdownTimer;

0 commit comments

Comments
 (0)