ditty 0.8.0 → 0.10.2

data/views/quick_start.haml

@@ -0,0 +1,23 @@
+%link{ rel: 'stylesheet', href: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/themes/prism-okaidia.min.css' }
+
+.row.mb-4
+  .col-2
+  .col-8
+    .card.card-default.border-left-dark.shadow.h-100
+      %h4.card-header Run on a folder
+      .card-body
+        %pre
+          %code.lang-shell
+            :preserve
+              docker run -d -e ELASTICSEARCH_HOSTS=192.168.1.200:9200 \
+                --volume=/var/log/nginx/:/usr/share/incoming/ \
+                hackerplanet/requestd-filebeat:latest
+    .card.card-default.border-left-dark.shadow.h-100
+      %h4.card-header Run on a single file
+      .card-body
+        %pre
+          %code.lang-shell
+            :preserve
+              docker run -d -e ELASTICSEARCH_HOSTS=elastic.hackerpla.net:9200 \
+                --volume=/var/log/nginx/access.log:/usr/share/incoming/access.log \
+                hackerplanet/requestd-filebeat:latest

data/views/roles/display.haml

@@ -1,17 +1,38 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         %p.description
           %label Name:
-          = entity.name
+          = entity.name.titlecase
+        %p.description
+          %label Parent:
+          %a{ href: "#{base_path}/#{entity.parent_id}" }= entity.parent&.name&.titlecase || '(None)'
 
         .row
           .col-md-6
-            %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+            %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
+
+.row
+  .col-md-2
+  .col-md-8
+    .card.card-default.shadow
+      .card-body
+        %h4.card-title Included Roles
+      %table.table.table-striped.mb-0
+        %tbody
+          - if entity.descendants.count > 0
+            - entity.descendants.each do |role|
+              %tr
+                %td
+                  %a.btn-block{ href: "#{settings.map_path}/role/#{role.id}" }
+                    = role.name.titlecase
+          - else
+            %tr
+              %td.text-center No records

data/views/roles/edit.haml

@@ -1,9 +1,9 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag "#{base_path}/#{entity.id}" do
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update Role

data/views/roles/form.haml

@@ -1 +1,2 @@
+= form_control(:parent_id, entity, type: 'select', options: parent_options(entity).as_hash(:id, :name))
 = form_control(:name, entity)

data/views/roles/index.haml

@@ -1,20 +1,27 @@
 .row
   .col-md-12
-    .panel.panel-default
-      .panel-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead
-          %tr
-            %th Name
-        %tbody
-          - if list.count > 0
-            - list.all.each do |entity|
-              %tr
-                %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.name
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "Name#{sort_ui(:name)}"
+          %th Parent
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 1 } No records
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.name
+              %td
+                %a{ href: "#{base_path}/#{entity.parent_id}" }= entity.parent&.name || '(None)'
+              %td
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: 3 } No Roles
 
-=pagination(list, base_path)
+- if list.count > 0
+  = pagination(list, base_path)

data/views/roles/new.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = new_form_tag base_path do
           = haml :'roles/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/user_login_traits/display.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         %p.description
           %label User:
           = entity.user&.email || 'Unknown'
@@ -24,9 +24,9 @@
 
         .row
           .col-md-6
-            %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+            %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2

data/views/user_login_traits/edit.haml

@@ -1,9 +1,9 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag "#{base_path}/#{entity.id}" do
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'user_login_traits/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update Login Trait

data/views/user_login_traits/index.haml

@@ -1,30 +1,28 @@
 .row
   .col-md-12
-    .panel.panel-default
-      .panel-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead
-          %tr
-            %th User
-            %th IP Address
-            %th Device
-            %th Platform
-            %th Browser
-            %th Last Seen
-        %tbody
-          - if list.count.positive?
-            - list.all.each do |entity|
-              %tr
-                %td= entity.user&.email || 'Unknown'
-                %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.ip_address || 'Unknown'
-                %td= entity.device || 'Unknown'
-                %td= entity.platform || 'Unknown'
-                %td= entity.browser || 'Unknown'
-                %td= entity.updated_at
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "User #{sort_ui(:user_id)}"
+          %th= "IP Address #{sort_ui(:ip_address)}"
+          %th= "Device #{sort_ui(:device)}"
+          %th= "Platform #{sort_ui(:platform)}"
+          %th= "Browser #{sort_ui(:browser)}"
+          %th= "Last Seen #{sort_ui(:updated_at)}"
+      %tbody
+        - if list.count.positive?
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 6 } No records
+              %td= entity.user&.email || 'Unknown'
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
+              %td= entity.device || 'Unknown'
+              %td= entity.platform || 'Unknown'
+              %td= entity.browser || 'Unknown'
+              %td= entity.updated_at
+        - else
+          %tr
+            %td.text-center{ colspan: 6 } No records
 
 =pagination(list, base_path)

data/views/user_login_traits/new.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = new_form_tag base_path do
           = haml :'user_login_traits/form', locals: { entity: entity }
           %button.btn.btn-primary{ type: 'submit' }

data/views/users/display.haml

@@ -1,19 +1,19 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
-          %h4= entity.email
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
+          %h4= entity.display_name
 
         %hr
         %p.description
           %label Name:
-          = entity.name
+          = entity.name || '(None)'
         %p.description
           %label Surname:
-          = entity.surname
+          = entity.surname || '(None)'
         %p.description
           %label Roles:
           = entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
@@ -24,22 +24,21 @@
         .row
           .col-md-6
             - if policy(entity).update?
-              %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+              %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
 - if entity.identity.first
-  .row
+  .row.mb-4
     .col-md-2
     .col-md-8
-      .panel.panel-default
-        .panel-heading
-          %h4 Change Password
-        .panel-body
-          = edit_form_tag("#{base_path}/#{entity.id}/identity") do
+      .card.card-default.shadow
+        .card-body
+          %h4.card-title Change Password
+          = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do
             = form_control(:password, entity.identity.first, type: 'password', placeholder: 'Your password', group: 'identity')
             = form_control(:password_confirmation, entity.identity.first, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password', group: 'identity')
             %button.btn.btn-primary{ type: 'submit' }

data/views/users/edit.haml

@@ -1,9 +1,9 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
-        = edit_form_tag "#{base_path}/#{entity.id}" do
+    .card.card-default.shadow
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
           = haml :'users/user', locals: { user: entity }
           %button.btn.btn-primary{ type: 'submit' }
             Update User

data/views/users/index.haml

@@ -1,28 +1,35 @@
 .row
   .col-md-12
-    .panel.panel-default
-      .panel-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead
-          %tr
-            %th Email
-            %th Name
-            %th Surname
-            %th Roles
-            %th Signed Up
-        %tbody
-          - if list.count > 0
-            - list.all.each do |entity|
-              %tr
-                %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.email
-                %td= entity.name
-                %td= entity.surname
-                %td= entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
-                %td= entity.created_at.strftime('%Y-%m-%d')
-          - else
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th= "Email #{sort_ui(:email)}"
+          %th= "Name #{sort_ui(:name)}"
+          %th= "Surname #{sort_ui(:surname)}"
+          %th Roles
+          %th= "Signed Up #{sort_ui(:created_at)}"
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 5 } No records
+              %td
+                - if policy(entity).read?
+                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.email
+                - else
+                  = entity.email
+              %td= entity.name
+              %td= entity.surname
+              %td= entity.all_roles.map(&:name).map(&:titlecase).join(', ')
+              %td= entity.created_at.strftime('%Y-%m-%d')
+              %td
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: 6 } No records
 
-=pagination(list, base_path)
+- if list.count > 0
+  = pagination(list, base_path)

data/views/users/login_traits.haml

@@ -1,11 +1,10 @@
 .row
-  .col-md-2
-  .col-md-8
-    .panel.panel-default
-      .panel-heading
-        %h4 Logins
-      %table.table
-        %thead
+  .col-md-12
+    .card.card-default.shadow
+      .card-body
+        %h4.card-title Logins
+      %table.table.table-striped.mb-0
+        %thead.thead-dark
           %tr
             %th IP Address
             %th Device
@@ -24,4 +23,3 @@
           - else
             %tr
               %td.text-center{ colspan: 5 } No Records
-  .col-md-2

data/views/users/new.haml

@@ -1,8 +1,8 @@
 .row
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         = new_form_tag base_path do
           = haml :'users/identity', locals: { identity: identity }
           = haml :'users/user', locals: { user: entity }

data/views/users/profile.haml

@@ -1,19 +1,19 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default.shadow
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
           %h4= entity.email
 
         %hr
         %p.description
           %label Name:
-          = entity.name
+          = entity.name || '(None)'
         %p.description
           %label Surname:
-          = entity.surname
+          = entity.surname || '(None)'
         %p.description
           %label Roles:
           = entity.roles_dataset.map(:name).map(&:titlecase).join(', ')
@@ -23,22 +23,22 @@
         .row
           .col-md-6
             - if policy(entity).update?
-              %a.btn.btn-default{ href: "#{base_path}/#{entity.id}/edit" } Edit
+              %a.btn.btn-secondary{ href: "#{base_path}/#{entity.display_id}/edit" } Edit
           .col-md-6.text-right
             - if policy(entity).delete?
-              = delete_form_tag("#{base_path}/#{entity.id}") do
+              = delete_form_tag("#{base_path}/#{entity.display_id}") do
                 %button.btn.btn-warning{ type: 'submit' } Delete
   .col-md-2
 
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-heading
-        %h4 Change Password
-      .panel-body
-        = edit_form_tag("#{base_path}/#{entity.id}/identity") do
-          = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password')
+    .card.card-default.shadow
+      .card-body
+        %h4.card-title Change Password
+        = edit_form_tag("#{base_path}/#{entity.display_id}/identity") do
+          - if current_user.super_admin? == false
+            = form_control(:old_password, identity, type: 'password', placeholder: 'Your current password', value: '')
           = form_control(:password, identity, type: 'password', placeholder: 'Your new password')
           = form_control(:password_confirmation, identity, type: 'password', label: 'Confirm Password', placeholder: 'Confirm your password')
           %button.btn.btn-primary{ type: 'submit' }