Skip to content

Commit 063fff5

Browse files
rjwatsrjwats
committed
Don't use deprecated variants in material ui.
1 parent 59d2646 commit 063fff5

16 files changed

+70
-51
lines changed

‎data/www/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="stylesheet" href="/css/roboto.css"><link rel="manifest" href="/app/manifest.json"><title>ESP8266 React</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/js/1.b351.js"></script><script src="/js/2.9881.js"></script><script src="/js/0.d999.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="stylesheet" href="/css/roboto.css"><link rel="manifest" href="/app/manifest.json"><title>ESP8266 React</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/js/1.b351.js"></script><script src="/js/2.9881.js"></script><script src="/js/0.da55.js"></script></body></html>

‎data/www/js/0.d999.js.gz

-7.45 KB
Binary file not shown.

‎data/www/js/0.da55.js.gz

7.45 KB
Binary file not shown.

‎interface/.env.development

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
REACT_APP_ENDPOINT_ROOT=http://192.168.0.26/rest/
1+
REACT_APP_ENDPOINT_ROOT=http://192.168.0.4/rest/

‎interface/package-lock.json

Lines changed: 30 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎interface/src/containers/APConfiguration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class APConfiguration extends Component {
2525
const { selectedTab } = this.state;
2626
return (
2727
<MenuAppBar sectionTitle="AP Configuration">
28-
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" fullWidth scrollable>
28+
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" variant="scrollable">
2929
<Tab value="apStatus" label="AP Status" />
3030
<Tab value="apSettings" label="AP Settings" />
3131
</Tabs>

‎interface/src/containers/APStatus.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,26 @@ class APStatus extends Component {
5959
</Avatar>
6060
<ListItemText primary="Status" secondary={this.apStatus(data)} />
6161
</ListItem>
62-
<Divider inset component="li" />
62+
<Divider variant="inset" component="li" />
6363
<ListItem>
6464
<Avatar>IP</Avatar>
6565
<ListItemText primary="IP Address" secondary={data.ip_address} />
6666
</ListItem>
67-
<Divider inset component="li" />
67+
<Divider variant="inset" component="li" />
6868
<ListItem>
6969
<Avatar>
7070
<DeviceHubIcon />
7171
</Avatar>
7272
<ListItemText primary="MAC Address" secondary={data.mac_address} />
7373
</ListItem>
74-
<Divider inset component="li" />
74+
<Divider variant="inset" component="li" />
7575
<ListItem>
7676
<Avatar>
7777
<ComputerIcon />
7878
</Avatar>
7979
<ListItemText primary="AP Clients" secondary={data.station_num} />
8080
</ListItem>
81-
<Divider inset component="li" />
81+
<Divider variant="inset" component="li" />
8282
</Fragment>
8383
);
8484
}
@@ -91,7 +91,7 @@ class APStatus extends Component {
9191
{this.createListItems(data, fullDetails, classes)}
9292
</Fragment>
9393
</List>
94-
<Button variant="raised" color="secondary" className={classes.button} onClick={this.props.loadData}>
94+
<Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
9595
Refresh
9696
</Button>
9797
</div>
@@ -118,7 +118,7 @@ class APStatus extends Component {
118118
<Typography variant="display1" className={classes.fetching}>
119119
{errorMessage}
120120
</Typography>
121-
<Button variant="raised" color="secondary" className={classes.button} onClick={this.props.loadData}>
121+
<Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
122122
Refresh
123123
</Button>
124124
</div>

‎interface/src/containers/NTPConfiguration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class NTPConfiguration extends Component {
2323
const { selectedTab } = this.state;
2424
return (
2525
<MenuAppBar sectionTitle="NTP Configuration">
26-
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" fullWidth scrollable>
26+
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" variant="scrollable">
2727
<Tab value="ntpStatus" label="NTP Status" />
2828
<Tab value="ntpSettings" label="NTP Settings" />
2929
</Tabs>

‎interface/src/containers/NTPStatus.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class NTPStatus extends Component {
6060
</Avatar>
6161
<ListItemText primary="Status" secondary={ntpStatus(data)} />
6262
</ListItem>
63-
<Divider inset component="li" />
63+
<Divider variant="inset" component="li" />
6464
{ isSynchronized(data) &&
6565
<Fragment>
6666
<ListItem>
@@ -69,14 +69,14 @@ class NTPStatus extends Component {
6969
</Avatar>
7070
<ListItemText primary="Time Now" secondary={unixTimeToTimeAndDate(data.now)} />
7171
</ListItem>
72-
<Divider inset component="li" />
72+
<Divider variant="inset" component="li" />
7373
<ListItem>
7474
<Avatar>
7575
<SwapVerticalCircleIcon />
7676
</Avatar>
7777
<ListItemText primary="Last Sync" secondary={data.last_sync > 0 ? unixTimeToTimeAndDate(data.last_sync) : "never" } />
7878
</ListItem>
79-
<Divider inset component="li" />
79+
<Divider variant="inset" component="li" />
8080
</Fragment>
8181
}
8282
<ListItem>
@@ -85,21 +85,21 @@ class NTPStatus extends Component {
8585
</Avatar>
8686
<ListItemText primary="NTP Server" secondary={data.server} />
8787
</ListItem>
88-
<Divider inset component="li" />
88+
<Divider variant="inset" component="li" />
8989
<ListItem>
9090
<Avatar>
9191
<TimerIcon />
9292
</Avatar>
9393
<ListItemText primary="Sync Interval" secondary={moment.duration(data.interval, 'seconds').humanize()} />
9494
</ListItem>
95-
<Divider inset component="li" />
95+
<Divider variant="inset" component="li" />
9696
<ListItem>
9797
<Avatar>
9898
<AvTimerIcon />
9999
</Avatar>
100100
<ListItemText primary="Uptime" secondary={moment.duration(data.uptime, 'seconds').humanize()} />
101101
</ListItem>
102-
<Divider inset component="li" />
102+
<Divider variant="inset" component="li" />
103103
</Fragment>
104104
);
105105
}
@@ -110,7 +110,7 @@ class NTPStatus extends Component {
110110
<List>
111111
{this.createListItems(data, fullDetails, classes)}
112112
</List>
113-
<Button variant="raised" color="secondary" className={classes.button} onClick={this.props.loadData}>
113+
<Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
114114
Refresh
115115
</Button>
116116
</div>
@@ -137,7 +137,7 @@ class NTPStatus extends Component {
137137
<Typography variant="display1" className={classes.fetching}>
138138
{errorMessage}
139139
</Typography>
140-
<Button variant="raised" color="secondary" className={classes.button} onClick={this.props.loadData}>
140+
<Button variant="contained" color="secondary" className={classes.button} onClick={this.props.loadData}>
141141
Refresh
142142
</Button>
143143
</div>

‎interface/src/containers/WiFiConfiguration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class WiFiConfiguration extends Component {
3838
const { selectedTab } = this.state;
3939
return (
4040
<MenuAppBar sectionTitle="WiFi Configuration">
41-
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" fullWidth scrollable>
41+
<Tabs value={selectedTab} onChange={this.handleTabChange} indicatorColor="primary" textColor="primary" variant="scrollable">
4242
<Tab value="wifiStatus" label="WiFi Status" />
4343
<Tab value="networkScanner" label="Network Scanner" />
4444
<Tab value="wifiSettings" label="WiFi Settings" />

0 commit comments

Comments
 (0)