add Ethernet

interface/.env.development

@@ -2,8 +2,8 @@
 # Remember to also enable CORS in platformio.ini before uploading the code to the device.
 
 # ESP32 dev
-REACT_APP_HTTP_ROOT=http://10.10.10.194
-REACT_APP_WEB_SOCKET_ROOT=ws://10.10.10.194
+REACT_APP_HTTP_ROOT=http://192.168.1.32
+REACT_APP_WEB_SOCKET_ROOT=ws://192.168.1.32
 
 # ESP8266 dev
 #REACT_APP_HTTP_ROOT=http://10.10.10.140

interface/src/AppRouting.tsx

@@ -8,7 +8,7 @@ import AuthenticatedRoute from './authentication/AuthenticatedRoute';
 
 import SignIn from './SignIn';
 import ProjectRouting from './project/ProjectRouting';
-import WiFiConnection from './wifi/WiFiConnection';
+import NetworkConnection from './network/NetworkConnection';
 import AccessPoint from './ap/AccessPoint';
 import NetworkTime from './ntp/NetworkTime';
 import Security from './security/Security';
@@ -19,8 +19,7 @@ import Mqtt from './mqtt/Mqtt';
 import { withFeatures, WithFeaturesProps } from './features/FeaturesContext';
 import { Features } from './features/types';
 
-export const getDefaultRoute = (features: Features) => features.project ? `/${PROJECT_PATH}/` : "/wifi/";
-
+export const getDefaultRoute = (features: Features) => features.project ? `/${PROJECT_PATH}/` : "/network/";
 class AppRouting extends Component<WithFeaturesProps> {
 
   componentDidMount() {
@@ -38,10 +37,10 @@ class AppRouting extends Component<WithFeaturesProps> {
           {features.project && (
             <AuthenticatedRoute exact path={`/${PROJECT_PATH}/*`} component={ProjectRouting} />
           )}
-          <AuthenticatedRoute exact path="/wifi/*" component={WiFiConnection} />
+          <AuthenticatedRoute exact path="/network/*" component={NetworkConnection} />
           <AuthenticatedRoute exact path="/ap/*" component={AccessPoint} />
           {features.ntp && (
-          <AuthenticatedRoute exact path="/ntp/*" component={NetworkTime} />
+            <AuthenticatedRoute exact path="/ntp/*" component={NetworkTime} />
           )}
           {features.mqtt && (
             <AuthenticatedRoute exact path="/mqtt/*" component={Mqtt} />

interface/src/api/Endpoints.ts

@@ -8,8 +8,8 @@ export const AP_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "apSettings";
 export const AP_STATUS_ENDPOINT = ENDPOINT_ROOT + "apStatus";
 export const SCAN_NETWORKS_ENDPOINT = ENDPOINT_ROOT + "scanNetworks";
 export const LIST_NETWORKS_ENDPOINT = ENDPOINT_ROOT + "listNetworks";
-export const WIFI_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "wifiSettings";
-export const WIFI_STATUS_ENDPOINT = ENDPOINT_ROOT + "wifiStatus";
+export const NETWORK_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "networkSettings";
+export const NETWORK_STATUS_ENDPOINT = ENDPOINT_ROOT + "networkStatus";
 export const OTA_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "otaSettings";
 export const UPLOAD_FIRMWARE_ENDPOINT = ENDPOINT_ROOT + "uploadFirmware";
 export const MQTT_SETTINGS_ENDPOINT = ENDPOINT_ROOT + "mqttSettings";

interface/src/components/MenuAppBar.tsx

@@ -144,11 +144,11 @@ class MenuAppBar extends React.Component<MenuAppBarProps, MenuAppBarState> {
         )}
         
         <List>
-          <ListItem to='/wifi/' selected={path.startsWith('/wifi/')} button component={Link}>
+          <ListItem to='/network/' selected={path.startsWith('/network/')} button component={Link}>
             <ListItemIcon>
               <WifiIcon />
             </ListItemIcon>
-            <ListItemText primary="WiFi Connection" />
+            <ListItemText primary="Network Connection" />
           </ListItem>
           <ListItem to='/ap/' selected={path.startsWith('/ap/')} button component={Link}>
             <ListItemIcon>

interface/src/network/NetworkConnection.tsx

@@ -0,0 +1,62 @@
+import React, { Component } from 'react';
+import { Redirect, Switch, RouteComponentProps } from 'react-router-dom'
+
+import { Tabs, Tab } from '@material-ui/core';
+
+import { withAuthenticatedContext, AuthenticatedContextProps, AuthenticatedRoute } from '../authentication';
+import { MenuAppBar } from '../components';
+
+import NetworkStatusController from './NetworkStatusController';
+import NetworkSettingsController from './NetworkSettingsController';
+import WiFiNetworkScanner from './WiFiNetworkScanner';
+import { NetworkConnectionContext } from './NetworkConnectionContext';
+import { WiFiNetwork } from './types';
+
+type NetworkConnectionProps = AuthenticatedContextProps & RouteComponentProps;
+
+class NetworkConnection extends Component<NetworkConnectionProps, NetworkConnectionContext> {
+
+  constructor(props: NetworkConnectionProps) {
+    super(props);
+    this.state = {
+      selectNetwork: this.selectNetwork,
+      deselectNetwork: this.deselectNetwork
+    };
+  }
+
+  selectNetwork = (network: WiFiNetwork) => {
+    this.setState({ selectedNetwork: network });
+    this.props.history.push('/network/settings');
+  }
+
+  deselectNetwork = () => {
+    this.setState({ selectedNetwork: undefined });
+  }
+
+  handleTabChange = (event: React.ChangeEvent<{}>, path: string) => {
+    this.props.history.push(path);
+  };
+
+  render() {
+    const { authenticatedContext } = this.props;
+    return (
+      <NetworkConnectionContext.Provider value={this.state}>
+        <MenuAppBar sectionTitle="Network Connection">
+          <Tabs value={this.props.match.url} onChange={this.handleTabChange} variant="fullWidth">
+            <Tab value="/network/status" label="Network Status" />
+            <Tab value="/network/scan" label="Scan Networks" disabled={!authenticatedContext.me.admin} />
+            <Tab value="/network/settings" label="Network Settings" disabled={!authenticatedContext.me.admin} />
+          </Tabs>
+          <Switch>
+            <AuthenticatedRoute exact path="/network/status" component={NetworkStatusController} />
+            <AuthenticatedRoute exact path="/network/scan" component={WiFiNetworkScanner} />
+            <AuthenticatedRoute exact path="/network/settings" component={NetworkSettingsController} />
+            <Redirect to="/network/status" />
+          </Switch>
+        </MenuAppBar>
+      </NetworkConnectionContext.Provider>
+    )
+  }
+}
+
+export default withAuthenticatedContext(NetworkConnection);

interface/src/network/NetworkConnectionContext.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import { WiFiNetwork } from './types';
+
+export interface NetworkConnectionContext {
+  selectedNetwork?: WiFiNetwork;
+  selectNetwork: (network: WiFiNetwork) => void;
+  deselectNetwork: () => void;
+}
+
+const NetworkConnectionContextDefaultValue = {} as NetworkConnectionContext
+export const NetworkConnectionContext = React.createContext(
+  NetworkConnectionContextDefaultValue
+);

interface/src/network/NetworkSettingsController.tsx

@@ -0,0 +1,29 @@
+import React, { Component } from 'react';
+
+import { restController, RestControllerProps, RestFormLoader, SectionContent } from '../components';
+import NetworkSettingsForm from './NetworkSettingsForm';
+import { NETWORK_SETTINGS_ENDPOINT } from '../api';
+import { NetworkSettings } from './types';
+
+type NetworkSettingsControllerProps = RestControllerProps<NetworkSettings>;
+
+class NetworkSettingsController extends Component<NetworkSettingsControllerProps> {
+
+  componentDidMount() {
+    this.props.loadData();
+  }
+
+  render() {
+    return (
+      <SectionContent title="Network Settings">
+        <RestFormLoader
+          {...this.props}
+          render={formProps => <NetworkSettingsForm {...formProps} />}
+        />
+      </SectionContent>
+    );
+  }
+
+}
+
+export default restController(NETWORK_SETTINGS_ENDPOINT, NetworkSettingsController);

interface/src/network/NetworkSettingsForm.tsx

@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator';
+import { TextValidator, SelectValidator, ValidatorForm } from 'react-material-ui-form-validator';
 
 import { Checkbox, List, ListItem, ListItemText, ListItemAvatar, ListItemSecondaryAction } from '@material-ui/core';
 
@@ -9,33 +9,35 @@ import LockIcon from '@material-ui/icons/Lock';
 import LockOpenIcon from '@material-ui/icons/LockOpen';
 import DeleteIcon from '@material-ui/icons/Delete';
 import SaveIcon from '@material-ui/icons/Save';
+import MenuItem from '@material-ui/core/MenuItem';
 
 import { RestFormProps, PasswordValidator, BlockFormControlLabel, FormActions, FormButton } from '../components';
 import { isIP, isHostname, optional } from '../validators';
 
-import { WiFiConnectionContext } from './WiFiConnectionContext';
+import { NetworkConnectionContext } from './NetworkConnectionContext';
 import { isNetworkOpen, networkSecurityMode } from './WiFiSecurityModes';
-import { WiFiSettings } from './types';
+import { NetworkSettings } from './types';
 
-type WiFiStatusFormProps = RestFormProps<WiFiSettings>;
+type NetworkStatusFormProps = RestFormProps<NetworkSettings>;
 
-class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
+class NetworkSettingsForm extends React.Component<NetworkStatusFormProps> {
 
-  static contextType = WiFiConnectionContext;
-  context!: React.ContextType<typeof WiFiConnectionContext>;
+  static contextType = NetworkConnectionContext;
+  context!: React.ContextType<typeof NetworkConnectionContext>;
 
-  constructor(props: WiFiStatusFormProps, context: WiFiConnectionContext) {
+  constructor(props: NetworkStatusFormProps, context: NetworkConnectionContext) {
     super(props);
 
     const { selectedNetwork } = context;
     if (selectedNetwork) {
-      const wifiSettings: WiFiSettings = {
+      const networkSettings: NetworkSettings = {
         ssid: selectedNetwork.ssid,
         password: "",
         hostname: props.data.hostname,
+        ethernet_profile: 0,
         static_ip_config: false,
       }
-      props.setData(wifiSettings);
+      props.setData(networkSettings);
     }
   }
 
@@ -58,7 +60,7 @@ class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
     const { selectedNetwork, deselectNetwork } = this.context;
     const { data, handleValueChange, saveData } = this.props;
     return (
-      <ValidatorForm onSubmit={saveData} ref="WiFiSettingsForm">
+      <ValidatorForm onSubmit={saveData} ref="NetworkSettingsForm">
         {
           selectedNetwork ?
             <List>
@@ -117,6 +119,17 @@ class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
           onChange={handleValueChange('hostname')}
           margin="normal"
         />
+        <SelectValidator name="ems_bus_id"
+          label="Ethernet Profile"
+          value={data.ethernet_profile}
+          fullWidth
+          variant="outlined"
+          onChange={handleValueChange('ethernet_profile')}
+          margin="normal">
+          <MenuItem value={0}>None (wifi only)</MenuItem>
+          <MenuItem value={1}>Profile 1 (LAN8720)</MenuItem>
+          <MenuItem value={2}>Profile 2 (TLK110)</MenuItem>
+        </SelectValidator>
         <BlockFormControlLabel
           control={
             <Checkbox
@@ -197,4 +210,4 @@ class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
   }
 }
 
-export default WiFiSettingsForm;
+export default NetworkSettingsForm;

interface/src/network/NetworkStatus.ts

@@ -0,0 +1,48 @@
+import { Theme } from '@material-ui/core';
+import { NetworkStatus, NetworkConnectionStatus } from './types';
+
+export const isConnected = ({ status }: NetworkStatus) => {
+  return ((status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED) || (status === NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED));
+}
+
+export const isWiFi = ({ status }: NetworkStatus) => (status === NetworkConnectionStatus.WIFI_STATUS_CONNECTED)
+
+export const networkStatusHighlight = ({ status }: NetworkStatus, theme: Theme) => {
+  switch (status) {
+    case NetworkConnectionStatus.WIFI_STATUS_IDLE:
+    case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
+    case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
+      return theme.palette.info.main;
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
+    case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
+      return theme.palette.success.main;
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
+      return theme.palette.error.main;
+    default:
+      return theme.palette.warning.main;
+  }
+}
+
+export const networkStatus = ({ status }: NetworkStatus) => {
+  switch (status) {
+    case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
+      return "Inactive";
+    case NetworkConnectionStatus.WIFI_STATUS_IDLE:
+      return "Idle";
+    case NetworkConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL:
+      return "No SSID Available";
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
+      return "Connected (WiFi)";
+    case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
+      return "Connected (Ethernet)";
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
+      return "Connection Failed";
+    case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
+      return "Connection Lost";
+    case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
+      return "Disconnected";
+    default:
+      return "Unknown";
+  }
+}

interface/src/network/NetworkStatusController.tsx

@@ -0,0 +1,29 @@
+import React, { Component } from 'react';
+
+import {restController, RestControllerProps, RestFormLoader, SectionContent } from '../components';
+import NetworkStatusForm from './NetworkStatusForm';
+import { NETWORK_STATUS_ENDPOINT } from '../api';
+import { NetworkStatus } from './types';
+
+type NetworkStatusControllerProps = RestControllerProps<NetworkStatus>;
+
+class NetworkStatusController extends Component<NetworkStatusControllerProps> {
+
+  componentDidMount() {
+    this.props.loadData();
+  }
+
+  render() {
+    return (
+      <SectionContent title="Network Status">
+        <RestFormLoader
+          {...this.props}
+          render={formProps => <NetworkStatusForm {...formProps} />}
+        />
+      </SectionContent>
+    );
+  }
+
+}
+
+export default restController(NETWORK_STATUS_ENDPOINT, NetworkStatusController);

interface/src/network/NetworkStatusForm.tsx

@@ -11,14 +11,14 @@ import DeviceHubIcon from '@material-ui/icons/DeviceHub';
 import RefreshIcon from '@material-ui/icons/Refresh';
 
 import { RestFormProps, FormActions, FormButton, HighlightAvatar } from '../components';
-import { wifiStatus, wifiStatusHighlight, isConnected } from './WiFiStatus';
-import { WiFiStatus } from './types';
+import { networkStatus, networkStatusHighlight, isConnected, isWiFi } from './NetworkStatus';
+import { NetworkStatus } from './types';
 
-type WiFiStatusFormProps = RestFormProps<WiFiStatus> & WithTheme;
+type NetworkStatusFormProps = RestFormProps<NetworkStatus> & WithTheme;
 
-class WiFiStatusForm extends Component<WiFiStatusFormProps> {
+class NetworkStatusForm extends Component<NetworkStatusFormProps> {
 
-  dnsServers(status: WiFiStatus) {
+  dnsServers(status: NetworkStatus) {
     if (!status.dns_ip_1) {
       return "none";
     }
@@ -31,15 +31,15 @@ class WiFiStatusForm extends Component<WiFiStatusFormProps> {
       <Fragment>
         <ListItem>
           <ListItemAvatar>
-            <HighlightAvatar color={wifiStatusHighlight(data, theme)}>
+            <HighlightAvatar color={networkStatusHighlight(data, theme)}>
               <WifiIcon />
             </HighlightAvatar>
           </ListItemAvatar>
-          <ListItemText primary="Status" secondary={wifiStatus(data)} />
+          <ListItemText primary="Status" secondary={networkStatus(data)} />
         </ListItem>
         <Divider variant="inset" component="li" />
         {
-          isConnected(data) &&
+          isWiFi(data) &&
           <Fragment>
             <ListItem>
               <ListItemAvatar>
@@ -50,6 +50,10 @@ class WiFiStatusForm extends Component<WiFiStatusFormProps> {
               <ListItemText primary="SSID" secondary={data.ssid} />
             </ListItem>
             <Divider variant="inset" component="li" />
+          </Fragment>
+        }
+        { isConnected(data) &&
+          <Fragment>
             <ListItem>
               <ListItemAvatar>
                 <Avatar>IP</Avatar>
@@ -114,4 +118,4 @@ class WiFiStatusForm extends Component<WiFiStatusFormProps> {
 
 }
 
-export default withTheme(WiFiStatusForm);
+export default withTheme(NetworkStatusForm);

interface/src/network/WiFiNetworkSelector.tsx

@@ -8,7 +8,7 @@ import LockIcon from '@material-ui/icons/Lock';
 import LockOpenIcon from '@material-ui/icons/LockOpen';
 
 import { isNetworkOpen, networkSecurityMode } from './WiFiSecurityModes';
-import { WiFiConnectionContext } from './WiFiConnectionContext';
+import { NetworkConnectionContext } from './NetworkConnectionContext';
 import { WiFiNetwork, WiFiNetworkList } from './types';
 
 interface WiFiNetworkSelectorProps {
@@ -17,8 +17,8 @@ interface WiFiNetworkSelectorProps {
 
 class WiFiNetworkSelector extends Component<WiFiNetworkSelectorProps> {
 
-  static contextType = WiFiConnectionContext;
-  context!: React.ContextType<typeof WiFiConnectionContext>;
+  static contextType = NetworkConnectionContext;
+  context!: React.ContextType<typeof NetworkConnectionContext>;
 
   renderNetwork = (network: WiFiNetwork) => {
     return (

interface/src/network/types.ts

@@ -1,10 +1,11 @@
-export enum WiFiConnectionStatus {
+export enum NetworkConnectionStatus {
   WIFI_STATUS_IDLE = 0,
   WIFI_STATUS_NO_SSID_AVAIL = 1,
   WIFI_STATUS_CONNECTED = 3,
   WIFI_STATUS_CONNECT_FAILED = 4,
   WIFI_STATUS_CONNECTION_LOST = 5,
   WIFI_STATUS_DISCONNECTED = 6,
+  ETHERNET_STATUS_CONNECTED = 10,
   WIFI_STATUS_NO_SHIELD = 255
 }
 
@@ -17,8 +18,8 @@ export enum WiFiEncryptionType {
   WIFI_AUTH_WPA2_ENTERPRISE = 5
 }
 
-export interface WiFiStatus {
-  status: WiFiConnectionStatus;
+export interface NetworkStatus {
+  status: NetworkConnectionStatus;
   local_ip: string;
   mac_address: string;
   rssi: number;
@@ -31,10 +32,11 @@ export interface WiFiStatus {
   dns_ip_2: string;
 }
 
-export interface WiFiSettings {
+export interface NetworkSettings {
   ssid: string;
   password: string;
   hostname: string;
+  ethernet_profile: number;
   static_ip_config: boolean;
   local_ip?: string;
   gateway_ip?: string;

interface/src/system/SystemStatusForm.tsx

@@ -6,14 +6,11 @@ import { List, ListItem, ListItemAvatar, ListItemText } from '@material-ui/core'
 import DevicesIcon from '@material-ui/icons/Devices';
 import MemoryIcon from '@material-ui/icons/Memory';
 import ShowChartIcon from '@material-ui/icons/ShowChart';
-import SdStorageIcon from '@material-ui/icons/SdStorage';
 import FolderIcon from '@material-ui/icons/Folder';
-import DataUsageIcon from '@material-ui/icons/DataUsage';
 import AppsIcon from '@material-ui/icons/Apps';
 import PowerSettingsNewIcon from '@material-ui/icons/PowerSettingsNew';
 import RefreshIcon from '@material-ui/icons/Refresh';
 import SettingsBackupRestoreIcon from '@material-ui/icons/SettingsBackupRestore';
-import BatteryUnknownIcon from "@material-ui/icons/BatteryUnknown";
 import TimerIcon from "@material-ui/icons/Timer";
 
 import { redirectingAuthorizedFetch, AuthenticatedContextProps, withAuthenticatedContext } from '../authentication';
@@ -96,24 +93,6 @@ class SystemStatusForm extends Component<SystemStatusFormProps, SystemStatusForm
             </Fragment>)
         }
         <Divider variant="inset" component="li" />
-        <ListItem >
-          <ListItemAvatar>
-            <Avatar>
-              <DataUsageIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary="Sketch (Size / Free)" secondary={formatNumber(data.sketch_size) + ' / ' + formatNumber(data.free_sketch_space) + ' bytes'} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
-        <ListItem >
-          <ListItemAvatar>
-            <Avatar>
-              <SdStorageIcon />
-            </Avatar>
-          </ListItemAvatar>
-          <ListItemText primary="Flash Chip (Size / Speed)" secondary={formatNumber(data.flash_chip_size) + ' bytes / ' + (data.flash_chip_speed / 1000000).toFixed(0) + ' MHz'} />
-        </ListItem>
-        <Divider variant="inset" component="li" />
         <ListItem >
           <ListItemAvatar>
             <Avatar>

interface/src/system/types.ts

@@ -8,8 +8,6 @@ interface ESPSystemStatus {
   max_alloc_heap: number;
   cpu_freq_mhz: number;
   free_heap: number;
-  sketch_size: number;
-  free_sketch_space: number;
   sdk_version: string;
   flash_chip_size: number;
   flash_chip_speed: number;

interface/src/wifi/WiFiConnection.tsx

@@ -1,62 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect, Switch, RouteComponentProps } from 'react-router-dom'
-
-import { Tabs, Tab } from '@material-ui/core';
-
-import { withAuthenticatedContext, AuthenticatedContextProps, AuthenticatedRoute } from '../authentication';
-import { MenuAppBar } from '../components';
-
-import WiFiStatusController from './WiFiStatusController';
-import WiFiSettingsController from './WiFiSettingsController';
-import WiFiNetworkScanner from './WiFiNetworkScanner';
-import { WiFiConnectionContext } from './WiFiConnectionContext';
-import { WiFiNetwork } from './types';
-
-type WiFiConnectionProps = AuthenticatedContextProps & RouteComponentProps;
-
-class WiFiConnection extends Component<WiFiConnectionProps, WiFiConnectionContext> {
-
-  constructor(props: WiFiConnectionProps) {
-    super(props);
-    this.state = {
-      selectNetwork: this.selectNetwork,
-      deselectNetwork: this.deselectNetwork
-    };
-  }
-
-  selectNetwork = (network: WiFiNetwork) => {
-    this.setState({ selectedNetwork: network });
-    this.props.history.push('/wifi/settings');
-  }
-
-  deselectNetwork = () => {
-    this.setState({ selectedNetwork: undefined });
-  }
-
-  handleTabChange = (event: React.ChangeEvent<{}>, path: string) => {
-    this.props.history.push(path);
-  };
-
-  render() {
-    const { authenticatedContext } = this.props;
-    return (
-      <WiFiConnectionContext.Provider value={this.state}>
-        <MenuAppBar sectionTitle="WiFi Connection">
-          <Tabs value={this.props.match.url} onChange={this.handleTabChange} variant="fullWidth">
-            <Tab value="/wifi/status" label="WiFi Status" />
-            <Tab value="/wifi/scan" label="Scan Networks" disabled={!authenticatedContext.me.admin} />
-            <Tab value="/wifi/settings" label="WiFi Settings" disabled={!authenticatedContext.me.admin} />
-          </Tabs>
-          <Switch>
-            <AuthenticatedRoute exact path="/wifi/status" component={WiFiStatusController} />
-            <AuthenticatedRoute exact path="/wifi/scan" component={WiFiNetworkScanner} />
-            <AuthenticatedRoute exact path="/wifi/settings" component={WiFiSettingsController} />
-            <Redirect to="/wifi/status" />
-          </Switch>
-        </MenuAppBar>
-      </WiFiConnectionContext.Provider>
-    )
-  }
-}
-
-export default withAuthenticatedContext(WiFiConnection);

interface/src/wifi/WiFiConnectionContext.tsx

@@ -1,13 +0,0 @@
-import React from 'react';
-import { WiFiNetwork } from './types';
-
-export interface WiFiConnectionContext {
-  selectedNetwork?: WiFiNetwork;
-  selectNetwork: (network: WiFiNetwork) => void;
-  deselectNetwork: () => void;
-}
-
-const WiFiConnectionContextDefaultValue = {} as WiFiConnectionContext
-export const WiFiConnectionContext = React.createContext(
-  WiFiConnectionContextDefaultValue
-);

interface/src/wifi/WiFiSettingsController.tsx

@@ -1,29 +0,0 @@
-import React, { Component } from 'react';
-
-import { restController, RestControllerProps, RestFormLoader, SectionContent } from '../components';
-import WiFiSettingsForm from './WiFiSettingsForm';
-import { WIFI_SETTINGS_ENDPOINT } from '../api';
-import { WiFiSettings } from './types';
-
-type WiFiSettingsControllerProps = RestControllerProps<WiFiSettings>;
-
-class WiFiSettingsController extends Component<WiFiSettingsControllerProps> {
-
-  componentDidMount() {
-    this.props.loadData();
-  }
-
-  render() {
-    return (
-      <SectionContent title="WiFi Settings">
-        <RestFormLoader
-          {...this.props}
-          render={formProps => <WiFiSettingsForm {...formProps} />}
-        />
-      </SectionContent>
-    );
-  }
-
-}
-
-export default restController(WIFI_SETTINGS_ENDPOINT, WiFiSettingsController);

interface/src/wifi/WiFiStatus.ts

@@ -1,41 +0,0 @@
-import { Theme } from '@material-ui/core';
-import { WiFiStatus, WiFiConnectionStatus } from './types';
-
-export const isConnected = ({ status }: WiFiStatus) => status === WiFiConnectionStatus.WIFI_STATUS_CONNECTED;
-
-export const wifiStatusHighlight = ({ status }: WiFiStatus, theme: Theme) => {
-  switch (status) {
-    case WiFiConnectionStatus.WIFI_STATUS_IDLE:
-    case WiFiConnectionStatus.WIFI_STATUS_DISCONNECTED:
-    case WiFiConnectionStatus.WIFI_STATUS_NO_SHIELD:
-      return theme.palette.info.main;
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECTED:
-      return theme.palette.success.main;
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
-      return theme.palette.error.main;
-    default:
-      return theme.palette.warning.main;
-  }
-}
-
-export const wifiStatus = ({ status }: WiFiStatus) => {
-  switch (status) {
-    case WiFiConnectionStatus.WIFI_STATUS_NO_SHIELD:
-      return "Inactive";
-    case WiFiConnectionStatus.WIFI_STATUS_IDLE:
-      return "Idle";
-    case WiFiConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL:
-      return "No SSID Available";
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECTED:
-      return "Connected";
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
-      return "Connection Failed";
-    case WiFiConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
-      return "Connection Lost";
-    case WiFiConnectionStatus.WIFI_STATUS_DISCONNECTED:
-      return "Disconnected";
-    default:
-      return "Unknown";
-  }
-}

interface/src/wifi/WiFiStatusController.tsx

@@ -1,29 +0,0 @@
-import React, { Component } from 'react';
-
-import {restController, RestControllerProps, RestFormLoader, SectionContent } from '../components';
-import WiFiStatusForm from './WiFiStatusForm';
-import { WIFI_STATUS_ENDPOINT } from '../api';
-import { WiFiStatus } from './types';
-
-type WiFiStatusControllerProps = RestControllerProps<WiFiStatus>;
-
-class WiFiStatusController extends Component<WiFiStatusControllerProps> {
-
-  componentDidMount() {
-    this.props.loadData();
-  }
-
-  render() {
-    return (
-      <SectionContent title="WiFi Status">
-        <RestFormLoader
-          {...this.props}
-          render={formProps => <WiFiStatusForm {...formProps} />}
-        />
-      </SectionContent>
-    );
-  }
-
-}
-
-export default restController(WIFI_STATUS_ENDPOINT, WiFiStatusController);