oxen_account 0.1.0 → 0.1.1

data/app/controllers/{accounts_controller.rb → accounts/base/accounts_controller.rb}

@@ -1,4 +1,4 @@
-class AccountsController < AbstractResourcesController
+class Accounts::Base::AccountsController < AbstractResourcesController
 
   # before_filter :authenticate_user!
   # before_filter :set_parents, only: [ :new, :edit, :show ]

data/app/controllers/users/base/users_controller.rb

@@ -62,7 +62,7 @@ class Users::Base::UsersController < AbstractResourcesController
     end
 
     def check_user_permissions
-      UserPermission.where(email: params[:user][:email]).count == 1
+      # UserPermission.where(email: params[:user][:email]).count == 1
     end
 
 end

data/app/policies/account_policy.rb

@@ -1,14 +1,15 @@
 class AccountPolicy < AbstractResourcePolicy
 
-    class Scope < Scope
-      def resolve
-        if current_user.admin?
-          scope.all
-        else
-          scope.where(id: current_user.account.id)
-        end
+  class Scope < Scope
+    def resolve
+      return Account.where(1==2) if current_user.nil?
+      if current_user.admin?
+        scope.all
+      else
+        scope.where(id: current_user.account.id)
       end
     end
+  end
 
 
 

data/app/policies/user_policy.rb

@@ -2,6 +2,7 @@ class UserPolicy < AbstractResourcePolicy
 
   class Scope < Scope
     def resolve
+      return Account.where(1==2) if current_user.nil?
       if current_user.admin?
         scope.all
       else

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

@@ -4,3 +4,9 @@
   %td
     - if user.active
       %i.mdi-action-done.small
+  %td
+    - if user.confirmed?
+      %i.mdi-action-done.small
+  %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

@@ -7,6 +7,8 @@
           %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= t(:delete)
 
       %tbody#account_users
         - resource.users.each do |user|

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

@@ -26,11 +26,12 @@
       $form = $(e.target).closest('form')
       data = $form.serialize()
       jqxhr = $.ajax
-        url: '/users/invitation',
+        url: '/users/invitation.js',
         type: 'post',
         data: data
       .done (response) ->
         $('#account_users').append(response)
+        initializeDeleteLinks()
         fadeItOut $('.message_container .alert-success')
       .fail (response) ->
         $('body').append(response.responseText)

data/config/initializers/devise.rb

@@ -11,7 +11,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'

data/lib/oxen_account/version.rb

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

data/lib/oxen_account.rb

@@ -1,7 +1,10 @@
 require "oxen_account/version"
 require "oxen_account/engine"
+require "devise_zxcvbn"
+require "paper_trail"
+require "devise_invitable"
 
 module OxenAccount
   # Your code goes here...
-  
+
 end

data/oxen_account.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'devise'
-  spec.add_runtime_dependency 'devise_invitable'
-  spec.add_runtime_dependency 'devise_zxcvbn'
+  spec.add_dependency 'devise'
+  spec.add_dependency 'devise_invitable'
+  spec.add_dependency 'devise_zxcvbn'
 
-  spec.add_runtime_dependency "paper_trail"
-  spec.add_runtime_dependency 'pundit'
+  spec.add_dependency "paper_trail"
+  spec.add_dependency 'pundit'
 
   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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -308,7 +308,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/accounts_controller.rb
+- 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
@@ -353,6 +356,7 @@ 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:
@@ -374,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Offers an account table for customer accounts