finery 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a40d95bfaaec38b95bad08470391cd99a51a83fe31644fc72cf513b6ac0b69f
-  data.tar.gz: e0e41fd7197e9f4a14b288f253bb865ce97cc85a4937b5f2e64112468fe1940b
+  metadata.gz: 4c11bf80f48ee76d4afaed581aabb6481bccd7b56a839c49b2bd61613b8e000e
+  data.tar.gz: f350e697db4948e3b1426961b3b26f46fdd49a2db2a3411812cb85be6510671b
 SHA512:
-  metadata.gz: 6df58aa1566ca58dbb5f0fcfdae18ba56657a1fdba72a87a4e77e1415cef15852efb2522703939870906523fb099e28849d4788a6a8ef6eb1e9f6f90fe1f1645
-  data.tar.gz: a4e647be9599ba0869f71be477f3829de5d6e26e266f879b9b5f37ddf740af7404a90801b06b68d427c18f5450a610371cbb16a6170c666d220902d35716073c
+  metadata.gz: 6398ed311ae7de30b5f8c8b7f9ad3a3de14c793f62ceeb6bf3b35970703f5d69e5e093888bf41fef8df77945928be7aff3a911b17799bc4b3fbab48c2d221620
+  data.tar.gz: 25553c55eeb394fc57084d8174d408a6a4f977cf28e4333f59c3c611b6fd5bb30f0cc2288e6609cec15cef936db451cec44808ddf0b305d19ee15f88c53e5fa3

data/README.md

@@ -53,7 +53,7 @@ gem "finery"
 Run:
 
 ```sh
-rails generate finery:install
+rails generate blazer:install
 rails db:migrate
 ```
 

data/app/assets/javascripts/blazer/application.js

@@ -5,7 +5,7 @@
 //= require ./stupidtable
 //= require ./stupidtable-custom-settings
 //= require ./jquery.stickytableheaders
-//= require ./selectize
+//= require selectize.min
 //= require ./highlight.min
 //= require ./moment
 //= require ./moment-timezone-with-data
@@ -17,7 +17,7 @@
 //= require ./chartjs-plugin-annotation.min
 //= require ./ace
 //= require ./Sortable
-//= require ./bootstrap
+//= require bootstrap.bundle.min
 //= require ./vue.global.prod
 //= require ./routes
 //= require ./queries

data/app/assets/javascripts/blazer/controllers/application.js.erb

@@ -0,0 +1,2 @@
+import { Application, Controller } from "<%= javascript_url "stimulus.min" %>"
+window.Stimulus = Application.start()

data/app/assets/javascripts/blazer/controllers/index.js

@@ -7,5 +7,6 @@
 //= require ./code_controller
 //= require ./datepicker_controller
 //= require ./daterangepicker_controller
+//= require ./navbar_padding_controller
 //= require ./selectize_controller
 //= require ./unsaved_controller

data/app/assets/javascripts/blazer/controllers/navbar_padding_controller.js

@@ -0,0 +1,7 @@
+Stimulus.register("navbar-padding", class extends Controller {
+  static targets = [ "navbar" ]
+
+  connect() {
+    this.element.style.paddingTop = (this.navbarTarget.clientHeight || 0) + "px"
+  }
+})

data/app/assets/stylesheets/blazer/application.css

@@ -1,20 +1,26 @@
 /*
- *= require ./bootstrap-sprockets
- *= require ./bootstrap
- *= require ./selectize
+ *= require bootstrap.min
+ *= require selectize.bootstrap5
  *= require ./github
  *= require ./daterangepicker
  *= require_self
  */
 
+.hide {
+  display: none !important;
+}
+
 pre {
   border: none;
   border-radius: 0;
 }
 
-body {
-  padding-top: 15px;
-  padding-bottom: 15px;
+.text-pre-line {
+  white-space: pre-line;
+}
+
+body.with-navbar {
+  padding-top: 3.5rem;
 }
 
 table.results-table {
@@ -52,6 +58,10 @@ input.search:focus {
   outline: none;
 }
 
+.selectize-control {
+  min-width: 10em;
+}
+
 .form-inline .selectize-control, .text-right .selectize-control {
   display: inline-block;
   vertical-align: middle;
@@ -157,26 +167,10 @@ input.search:focus {
   background-color: #fff;
 }
 
-.glyphicon-remove {
-  cursor: pointer;
-  color: #d9534f;
-  display: none;
-  float: right;
-  margin-top: 3px;
-}
-
-.list-group li:hover .glyphicon-remove {
-  display: inline;
-}
-
-.list-group {
+#queries.list-group {
   cursor: move;
 }
 
-#header a.active {
-  color: #999;
-}
-
 [v-cloak] {
   display: none;
 }
@@ -197,34 +191,6 @@ input.search:focus {
   color: red;
 }
 
-.small-form {
-  margin-right: auto;
-  margin-left: auto;
-  max-width: 400px;
-}
-
-.alert {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-h1, h2, h3, h4, p, hr, .table, .navbar, #header, .alert, .form-group {
-  margin-top: 0;
-  margin-bottom: 15px;
-}
-
-.double-margin, .chart-container {
-  margin-bottom: 30px;
-}
-
-h1 {
-  font-size: 24px;
-}
-
-h2 {
-  font-size: 20px;
-}
-
 .schema-table {
   max-width: 500px;
 }

data/app/controllers/blazer/base_controller.rb

@@ -103,6 +103,7 @@ module Blazer
     end
 
     def variable_params(resource, var_params = nil)
+      return {} unless resource.present?
       permitted_keys = resource.variables
       var_params ||= request.query_parameters
       var_params.slice(*permitted_keys)

data/app/controllers/blazer/queries_controller.rb

@@ -273,7 +273,7 @@ module Blazer
           raise Error, @error if @error && Rails.env.test?
 
           data = csv_data(@columns, @rows, @data_source)
-          query_params = variable_params.select { |k| @query.variables.include?(k) }
+          query_params = variable_params(@query).select { |k| @query.variables.include?(k) }
           name = @query.try(:name).presence || "query"
           filename = "#{name}-#{query_params.to_query}".parameterize + ".csv"
           send_data data, type: "text/csv; charset=utf-8", disposition: "attachment", filename: filename

data/app/views/blazer/_navbar.html.erb

@@ -0,0 +1,38 @@
+<nav class="navbar navbar-expand-md fixed-top bg-body-tertiary" data-navbar-padding-target="navbar">
+  <div class="container flex-nowrap">
+    <span class="navbar-brand d-none d-sm-inline">Finery</span>
+    <button class="navbar-toggler me-3" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <span class="navbar-brand d-sm-none text-truncate"><%= blazer_title || "Finery" %></span>
+    <div class="collapse navbar-collapse" id="navbarCollapse">
+      <ul class="navbar-nav me-auto mb-2 mb-md-0">
+        <li class="nav-item">
+          <%= link_to "Home", blazer.root_path, class: "nav-link" %>
+        </li>
+        <li class="nav-item">
+          <%= link_to "Checks", blazer.checks_path, class: "nav-link" %>
+        </li>
+        <% if Blazer.uploads? %>
+          <li class="nav-item">
+            <%= link_to "Uploads", blazer.uploads_path, class: "nav-link" %>
+          </li>
+        <% end %>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            New
+          </a>
+          <ul class="dropdown-menu">
+            <li><%= link_to "Query", blazer.new_query_path, class: "dropdown-item" %></li>
+            <li><%= link_to "Dashboard", blazer.new_dashboard_path, class: "dropdown-item" %></li>
+            <li><%= link_to "Check", blazer.new_check_path(query_id: @query&.id), class: "dropdown-item" %></li>
+            <% if Blazer.uploads? %>
+              <%= link_to "Upload", blazer.new_upload_path, class: "dropdown-item" %>
+            <% end %>
+          </ul>
+        </li>
+      </ul>
+      <%= yield(:nav) %>
+    </div>
+  </div>
+</nav>

data/app/views/blazer/checks/_form.html.erb

@@ -7,7 +7,7 @@
     <div class="alert alert-danger"><%= @check.errors.full_messages.first %></div>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :query_id, "Query" %>
     <div class="hide">
       <%= f.select :query_id, [], {include_blank: true} %>
@@ -21,7 +21,7 @@
   </div>
 
   <% if @check.respond_to?(:check_type) %>
-    <div class="form-group">
+    <div class="form-group mb-3">
       <%= f.label :check_type, "Alert if" %>
       <div class="hide">
         <% check_options = [["Any results (bad data)", "bad_data"], ["No results (missing data)", "missing_data"]] %>
@@ -33,7 +33,7 @@
       </script>
     </div>
   <% elsif @check.respond_to?(:invert) %>
-    <div class="form-group">
+    <div class="form-group mb-3">
       <%= f.label :invert, "Fails if" %>
       <div class="hide">
         <%= f.select :invert, [["Any results (bad data)", false], ["No results (missing data)", true]] %>
@@ -45,7 +45,7 @@
   <% end %>
 
   <% if @check.respond_to?(:schedule) && Blazer.check_schedules %>
-    <div class="form-group">
+    <div class="form-group mb-3">
       <%= f.label :schedule, "Run every" %>
       <div class="hide">
         <%= f.select :schedule, Blazer.check_schedules.map { |v| [v, v] } %>
@@ -56,13 +56,13 @@
     </div>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :emails %>
     <%= f.text_field :emails, placeholder: "Optional, comma separated", class: "form-control" %>
   </div>
 
   <% if Blazer.slack? %>
-    <div class="form-group">
+    <div class="form-group mb-3">
       <%= f.label :slack_channels %>
       <%= f.text_field :slack_channels, placeholder: "Optional, comma separated", class: "form-control" %>
     </div>

data/app/views/blazer/checks/index.html.erb

@@ -1,25 +1,6 @@
 <% blazer_title "Checks" %>
 
 <div id="header">
-  <div class="pull-right" style="line-height: 34px;">
-    <div class="btn-group">
-      <%= link_to "New Check", new_check_path, class: "btn btn-info" %>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><%= link_to "Home", root_path %></li>
-        <% if Blazer.uploads? %>
-          <li><%= link_to "Uploads", uploads_path %></li>
-        <% end %>
-        <li role="separator" class="divider"></li>
-        <li><%= link_to "New Query", new_query_path %></li>
-        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-      </ul>
-    </div>
-  </div>
-
   <input id="search" type="text" placeholder="Start typing a query or state" style="width: 300px; display: inline-block;" class="search form-control" />
 </div>
 

data/app/views/blazer/dashboards/_form.html.erb

@@ -3,21 +3,23 @@
     <div class="alert alert-danger"><%= @dashboard.errors.full_messages.first %></div>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :name %>
     <%= f.text_field :name, class: "form-control" %>
   </div>
-  <div class="form-group" v-show="queries.length">
+  <div class="form-group mb-3" v-show="queries.length">
     <%= f.label :charts %>
     <ul id="queries" class="list-group">
-      <li class="list-group-item" v-for="(query, index) in queries" :key="query.id" v-cloak>
-        <span class="glyphicon glyphicon-remove" aria-hidden="true" v-on:click="remove(index)"></span>
+      <li class="list-group-item d-flex justify-content-between align-items-center" v-for="(query, index) in queries" :key="query.id" v-cloak>
         {{ query.name }}
+        <button class="btn btn-sm btn-danger" v-on:click="remove(index)">
+          remove
+        </button>
         <input type="hidden" name="query_ids[]" :value="query.id">
       </li>
     </ul>
   </div>
-  <div class="form-group" v-cloak>
+  <div class="form-group mb-3" v-cloak>
     <%= f.label :query_id, "Add Chart" %>
     <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %>
   </div>

data/app/views/blazer/dashboards/show.html.erb

@@ -1,22 +1,11 @@
 <% blazer_title @dashboard.name %>
-
-<div class="topbar">
-  <div class="container">
-    <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
-        <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
-          <%= @dashboard.name %>
-        </h3>
-      </div>
-      <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_dashboard_path(@dashboard, params: variable_params(@dashboard)), class: "btn btn-info" %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div style="margin-bottom: 60px;"></div>
+<% content_for :nav do %>
+  <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+    <li class="nav-item">
+      <%= link_to "Edit", blazer.edit_dashboard_path(@dashboard, params: variable_params(@dashboard)), class: "nav-link" %>
+    </li>
+  </ul>
+<% end %>
 
 <% if @data_sources.any? { |ds| ds.cache_mode != "off" } %>
   <p class="text-muted" style="float: right;">

data/app/views/blazer/queries/_form.html.erb

@@ -7,38 +7,44 @@
 <div id="app" v-cloak>
   <%= form_for @query, url: (@query.persisted? ? query_path(@query, params: @variable_params) : queries_path(params: @variable_params)), html: {autocomplete: "off"}, data: { controller: "unsaved", action: "unsaved#clear input->unsaved#set" } do |f| %>
     <div class="row">
-      <div id="statement-box" class="col-xs-8">
+      <div id="statement-box" class="col-8">
         <div class= "form-group">
           <%= f.hidden_field :statement %>
           <div id="editor-container">
             <div id="editor" :style="{ height: editorHeight }"><%= @query.statement %></div>
           </div>
         </div>
-        <div class="form-group text-right" style="margin-bottom: 8px;">
-          <div class="pull-left" style="margin-top: 8px;">
-            <%= link_to "Back", :back %>
-            <a :href="docsPath" target="_blank" style="margin-left: 40px;">Docs</a>
-            <a :href="schemaPath" target="_blank" style="margin-left: 40px;">Schema</a>
+        <div class="form-group d-flex justify-content-between my-2">
+          <div>
+            <%= link_to "Back", :back, class: "me-2" %>
+            <a :href="docsPath" target="_blank" class="m-2">Docs</a>
+            <a :href="schemaPath" target="_blank" class="m-2">Schema</a>
           </div>
 
-          <%= f.select :data_source, Blazer.data_sources.map { |_, ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1), style: "width: 140px;" %>
-          <div id="tables" style="display: inline-block; width: 250px; margin-right: 10px;">
-            <select id="table_names" style="width: 240px;" placeholder="Preview table"></select>
+          <div class="row">
+            <div class="col">
+              <%= f.select :data_source, Blazer.data_sources.map { |_, ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size <= 1) %>
+            </div>
+            <div class="col">
+              <select id="table_names" placeholder="Preview table"></select>
+            </div>
           </div>
+        </div>
+        <div class="form-group">
           <a v-on:click="run" v-if="!running" class="btn btn-info" style="vertical-align: top; width: 70px;">Run</a>
           <a v-on:click="cancel" v-if="running" class="btn btn-danger" style="vertical-align: top; width: 70px;">Cancel</a>
         </div>
       </div>
-      <div class="col-xs-4">
-        <div class="form-group">
+      <div class="col-4">
+        <div class="form-group mb-3">
           <%= f.label :name %>
           <%= f.text_field :name, class: "form-control" %>
         </div>
-        <div class="form-group">
+        <div class="form-group mb-3">
           <%= f.label :description %>
           <%= f.text_area :description, placeholder: "Optional", style: "height: 80px;", class: "form-control" %>
         </div>
-        <div class="form-group text-right">
+        <div class="form-group text-end mb-3">
           <%= f.submit "For Enter Press", class: "hide" %>
           <% if @query.persisted? %>
             <%= link_to "Delete", query_path(@query), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>

data/app/views/blazer/queries/home.html.erb

@@ -1,35 +1,22 @@
 <div id="queries">
-  <div id="header">
-    <div class="pull-right" style="line-height: 34px;">
-      <% if blazer_user %>
-        <%= link_to "All", root_path, class: !params[:filter] ? "active" : nil, style: "margin-right: 40px;" %>
-
-        <% if Blazer.audit %>
-          <%= link_to "Viewed", root_path(filter: "viewed"), class: params[:filter] == "viewed" ? "active" : nil, style: "margin-right: 40px;" %>
-        <% end %>
-
-        <%= link_to "Mine", root_path(filter: "mine"), class: params[:filter] == "mine" ? "active" : nil, style: "margin-right: 40px;" %>
+  <ul class="nav nav-pills d-flex flex-column flex-sm-row mb-3">
+    <li class="text-start flex-fill">
+    <input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" autofocus class="search form-control flex-fill align-self-stretch" />
+    </li>
+    <% if blazer_user %>
+      <li class="nav-item">
+        <%= link_to "All", blazer.root_path, class: { "nav-link": true, active: !params[:filter] } %>
+      </li>
+      <% if Blazer.audit %>
+        <li class="nav-item">
+          <%= link_to "Viewed", blazer.root_path(filter: "viewed"), class: { "nav-link": true, active: params[:filter] == "viewed" } %>
+        </li>
       <% end %>
-
-      <div class="btn-group">
-        <%= link_to "New Query", new_query_path, class: "btn btn-info" %>
-        <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          <span class="caret"></span>
-          <span class="sr-only">Toggle Dropdown</span>
-        </button>
-        <ul class="dropdown-menu">
-          <li><%= link_to "Checks", checks_path %></li>
-          <% if Blazer.uploads? %>
-            <li><%= link_to "Uploads", uploads_path %></li>
-          <% end %>
-          <li role="separator" class="divider"></li>
-          <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-          <li><%= link_to "New Check", new_check_path %></li>
-        </ul>
-      </div>
-    </div>
-    <input type="text" v-model="searchTerm" placeholder="Start typing a query, dashboard, or person" style="width: 300px; display: inline-block;" v-focus class="search form-control" />
-  </div>
+      <li class="nav-item">
+        <%= link_to "Mine", blazer.root_path(filter: "mine"), class: { "nav-link": true, active: params[:filter] == "mine" } %>
+      </li>
+    <% end %>
+  </ul>
 
   <table class="table">
     <thead>

data/app/views/blazer/queries/run.html.erb

@@ -131,7 +131,7 @@
 
     <% unless @only_chart && !@no_chart %>
       <% header_width = 100 / @columns.size.to_f %>
-      <div class="results-container">
+      <div class="results-container overflow-x-scroll">
         <% if @columns == ["QUERY PLAN"] %>
           <pre><code><%= @rows.map { |r| r[0] }.join("\n") %></code></pre>
         <% elsif @columns == ["PLAN"] && @data_source.adapter == "druid" %>

data/app/views/blazer/queries/show.html.erb

@@ -1,27 +1,20 @@
 <% blazer_title @query.name %>
-
-<div class="topbar">
-  <div class="container">
-    <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
-        <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
-          <%= @query.name %>
-        </h3>
-      </div>
-      <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
-        <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %>
-
-        <% if !@error && @success %>
-          <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div style="margin-bottom: 60px;"></div>
+<% content_for :nav do %>
+  <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+    <li class="navbar-brand d-none d-sm-inline text-wrap"><%= @query.name %></li>
+    <li class="nav-item">
+      <%= link_to "Edit", blazer.edit_query_path(@query, params: variable_params(@query)), class: "nav-link", disabled: !@query.editable?(blazer_user) %>
+    </li>
+    <li class="nav-item">
+      <%= link_to "Fork", blazer.new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "nav-link" %>
+    </li>
+    <li class="nav-item dropdown">
+      <% if !@error && @success %>
+        <%= button_to "Download", blazer.run_queries_path(format: "csv"), params: @run_data, class: "nav-link" %>
+      <% end %>
+    </li>
+  </ul>
+<% end %>
 
 <% if @sql_errors.any? %>
   <div class="alert alert-danger">
@@ -34,13 +27,13 @@
 <% end %>
 
 <% if @query.description.present? %>
-  <p style="white-space: pre-line;"><%= @query.description %></p>
+  <p class="text-pre-line"><%= @query.description %></p>
 <% end %>
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
 
 <details class="row">
-  <summary class="col-md-1 col-md-offset-11 btn btn-sm btn-info">Show source</summary>
+  <summary class="col-md-1 offset-md-11 btn btn-sm btn-info">Show source</summary>
   <pre id="code" class="col-md-12">
     <code data-controller="code"><%= @statement.display_statement %></code>
   </pre>
@@ -54,7 +47,7 @@
   <script>
     function showRun(data) {
       $("#results").html(data)
-      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 56})
     }
 
     function showError(message) {

data/app/views/blazer/uploads/_form.html.erb

@@ -5,15 +5,15 @@
     <p>Create a database table from a CSV file. The table will be created in the <code><%= Blazer.settings["uploads"]["schema"] %></code> schema.</p>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :table %>
     <%= f.text_field :table, class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :description %>
     <%= f.text_area :description, placeholder: "Optional", style: "height: 60px;", class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :file %>
     <%= f.file_field :file, accept: "text/csv", style: "margin-top: 6px; margin-bottom: 21px;" %>
   </div>

data/app/views/blazer/uploads/index.html.erb

@@ -1,24 +1,6 @@
 <% blazer_title "Uploads" %>
 
 <div id="header">
-  <div class="pull-right" style="line-height: 34px;">
-    <div class="btn-group">
-      <%= link_to "New Upload", new_upload_path, class: "btn btn-info" %>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><%= link_to "Home", root_path %></li>
-        <li><%= link_to "Checks", checks_path %></li>
-        <li role="separator" class="divider"></li>
-        <li><%= link_to "New Query", new_query_path %></li>
-        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-        <li><%= link_to "New Check", new_check_path %></li>
-      </ul>
-    </div>
-  </div>
-
   <input id="search" type="text" placeholder="Start typing a table or person" style="width: 300px; display: inline-block;" class="search form-control" />
 </div>
 

data/app/views/layouts/blazer/application.html.erb

@@ -1,25 +1,24 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
+    <title><%= blazer_title ? blazer_title : "Finery" %></title>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="robots" content="noindex" />
+    <meta name="referrer" content="same-origin" />
 
     <meta charset="utf-8" />
     <%= favicon_link_tag "blazer/favicon.png" %>
-    <% if defined?(Propshaft::Railtie) %>
-      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
-    <% else %>
-      <%= stylesheet_link_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/module", type: "module" %>
-    <% end %>
+    <%= stylesheet_link_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/module", type: "module" %>
     <script>
       <%= blazer_js_var "rootPath", root_path %>
     </script>
     <%= csrf_meta_tags %>
   </head>
-  <body>
-    <div class="container">
+  <body class="with-navbar overflow-y-scroll" data-controller="navbar-padding">
+    <%= render partial: "blazer/navbar" %>
+    <div class="container mt-2">
       <%= yield %>
     </div>
   </body>