Place the portal template into a seperate file

mcpt · Jul 8, 2020 · 0c94a49 · 0c94a49
1 parent 41220b3
commit 0c94a49
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 16 deletions.
diff --git a/karby-server.rb b/karby-server.rb
@@ -1,4 +1,5 @@
 require 'date'
+require 'erb'
 require 'json'
 require 'securerandom'
 require 'sinatra'
@@ -24,22 +25,7 @@ def tablify dated_files
   parts = Dir["#{PRE_AGGREGATION_DIR}/*.log"].map{|path| DatedFile.new(path.split("/")[-1], File::Stat.new(path).ctime)}.sort_by(&:creation_date).reverse
 
   headers "Content-Type" => "text/html"
-  body %{<style>
-* {font-family: sans-serif;}
-div.expandable {display: none;}
-input:checked + label + div.expandable {display: block;}
-table, th, td {border: 1px solid black; border-collapse: collapse;}
-th, td {padding: 5px;}
-</style>
-<input type=\"checkbox\" id=\"aggregated\"><label for=\"aggregated\">Show Aggregated Logs</label>
-<div class=\"expandable\">
-  #{tablify(aggregated)}
-</div>
-<hr>
-<input type=\"checkbox\" id=\"parts\"><label for=\"parts\">Show Log Parts</label>
-<div class=\"expandable\">
-  #{tablify(parts)}
-</div>}.delete("\n").squeeze(" ")
+  erb :index, :locals => {:aggregated => tablify(aggregated), :parts => tablify(parts)}
 end
 
 get '/raw/*.log' do |file|

diff --git a/views/index.erb b/views/index.erb
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Karby</title>
+  <style>
+    * {
+      font-family: sans-serif;
+    }
+    div.expandable {
+      display: none;
+    }
+    input:checked + label + div.expandable {
+      display: block;
+    }
+    table, th, td {
+      border: 1px solid black; border-collapse: collapse;
+    }
+    th, td {
+      padding: 5px;
+    }
+  </style>
+</head> 
+<body>
+  <input type="checkbox" id="aggregated"><label for="aggregated">Show Aggregated Logs</label>
+  <div class="expandable">
+    <%= aggregated %>
+  </div>
+  <hr>
+  <input type="checkbox" id="parts"><label for="parts">Show Log Parts</label>
+  <div class="expandable">
+    <%= parts %>
+  </div>
+</body>
+</html>