Skip to content

Commit d0e8af7

Browse files
maxceemmaxceem
committed
Merge branch 'checklist' into dev
# Conflicts: # package.json # src/components/Header/Header.jsx # src/containers/HeaderContainer.js # src/services/APIService.js # src/services/AuthService.js # src/store/modules/global.js
2 parents 31f97b4 + 5295af2 commit d0e8af7

39 files changed

+1099
-106
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* node v6 (https://nodejs.org)
55

66
## Quick Start
7+
* copy `.env.example` to `.env`
78
* `npm install`
89
* `npm run dev`
910
* Navigate browser to `http://localhost:3000`

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
"react-simple-dropdown": "^1.1.5",
9292
"react-slick": "^0.14.5",
9393
"react-star-rating-component": "^1.2.2",
94+
"react-table": "^3.1.4",
9495
"react-tabs": "^0.8.2",
9596
"react-timeago": "^3.1.3",
9697
"reactable": "^0.14.1",

‎src/components/BreadcrumbItem/BreadcrumbItem.jsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React, {PropTypes} from 'react';
2+
import CSSModules from 'react-css-modules';
3+
import styles from './BreadcrumbItem.scss';
4+
5+
export const BreadcrumbItem = ({title}) => (
6+
<span styleName="breadcrumb-item">
7+
{title}
8+
</span>
9+
);
10+
11+
BreadcrumbItem.propTypes = {
12+
title: PropTypes.string.isRequired,
13+
};
14+
15+
export default CSSModules(BreadcrumbItem, styles);

‎src/components/BreadcrumbItem/BreadcrumbItem.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.breadcrumb-item {
2+
background-color: transparent;
3+
4+
:global {
5+
6+
}
7+
}

‎src/components/BreadcrumbItem/index.js

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

‎src/components/Button/Button.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Button.propTypes = {
1919
Button.defaultProps = {
2020
type: 'button',
2121
size: 'normal',
22+
color: 'blue',
2223
};
2324

2425
export default CSSModules(Button, styles, {allowMultiple: true});

‎src/components/Header/Header.jsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,14 @@ export function Header({
7171
</ul>
7272
</li>
7373
);
74+
} else if (user.role === 'pilot') {
75+
res = (
76+
<li styleName="pages">
77+
<ul>
78+
<li><Link to="/pilot-missions" activeClassName="active">Pilot Missions</Link></li>
79+
</ul>
80+
</li>
81+
);
7482
}
7583
return res;
7684
})()

‎src/components/Radiobox/Radiobox.jsx

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import React, {PropTypes} from 'react';
2+
import CSSModules from 'react-css-modules';
3+
import styles from './Radiobox.scss';
4+
5+
const Radiobox = ({children, className, radioValue, name, value, onChange, disabled}) => (
6+
<div styleName="radiobox" className={className}>
7+
<input
8+
type="radio"
9+
id={`${name}.${radioValue}`}
10+
name={name}
11+
value={radioValue}
12+
checked={value === radioValue}
13+
onChange={onChange}
14+
disabled={disabled}
15+
/>
16+
<label htmlFor={`${name}.${radioValue}`}>
17+
<span /> {children}
18+
</label>
19+
</div>
20+
);
21+
22+
Radiobox.propTypes = {
23+
children: PropTypes.string,
24+
className: PropTypes.string,
25+
radioValue: PropTypes.string.isRequired,
26+
name: PropTypes.string.isRequired,
27+
value: PropTypes.string,
28+
onChange: PropTypes.func,
29+
disabled: PropTypes.bool,
30+
};
31+
32+
Radiobox.defaultProps = {
33+
disabled: false,
34+
};
35+
36+
export default CSSModules(Radiobox, styles);

‎src/components/Radiobox/Radiobox.scss

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.radiobox {
2+
height: 40px;
3+
display: flex;
4+
align-items: center;
5+
6+
input[type="radio"] {
7+
display: none;
8+
}
9+
10+
input[type="radio"] + label span {
11+
flex-shrink: 0;
12+
display: inline-block;
13+
width: 23px;
14+
height: 23px;
15+
border: 1px solid #a1a1a1;
16+
box-shadow: none;
17+
appearance: none;
18+
margin: 0 9px 0 0;
19+
background-color: transparent;
20+
vertical-align: middle;
21+
cursor: pointer;
22+
}
23+
24+
input[type="radio"]:checked + label span {
25+
background: url('icon-checkbox.png') no-repeat 50% 50%;
26+
}
27+
28+
label {
29+
font-weight: normal;
30+
cursor: pointer;
31+
line-height: 1;
32+
display: flex;
33+
align-items: center;
34+
margin-bottom: 0;
35+
}
36+
37+
input[type="radio"][disabled] + label {
38+
cursor: default;
39+
}
40+
41+
input[type="radio"][disabled] + label span {
42+
cursor: default;
43+
background-color: #efefef;
44+
border-color: #ebebeb;
45+
}
46+
}

‎src/components/Radiobox/index.js

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

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