# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2017-06-01 09:03:09
# Node ID 6059de6659c3f712d0ad2e4e52a2e2802f384927
# Parent  7943daa149dadb27d56a9fd2ca63bdf16a462209

move effects/ page into web/. fix homepage list. rm old subserver code.
Ignore-this: df247afa405eb7e3a80891c2806d5fed

diff --git a/bin/effecteval b/bin/effecteval
--- a/bin/effecteval
+++ b/bin/effecteval
@@ -1,4 +1,5 @@
 #!bin/python
+
 from __future__ import division
 from run_local import log
 from twisted.internet import reactor
diff --git a/bin/subserver b/bin/subserver
--- a/bin/subserver
+++ b/bin/subserver
@@ -17,45 +17,6 @@ from light9 import networking, showconfi
 
 from lib.cycloneerr import PrettyErrorHandler
         
-liveClients = set()
-def sendToLiveClients(d=None, asJson=None):
-    j = asJson or json.dumps(d)
-    for c in liveClients:
-        c.sendMessage(j)
-
-class Live(cyclone.websocket.WebSocketHandler):
-    def connectionMade(self, *args, **kwargs):
-        log.info("websocket opened")
-        liveClients.add(self)
-        self.settings.onNewClient()
-
-    def connectionLost(self, reason):
-        log.info("websocket closed")
-        liveClients.remove(self)
-
-    def messageReceived(self, message):
-        log.info("got message %s" % message)
-        self.sendMessage(message)
-        
-class EffectsUpdates(cyclone.websocket.WebSocketHandler):
-    def connectionMade(self, *args, **kwargs):
-        self.connected = True
-        self.settings.graph.addHandler(self.onGraphChange)
-        
-    def connectionLost(self, reason):
-        self.connected = False
-        
-    def onGraphChange(self):
-        if not self.connected:
-            return
-        graph = self.settings.graph
-        classes = []
-        for e in graph.subjects(RDF.type, L9['Effect']):
-            classes.append({'uri': e,
-                            'label': graph.label(e),
-                            'code': graph.value(e, L9['code'])})
-        self.sendMessage({'classes': classes})
-
 class Static(PrettyErrorHandler, cyclone.web.StaticFileHandler):
     def get(self, path, *args, **kw):
         if path in ['', 'effects']:
@@ -116,39 +77,9 @@ if __name__ == "__main__":
 
     graph = SyncedGraph(networking.rdfdb.url, "subServer")
 
-    d = {}
-    def updateSubs():
-        subs = []
-        for sub in sorted(graph.subjects(RDF.type, L9['Submaster'])):
-            rec = {'uri' : sub}
-            rec['isLocal'] = graph.contains((sub, RDF.type,
-                                             L9['LocalSubmaster']))
-            rec['label'] = graph.label(sub)
-            rec['img'] = newestImage(sub)
-            subs.append(rec)
-        
-        d.clear()
-        d.update({'subs': subs})
-
-        d['chases'] = []
-        for chase in sorted(graph.subjects(RDF.type, L9['Chase'])):
-            fakeLabel = chase.rsplit('/', 1)[-1]
-            d['chases'].append({
-                'uri': chase,
-                'label': fakeLabel,
-            })
-        
-        sendToLiveClients(d=d)
-    def onNewClient():
-        sendToLiveClients(d=d)
-        
-    graph.addHandler(updateSubs)
-    
     
     port = networking.subServer.port
     reactor.listenTCP(port, cyclone.web.Application(handlers=[
-        (r'/live', Live),
-        (r'/effectsUpdates', EffectsUpdates),
         (r'/snapshot', Snapshot),
         (r'/(.*)', Static,
          {"path" : "light9/subserver",
diff --git a/light9/subserver/effects2.coffee b/light9/web/effects/effects.coffee
rename from light9/subserver/effects2.coffee
rename to light9/web/effects/effects.coffee
diff --git a/light9/subserver/effects2.html b/light9/web/effects/index.html
rename from light9/subserver/effects2.html
rename to light9/web/effects/index.html
--- a/light9/subserver/effects2.html
+++ b/light9/web/effects/index.html
@@ -45,6 +45,7 @@
       <template>
         <style>
         </style>
+        <h1>Effects</h1>
         <rdfdb-synced-graph graph="{{graph}}"></rdfdb-synced-graph>
 
         <template is="dom-repeat" items="{{effectClasses}}">
@@ -56,6 +57,6 @@
 
     <light9-effects></light9-effects>
 
-    <script src="effects2.js"></script>
+    <script src="effects.js"></script>
   </body>
 </html>
diff --git a/light9/web/index.html b/light9/web/index.html
--- a/light9/web/index.html
+++ b/light9/web/index.html
@@ -1,11 +1,10 @@
 <!doctype html>
 <html>
   <head>
-    <title></title>
+    <title>light9 home</title>
     <meta charset="utf-8" />
     <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="stylesheet" href="/style.css">
-    <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="/lib/polymer/polymer.html">
   </head>
   <body>
@@ -23,11 +22,14 @@
          .left {
              display: inline-block;
              margin-right: 3px;
+             flex-grow: 1;
+         }
+         .window {
          }
         </style>
         <div>
           <span class="left"><a class="big" href="{{name}}/">{{name}}</a></span>
-          <span><button on-click="click">window</button></span>
+          <span class="window"><button on-click="click">window</button></span>
           <span><a href="{{name}}/stats">stats</a></span>
         </div>
       </template>
@@ -52,14 +54,21 @@
     <div style="float: left">
       <service-button-row name="."></service-button-row>
       <service-button-row name="rdfdb"></service-button-row>
+      <hr>
+      <service-button-row name="ascoltami"></service-button-row>
+      <hr>
+      <service-button-row name="picamserve"></service-button-row>
+      <service-button-row name="vidref"></service-button-row>
+      <hr>
       <service-button-row name="collector"></service-button-row>
       <service-button-row name="effectSequencer"></service-button-row>
-      <service-button-row name="ascoltami"></service-button-row>
+      <service-button-row name="live"></service-button-row>
+      <service-button-row name="effects"></service-button-row>
+      <service-button-row name="timeline"></service-button-row>
+      <service-button-row name="paint"></service-button-row>
+      <service-button-row name="effectEval"></service-button-row>
+      <hr>
       <service-button-row name="subServer"></service-button-row>
-      <service-button-row name="picamserve"></service-button-row>
-      <service-button-row name="vidref"></service-button-row>
-      <service-button-row name="live"></service-button-row>
-      <service-button-row name="timeline"></service-button-row>
       <service-button-row name="subComposer"></service-button-row>
     </div>
     
diff --git a/makefile b/makefile
--- a/makefile
+++ b/makefile
@@ -107,7 +107,7 @@ arduino_upload: /usr/share/arduino/Ardui
 effect_node_setup: create_virtualenv packages binexec install_python_deps
 
 coffee:
-	zsh -c 'coffee -cw light9/web/{.,live,timeline,paint}/*.coffee'
+	zsh -c 'coffee -cw light9/web/{.,live,timeline,paint,effects}/*.coffee'
 
 env-mypy/bin/mypy:
 	mkdir -p env-mypy