url changes

diff --git a/TODO b/TODO
index b42e23c85273cfd6fb3c1f68688c2205d6f234ad..85da99a25fb8c0a917701b497e7def341f12892a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-_ in static urls
-
 token in main url
 client ? struct ?
 instance struct

diff --git a/src/bin/server.rs b/src/bin/server.rs
index f72aed00e6d782a55bc58b8a61001fd0cbe1c23e..7309e3a399973dc33de03299d20716f98ddba429 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -56,7 +56,7 @@ impl Read for TestCounterInner {
   }
 }
 
-#[get("/updates")]
+#[get("/_/updates")]
 fn updates() -> impl response::Responder<'static> {
   let tc = TestCounterInner { next : 0 };
   let tc = BufReader::new(tc);
@@ -66,7 +66,7 @@ fn updates() -> impl response::Responder<'static> {
   response::content::Content(ct,ch)
 }  
 
-#[get("/<leaf>")]
+#[get("/_/<leaf>")]
 fn resource(leaf : CheckedResourceLeaf) -> io::Result<NamedFile> {
   let template_dir = "templates"; // xxx
   NamedFile::open(format!("{}/{}", template_dir, leaf.safe))

diff --git a/templates/script.js b/templates/script.js
index 72d45425013efa1817756c92ed1cc16702e750f0..7d2e41a350abb2659f908e6c018efd599b037920 100644 (file)
--- a/templates/script.js
+++ b/templates/script.js
@@ -82,7 +82,7 @@ messages.TestCounter = function(data) {
   status_node.innerHTML = data.value;
 }
 
-es = new EventSource("updates");
+es = new EventSource("/_/updates");
 es.onmessage = function(event) {
   var j = JSON.parse(event.data);
   var k = Object.keys(j)[0];

diff --git a/templates/test.tera b/templates/test.tera
index 52a03f0b6c6fa4afdd0796bfcea44259fe91e343..d835fc18083bb0c5c73825fe19264972a5cfbfa7 100644 (file)
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -42,4 +42,4 @@
     </svg>
 
 </body>
-<script src="script.js"></script>
+<script src="/_/script.js"></script>