Skip to content

Commit c003679

Browse files
author
Yannick
authored
Merge pull request #65 from webgem-xyz/V2.0.1
V2.0.1
2 parents 0d1f141 + e91e8a2 commit c003679

File tree

8 files changed

+84
-23
lines changed

8 files changed

+84
-23
lines changed

‎firebase.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"headers": [
4343
{
4444
"key": "Link",
45-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style"
45+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style"
4646
}
4747
]
4848
},
@@ -51,7 +51,7 @@
5151
"headers": [
5252
{
5353
"key": "Link",
54-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-account.chunk.c5840.js>; rel=preload; as=script"
54+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-account.chunk.e2f47.js>; rel=preload; as=script"
5555
}
5656
]
5757
},
@@ -60,7 +60,7 @@
6060
"headers": [
6161
{
6262
"key": "Link",
63-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-addMedia.chunk.1d412.js>; rel=preload; as=script"
63+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-addMedia.chunk.1d412.js>; rel=preload; as=script"
6464
}
6565
]
6666
},
@@ -69,7 +69,7 @@
6969
"headers": [
7070
{
7171
"key": "Link",
72-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-add.chunk.2af82.js>; rel=preload; as=script"
72+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-add.chunk.2af82.js>; rel=preload; as=script"
7373
}
7474
]
7575
},
@@ -78,7 +78,7 @@
7878
"headers": [
7979
{
8080
"key": "Link",
81-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-measurement.chunk.41dac.js>; rel=preload; as=script"
81+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-measurement.chunk.41dac.js>; rel=preload; as=script"
8282
}
8383
]
8484
},
@@ -87,7 +87,7 @@
8787
"headers": [
8888
{
8989
"key": "Link",
90-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-Media.chunk.f52e3.js>; rel=preload; as=script"
90+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-Media.chunk.f52e3.js>; rel=preload; as=script"
9191
}
9292
]
9393
},
@@ -96,7 +96,7 @@
9696
"headers": [
9797
{
9898
"key": "Link",
99-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-overview.chunk.42821.js>; rel=preload; as=script"
99+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-overview.chunk.2091b.js>; rel=preload; as=script"
100100
}
101101
]
102102
},
@@ -105,7 +105,7 @@
105105
"headers": [
106106
{
107107
"key": "Link",
108-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-edit.chunk.64519.js>; rel=preload; as=script"
108+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-edit.chunk.64519.js>; rel=preload; as=script"
109109
}
110110
]
111111
},
@@ -114,7 +114,7 @@
114114
"headers": [
115115
{
116116
"key": "Link",
117-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-notifications.chunk.ddcaa.js>; rel=preload; as=script"
117+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-notifications.chunk.ddcaa.js>; rel=preload; as=script"
118118
}
119119
]
120120
},
@@ -123,7 +123,7 @@
123123
"headers": [
124124
{
125125
"key": "Link",
126-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-login.chunk.cd540.js>; rel=preload; as=script"
126+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-login.chunk.cd540.js>; rel=preload; as=script"
127127
}
128128
]
129129
},
@@ -132,7 +132,7 @@
132132
"headers": [
133133
{
134134
"key": "Link",
135-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-createAccount.chunk.2172c.js>; rel=preload; as=script"
135+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-createAccount.chunk.2172c.js>; rel=preload; as=script"
136136
}
137137
]
138138
},
@@ -141,7 +141,7 @@
141141
"headers": [
142142
{
143143
"key": "Link",
144-
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-editMedia.chunk.a86ea.js>; rel=preload; as=script"
144+
"value": "</bundle.13b9e.js>; rel=preload; as=script, </style.11c9e.css>; rel=preload; as=style, </route-editMedia.chunk.a86ea.js>; rel=preload; as=script"
145145
}
146146
]
147147
}

‎src/components/datePicker/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default class DateSelect extends Component {
2222
this.setState({
2323
startDate: date,
2424
});
25-
this.props.handleState(date, formatDate);
25+
this.props.handleState('date', formatDate);
2626
}
2727

2828
render() {

‎src/components/home/index.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,12 @@ export default class Home extends Component {
9898
measurements={this.state.measurements}
9999
addMeasurement={this.addMeasurement}
100100
/>
101-
<Media path="/med/:mediaId" uid={this.props.uid} measurements={this.state.measurements} />
101+
<Media
102+
path="/med/:mediaId"
103+
uid={this.props.uid}
104+
measurements={this.state.measurements}
105+
removeMeasurement={this.removeMeasurement}
106+
/>
102107
<Account
103108
path="/account"
104109
uid={this.props.uid}

‎src/components/removeMeasurementButton/index.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { Component } from 'preact';
2+
import { PropTypes } from 'preact-compat';
3+
import style from './style';
4+
5+
export default class RemoveMeasurementButton extends Component {
6+
render() {
7+
return (
8+
<button
9+
onClick={e => {
10+
this.props.removeMeasurement(e, this.props.Id);
11+
}}
12+
class={style.removeButton}
13+
>
14+
Delete {this.props.label}
15+
</button>
16+
);
17+
}
18+
}
19+
20+
RemoveMeasurementButton.propTypes = {
21+
Id: PropTypes.string.isRequired,
22+
removeMeasurement: PropTypes.func.isRequired,
23+
label: PropTypes.string.isRequired,
24+
};

‎src/components/removeMeasurementButton/style.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.removeButton {
2+
background: var(--main-bg-color);
3+
border: 1px solid var(--main-color);
4+
color: var(--main-color);
5+
display: block;
6+
font-size: 16px;
7+
font-weight: 700;
8+
margin: 15px 25px;
9+
outline: 0;
10+
padding: 10px 10px;
11+
text-transform: uppercase;
12+
width: calc(100% - 50px);
13+
}

‎src/routes/Media/index.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Header from '../../components/header/index';
77
import MeasurementRow from '../../components/measurementRow/';
88
import MapComponent from '../../components/map/';
99
import EditLink from '../../components/editLink/';
10+
import RemoveMeasurementButton from '../../components/removeMeasurementButton/index';
1011

1112
import style from './style';
1213

@@ -70,6 +71,11 @@ export default class Media extends Component {
7071
</section>
7172
{measurement.category && <MeasurementRow label="Category" value={measurement.category} />}
7273
{measurement.desc && <MeasurementRow label="Description" value={measurement.desc} desc />}
74+
<RemoveMeasurementButton
75+
Id={this.props.mediaId}
76+
label="media"
77+
removeMeasurement={this.props.removeMeasurement}
78+
/>
7379
</div>
7480
</div>
7581
);
@@ -79,4 +85,5 @@ export default class Media extends Component {
7985
Media.propTypes = {
8086
uid: PropTypes.string.isRequired,
8187
mediaId: PropTypes.string.isRequired,
88+
removeMeasurement: PropTypes.func.isRequired,
8289
};

‎src/routes/Media/style.scss‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,17 @@
4343
border: 1px solid var(--main-color);
4444
padding: 10px;
4545
}
46+
47+
.removeButton {
48+
background: var(--main-color);
49+
border: 0;
50+
color: var(--main-bg-color);
51+
display: block;
52+
font-size: 16px;
53+
font-weight: 700;
54+
margin: 15px 25px;
55+
outline: 0;
56+
padding: 15px 10px;
57+
text-transform: uppercase;
58+
width: calc(100% - 50px);
59+
}

‎src/routes/measurement/index.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Header from '../../components/header';
77
import MeasurementRow from '../../components/measurementRow';
88
import MapComponent from '../../components/map/';
99
import EditLink from '../../components/editLink/';
10+
import RemoveMeasurementButton from '../../components/removeMeasurementButton/index';
1011

1112
import style from './style';
1213

@@ -57,14 +58,11 @@ export default class Measurement extends Component {
5758
{measurement.tempature && (
5859
<MeasurementRow label="Tempature" value={measurement.tempature} />
5960
)}
60-
{/* <button
61-
onClick={e => {
62-
this.props.removeMeasurement(e, this.props.measurementId);
63-
}}
64-
class={style.removeButton}
65-
>
66-
Delete measurement
67-
</button> */}
61+
<RemoveMeasurementButton
62+
Id={this.props.measurementId}
63+
label="measurement"
64+
removeMeasurement={this.props.removeMeasurement}
65+
/>
6866
</div>
6967
</div>
7068
);
@@ -74,5 +72,5 @@ export default class Measurement extends Component {
7472
Measurement.propTypes = {
7573
uid: PropTypes.string.isRequired,
7674
measurementId: PropTypes.string.isRequired,
77-
// removeMeasurement: PropTypes.func.isRequired,
75+
removeMeasurement: PropTypes.func.isRequired,
7876
};

0 commit comments

Comments
 (0)