refac: Use SB Admin 2 as a theme

Author: jrgns

config.ru

@@ -5,6 +5,10 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'proxes'
 require 'proxes/db'
 
+raise 'Unconfigured' unless ENV['ELASTICSEARCH_URL']
+
+use Rack::Static, urls: ['/assets'], root: 'public'
+
 use Rack::Session::Pool
 # use Rack::Session::Cookie,
 #   :key => '_ProxES_session',

lib/proxes/app.rb

@@ -18,8 +18,6 @@ def root_url
     route do |r|
       r.multi_route
 
-      r.public
-
       r.get do
         authenticate!
 

lib/proxes/base.rb

@@ -11,6 +11,7 @@ class Base < Roda
 
     use Rack::MethodOverride
     plugin :all_verbs
+    plugin :empty_root
 
     plugin :default_headers,
       'Content-Type'=>'text/html',
@@ -26,13 +27,14 @@ class Base < Roda
     plugin :indifferent_params
     plugin :flash
     plugin :halt
-    plugin :public, root: opts[:public]
 
     plugin(:not_found) { view 'http_404' }
     plugin(:error_handler) do |e|
       case true
       when e.is_a?(Roda::RodaPlugins::Authentication::NotAuthenticated) || e.is_a?(OmniAuth::Error)
         request.redirect '/auth/identity'
+      when e.is_a?(Pundit::NotAuthorizedError)
+        request.halt 404
       else
         logger.error e
         raise e unless ENV['RACK_ENV'] == 'production'

views/_navbar.haml

@@ -1,25 +1,25 @@
-.navbar.navbar-default.navbar-fixed-top
-  .container-fluid
-    .navbar-header
-      %span.navbar-brand
-        ProxES
-        - if defined? title
-          = "- #{title}"
-      %button.navbar-toggle.collapsed{ type: 'button', 'data-toggle': 'collapse', 'data-target': '#navbar', 'aria-expanded': 'false', 'aria-controls': 'navbar' }
-        %span.sr-only Toggle navigation
-        %span.icon-bar.bar1
-        %span.icon-bar.bar2
-        %span.icon-bar.bar3
-    #navbar.navbar-collapse.collapse
-      -if current_user
-        %form.navbar-form.navbar-right{ action: '/auth/identity', method: 'post' }
-          = csrf_tag
-          %input{ name: '_method', value: 'DELETE', type: 'hidden' }
-          %button.btn.btn-default{ type: 'submit' }
-            / %i.ti-panel
-            Logout
-      - else
-        %ul.nav.navbar-nav.navbar-right
-          %li
-            %a.btn.btn-link{ href: '/auth/identity' }
-              Log In
+.navbar.navbar-default.navbar-static-top{ role: 'navigation', style: 'margin-bottom: 0' }
+  .navbar-header
+    %span.navbar-brand
+      ProxES
+      - if defined? title
+        = "- #{title}"
+    %button.navbar-toggle.collapsed{ type: 'button', 'data-toggle': 'collapse', 'data-target': '#navbar', 'aria-expanded': 'false', 'aria-controls': 'navbar' }
+      %span.sr-only Toggle navigation
+      %span.icon-bar.bar1
+      %span.icon-bar.bar2
+      %span.icon-bar.bar3
+  -if current_user
+    %form.nav.navbar-top-links.navbar-form.navbar-right{ action: '/auth/identity', method: 'post' }
+      = csrf_tag
+      %input{ name: '_method', value: 'DELETE', type: 'hidden' }
+      %button.btn.btn-default{ type: 'submit' }
+        / %i.ti-panel
+        Logout
+    .navbar-default.sidebar{ role: 'navigation' }
+      = partial('sidebar')
+  - else
+    %ul.nav.navbar-top-links.navbar-right
+      %li
+        %a.btn.btn-link{ href: '/auth/identity' }
+          Log In

views/_sidebar.haml

@@ -2,7 +2,7 @@
   - if defined?(current_user) && current_user
     %li
       %a{ href: root_url + '/' }
-        %i.fa.fa-pie-chart
+        %i.fa.fa-dashboard.fa-fw
         Dashboard
     - if current_user.admin?
       %li

views/layout.haml

@@ -15,30 +15,31 @@
     %meta{ name: "author", content: "" }
 
     / Le styles
-    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/cerulean/bootstrap.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/css/sb-admin-2.min.css', media: 'screen' }
+    %link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/metisMenu/2.5.2/metisMenu.min.css', media: 'screen' }
     %link{ rel: 'stylesheet', href: 'https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'screen' }
     /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
     /[if lt IE 9] <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
-    %style
-      body { padding-top: 60px; }
-  %body
-    = partial('navbar', locals: { title: (defined?(title) ? title : 'ProxES') })
-    .container-fluid
-      .row
-        .col-md-3.sidebar
-          = partial('sidebar')
 
-        .col-md-9
-          = partial('notifications')
-          = yield
-          %footer.footer.text-muted.text-center
-            %hr
-            .copyright
-              :plain
-                &copy; <script>document.write(new Date().getFullYear())</script>, JadeIT
+  %body
+    #wrapper
+      = partial('navbar', locals: { title: (defined?(title) ? title : 'ProxES') })
+      #page-wrapper
+        .row
+          .col-md-12
+            = partial('notifications')
+            = yield
+        %footer.footer.text-muted.text-center
+          %hr
+          .copyright
+            :plain
+              &copy; <script>document.write(new Date().getFullYear())</script>, JadeIT
 
 
     / Placed at the end of the document so the pages load faster
     %script{ type: 'text/javascript', src: '/assets/js/bundle.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/startbootstrap-sb-admin-2/3.3.7+1/js/sb-admin-2.min.js' }
     %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js' }
+    %script{ type: 'text/javascript', src: 'https://cdnjs.cloudflare.com/ajax/libs/metisMenu/2.5.2/metisMenu.min.js' }
     %script{ type: 'text/javascript', src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js' }