8000 UI tidyups · adityathakekar/esp8266-react@5133307 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5133307

Browse files
rjwatsrjwats
committed
UI tidyups
1 parent 9e59a4d commit 5133307

16 files changed

+59
-272
lines changed

‎interface/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"@material-ui/icons": "^4.4.3",
88
"compression-webpack-plugin": "^2.0.0",
99
"jwt-decode": "^2.2.0",
10+
"lodash": "^4.17.15",
1011
"moment": "^2.24.0",
1112
"notistack": "^0.8.9",
1213
"prop-types": "^15.7.2",
@@ -16,7 +17,6 @@
1617
"react-form-validator-core": "^0.6.4",
1718
"react-jss": "^10.0.0",
1819
"react-material-ui-form-validator": "^2.0.9",
19-
"react-rangeslider": "^2.2.0",
2020
"react-router": "^5.1.1",
2121
"react-router-dom": "^5.1.1",
2222
"react-scripts": "3.0.1",

‎interface/src/components/ColorPicker.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import { HuePicker, TwitterPicker } from 'react-color'
77
const styles = theme => ({
88
picker: {
99
"margin-top": theme.spacing.unit,
10-
"margin-bottom": theme.spacing.unit*2
10+
"margin-bottom": theme.spacing.unit*2,
11+
"& .hue-picker ":{
12+
marginBottom: theme.spacing.unit*2
13+
}
1114
}
1215
});
1316

‎interface/src/project/AudioLightSettings.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,18 @@ class AudioLightSettings extends Component {
2525
fetched,
2626
errorMessage,
2727
saveData,
28-
handleValueChange,
29-
handleColorChange,
3028
handleChange,
31-
handleCheckboxChange
3229
} = this.props;
33-
30+
3431
return (
3532
<SectionContent title="Settings">
3633
<AudioLightSettingsForm
37-
audioLightSettings={data}
3834
audioLightSettingsFetched={fetched}
35+
audioLightSettings={data}
3936
errorMessage={errorMessage}
40-
onSubmit={saveData}
41-
handleValueChange={handleValueChange}
42-
handleColorChange={handleColorChange}
43-
handleChange={handleChange}
44-
handleCheckboxChange={handleCheckboxChange}
4537
handleChangeMode={this.handleChangeMode}
38+
handleChange={handleChange}
39+
onSubmit={saveData}
4640
/>
4741
</SectionContent>
4842
);

‎interface/src/project/DemoController.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎interface/src/project/DemoInformation.js

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎interface/src/project/modes/AudioLightColorMode.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32
import ColorPicker from '../../components/ColorPicker'
43
import IncludedBands from '../../components/IncludedBands'
54

65
import FormLabel from '@material-ui/core/FormLabel';
76
import Switch from '@material-ui/core/Switch';
8-
import Slider from 'react-rangeslider';
9-
10-
import 'react-rangeslider/lib/index.css'
7+
import Slider from '@material-ui/core/Slider';
118

129
export class AudioLightColorMode extends React.Component {
1310

1411
render() {
15-
const { audioLightSettings, handleColorChange, handleChange, handleCheckboxChange, classes } = this.props;
12+
const { audioLightSettings, handleColorChange, handleChange, handleValueChange, classes } = this.props;
1613
return (
1714
<div>
1815
<FormLabel>Color</FormLabel>
@@ -27,14 +24,14 @@ export class AudioLightColorMode extends React.Component {
2724
max={255}
2825
step={1}
2926
value={audioLightSettings.brightness}
30-
onChange={handleChange('brightness')}
27+
onChange={handleValueChange('brightness')}
3128
/>
3229

3330
<FormLabel>Audio Enabled</FormLabel>
3431
<div className={classes.formControl}>
3532
<Switch
3633
checked={audioLightSettings.audio_enabled}
37-
onChange={handleCheckboxChange('audio_enabled')}
34+
onChange={handleValueChange('audio_enabled')}
3835
value="enabled"
3936
color="primary"
4037
/>
@@ -50,10 +47,3 @@ export class AudioLightColorMode extends React.Component {
5047
);
5148
}
5249
}
53-
54-
AudioLightColorMode.propTypes = {
55-
audioLightSettings: PropTypes.object,
56-
onSubmit: PropTypes.func.isRequired,
57-
handleColorChange: PropTypes.func.isRequired,
58-
handleChange: PropTypes.func.isRequired
59-
};

‎interface/src/project/modes/AudioLightConfettiMode.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32

43
export class AudioLightConfettiMode extends React.Component {
54

@@ -11,8 +10,3 @@ export class AudioLightConfettiMode extends React.Component {
1110
);
1211
}
1312
}
14-
15-
AudioLightConfettiMode.propTypes = {
16-
audioLightSettings: PropTypes.object,
17-
handleChange: PropTypes.func.isRequired
18-
};

‎interface/src/project/modes/AudioLightFireMode.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32

43
export class AudioLightFireMode extends React.Component {
54

@@ -12,7 +11,3 @@ export class AudioLightFireMode extends React.Component {
1211
}
1312
}
1413

15-
AudioLightFireMode.propTypes = {
16-
audioLightSettings: PropTypes.object,
17-
handleChange: PropTypes.func.isRequired
18-
};

‎interface/src/project/modes/AudioLightLightningMode.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
32

43
import FormLabel from '@material-ui/core/FormLabel';
4+
import Slider from '@material-ui/core/Slider';
55

66
import ColorPicker from '../../components/ColorPicker.js'
77
import IncludedBands from '../../components/IncludedBands'
8-
import Slider from 'react-rangeslider';
98

109
export class AudioLightLightningMode extends React.Component {
1110

1211
render() {
1312

14-
const { audioLightSettings, handleChange, handleColorChange } = this.props;
13+
const { audioLightSettings, handleChange, handleValueChange, handleColorChange } = this.props;
1514

1615
return (
1716
<div>
@@ -27,7 +26,7 @@ export class AudioLightLightningMode extends React.Component {
2726
max={255}
2827
step={1}
2928
value={audioLightSettings.brightness}
30-
onChange={handleChange('brightness')}
29+
onChange={handleValueChange('brightness')}
3130
/>
3231

3332
<FormLabel>Flashes</FormLabel>
@@ -36,7 +35,7 @@ export class AudioLightLightningMode extends React.Component {
3635
max={20}
3736
step={1}
3837
value={audioLightSettings.flashes}
39-
onChange={handleChange('flashes')}
38+
onChange={handleValueChange('flashes')}
4039
/>
4140

4241
<FormLabel>Threshold</FormLabel>
@@ -45,7 +44,7 @@ export class AudioLightLightningMode extends React.Component {
4544
max={255}
4645
step={1}
4746
value={audioLightSettings.threshold}
48-
onChange={handleChange('threshold')}
47+
onChange={handleValueChange('threshold')}
4948
/>
5049

5150
<FormLabel>Included Bands</FormLabel>
@@ -57,8 +56,3 @@ export class AudioLightLightningMode extends React.Component {
5756
);
5857
}
5958
}
60-
61-
AudioLightLightningMode.propTypes = {
62-
audioLightSettings: PropTypes.object,
63-
handleChange: PropTypes.func.isRequired
64-
};

0 commit comments

Comments
 (0)
0