tanner/pslockout
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare web side for Pi hosting

Browse Source
This commit is contained in:
Tanner Collin
2018-02-06 06:37:44 +00:00
parent 6071534a72
commit f0a3b02c6a
6 changed files with 336 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webclient/src/App.js
View File

@@ -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://localhost:8080";
const SERVER_URL = "http://tools.protospace.ca:8080";
class App extends Component {
constructor() {

18
webclient/src/Tool.js
View File

@@ -6,17 +6,17 @@ class Tool extends Component {
decodeStatus = status => {
if (status === null) {
return { msg: 'Unknown! Connection error?', canArm: false, canDisarm: false, };
} else if (status.armable && !status.armed) {
} else if (status.action == 'arm') {
return { msg: 'Arming...', canArm: false, canDisarm: true, };
} else if (!status.armable && status.armed) {
} else if (status.action == 'disarm') {
return { msg: 'Disarming...', canArm: true, canDisarm: false, };
} else if (!status.armed && !status.on) {
return { msg: 'Off', canArm: true, canDisarm: false, };
} else if (status.armed && !status.on) {
return { msg: 'Armed', canArm: false, canDisarm: true, };
} else if (status.armed && status.on) {
return { msg: 'On', canArm: false, canDisarm: true, };
} else if (!status.armed && status.on) {
} else if (status.state == 'off') {
return { msg: 'Off.', canArm: true, canDisarm: false, };
} else if (status.state == 'armed') {
return { msg: 'Armed.', canArm: false, canDisarm: true, };
} else if (status.state == 'on') {
return { msg: 'On.', canArm: false, canDisarm: true, };
} else {
return { msg: 'Error: Impossible state!', canArm: false, canDisarm: false, };
}
}