Merge pull request #10 from pikesley/full-api

Full api

lib/assets/javascripts/dashboard.js

@@ -1,3 +1,63 @@
 function githubLink(json) {
-  return '<a href="' + json['url'] + '">Source</a>'
+  return '<a href="' + json['source-url'] + '">Source</a>'
+}
+
+function cellContent(id, content) {
+  return "<div class='col-md-12' id='#" + id + "'>" + content + "</div>"
+}
+
+function graph(json) {
+  ecks = Object.keys(json['data'][0])[0]
+  why = Object.keys(json['data'][0])[1]
+  var points = [
+    {
+      x: json['data'].map(function(item){ return item[ecks] }),
+      y: json['data'].map(function(item){ return item[why] }),
+      type: 'scatter'
+    }
+  ]
+
+  var layout = {
+    title: json['title'] + ' (' + githubLink(json) + ')',
+    xaxis: {
+      tickformat: "%b %Y",
+      tickangle: 90
+    },
+    yaxis: {
+      title: why,
+      titlefont: {
+        size: 14,
+        color: '#7f7f7f'
+      }
+    },
+    margin: {
+     l: 50, r: 10
+    }
+  }
+
+  $('#data').html("<div id='" + json['id'] + "' class='col-md-12' style='height: 400px'></div>")
+  Plotly.newPlot(json['id'], points, layout)
+}
+
+function latestCell(json) {
+  d = json['data'][json['data'].length -1][json['date-field']]
+  fixedDate = moment(d, 'YYYY-MM-DD').format('Do MMMM')
+  age = moment(d, 'YYYY-MM-DD').fromNow()
+  content = '<h1><small>Last</small> '
+  content += json['title'] + ':</h1>'
+  if(json['special_fields']) {
+    content += '<h4>'
+
+    json['special_fields'].forEach(function(field) {
+      content += json['data'][json['data'].length -1][field]
+      content += ' '
+    })
+
+    content += '</h4>'
+  }
+  content += '<h2>' + fixedDate + '</h2>'
+  content += '<h3>(' + age + ')</h3>'
+  content += githubLink(json)
+
+  return cellContent(json['id'], content)
 }

lib/dashboard.rb

@@ -21,7 +21,6 @@
 
 module Dashboard
   class App < Sinatra::Base
-    set :views, 'lib/views'
 
     helpers do
       include Dashboard::Helpers
@@ -34,13 +33,17 @@ class App < Sinatra::Base
     end
 
     get '/:repo' do
+      # I have literally no idea
+      if params[:repo] == 'favicon'
+        return 200
+      end
+
       respond_to do |wants|
         headers 'Vary' => 'Accept'
 
         wants.html do
           @title = Cleaner.lookups[params[:repo]]['title']
           erb :dashboard, layout: :default
-        #  erb :grid, layout: :default
         end
 
         wants.json do

lib/dashboard/assets.rb

@@ -1,27 +1,7 @@
 module Dashboard
   class App < Sinatra::Base
+    set :root, File.dirname(__FILE__)
+    set :public_folder, Proc.new { File.join(root, '..', "assets") }
     set :views, 'lib/views'
-    set :public_folder, 'public'
-
-    set :sass, { :load_paths => [
-      "../assets/css"
-    ]}
-
-    register Sinatra::AssetPack
-    assets do
-      serve '/js', from: '../assets/javascripts'
-      js :app, [
-        '/js/dashboard.js',
-        '/js/plotly-latest.min.js'
-      ]
-
-      serve '/css', from: '../assets/css'
-      css :application, [
-        '/css/application.css'
-      ]
-
-      js_compression :jsmin
-      css_compression :sass
-    end
   end
 end

lib/dashboard/racks.rb

@@ -4,7 +4,7 @@ class App < Sinatra::Base
       conneg.set :accept_all_extensions, false
       conneg.set :fallback, :html
       conneg.ignore('/css/')
-      conneg.ignore('/js/')
+      conneg.ignore('/javascripts/')
       conneg.provide [
         :html,
         :json

lib/views/dataset.erb

@@ -2,7 +2,6 @@
 
 <script>
   $.getJSON(document.URL, function(json) {
-    console.log(json['type'])
     if (json['type'] === 'latest') {
       $('#data').append(
         latestCell(json)
@@ -12,68 +11,4 @@
       graph(json)
     }
   })
-
-  function graph(json) {
-    ecks = Object.keys(json['data'][0])[0]
-    why = Object.keys(json['data'][0])[1]
-    var points = [
-      {
-        x: json['data'].map(function(item){ return item[ecks] }),
-        y: json['data'].map(function(item){ return item[why] }),
-        type: 'scatter'
-      }
-    ]
-
-    var layout = {
-      title: json['title'] + ' (' + githubLink(json) + ')',
-      xaxis: {
-        tickformat: "%b %Y",
-        tickangle: 90
-      },
-      yaxis: {
-        title: why,
-        titlefont: {
-          size: 14,
-          color: '#7f7f7f'
-        }
-      },
-      margin: {
-       l: 50, r: 10
-      }
-    }
-
-    $('#data').html("<div id='" + json['id'] + "' class='col-md-12' style='height: 400px'></div>")
-    Plotly.newPlot(json['id'], points, layout)
-  }
-
-  function latestCell(json) {
-    d = json['data'][json['data'].length -1][json['date-field']]
-    fixedDate = moment(d, 'YYYY-MM-DD').format('Do MMMM')
-    age = moment(d, 'YYYY-MM-DD').fromNow()
-    content = '<h1><small>Last</small> '
-    content += json['title'] + ':</h1>'
-    if(json['special_fields']) {
-      content += '<h4>'
-
-      json['special_fields'].forEach(function(field) {
-        content += json['data'][json['data'].length -1][field]
-        content += ' '
-      })
-
-      content += '</h4>'
-    }
-    content += '<h2>' + fixedDate + '</h2>'
-    content += '<h3>(' + age + ')</h3>'
-    content += githubLink(json)
-
-    return cellContent(json['id'], content)
-  }
-
-  function githubLink(json) {
-    return '<a href="' + json['url'] + '">Source</a>'
-  }
-
-  function cellContent(id, content) {
-    return "<div class='col-md-12' id='#" + id + "'>" + content + "</div>"
-  }
 </script>

lib/views/includes/header.erb

@@ -9,8 +9,7 @@
   <script src='https://oss.maxcdn.com/respond/1.4.2/respond.min.js'></script>
 <![endif]-->
 
-<!-- <script src='//cdn.plot.ly/plotly-latest.min.js'></script> -->
-<script src='/js/plotly-latest.min.js'></script>
+<!--<script src='//cdn.plot.ly/plotly-latest.min.js'></script>-->
 
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'></script>
@@ -22,6 +21,6 @@
 <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" />
 
 <link rel="stylesheet" href="/css/application.css" />
-
-<link rel='icon' type='image/png' href='/assets/favicon.ico' />
+<script src='/javascripts/dashboard.js'></script>
+<script src='/javascripts/plotly-latest.min.js'></script>
 <title><%= @title %></title>

lib/views/simple.erb

@@ -2,7 +2,6 @@
 <html lang='en'>
   <head>
     <%= erb :'includes/header' %>
-    <link rel="stylesheet" href="/public/simple.css" />
   </head>
 
   <body>