ditty 0.8.0 → 0.9.0

data/lib/ditty/templates/type.rb.erb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require '<%= folder %>/types/base_object'
+
+module <%= namespace %>
+  module Types
+    class <%= model_name %>Type < BaseObject
+      description 'A <%= model_name %>.'
+      <%- if columns.include? :guid -%>
+      field :id, ID, 'The unique GUID', null: false, resolver_method: :guid
+      <%- end -%>
+      <%- many_to_ones.each do |rel| -%>
+      field :<%= rel[:table].to_s.singularize %>, '<%= namespace %>::Types::<%= rel[:table].to_s.classify %>Type', null: <%= schema[rel[:columns].first][:allow_null] %>
+      <%- end -%>
+      <%- schema.each do |name, info| -%>
+      <%- next if %i[id guid].include?(name) || (name.to_s =~ /_id/ && info[:type] == :integer) -%>
+      field :<%= name %>, <%= graphql_types[info[:type]] %>, null: <%= info[:allow_null] %>
+      <%- end -%>
+    end
+  end
+end

data/lib/ditty/templates/views/display.haml.tt

@@ -0,0 +1,20 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card
+      .card-body
+        <%- columns.each do |col| -%>
+        %p.description
+          %label <%= col.to_s.titleize %>:
+          = entity.<%= col %>
+        <%- end %>
+
+        .row
+          .col-md-6
+            - if policy(entity).update?
+              %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.display_id}") do
+                %button.btn.btn-warning{ type: 'submit' } Delete
+  .col-md-2

data/lib/ditty/templates/views/edit.haml.tt

@@ -0,0 +1,10 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card
+      .card-body
+        = edit_form_tag "#{base_path}/#{entity.display_id}" do
+          = haml :'<%= model_name.pluralize.underscore %>/form', locals: { entity: entity }
+          %button.btn.btn-primary{ type: 'submit' }
+            Update <%= model_name %>
+  .col-md-2

data/lib/ditty/templates/views/form.haml.tt

@@ -0,0 +1,11 @@
+<%- if columns.include? :user_id -%>
+= form_control(:user_id, entity, type: 'select', options: policy_scope(Ditty::User).order(:email).as_hash(:id, :email))
+<%- end -%>
+<%- many_to_ones.each do |rel| -%>
+<%- next if %i[users].include?(rel[:tablename]) -%>
+= form_control(:<%= rel[:columns].first %>, entity, type: 'select', options: policy_scope(<%= namespace %>::<%= rel[:table].to_s.classify %>).order(:<%= name_column(rel[:table]) %>).as_hash(:id, :<%= name_column(rel[:table]) %>))
+<%- end -%>
+<%- (columns - meta_columns).each do |col| -%>
+<%- next if %i[id guid].include?(name) || (name.to_s =~ /_id/ && info[:type] == :integer) -%>
+= form_control(:<%= col %>, entity, type: '<%= input_types[schema[col][:type]] %>')
+<%- end -%>

data/lib/ditty/templates/views/index.haml.tt

@@ -0,0 +1,29 @@
+.row
+  .col-md-12
+    = haml :'partials/search'
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          <%- columns.each do |col| -%>
+          %th <%= col.to_s.titleize %>
+          <%- end %>
+          %th
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
+            %tr
+              <%- columns.each do |col| -%>
+              %td= entity.<%= col %>
+              <%- end %>
+              %td
+                %a{ href: "#{base_path}/#{entity.display_id}", title: 'Show' }
+                  %i.fa.fa-search
+                - if policy(entity).update?
+                  %a{ href: "#{base_path}/#{entity.display_id}/edit", title: 'Edit' }
+                    %i.fa.fa-edit
+        - else
+          %tr
+            %td.text-center{ colspan: <%= columns.count + 1 %> } No <%= model_name.pluralize %>
+
+- if list.count > 0
+  =pagination(list, base_path)

data/lib/ditty/templates/views/new.haml.tt

@@ -0,0 +1,10 @@
+.row
+  .col-md-2
+  .col-md-8
+    .card
+      .card-body
+        = new_form_tag base_path do
+          = haml :'<%= model_name.pluralize.underscore %>/form', locals: { entity: entity }
+          %button.btn.btn-primary{ type: 'submit' }
+            Create <%= model_name %>
+  .col-md-2

data/lib/ditty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ditty
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/rubocop/cop/ditty/call_services_directly.rb

@@ -13,10 +13,10 @@ module RuboCop
       #
       # @example
       #   # bad
-      #   Ditty::Services::Logger.instance.info 'This is a log message'
+      #   ::Ditty::Services::Logger.instance.info 'This is a log message'
       #
       #   # good
-      #   Ditty::Services::Logger.info 'This is a log message'
+      #   ::Ditty::Services::Logger.info 'This is a log message'
       class CallServicesDirectly < RuboCop::Cop::Cop
         MSG = 'Do not use `.instance` on services. Call the method directly instead'
 

data/migrate/20181209_add_user_login_traits.rb

@@ -5,10 +5,10 @@ Sequel.migration do
     create_table :user_login_traits do
       primary_key :id
       foreign_key :user_id, :users
-      String :ip_address, nullable: true
-      String :platform, nullable: true
-      String :device, nullable: true
-      String :browser, nullable: true
+      String :ip_address, null: true
+      String :platform, null: true
+      String :device, null: true
+      String :browser, null: true
       DateTime :created_at
       DateTime :updated_at
     end

data/migrate/20190220_add_parent_id_to_roles.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    alter_table :roles do
+      add_column :parent_id, Integer
+    end
+  end
+end

data/public/css/styles.css

@@ -0,0 +1,13 @@
+/* Add your application specific styles here */
+
+.bg-login-image {
+	background-image: url('https://source.unsplash.com/4rDCa5hBlCs/600x800');
+}
+
+.bg-password-image {
+	background-image: url('https://source.unsplash.com/4rDCa5hBlCs/600x800');
+}
+
+.bg-register-image {
+	background-image: url('https://source.unsplash.com/4rDCa5hBlCs/600x800');
+}

data/public/js/scripts.js

@@ -0,0 +1 @@
+// Add your application specific scripts here

data/views/404.haml

@@ -1,7 +1,5 @@
-%h2 Whoops!
-
-%p.lead
+%p.lead.text-center
   We could not find the page you were looking for...
 
 .text-center
-  %iframe{ width: 560, height: 315, src: 'https://www.youtube.com/embed/e3-5YC_oHjE', frameborder: 0, allowfullscreen: true }
+  %iframe{ width: 560, height: 315, src: 'https://www.youtube.com/embed/e3-5YC_oHjE', frameborder: 0, allowfullscreen: true }

data/views/audit_logs/index.haml

@@ -1,37 +1,35 @@
+= haml :'partials/search'
 .row
-  .col-md-12
-    .panel.panel-default
-      .panel-body
-        = haml :'partials/search'
-      %table.table.table-striped
-        %thead
-          %tr
-            %th User email
-            %th Action
-            %th Details
-            %th IP Address
-            %th Browser
-            %th Device
-            %th Platform
-            %th Created at
-        %tbody
-          - if list.count > 0
-            - list.all.each do |entity|
-              %tr
-                %td
-                  -if entity.user
-                    %a{ href: "#{settings.map_path}/users/#{entity.user.id}" }= entity.user.email
-                  -else
-                    None
-                %td= entity.action
-                %td= entity.details
-                %td= entity.ip_address || 'Unknown'
-                %td= entity.browser || 'Unknown'
-                %td= entity.device || 'Unknown'
-                %td= entity.platform || 'Unknown'
-                %td= entity.created_at&.strftime('%Y-%m-%d %H:%M:%S') || 'Unknown'
-          - else
+  .col-12
+    %table.table.table-striped.table-bordered.table-hover
+      %thead.thead-dark
+        %tr
+          %th User email
+          %th Action
+          %th Details
+          %th IP Address
+          %th Browser
+          %th Device
+          %th Platform
+          %th Created at
+      %tbody
+        - if list.count > 0
+          - list.all.each do |entity|
             %tr
-              %td.text-center{ colspan: 4 } No records
+              %td
+                -if entity.user
+                  %a{ href: "#{settings.map_path}/users/#{entity.user.id}" }= entity.user.email
+                -else
+                  None
+              %td= entity.action
+              %td= entity.details
+              %td= entity.ip_address || 'Unknown'
+              %td= entity.browser || 'Unknown'
+              %td= entity.device || 'Unknown'
+              %td= entity.platform || 'Unknown'
+              %td= entity.created_at&.strftime('%Y-%m-%d %H:%M:%S') || 'Unknown'
+        - else
+          %tr
+            %td.text-center{ colspan: 4 } No records
 
-=pagination(list, base_path)
+    =pagination(list, base_path)

data/views/auth/forgot_password.haml

@@ -1,16 +1,27 @@
-.row
-  .col-md-4
-  .col-md-4
-    .panel.panel-default
-      .panel-body
-        %p.text-center
-          Enter your email address and we will send you a link to reset your password if you've registered on the system.
-        = form_tag("#{settings.map_path}/auth/forgot-password") do
-          .form-group
-            .col-sm-12
-              %input.form-control{ name: 'email', type: 'text', placeholder: 'Enter your email address' }
-          .row.text-right
-            .col-md-12
-              %button.btn.btn-primary.btn-block{ type: 'submit' }
-                Email password reset link
-  .col-md-4
+.container
+  .card.o-hidden.border-0.shadow-lg.my-5
+    .card-body.p-0
+      / Nested Row within Card Body
+      .row
+        .col-lg-6.d-none.d-lg-block.bg-password-image
+        .col-lg-6
+          .p-5
+            .text-center
+              %h1.h4.text-gray-900.mb-2
+                Forgot Your Password?
+              %p.mb-4
+                We get it, stuff happens. Just enter your email address below and we'll send you a link to reset your password!
+            = form_tag("#{settings.map_path}/auth/forgot-password", attributes: { class: 'user' }) do
+              .form-group
+                %input.form-control.form-control-user{ type: 'email',  placeholder: 'Enter Email Address...' }
+              %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' }
+                Reset Password
+            %hr
+            - if policy(::Ditty::User).register?
+              .text-center
+                %a.small{ href: "#{settings.map_path}/auth/register" } Create an Account!
+            .text-center
+              %a.small{ href: "#{settings.map_path}/auth/login" } Already have an account? Login!
+
+  .row.justify-content-center
+    .col-xl-10.col-lg-12.col-md-9

data/views/auth/identity.haml

@@ -1,15 +1,16 @@
-= form_tag("#{settings.map_path}/auth/identity/callback", attributes: { class: '' }) do
+= form_tag("#{settings.map_path}/auth/identity/callback", attributes: { class: 'user' }) do
   .form-group
-    %label.control-label Email
-    %input.form-control.border-input{ name: 'username', tabindex: '1' }
+    %input.form-control.form-control-user{ name: 'username', type: 'email', 'aria-describedby': 'emailHelp', placeholder: 'Enter Email Address...' }
   .form-group
-    %label.control-label{ style: 'display: block' }
-      Password
-      %a{ href: "#{settings.map_path}/auth/forgot-password", style: 'float: right', tabindex: '5' }
-        Forgot?
-    %input.form-control.border-input{ name: 'password', type: 'password', tabindex: '2' }
-  %button.btn.btn-primary{ type: 'submit', tabindex: '3' } Log In
-  - if policy(::Ditty::User).register?
-    .pull-right
-      No account yet?
-      %a.btn.btn-default{ href: "#{settings.map_path}/auth/register", tabindex: '4' } Register
+    %input.form-control.form-control-user{ name: 'password', type: 'password', placeholder: 'Password' }
+  / .form-group
+  /   .custom-control.custom-checkbox.small
+  /     <input type="checkbox" class="custom-control-input" id="customCheck">
+  /     <label class="custom-control-label" for="customCheck">Remember Me</label>
+  %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' } Log In
+%hr
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/forgot-password" } Forgot Password?
+- if policy(::Ditty::User).register?
+  .text-center
+    %a.small{ href: "#{settings.map_path}/auth/register" } Create an Account!

data/views/auth/ldap.haml

@@ -1,8 +1,8 @@
 .row
   .col-sm-2
   .col-sm-8
-    .panel.panel-default
-      .panel-body
+    .card.card-default
+      .card-body
         = form_tag("#{settings.map_path}/auth/ldap/callback", attributes: { class: '' }) do
           .form-group
             %label.control-label Username

data/views/auth/login.haml

@@ -1,18 +1,23 @@
-.row
-  .col-sm-2
-  .col-sm-8
-    .panel.panel-default
-      .panel-body
-        - if Ditty::Services::Authentication.provides? 'identity'
-          = haml :'auth/identity'
+.container
+  / Outer Row
+  .row.justify-content-center
+    .col-xl-10.col-lg-12.col-md-9
+      .card.o-hidden.border-0.shadow-lg.my-5
+        .card-body.p-0
+          / Nested Row within Card Body
           .row
-            .col-sm-12= " "
-        .row
-          .col-sm-8.col-sm-push-2
-            - Ditty::Services::Authentication.providers.each do |name|
-              - provider = Ditty::Services::Authentication[name]
-              - next if provider[:login_prompt].nil?
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/#{name}" }
-                %i.fa{ class: "fa-#{provider[:icon] || 'key'}"}
-                = provider[:login_prompt]
-  .col-sm-2
+            .col-lg-6.d-none.d-lg-block.bg-login-image
+            .col-lg-6
+              .p-5
+                .text-center
+                  %h1.h4.text-gray-900.mb-4 Welcome Back!
+                - ::Ditty::Services::Authentication.providers.each do |name|
+                  - provider = ::Ditty::Services::Authentication[name]
+                  - next if provider[:login_prompt].nil?
+                  %p
+                    %a.btn.btn-block.btn-secondary{ href: "#{settings.map_path}/auth/#{name}" }
+                      %i.fab.fw{ class: "fa-#{provider[:icon] || 'key'}"}
+                      = provider[:login_prompt]
+                = haml :'partials/notifications'
+                - if ::Ditty::Services::Authentication.provides? 'identity'
+                  = haml :'auth/identity'

data/views/auth/register.haml

@@ -1,19 +1,20 @@
-/ TODO: How can we detect a google registration? Extra parameter to the callback? Or a custom callback page?
-.row
-  .col-md-2
-  .col-md-8
-    .panel.panel-default
-      .panel-body
-        - if Ditty::Services::Authentication.provides? 'identity'
-          = haml :'auth/register_identity', locals: { identity: identity }
-          .row
-            .col-sm-12= " "
-        .row
-          .col-sm-8.col-sm-push-2
-            - Ditty::Services::Authentication.providers.each do |name|
-              - provider = Ditty::Services::Authentication[name]
+.container
+  .card.o-hidden.border-0.shadow-lg.my-5
+    .card-body.p-0
+      / Nested Row within Card Body
+      .row
+        .col-lg-5.d-none.d-lg-block.bg-register-image
+        .col-lg-7
+          .p-5
+            .text-center
+              %h1.h4.text-gray-900.mb-4 Create an Account!
+            = haml :'partials/notifications'
+            - ::Ditty::Services::Authentication.providers.each do |name|
+              - provider = ::Ditty::Services::Authentication[name]
               - next if provider[:register_prompt].nil?
-              %a.btn.btn-block.btn-default{ href: "#{settings.map_path}/auth/#{name}" }
-                %i.fa{ class: "fa-#{provider[:icon] || 'key'}"}
-                = provider[:register_prompt]
-  .col-md-2
+              %p
+                %a.btn.btn-user.btn-block{ href: "#{settings.map_path}/auth/#{name}", class: "btn-#{provider[:icon] || 'key'}" }
+                  %i.fab.fa-fw{ class: "fa-#{provider[:icon] || 'key'}"}
+                  = provider[:register_prompt]
+            - if ::Ditty::Services::Authentication.provides? 'identity'
+              = haml :'auth/register_identity', locals: { identity: identity }

data/views/auth/register_identity.haml

@@ -1,14 +1,29 @@
-= form_tag("#{settings.map_path}/auth/register/identity") do
-  = form_control(:username, identity, label: 'Email', placeholder: 'your@email.com')
-  = form_control(:password, identity, label: 'Password', type: :password)
-  = form_control(:password_confirmation, identity, label: 'Confirm Password', type: :password)
+- if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
+  .alert.alert-warning
+    %p Make sure your password is at least 8 characters long, and including the following
+    %ul
+      %li Upper- and lowercase letters
+      %li Numbers
+      %li Special Characters
 
-  - if identity.errors[:password] && identity.errors[:password].include?('is not strong enough')
-    .alert.alert-warning
-      %p Make sure your password is at least 8 characters long, and including the following
-      %ul
-        %li Upper- and lowercase letters
-        %li Numbers
-        %li Special Characters
+= form_tag("#{settings.map_path}/auth/register/identity", attributes: { class: 'user' }) do
+  .form-group
+    %input.form-control.form-control-user{ name: 'identity[username]', type: 'email', placeholder: 'Email Address', class: identity.errors[:username] ? 'is-invalid' : 'is-valid' }
+    - if identity.errors[:username]
+      .invalid-feedback= identity.errors[:username].join(', ')
+  .form-group.row
+    .col-sm-6.mb-3.mb-sm-0
+      %input.form-control.form-control-user{ name: 'identity[password]', type: 'password', placeholder: 'Password', class: identity.errors[:password] ? 'is-invalid' : 'is-valid' }
+      - if identity.errors[:password]
+        .invalid-feedback= identity.errors[:password].join(', ')
+    .col-sm-6
+      %input.form-control.form-control-user{ name: 'identity[password_confirmation]', type: 'password', placeholder: 'Repeat Password', class: identity.errors[:password_confirmation] ? 'is-invalid' : 'is-valid' }
+      - if identity.errors[:password_confirmation]
+        .invalid-feedback= identity.errors[:password_confirmation].join(', ')
 
-  %button.btn.btn-primary{ type: 'submit' } Register
+  %button.btn.btn-primary.btn-user.btn-block{ type: 'submit' } Register
+%hr
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/forgot-password" } Forgot Password?
+.text-center
+  %a.small{ href: "#{settings.map_path}/auth/login" } Already have an account? Login!