Upgrades khufu-routing, removes hacks, restores leader link

tailhook · Jan 16, 2018 · 9aaa837 · 9aaa837
1 parent dac78b8
commit 9aaa837
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/frontend/main.khufu b/frontend/main.khufu
@@ -134,7 +134,7 @@ view _navbar(status, frontend_version, @expert_mode, router):
           if status and status.leader:
             <li>
               let url = (set_port(status.leader.name, status.leader.addr)
-                         + '/' +  router.rel('.'))
+                         + '/' +  router.tail())
               <a.navbar-brand href=url>
                 status.leader.name
                 <div.subtext.text-muted>

diff --git a/frontend/package.json b/frontend/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "khufu-runtime": "0.5.2",
-    "khufu-routing": "0.1.2",
+    "khufu-routing": "0.1.3",
     "redux": "3.7.2",
     "incremental-dom": "0.5.1",
     "redux-logger": "3.0.6",

diff --git a/frontend/pages/tail.khufu b/frontend/pages/tail.khufu
@@ -11,10 +11,10 @@ style:
 view main(status, expert_mode, router):
   <div>
     store @log = tail
-      | tailer('/v1/log/' + router._tail.join('/'), router)
+      | tailer('/v1/log/' + router.tail(), router)
     store @show_curl = value
     // TODO(tailhook) expose API in khufu routing
-    let path = router._tail.join('/')
+    let path = router.tail()
     <div>
       <code> path
       <span.offset>

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -2237,9 +2237,9 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-khufu-routing@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/khufu-routing/-/khufu-routing-0.1.2.tgz#9f59617cbe8b614f8c06f6871878b3f4daa62b40"
+khufu-routing@0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/khufu-routing/-/khufu-routing-0.1.3.tgz#961576e266da8cffa3b13d733facca7af9d95378"
 
 khufu-runtime@0.5.2:
   version "0.5.2"