From c34b698a734537a9819289e3da76f8a97a32a7d9 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Fri, 20 Jan 2017 17:03:24 -0500
Subject: [PATCH] remove bindata, update name, add new bootstrap + mithril

---
 services/boot/generate.go                     |  2 +-
 services/boot/js/index.js                     | 48 +++++++++++++++++++
 services/boot/package.json                    |  9 ++--
 .../boot/static/css/bootstrap-theme.min.css   |  1 -
 .../static/css/bootstrap-theme.min.css.map    |  1 -
 services/boot/static/fonts                    |  1 -
 services/boot/static/index.html               | 14 +++---
 7 files changed, 60 insertions(+), 16 deletions(-)
 delete mode 120000 services/boot/static/css/bootstrap-theme.min.css
 delete mode 120000 services/boot/static/css/bootstrap-theme.min.css.map
 delete mode 120000 services/boot/static/fonts

diff --git a/services/boot/generate.go b/services/boot/generate.go
index b3ce61b191..d9353e13b3 100644
--- a/services/boot/generate.go
+++ b/services/boot/generate.go
@@ -1,7 +1,7 @@
 //go:generate sh -c "which go-bindata 2>&1 >/dev/null || go get github.com/jteeuwen/go-bindata/..."
 //go:generate sh -c "which go-bindata-assetfs 2>&1 >/dev/null || go get github.com/elazarl/go-bindata-assetfs/..."
 //go:generate sh -c "[ -d node_modules ] || npm install"
-//go:generate sh -c "rm -r bindata.tmp && mkdir bindata.tmp"
+//go:generate sh -c "if [ -e bindata.tmp ]; then rm -r bindata.tmp; fi && mkdir bindata.tmp"
 //go:generate sh -c "npm run webpack ${WEBPACK_FLAGS:-p}"
 //go:generate sh -c "cp -rpL static/* bindata.tmp/"
 //go:generate go-bindata-assetfs -nometadata bindata.tmp/...
diff --git a/services/boot/js/index.js b/services/boot/js/index.js
index 5915b9249e..9e8452fe79 100644
--- a/services/boot/js/index.js
+++ b/services/boot/js/index.js
@@ -1,2 +1,50 @@
 // application entry point
+window.jQuery = require('jquery')
+window.Tether = require('tether')
+require('bootstrap')
 require('./example.js')
+var m = require('mithril')
+var Stream = require('mithril/stream')
+
+var checklist = [
+    {
+        name: 'arvados-boot web gui',
+        api: null,
+        lastCheck: (new Date()).valueOf(),
+        error: Stream(null),
+        response: Stream('ok'),
+    },
+    {
+        name: 'arvados-boot web backend',
+        api: '/api/ping',
+    },
+    {
+        name: 'arvados-boot fail canary',
+        api: '/api/error',
+    },
+]
+
+checklist.map(function(check) {
+    if (!check.api) return
+    if (!check.response) check.response = Stream()
+    if (!check.error) check.error = Stream()
+    m.request({method: 'GET', url: check.api}).then(check.response).catch(check.error)
+})
+
+var Home = {
+    view: function(vnode) {
+        return m('.panel', checklist.map(function(check) {
+            return m('div.alert',
+                     {class: (!check.response() || check.error()) ? 'alert-danger' : 'alert-success'}, 
+                     [
+                         check.name,
+                         ': ',
+                         JSON.stringify(check.response()),
+                     ])
+        }))
+    }
+}
+
+m.route(document.getElementById('app'), '/', {
+    '/': Home,
+})
diff --git a/services/boot/package.json b/services/boot/package.json
index e9f6101c52..0a1640d606 100644
--- a/services/boot/package.json
+++ b/services/boot/package.json
@@ -1,20 +1,21 @@
 {
-  "name": "gowebapp",
+  "name": "boot",
   "version": "0.1.0",
   "license": "Apache-2.0",
   "dependencies": {},
   "devDependencies": {
-    "bootstrap": "^3.3.7",
+    "bootstrap": "^4.0.0-alpha.6",
     "check-dependencies": "",
+    "mithril": "^1.0.0-rc.8",
     "tap": "^9.0.3",
     "tape": "^4.6.3",
     "webpack": ""
   },
   "scripts": {
-    "dev": "WEBPACK_FLAGS=-d go generate && go get ./... && $GOPATH/bin/gowebapp -listen :${PORT:-8000}",
+    "dev": "WEBPACK_FLAGS=-d go generate && go get ./... && $GOPATH/bin/boot -listen :${PORT:-8000}",
     "test": "./node_modules/.bin/tap 'js/**/*_test.js'",
     "build": "go generate && go get ./...",
-    "start": "npm run build && $GOPATH/bin/gowebapp -listen :${PORT:-8000}",
+    "start": "npm run build && $GOPATH/bin/boot -listen :${PORT:-8000}",
     "webpack": "webpack $WEBPACK_FLAGS"
   }
 }
diff --git a/services/boot/static/css/bootstrap-theme.min.css b/services/boot/static/css/bootstrap-theme.min.css
deleted file mode 120000
index 827ff2f6b4..0000000000
--- a/services/boot/static/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/css/bootstrap-theme.min.css
\ No newline at end of file
diff --git a/services/boot/static/css/bootstrap-theme.min.css.map b/services/boot/static/css/bootstrap-theme.min.css.map
deleted file mode 120000
index 9b7dbcb442..0000000000
--- a/services/boot/static/css/bootstrap-theme.min.css.map
+++ /dev/null
@@ -1 +0,0 @@
-../../node_modules/bootstrap/dist/css/bootstrap-theme.min.css.map
\ No newline at end of file
diff --git a/services/boot/static/fonts b/services/boot/static/fonts
deleted file mode 120000
index 0e6e04adec..0000000000
--- a/services/boot/static/fonts
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/bootstrap/dist/fonts
\ No newline at end of file
diff --git a/services/boot/static/index.html b/services/boot/static/index.html
index 5387e2120f..7bc78fe951 100644
--- a/services/boot/static/index.html
+++ b/services/boot/static/index.html
@@ -1,14 +1,12 @@
-<!doctype html>
-<html>
+<!DOCTYPE html>
+<html lang="en">
   <head>
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="css/bootstrap.min.css" />
-    <link rel="stylesheet" href="css/bootstrap-theme.min.css" />
+    <link rel="stylesheet" href="css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
   </head>
   <body>
-    <div class="container-fluid">
-      <a class="btn btn-default" href="./">btn-default</a>
-    </div>
+    <div id="app" class="container-fluid"></div>
+    <script src="js.js"></script>
   </body>
-  <script src="js.js"></script>
 </html>
-- 
2.30.2