From 427d0674b5ec9ce530d24ccac30f0233203b48f4 Mon Sep 17 00:00:00 2001 From: Pete Shadbolt Date: Fri, 6 May 2016 16:48:44 +0100 Subject: [PATCH] It's working now - Ctrl-C, polling etc are good --- server/index.html | 3 ++- server/main.css | 2 +- server/main.js | 5 ++++- server/server.py | 8 ++++++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/index.html b/server/index.html index 055d2d9..724bc63 100644 --- a/server/index.html +++ b/server/index.html @@ -9,6 +9,7 @@ -Watching server on localhost:8000 +Soft console: +

 
 
diff --git a/server/main.css b/server/main.css
index bda8fd8..1ca5371 100644
--- a/server/main.css
+++ b/server/main.css
@@ -1,3 +1,3 @@
 body{
-    font-family: monospace;
+    font-family: sans-serif;
 }
diff --git a/server/main.js b/server/main.js
index e13ea2b..b32f4b5 100644
--- a/server/main.js
+++ b/server/main.js
@@ -1,11 +1,14 @@
+var body;
+
 function poll() {
     var xhr = new XMLHttpRequest();
 
     xhr.onload=function() {
-        console.log(xhr.responseText);
+        soft_console.innerHTML = "\n" + xhr.responseText;
     };
 
     xhr.onerror = function(e){
+        soft_console.innerHTML = "\n" + "Lost connection to server";
     };
 
     xhr.open("GET", "/state", true);
diff --git a/server/server.py b/server/server.py
index 248615a..3cef71f 100644
--- a/server/server.py
+++ b/server/server.py
@@ -7,6 +7,8 @@ import json
 import threading
 import time
 
+state = 0
+
 class VizHandler(SimpleHTTPRequestHandler):
     """ Handles requests to the server """
     def __init__(self, *args, **kwargs):
@@ -16,7 +18,7 @@ class VizHandler(SimpleHTTPRequestHandler):
         self.send_response(200)
         self.send_header('Content-Type', 'application/json')
         self.end_headers()
-        self.wfile.write(json.dumps({"state":"here is the state"}))
+        self.wfile.write(json.dumps({"state":"{}".format(state)}))
     
     def do_GET(self, *args, **kwargs):
         parsed_path = urlparse.urlparse(self.path)
@@ -49,5 +51,7 @@ class VizServer(SocketServer.TCPServer):
 if __name__ == '__main__':
     server = VizServer()
     server.start()
-    time.sleep(5)
+    while True:
+        state += 1
+        time.sleep(1)
     server.shutdown()