Skip to content

Commit d44b42c

Browse files
bflataubflatau
committed
updated debug panel with on/off hack
1 parent a8212de commit d44b42c

13 files changed

+34
-28
lines changed

‎codeart_backend/public/.DS_Store

-6 KB
Binary file not shown.

‎codeart_backend/public/asset-manifest.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.800ad38d.chunk.css",
4-
"main.js": "/static/js/main.f505373f.chunk.js",
5-
"main.js.map": "/static/js/main.f505373f.chunk.js.map",
4+
"main.js": "/static/js/main.861574d5.chunk.js",
5+
"main.js.map": "/static/js/main.861574d5.chunk.js.map",
66
"runtime-main.js": "/static/js/runtime-main.95403422.js",
77
"runtime-main.js.map": "/static/js/runtime-main.95403422.js.map",
88
"static/css/2.9a44ea78.chunk.css": "/static/css/2.9a44ea78.chunk.css",
99
"static/js/2.8f3cf685.chunk.js": "/static/js/2.8f3cf685.chunk.js",
1010
"static/js/2.8f3cf685.chunk.js.map": "/static/js/2.8f3cf685.chunk.js.map",
1111
"index.html": "/index.html",
12-
"precache-manifest.d03b8dfdcb14722bd3a42759a547359d.js": "/precache-manifest.d03b8dfdcb14722bd3a42759a547359d.js",
12+
"precache-manifest.fc7d4f4cfeb98b0c5399cf73951e5c39.js": "/precache-manifest.fc7d4f4cfeb98b0c5399cf73951e5c39.js",
1313
"service-worker.js": "/service-worker.js",
1414
"static/css/2.9a44ea78.chunk.css.map": "/static/css/2.9a44ea78.chunk.css.map",
1515
"static/css/main.800ad38d.chunk.css.map": "/static/css/main.800ad38d.chunk.css.map",
@@ -21,6 +21,6 @@
2121
"static/css/2.9a44ea78.chunk.css",
2222
"static/js/2.8f3cf685.chunk.js",
2323
"static/css/main.800ad38d.chunk.css",
24-
"static/js/main.f505373f.chunk.js"
24+
"static/js/main.861574d5.chunk.js"
2525
]
2626
}

‎codeart_backend/public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><title>I/O</title><link href="/static/css/2.9a44ea78.chunk.css" rel="stylesheet"><link href="/static/css/main.800ad38d.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,i=r[0],l=r[1],a=r[2],c=0,s=[];c<i.length;c++)f=i[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var l=t[i];0!==o[l]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var i=this.webpackJsonpraspi_frontend=this.webpackJsonpraspi_frontend||[],l=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var p=l;t()}([])</script><script src="/static/js/2.8f3cf685.chunk.js"></script><script src="/static/js/main.f505373f.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><title>I/O</title><link href="/static/css/2.9a44ea78.chunk.css" rel="stylesheet"><link href="/static/css/main.800ad38d.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,f,i=r[0],l=r[1],a=r[2],c=0,s=[];c<i.length;c++)f=i[c],Object.prototype.hasOwnProperty.call(o,f)&&o[f]&&s.push(o[f][0]),o[f]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var l=t[i];0!==o[l]&&(n=!1)}n&&(u.splice(r--,1),e=f(f.s=t[0]))}return e}var n={},o={1:0},u=[];function f(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,f),t.l=!0,t.exports}f.m=e,f.c=n,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,r){if(1&r&&(e=f(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)f.d(t,n,function(r){return e[r]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var i=this.webpackJsonpraspi_frontend=this.webpackJsonpraspi_frontend||[],l=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var p=l;t()}([])</script><script src="/static/js/2.8f3cf685.chunk.js"></script><script src="/static/js/main.861574d5.chunk.js"></script></body></html>

‎codeart_backend/public/precache-manifest.d03b8dfdcb14722bd3a42759a547359d.js renamed to ‎codeart_backend/public/precache-manifest.fc7d4f4cfeb98b0c5399cf73951e5c39.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
self.__precacheManifest = (self.__precacheManifest || []).concat([
22
{
3-
"revision": "2d2262430190fdca3d19a59cf92d284e",
3+
"revision": "2201980577f528051517755a8f8d05b2",
44
"url": "/index.html"
55
},
66
{
77
"revision": "079a924da5167334f2d0",
88
"url": "/static/css/2.9a44ea78.chunk.css"
99
},
1010
{
11-
"revision": "03ebf77c15268dd80a65",
11+
"revision": "de5cc4eca86294e776c1",
1212
"url": "/static/css/main.800ad38d.chunk.css"
1313
},
1414
{
@@ -20,8 +20,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
2020
"url": "/static/js/2.8f3cf685.chunk.js.LICENSE.txt"
2121
},
2222
{
23-
"revision": "03ebf77c15268dd80a65",
24-
"url": "/static/js/main.f505373f.chunk.js"
23+
"revision": "de5cc4eca86294e776c1",
24+
"url": "/static/js/main.861574d5.chunk.js"
2525
},
2626
{
2727
"revision": "c05c057e30e4bd6e6609",

‎codeart_backend/public/service-worker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
1515

1616
importScripts(
17-
"/precache-manifest.d03b8dfdcb14722bd3a42759a547359d.js"
17+
"/precache-manifest.fc7d4f4cfeb98b0c5399cf73951e5c39.js"
1818
);
1919

2020
self.addEventListener('message', (event) => {

‎codeart_backend/public/static/js/main.861574d5.chunk.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codeart_backend/public/static/js/main.861574d5.chunk.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎codeart_backend/public/static/js/main.f505373f.chunk.js

-2
This file was deleted.

‎codeart_backend/public/static/js/main.f505373f.chunk.js.map

-1
This file was deleted.

‎codeart_frontend/src/components/Main/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Main extends Component {
5656
<OutputBoard socket={this.props.socket} splitflapState={this.state.boardLayoutData} />
5757
<OutputBoard socket={this.props.socket} splitflapState={this.state.splitflapState} onResetModule={this.props.resetModule}/>
5858
{/* <SocketTest socket={socket}/> */}
59-
<SplitflapDiagnostics serverName={this.props.socket.io.uri} socket={this.props.socket} onHardResetClick={this.props.splitflapHardReset} startAnimation={this.props.startAnimation} stopAnimation={this.props.stopAnimation} />
59+
<SplitflapDiagnostics serverName={this.props.socket.io.uri} socket={this.props.socket} onHardResetClick={this.props.splitflapHardReset} startAnimation={this.props.startAnimation} stopAnimation={this.props.stopAnimation} turnPlugOn={this.props.turnPlugOn} turnPlugOff={this.props.turnPlugOff} />
6060
</div>
6161
)
6262
}

‎codeart_frontend/src/components/SplitflapDiagnostics/index.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { Component } from "react";
22
import { PB } from "splitflapjs-proto";
33
import './style.css';
4-
import { plugURL } from "../../constants";
54

65
const PowerChannel = (props) => {
76
return (
@@ -42,6 +41,8 @@ class SplitflapDiagnostics extends Component {
4241

4342
render() {
4443
const supervisorStateObj = PB.SupervisorState.toObject(this.state.supervisorState, {defaults:true, enums: String})
44+
45+
4546
return (
4647
<div className="diagnostics">
4748
<div>Server: {this.props.serverName}</div>
@@ -61,9 +62,9 @@ class SplitflapDiagnostics extends Component {
6162
}
6263
</div>
6364
<div>
64-
<p>REMOTE PLUG:</p>
65-
<button onClick={()=> fetch(`${plugURL}/on`, {method: 'POST'}) }>TURN ON</button>
66-
<button onClick={()=> fetch(`${plugURL}/off`, {method: 'POST'}) }>TURN OFF</button>
65+
<p>REMOTE PLUG STATE: {this.state.plugState}</p>
66+
<button onClick={()=>{this.props.turnPlugOn(); this.setState({plugState:'ON'})}}>TURN ON</button>
67+
<button onClick={()=>{this.props.turnPlugOff(); this.setState({plugState:'OFF'})}}>TURN OFF</button>
6768
</div>
6869
</div>
6970
)

‎codeart_frontend/src/constants.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export const apiURL = 'http://10.0.0.11:8090'
2-
// export const plugURL = 'http://10.0.0.13:3000'
3-
export const plugURL = 'http://piplug:3000'
2+
export const plugURL = 'http://10.0.0.13:3000'
3+
// export const plugURL = 'http://piplug:3000'

‎codeart_frontend/src/index.js

+13-8
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,27 @@ const stopAnimation = async () => {
6868
}
6969
}
7070

71-
const turnPlugOn= async () => {
72-
try {
73-
const result = await fetch(`${plugURL}/on`,{method: 'POST'})
74-
console.log(`Stop animation result: ${await result.text()}`)
75-
} catch (err) {
76-
alert(err)
77-
}
71+
const turnPlugOn= () => {
72+
console.log('turning on')
73+
fetch(`${plugURL}/on`,{method: 'POST'}).then(response =>{
74+
}).catch(err =>{alert(err)})
75+
76+
}
77+
78+
const turnPlugOff= () => {
79+
fetch(`${plugURL}/off`,{method: 'POST'}).then(response =>{
80+
}).catch(err =>{alert(err)})
81+
7882
}
7983

8084

8185

8286

87+
8388
ReactDOM.render(
8489
<React.StrictMode>
8590
<div id='app-content'>
86-
<Main socket={socket} splitflapHardReset={splitflapHardReset} resetModule={resetModule} startAnimation={startAnimation} stopAnimation={stopAnimation} />
91+
<Main socket={socket} splitflapHardReset={splitflapHardReset} resetModule={resetModule} startAnimation={startAnimation} stopAnimation={stopAnimation} turnPlugOn={turnPlugOn} turnPlugOff={turnPlugOff} />
8792
</div>
8893
</React.StrictMode>,
8994
document.getElementById('root')

0 commit comments

Comments
 (0)