From 56ef19708d720a13999d9a4fdef3d1710f2a1a68 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Wed, 16 May 2018 22:14:41 -0600 Subject: [PATCH] Simplify arming steps --- webclient/src/App.js | 3 +- webclient/src/Tool.js | 2 +- webclient/yarn.lock | 155 +++++++++++- webserver/server.js | 61 +++-- webserver/yarn.lock | 541 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 727 insertions(+), 35 deletions(-) create mode 100644 webserver/yarn.lock diff --git a/webclient/src/App.js b/webclient/src/App.js index f3bc422..0e55082 100644 --- a/webclient/src/App.js +++ b/webclient/src/App.js @@ -7,7 +7,7 @@ import { Link, Route } from 'react-router-dom'; import io from 'socket.io-client'; // Move to env var -const SERVER_URL = "http://tools.protospace.ca:8080"; +const SERVER_URL = 'http://localhost:8080'; class App extends Component { constructor() { @@ -106,7 +106,6 @@ class App extends Component { Loading } - ); } diff --git a/webclient/src/Tool.js b/webclient/src/Tool.js index 74a7ecd..79bec1b 100644 --- a/webclient/src/Tool.js +++ b/webclient/src/Tool.js @@ -70,7 +70,7 @@ class Tool extends Component { disabled={!approved || !decodedStatus.canDisarm} onClick={() => requestInterlock({toolId: tool.id, action: 'disarm',})} > - Disarm + Disarm {approved ||