oxen_account 0.1.1 → 0.2.0

data/app/views/oxen/accounts/_account.html.haml

@@ -0,0 +1,4 @@
+%tr{ id: "tr-#{resource.id}"}
+  %td= link_to resource.name, resource
+  %td= show_resource_active resource
+  %td= show_resource_delete_icon resource, '/admin/accounts'

data/app/views/oxen/accounts/_accounts.html.haml

@@ -0,0 +1,18 @@
+:css
+	a.dropdown-button {
+		padding-left: 1em;
+		padding-right: 1em;
+	}
+
+- unless params[:action] == 'print'
+	= paginate resources
+
+%thead
+	%tr
+		%th{ :"data-field"=>"name"}= t('.name')
+		%th{ :"data-field"=>"active"}= t('.active')
+		%th= t(:delete)
+
+%tbody.bordered.responsive-table.striped.hoverable.page.resources_list
+	- resources.each do |account|
+		= render partial: 'account', locals: { resource: account }

data/app/views/oxen/accounts/_form.html.haml

@@ -0,0 +1,82 @@
+
+= simple_form_for(resource, html: {class: 'col sl12'} ) do |f|
+  / - if parent?
+  /   = render @parent
+  = f.error_notification
+
+  .form-inputs
+    .row
+      = f.input :name, class: :validate, disabled: @disabled, autofocus: true
+
+    .row
+      = f.input :default_url, class: :validate, disabled: @disabled
+
+    .row
+      = f.input :free_users, class: :validate, disabled: @disabled
+
+    .row
+      .input-field.col.s6
+        %label{ style: "margin-top: -20px"}= t('.account_active')
+        .switch
+          %label
+            = t(:passive)
+            =f.check_box :active, disabled: @disabled
+            %span.lever
+            = t(:active)
+
+      .input-field.col.s6
+        %label{ style: "margin-top: -20px"}= t('.account_chargeable')
+        .switch
+          %label
+            = t(:false)
+            =f.check_box :chargeable, disabled: @disabled
+            %span.lever
+            = t(:true)
+
+    %br
+    %br
+
+    .row
+      .input-field.col.s12
+        %label= t('.last_charged_at')
+        %input{ type: 'date', name: 'account[last_charged_at]', class: 'datepicker', disabled: @disabled}
+
+    .row
+      .col.sl12{ style: "margin-bottom: 30px"}
+    %hr
+
+
+
+/ from oxen_user/views/accounts/_form.html.haml
+/
+/ = simple_form_for(resource, html: {class: 'col sl12'} ) do |f|
+/   / - if parent?
+/   /   = render @parent
+/   = f.error_notification
+/
+/   .form-inputs
+/     .row
+/       = f.input :name, class: :validate, disabled: @disabled, autofocus: true
+/
+/     .row
+/       .input-field.col.s12
+/         %label{ style: "margin-top: -20px"}= t('.account_active')
+/         .switch
+/           %label
+/             = t(:passive)
+/             =f.check_box :active, disabled: @disabled
+/             %span.lever
+/             = t(:active)
+/
+/     .row
+/       .col.sl12{ style: "margin-bottom: 30px"}
+/     %hr
+/
+/   - unless @disabled
+/     .row
+/       .form-actions.right-align
+/         = f.button :submit, t(".#{params[:action]}.submit")
+/
+/ - if %w{ show edit }.include? params[:action]
+/   :coffeescript
+/     $('form label').addClass('active')

data/app/views/oxen/accounts/_show.html.haml

@@ -0,0 +1,4 @@
+
+- if %w{ show }.include? params[:action]
+  = render partial: 'users/account_users'
+  = render partial: 'users/invitations/new', locals: { account_id: resource.id }

data/app/views/users/_account_user.html.haml

@@ -1,12 +1,14 @@
 %tr{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
   %td= link_to user.name, user
   %td= user.email
-  %td
-    - if user.active
-      %i.mdi-action-done.small
+  %td= show_resource_active user
   %td
     - if user.confirmed?
-      %i.mdi-action-done.small
+      %i.small.material-icons done
+    - else
+      = link_to url_for(user) + '/confirm', class: "unconfirmed yellow-text" do
+        = content_tag :i, 'report_problem', class: "material-icons"
+  %td= user.invitations.count
   %td
     = link_to user, class: 'delete_link', data: { url: '/admin/users', name: "#{user.name}", id: "#{user.id}", remove: "#tr-#{user.id}" } do
       %i.mdi-action-delete.small{ title: "#{t('.delete')}"}

data/app/views/users/_account_users.html.haml

@@ -1,15 +1,34 @@
 .row
   .col.s12
     %h5= t('.users')
-    %table.responsive-table.hoverable.striped
+    %table.responsive-table.hoverable.striped.resources_table
       %thead
         %tr
           %th{ :"data-field"=>"name"}= t('.name')
           %th{ :"data-field"=>"email"}= t('.email')
           %th{ :"data-field"=>"active"}= t('.active')
           %th{ :"data-field"=>"active"}= t('.confirmed')
+          %th{ :"data-field"=>"invitations"}= t('.invitations')
           %th= t(:delete)
 
-      %tbody#account_users
+      %tbody#account_users.resources_list
         - resource.users.each do |user|
           = render partial: 'users/account_user', locals: { user: user}
+
+
+:coffeescript
+
+  $ ->
+    $(document.body).on 'click', '.unconfirmed', (e) ->
+      e.preventDefault()
+      e.stopPropagation()
+      $elem = $(e.currentTarget)
+      request = $.ajax
+        url: $elem.attr('href'),
+        type: "get",
+        dataType: 'html'
+      .done (data) ->
+        $( $elem[0].parentElement).html(data)
+
+      .error (data) ->
+        swal("Oops", "We couldn't connect to the server!", "error")

data/app/views/users/_user.html.haml

@@ -0,0 +1,9 @@
+%tr{ id: "tr-#{user.id}", class:"#{invited_user? user}"}
+  %td= link_to user.name, user
+  %td= link_to( user.account.name, user.account) rescue ''
+  %td= user.email rescue ''
+  %td= show_resource_active user
+  %td= user.invitations.count
+  %td
+    = link_to user, class: 'delete_link', data: { url: '/admin/users', name: "#{user.name}", id: "#{user.id}", remove: "#tr-#{user.id}" } do
+      %i.mdi-action-delete.small{ title: "#{t('.delete')}"}

data/app/views/users/_users.html.haml

@@ -0,0 +1,15 @@
+.row
+  .col.s12
+    %table.responsive-table.hoverable.striped.resources_table
+      %thead
+        %tr
+          %th{ :"data-field"=>"name"}= t('.name')
+          %th{ :"data-field"=>"account"}= t('.account')
+          %th{ :"data-field"=>"email"}= t('.email')
+          %th{ :"data-field"=>"active"}= t('.active')
+          %th{ :"data-field"=>"invitations"}= t('.invitations')
+          %th= t(:delete)
+
+      %tbody.resources_list
+        - @resources.each do |user|
+          = render partial: 'user', locals: { user: user}

data/app/views/users/invitations/_new.html.haml

@@ -23,6 +23,7 @@
   $ ->
     $('input[name="commit"]').on 'click', (e) ->
       e.preventDefault()
+      e.stopPropagation()
       $form = $(e.target).closest('form')
       data = $form.serialize()
       jqxhr = $.ajax
@@ -31,7 +32,6 @@
         data: data
       .done (response) ->
         $('#account_users').append(response)
-        initializeDeleteLinks()
         fadeItOut $('.message_container .alert-success')
       .fail (response) ->
         $('body').append(response.responseText)

data/app/views/users/invitations/create.html.haml

@@ -1,21 +1,5 @@
-- if result
+- if (resource.errors.empty? rescue false)
   = render partial: 'users/account_user', locals: { user: resource }
 
-  :coffeescript
-    $ ->
-      $('.message_container').append '<div class="alert alert-success">' +
-        '<a aria-hidden="true" class="btn-floating btn-small close-notice success waves-effect waves-light" data-dismiss="alert" type="button">'+
-        '<i class="mdi-navigation-close"></i>'+
-        '</a>'+
-        '<div id="flash_notice">#{t("devise.invitations.send_instructions", email: resource.email)}</div>'+
-        '</div>'
-
-- else
-  :coffeescript
-    $ ->
-      $('.message_container').append '<div class="alert alert-danger">' +
-        '<a aria-hidden="true" class="btn-floating btn-small close-notice danger waves-effect waves-light" data-dismiss="alert" type="button">'+
-        '<i class="mdi-navigation-close"></i>'+
-        '</a>'+
-        '<div id="flash_notice">#{t("devise.failure.missing_data")}</div>'+
-        '</div>'
+:javascript
+  eval("#{set_toasts}");

data/config/initializers/devise.rb

@@ -1,4 +1,8 @@
 require 'devise'
+# require 'devise_invitable'
+# require 'devise_zxcvbn'
+#require 'devise_cas_authenticatable'
+
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -11,7 +15,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  # config.mailer_sender = 'no-reply@' + Rails.application.secrets.domain_name
+  config.mailer_sender = 'no-reply@' + Rails.application.secrets.domain_name
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -300,4 +304,57 @@ Devise.setup do |config|
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+  # ==> CAS Authenticatable
+  # config.cas_base_url = "https://localhost:3100"
+
+  # you can override these if you need to, but cas_base_url is usually enough
+  # config.cas_login_url = "https://cas.myorganization.com/login"
+  # config.cas_logout_url = "https://cas.myorganization.com/logout"
+  # config.cas_validate_url = "https://cas.myorganization.com/serviceValidate"
+
+  # The CAS specification allows for the passing of a follow URL to be displayed when
+  # a user logs out on the CAS server. RubyCAS-Server also supports redirecting to a
+  # URL via the destination param. Set either of these urls and specify either nil,
+  # 'destination' or 'follow' as the logout_url_param. If the urls are blank but
+  # logout_url_param is set, a default will be detected for the service.
+  # config.cas_destination_url = 'https://cas.myorganization.com'
+  # config.cas_follow_url = 'https://cas.myorganization.com'
+  # config.cas_logout_url_param = nil
+
+  # You can specify the name of the destination argument with the following option.
+  # e.g. the following option will change it from 'destination' to 'url'
+  # config.cas_destination_logout_param_name = 'url'
+
+  # By default, devise_cas_authenticatable will create users.  If you would rather
+  # require user records to already exist locally before they can authenticate via
+  # CAS, uncomment the following line.
+  # config.cas_create_user = false
+
+  # You can enable Single Sign Out, which by default is disabled.
+  # config.cas_enable_single_sign_out = true
+
+  # If you don't want to use the username returned from your CAS server as the unique
+  # identifier, but some other field passed in cas_extra_attributes, you can specify
+  # the field name here.
+  # config.cas_user_identifier = nil
+
+  # If you want to use the Devise Timeoutable module with single sign out,
+  # uncommenting this will redirect timeouts to the logout url, so that the CAS can
+  # take care of signing out the other serviced applocations. Note that each
+  # application manages timeouts independently, so one application timing out will
+  # kill the session on all applications serviced by the CAS.
+  # config.warden do |manager|
+  #   manager.failure_app = DeviseCasAuthenticatable::SingleSignOut::WardenFailureApp
+  # end
+
+  # If you need to specify some extra configs for rubycas-client, you can do this via:
+  # config.cas_client_config_options = {
+  #     logger: Rails.logger
+  # }
+
+
+
+
+
 end

data/config/routes.rb

@@ -1,8 +1,43 @@
 Rails.application.routes.draw do
 
-  devise_for :users, :controllers => { :invitations => 'users/invitations' }
+  concern :printing do
+    member do
+      get 'print'
+      get 'slip'
+    end
+    collection do
+      get 'print'
+    end
+  end
+
+  # prefer and defer elements (setting preferred true|false)
+  concern :preferring do
+    member do
+      get 'prefer'
+      get 'defer'
+    end
+  end
+
+  # attach and detach the route in question to its 'parent'
+  concern :attaching do
+    member do
+      get 'attach'
+      get 'detach'
+    end
+  end
+
+  # activate and passify the route in question
+  concern :activating do
+    member do
+      get 'activate'
+      get 'deactivate'
+    end
+  end
+
+  # devise_for :users, :controllers => { :invitations => 'users/invitations', :sessions => 'devise/cas_sessions'  }
   scope '/admin' do
-    resources :accounts
-    resources :users
+    resources :accounts, concerns: [:activating, :attaching, :printing] do
+      resources :users, concerns: [:activating, :printing]
+    end
   end
 end

data/lib/generators/oxen_account/account_generator.rb

@@ -19,6 +19,8 @@ module OxenAccount
 
       def create_migration_file
         migration_template 'account.rb', 'db/migrate/create_accounts.rb'
+        # allow the clock to advance 1sec
+        sleep 1
         migration_template 'user_permission.rb', 'db/migrate/create_user_permissions.rb'
       end
     end

data/lib/oxen_account.rb

@@ -1,8 +1,9 @@
+require 'devise_invitable'
+require 'devise_zxcvbn'
+require 'paper_trail'
+
 require "oxen_account/version"
 require "oxen_account/engine"
-require "devise_zxcvbn"
-require "paper_trail"
-require "devise_invitable"
 
 module OxenAccount
   # Your code goes here...

data/lib/oxen_account/version.rb

@@ -1,3 +1,3 @@
 module OxenAccount
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/oxen_account.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "paper_trail"
   spec.add_dependency 'pundit'
 
+  # spec.add_dependency "devise_cas_authenticatable"
+
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxen_account
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -309,21 +309,10 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/oxen_account.js
-- app/assets/javascripts/pw_strength.js.coffee
-- app/assets/javascripts/zxcvbn.js
-- app/controllers/accounts/base/accounts_controller.rb
-- app/controllers/users/base/invitations_controller.rb
-- app/controllers/users/base/users_controller.rb
-- app/helpers/accounts_helper.rb
-- app/models/account.rb
-- app/models/user.rb
-- app/policies/account_policy.rb
-- app/policies/user_policy.rb
-- app/views/accounts/_form.html.haml
-- app/views/accounts/index.html.haml
-- app/views/accounts/index.json.jbuilder
-- app/views/accounts/show.html.haml
-- app/views/accounts/show.json.jbuilder
+- app/controllers/oxen/accounts_controller.rb
+- app/helpers/oxen/accounts_helper.rb
+- app/models/ox_account.rb
+- app/policies/oxen/account_policy.rb
 - app/views/devise/confirmations/new.html.haml
 - app/views/devise/mailer/invitation_instructions.html.erb
 - app/views/devise/passwords/edit.html.haml
@@ -333,11 +322,17 @@ files:
 - app/views/devise/sessions/new.html.haml
 - app/views/devise/shared/_links.html.haml
 - app/views/devise/unlocks/new.html.haml
+- app/views/oxen/accounts/_account.html.haml
+- app/views/oxen/accounts/_accounts.html.haml
+- app/views/oxen/accounts/_form.html.haml
+- app/views/oxen/accounts/_show.html.haml
+- app/views/oxen/accounts/index.json.jbuilder
+- app/views/oxen/accounts/show.json.jbuilder
 - app/views/users/_account_user.html.haml
 - app/views/users/_account_users.html.haml
-- app/views/users/_form.html.haml
-- app/views/users/_user.html.erb
-- app/views/users/index.html.haml
+- app/views/users/_user.html.haml
+- app/views/users/_user_form.html.erb
+- app/views/users/_users.html.haml
 - app/views/users/invitations/_new.html.haml
 - app/views/users/invitations/create.html.haml
 - app/views/users/invitations/edit.html.haml
@@ -356,7 +351,6 @@ files:
 - lib/oxen_account.rb
 - lib/oxen_account/engine.rb
 - lib/oxen_account/version.rb
-- oxen_account-0.1.0.gem
 - oxen_account.gemspec
 homepage: http://gitserver.alco.dk/oxen_account
 licenses:
@@ -378,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Offers an account table for customer accounts