diff --git a/FtcDashboard/dash/src/assets/icons/connected.svg b/FtcDashboard/dash/src/assets/icons/connected.svg new file mode 100644 index 000000000..505efc775 --- /dev/null +++ b/FtcDashboard/dash/src/assets/icons/connected.svg @@ -0,0 +1,7 @@ + + + Connected + + + + \ No newline at end of file diff --git a/FtcDashboard/dash/src/assets/icons/disconnected.svg b/FtcDashboard/dash/src/assets/icons/disconnected.svg new file mode 100644 index 000000000..4196e9747 --- /dev/null +++ b/FtcDashboard/dash/src/assets/icons/disconnected.svg @@ -0,0 +1,6 @@ + + + Disconnected + + + \ No newline at end of file diff --git a/FtcDashboard/dash/src/components/Dashboard/Dashboard.tsx b/FtcDashboard/dash/src/components/Dashboard/Dashboard.tsx index 14335e7c9..6d9d07016 100644 --- a/FtcDashboard/dash/src/components/Dashboard/Dashboard.tsx +++ b/FtcDashboard/dash/src/components/Dashboard/Dashboard.tsx @@ -6,8 +6,8 @@ import { saveLayoutPreset, getLayoutPreset } from '@/store/actions/settings'; import { RootState } from '@/store/reducers'; import { BaseViewIconButton } from '@/components/views/BaseView'; -import { ReactComponent as ConnectedIcon } from '@/assets/icons/wifi.svg'; -import { ReactComponent as DisconnectedIcon } from '@/assets/icons/wifi_off.svg'; +import { ReactComponent as ConnectedIcon } from '@/assets/icons/connected.svg'; +import { ReactComponent as DisconnectedIcon } from '@/assets/icons/disconnected.svg'; import { ReactComponent as SettingsIcon } from '@/assets/icons/settings.svg'; import SettingsModal from './SettingsModal'; import { startSocketWatcher } from '@/store/middleware/socketMiddleware'; @@ -71,6 +71,7 @@ export default function Dashboard() { )} setIsSettingsModalOpen(true)} > diff --git a/FtcDashboard/dash/src/components/views/CameraView.jsx b/FtcDashboard/dash/src/components/views/CameraView.jsx index de2b2204b..f220e717f 100644 --- a/FtcDashboard/dash/src/components/views/CameraView.jsx +++ b/FtcDashboard/dash/src/components/views/CameraView.jsx @@ -74,7 +74,7 @@ class CameraView extends React.Component { Camera - + diff --git a/FtcDashboard/dash/src/components/views/ConfigView/ConfigView.tsx b/FtcDashboard/dash/src/components/views/ConfigView/ConfigView.tsx index a56598778..07c572cd9 100644 --- a/FtcDashboard/dash/src/components/views/ConfigView/ConfigView.tsx +++ b/FtcDashboard/dash/src/components/views/ConfigView/ConfigView.tsx @@ -98,6 +98,7 @@ const ConfigView = ({ { const configDiff = validAndModified(configRoot); if (configDiff != null) { @@ -111,6 +112,7 @@ const ConfigView = ({ dispatch({ type: 'REFRESH_CONFIG', diff --git a/FtcDashboard/dash/src/components/views/GraphView/GraphView.tsx b/FtcDashboard/dash/src/components/views/GraphView/GraphView.tsx index b811bfbe4..ae83e1982 100644 --- a/FtcDashboard/dash/src/components/views/GraphView/GraphView.tsx +++ b/FtcDashboard/dash/src/components/views/GraphView/GraphView.tsx @@ -186,7 +186,10 @@ class GraphView extends Component { {this.state.graphing && this.state.selectedKeys.length !== 0 && ( - + {this.state.paused ? ( ) : ( @@ -195,7 +198,9 @@ class GraphView extends Component { )} - + {this.state.graphing ? ( ) : (