ditty 0.8.0 → 0.9.0

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
+      .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
+      .card-body
+        %h4.card-title Included Roles
+      %table.table.table-striped
+        %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-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
+          %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
+      .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
+      .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
+      .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,10 +1,10 @@
 .row
   .col-md-12
-    .panel.panel-default
-      .panel-body
+    .card.card-default
+      .card-body
         = haml :'partials/search'
       %table.table.table-striped
-        %thead
+        %thead.thead-dark
           %tr
             %th User
             %th IP Address
@@ -18,7 +18,7 @@
               %tr
                 %td= entity.user&.email || 'Unknown'
                 %td
-                  %a{ href: "#{base_path}/#{entity.id}" }= entity.ip_address || 'Unknown'
+                  %a{ href: "#{base_path}/#{entity.display_id}" }= entity.ip_address || 'Unknown'
                 %td= entity.device || 'Unknown'
                 %td= entity.platform || 'Unknown'
                 %td= entity.browser || 'Unknown'

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
+      .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,10 +1,10 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
           %h4= entity.email
 
         %hr
@@ -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
+        .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
+      .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
+          %th Name
+          %th Surname
+          %th Roles
+          %th Signed Up
+          %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
+      .card-body
+        %h4.card-title Logins
+      %table.table.table-striped
+        %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
+      .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,10 +1,10 @@
-.row
+.row.mb-4
   .col-md-2
   .col-md-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default
+      .card-body
         .author
-          %img.pull-right.thumbnail{ src: entity.gravatar }
+          %img.float-right.img-thumbnail{ src: entity.gravatar }
           %h4= entity.email
 
         %hr
@@ -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
+      .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' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ditty
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-thread_safety
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +220,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -429,34 +513,44 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CNAME
 - Contributors.md
+- Dockerfile
 - Gemfile.ci
 - License.txt
 - Rakefile
 - Readme.md
+- _config.yml
 - config.ru
 - ditty.gemspec
+- docs/CNAME
+- docs/_config.yml
+- docs/index.md
 - exe/ditty
 - lib/ditty.rb
 - lib/ditty/cli.rb
-- lib/ditty/components/app.rb
-- lib/ditty/controllers/application.rb
-- lib/ditty/controllers/audit_logs.rb
-- lib/ditty/controllers/auth.rb
-- lib/ditty/controllers/component.rb
-- lib/ditty/controllers/main.rb
-- lib/ditty/controllers/roles.rb
-- lib/ditty/controllers/user_login_traits.rb
-- lib/ditty/controllers/users.rb
+- lib/ditty/components/ditty.rb
+- lib/ditty/controllers/application_controller.rb
+- lib/ditty/controllers/audit_logs_controller.rb
+- lib/ditty/controllers/auth_controller.rb
+- lib/ditty/controllers/component_controller.rb
+- lib/ditty/controllers/main_controller.rb
+- lib/ditty/controllers/roles_controller.rb
+- lib/ditty/controllers/user_login_traits_controller.rb
+- lib/ditty/controllers/users_controller.rb
 - lib/ditty/db.rb
 - lib/ditty/emails/base.rb
 - lib/ditty/emails/forgot_password.rb
+- lib/ditty/generators/crud_generator.rb
+- lib/ditty/generators/migration_generator.rb
+- lib/ditty/generators/project_generator.rb
 - lib/ditty/helpers/authentication.rb
 - lib/ditty/helpers/component.rb
 - lib/ditty/helpers/pundit.rb
 - lib/ditty/helpers/response.rb
 - lib/ditty/helpers/views.rb
 - lib/ditty/listener.rb
+- lib/ditty/memcached.rb
 - lib/ditty/middleware/accept_extension.rb
 - lib/ditty/middleware/error_catchall.rb
 - lib/ditty/models/audit_log.rb
@@ -480,6 +574,32 @@ files:
 - lib/ditty/services/settings.rb
 - lib/ditty/tasks/ditty.rake
 - lib/ditty/tasks/omniauth-ldap.rake
+- lib/ditty/templates/.gitignore
+- lib/ditty/templates/.rspec
+- lib/ditty/templates/.rubocop.yml
+- lib/ditty/templates/Rakefile
+- lib/ditty/templates/application.rb
+- lib/ditty/templates/config.ru
+- lib/ditty/templates/controller.rb.erb
+- lib/ditty/templates/env.example
+- lib/ditty/templates/lib/project.rb.erb
+- lib/ditty/templates/logs/.empty_directory
+- lib/ditty/templates/migration.rb.erb
+- lib/ditty/templates/model.rb.erb
+- lib/ditty/templates/pids/.empty_directory
+- lib/ditty/templates/policy.rb.erb
+- lib/ditty/templates/public/css/sb-admin-2.min.css
+- lib/ditty/templates/public/js/sb-admin-2.min.js
+- lib/ditty/templates/settings.yml.erb
+- lib/ditty/templates/sidekiq.rb
+- lib/ditty/templates/sidekiq.yml
+- lib/ditty/templates/spec_helper.rb
+- lib/ditty/templates/type.rb.erb
+- lib/ditty/templates/views/display.haml.tt
+- lib/ditty/templates/views/edit.haml.tt
+- lib/ditty/templates/views/form.haml.tt
+- lib/ditty/templates/views/index.haml.tt
+- lib/ditty/templates/views/new.haml.tt
 - lib/ditty/version.rb
 - lib/rubocop/cop/ditty/call_services_directly.rb
 - migrate/20170207_base_tables.rb
@@ -488,7 +608,9 @@ files:
 - migrate/20180307_password_reset.rb
 - migrate/20181209_add_user_login_traits.rb
 - migrate/20181209_extend_audit_log.rb
+- migrate/20190220_add_parent_id_to_roles.rb
 - public/browserconfig.xml
+- public/css/styles.css
 - public/images/apple-icon.png
 - public/images/favicon-16x16.png
 - public/images/favicon-32x32.png
@@ -497,6 +619,7 @@ files:
 - public/images/launcher-icon-4x.png
 - public/images/mstile-150x150.png
 - public/images/safari-pinned-tab.svg
+- public/js/scripts.js
 - public/manifest.json
 - views/400.haml
 - views/403.haml
@@ -509,6 +632,7 @@ files:
 - views/auth/register.haml
 - views/auth/register_identity.haml
 - views/auth/reset_password.haml
+- views/blank.haml
 - views/emails/base.haml
 - views/emails/forgot_password.haml
 - views/emails/layouts/action.haml
@@ -519,16 +643,18 @@ files:
 - views/index.haml
 - views/layout.haml
 - views/partials/actions.haml
+- views/partials/content_tag.haml
 - views/partials/delete_form.haml
 - views/partials/filter_control.haml
 - views/partials/footer.haml
 - views/partials/form_control.haml
 - views/partials/form_tag.haml
-- views/partials/navbar.haml
+- views/partials/navitems.haml
 - views/partials/notifications.haml
 - views/partials/pager.haml
 - views/partials/search.haml
 - views/partials/sidebar.haml
+- views/partials/topbar.haml
 - views/roles/display.haml
 - views/roles/edit.haml
 - views/roles/form.haml
@@ -541,6 +667,7 @@ files:
 - views/user_login_traits/new.haml
 - views/users/display.haml
 - views/users/edit.haml
+- views/users/form.haml
 - views/users/identity.haml
 - views/users/index.haml
 - views/users/login_traits.haml
@@ -566,7 +693,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sinatra Based Application Framework