usman 0.1.5 → 0.1.6dev2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +48 -16
  3. data/app/controllers/usman/admin/base_controller.rb +22 -0
  4. data/app/controllers/usman/admin/dashboard_controller.rb +1 -1
  5. data/app/controllers/usman/admin/features_controller.rb +4 -1
  6. data/app/controllers/usman/admin/permissions_controller.rb +9 -15
  7. data/app/controllers/usman/admin/resource_controller.rb +3 -1
  8. data/app/controllers/usman/admin/roles_controller.rb +4 -2
  9. data/app/controllers/usman/admin/user_roles_controller.rb +142 -0
  10. data/app/controllers/usman/admin/users_controller.rb +5 -2
  11. data/app/controllers/usman/application_controller.rb +0 -4
  12. data/app/controllers/usman/sessions_controller.rb +5 -2
  13. data/app/helpers/usman/authentication_helper.rb +35 -25
  14. data/app/models/feature.rb +50 -46
  15. data/app/models/image/feature_image.rb +1 -1
  16. data/app/models/image/profile_picture.rb +1 -1
  17. data/app/models/permission.rb +3 -8
  18. data/app/models/role.rb +4 -7
  19. data/app/models/user.rb +81 -103
  20. data/app/models/usman/application_record.rb +3 -0
  21. data/app/services/usman/authentication_service.rb +4 -3
  22. data/app/uploaders/profile_picture_uploader.rb +2 -1
  23. data/app/views/layouts/kuppayam/_header.html.erb +1 -1
  24. data/app/views/layouts/kuppayam/_navbar.html.erb +1 -1
  25. data/app/views/layouts/kuppayam/_sidebar.html.erb +8 -7
  26. data/app/views/usman/admin/dashboard/index.html.erb +0 -1
  27. data/app/views/usman/admin/features/_form.html.erb +5 -2
  28. data/app/views/usman/admin/features/_index.html.erb +4 -1
  29. data/app/views/usman/admin/features/index.html.erb +20 -3
  30. data/app/views/usman/admin/permissions/_show.html.erb +2 -10
  31. data/app/views/usman/admin/permissions/index.html.erb +20 -3
  32. data/app/views/usman/admin/roles/_form.html.erb +1 -1
  33. data/app/views/usman/admin/roles/_index.html.erb +3 -3
  34. data/app/views/usman/admin/roles/_row.html.erb +2 -2
  35. data/app/views/usman/admin/roles/_show.html.erb +41 -7
  36. data/app/views/usman/admin/roles/index.html.erb +22 -3
  37. data/app/views/usman/admin/user_roles/_form.html.erb +24 -0
  38. data/app/views/usman/admin/user_roles/_index.html.erb +59 -0
  39. data/app/views/usman/admin/user_roles/_row.html.erb +34 -0
  40. data/app/views/usman/admin/users/_index.html.erb +22 -16
  41. data/app/views/usman/admin/users/_row.html.erb +4 -4
  42. data/app/views/usman/admin/users/_show.html.erb +1 -1
  43. data/app/views/usman/admin/users/index.html.erb +4 -2
  44. data/app/views/usman/sessions/_form.html.erb +19 -7
  45. data/app/views/usman/sessions/sign_in.html.erb +1 -1
  46. data/config/initializers/overide_kuppayam_controllers.rb +74 -0
  47. data/config/locales/kuppayam/authentication.en.yml +4 -1
  48. data/config/routes.rb +3 -1
  49. data/db/import_data/dummy/features.csv +7 -0
  50. data/db/import_data/dummy/permissions.csv +18 -1
  51. data/db/import_data/dummy/roles.csv +5 -0
  52. data/db/import_data/dummy/users.csv +7 -3
  53. data/db/import_data/features.csv +7 -0
  54. data/db/import_data/permissions.csv +1 -30
  55. data/db/import_data/roles.csv +5 -0
  56. data/db/migrate/20170000000100_create_users.rb +1 -1
  57. data/db/migrate/20170000000101_create_features.rb +1 -1
  58. data/db/migrate/20170000000102_create_roles.rb +1 -1
  59. data/db/migrate/20170728095744_create_otp_registrations.rb +17 -0
  60. data/lib/tasks/usman/all.rake +34 -10
  61. data/lib/{tasks/usman → temp}/features.rake +3 -6
  62. data/lib/{tasks/usman → temp}/permissions.rake +3 -5
  63. data/lib/temp/roles.rake +24 -0
  64. data/lib/{tasks/usman → temp}/users.rake +3 -5
  65. data/lib/usman/engine.rb +2 -3
  66. data/lib/usman/version.rb +1 -1
  67. metadata +27 -45
  68. data/app/views/usman/admin/features/_action_buttons.html.erb +0 -0
  69. data/app/views/usman/admin/features/temp/create.js.erb +0 -29
  70. data/app/views/usman/admin/features/temp/destroy.js.erb +0 -16
  71. data/app/views/usman/admin/features/temp/edit.js.erb +0 -7
  72. data/app/views/usman/admin/features/temp/index.js.erb +0 -8
  73. data/app/views/usman/admin/features/temp/new.js.erb +0 -7
  74. data/app/views/usman/admin/features/temp/row.js.erb +0 -10
  75. data/app/views/usman/admin/features/temp/show.js.erb +0 -8
  76. data/app/views/usman/admin/features/temp/update.js.erb +0 -16
  77. data/app/views/usman/admin/permissions/temp/create.js.erb +0 -29
  78. data/app/views/usman/admin/permissions/temp/destroy.js.erb +0 -22
  79. data/app/views/usman/admin/permissions/temp/edit.js.erb +0 -4
  80. data/app/views/usman/admin/permissions/temp/index.js.erb +0 -14
  81. data/app/views/usman/admin/permissions/temp/new.js.erb +0 -4
  82. data/app/views/usman/admin/permissions/temp/row.js.erb +0 -24
  83. data/app/views/usman/admin/permissions/temp/show.js.erb +0 -13
  84. data/app/views/usman/admin/permissions/temp/update.js.erb +0 -29
  85. data/db/import_data/dummy/images/users/guna.neweast.png +0 -0
  86. data/db/import_data/dummy/images/users/junaid.ramzan.jpg +0 -0
  87. data/db/import_data/dummy/images/users/kpvarma.png +0 -0
  88. data/db/import_data/dummy/images/users/stephen.price.png +0 -0
  89. data/db/import_data/dummy/images/users/vinodh.jpg +0 -0
  90. data/db/import_data/images/users/junaid.ramzan.jpg +0 -0
  91. data/db/import_data/images/users/kpvarma.png +0 -0
  92. data/db/import_data/images/users/vinodh.jpg +0 -0
  93. data/lib/usman/extras/import_error_handler.rb +0 -79
data/config/routes.rb CHANGED
@@ -24,7 +24,9 @@ Usman::Engine.routes.draw do
24
24
  end
25
25
  end
26
26
 
27
- resources :roles
27
+ resources :roles do
28
+ resources :users, :controller => "user_roles"
29
+ end
28
30
 
29
31
  resources :features do
30
32
  member do
@@ -1,7 +1,14 @@
1
1
  name,status
2
+ Users,published
3
+ Roles,published
2
4
  Products,published
3
5
  Categories,published
4
6
  Brands,published
7
+ Stores,published
8
+ Suppliers,published
9
+ Countries,published
10
+ Regions,published
11
+ Exchange Rates,published
5
12
  Events & News,unpublished
6
13
  Subscriptions,deactivated
7
14
  Enquiries,unpublished
@@ -57,4 +57,21 @@ stephen.price,Subscriptions,FALSE,FALSE,FALSE,FALSE
57
57
  stephen.price,Enquiries,FALSE,FALSE,FALSE,FALSE
58
58
  stephen.price,Teams,FALSE,FALSE,FALSE,FALSE
59
59
  stephen.price,Testimonials,FALSE,FALSE,FALSE,FALSE
60
- stephen.price,Careers / Jobs,FALSE,FALSE,FALSE,FALSE
60
+ stephen.price,Careers / Jobs,FALSE,FALSE,FALSE,FALSE
61
+ ,,,,,
62
+ silk.smitha,Users,TRUE,TRUE,TRUE,TRUE
63
+ silk.smitha,Roles,TRUE,TRUE,TRUE,TRUE
64
+ silk.smitha,Products,TRUE,TRUE,TRUE,TRUE
65
+ silk.smitha,Categories,TRUE,TRUE,TRUE,TRUE
66
+ silk.smitha,Brands,TRUE,TRUE,TRUE,TRUE
67
+ silk.smitha,Stores,TRUE,TRUE,TRUE,TRUE
68
+ silk.smitha,Suppliers,TRUE,TRUE,TRUE,TRUE
69
+ silk.smitha,Countries,TRUE,TRUE,TRUE,TRUE
70
+ silk.smitha,Regions,TRUE,TRUE,TRUE,TRUE
71
+ silk.smitha,Exchange Rates,TRUE,TRUE,TRUE,TRUE
72
+ silk.smitha,Events & News,TRUE,TRUE,TRUE,TRUE
73
+ silk.smitha,Subscriptions,TRUE,TRUE,TRUE,TRUE
74
+ silk.smitha,Enquiries,TRUE,TRUE,TRUE,TRUE
75
+ silk.smitha,Teams,TRUE,TRUE,TRUE,TRUE
76
+ silk.smitha,Testimonials,TRUE,TRUE,TRUE,TRUE
77
+ silk.smitha,Careers / Jobs,TRUE,TRUE,TRUE,TRUE
@@ -0,0 +1,5 @@
1
+ name
2
+ Site Admin
3
+ Warehouse Manager
4
+ POS Sales Manager
5
+ POS Sales Staff
@@ -2,6 +2,10 @@ name,username,designation,email,phone,super_admin,status
2
2
  Krishna Prasad Varma,kpvarma,Site Admin,prasad@rightsolutions.io,,TRUE,approved
3
3
  Vinodh Ellath,vinodh,Site Admin,vinodh@rightsolutions.io,,TRUE,approved
4
4
  Junaid Ramzan,junaid.ramzan,Site Admin,junaid.ramzan@gmail.com,,TRUE,approved
5
- Angelo Joseph,angelo.joseph,Manager,angelo@yopmail.com,,FALSE,pending
6
- Guna,guna.neweast,IT Support,guna@yopmail.com,,FALSE,pending
7
- Stephen Price,stephen.price,Director,stephen.price@yopmail.com,,FALSE,suspended
5
+ Oleksandra,oleksandra,Merchandise Manager,oleksandra@yopmail.com,,FALSE,approved
6
+ Staff User 1,staff_user.1,IT Support,staff_user_1@yopmail.com,,FALSE,pending
7
+ Staff User 2,staff_user.2,Sales Girl,staff_user_2@yopmail.com,,FALSE,suspended
8
+ Stephen Price,stephen.price,General Manager,stephen.price@yopmail.com,,FALSE,approved
9
+ Angelo Joseph,angelo.joseph,General Manager,angelo.joseph@yopmail.com,,FALSE,approved
10
+ Gunashekharan,guna.neweast,IT Admin,guna.neweast@yopmail.com,,FALSE,approved
11
+ Silk Smitha,silk.smitha,QA Analyst,silk.smitha@yopmail.com,,FALSE,approved
@@ -1,7 +1,14 @@
1
1
  name,status
2
+ Users,published
3
+ Roles,published
2
4
  Products,published
3
5
  Categories,published
4
6
  Brands,published
7
+ Stores,published
8
+ Suppliers,published
9
+ Countries,published
10
+ Regions,published
11
+ Exchange Rates,published
5
12
  Events & News,unpublished
6
13
  Subscriptions,deactivated
7
14
  Enquiries,unpublished
@@ -1,30 +1 @@
1
- user,feature,can_create,can_read,can_update,can_delete
2
- kpvarma,Products,TRUE,TRUE,TRUE,TRUE
3
- kpvarma,Categories,TRUE,TRUE,TRUE,TRUE
4
- kpvarma,Brands,TRUE,TRUE,TRUE,TRUE
5
- kpvarma,Events & News,TRUE,TRUE,TRUE,TRUE
6
- kpvarma,Subscriptions,TRUE,TRUE,TRUE,TRUE
7
- kpvarma,Enquiries,TRUE,TRUE,TRUE,TRUE
8
- kpvarma,Teams,TRUE,TRUE,TRUE,TRUE
9
- kpvarma,Testimonials,TRUE,TRUE,TRUE,TRUE
10
- kpvarma,Careers / Jobs,TRUE,TRUE,TRUE,TRUE
11
- ,,,,,
12
- vinodh,Products,TRUE,TRUE,TRUE,TRUE
13
- vinodh,Categories,TRUE,TRUE,TRUE,TRUE
14
- vinodh,Brands,TRUE,TRUE,TRUE,TRUE
15
- vinodh,Events & News,TRUE,TRUE,TRUE,TRUE
16
- vinodh,Subscriptions,TRUE,TRUE,TRUE,TRUE
17
- vinodh,Enquiries,TRUE,TRUE,TRUE,TRUE
18
- vinodh,Teams,TRUE,TRUE,TRUE,TRUE
19
- vinodh,Testimonials,TRUE,TRUE,TRUE,TRUE
20
- vinodh,Careers / Jobs,TRUE,TRUE,TRUE,TRUE
21
- ,,,,,
22
- junaid.ramzan,Products,TRUE,TRUE,TRUE,TRUE
23
- junaid.ramzan,Categories,TRUE,TRUE,TRUE,TRUE
24
- junaid.ramzan,Brands,TRUE,TRUE,TRUE,TRUE
25
- junaid.ramzan,Events & News,TRUE,TRUE,TRUE,TRUE
26
- junaid.ramzan,Subscriptions,TRUE,TRUE,TRUE,TRUE
27
- junaid.ramzan,Enquiries,TRUE,TRUE,TRUE,TRUE
28
- junaid.ramzan,Teams,TRUE,TRUE,TRUE,TRUE
29
- junaid.ramzan,Testimonials,TRUE,TRUE,TRUE,TRUE
30
- junaid.ramzan,Careers / Jobs,TRUE,TRUE,TRUE,TRUE
1
+ user,feature,can_create,can_read,can_update,can_delete
@@ -0,0 +1,5 @@
1
+ name
2
+ Site Admin
3
+ Warehouse Manager
4
+ POS Sales Manager
5
+ POS Sales Staff
@@ -3,7 +3,7 @@ class CreateUsers < ActiveRecord::Migration[5.0]
3
3
  create_table(:users) do |t|
4
4
 
5
5
  ## First Name, Last Name and Username
6
- t.string :name, limit: 256
6
+ t.string :name
7
7
  t.string :username, :null => false, :limit=>32
8
8
  t.string :email, :null => false
9
9
  t.string :phone, :null => true, :limit=>24
@@ -2,7 +2,7 @@ class CreateFeatures < ActiveRecord::Migration[5.0]
2
2
 
3
3
  def change
4
4
  create_table(:features) do |t|
5
- t.string :name, limit: 256
5
+ t.string :name
6
6
  t.string :status, :null => false, :default=>"unpublished", :limit=>16
7
7
  t.timestamps
8
8
  end
@@ -2,7 +2,7 @@ class CreateRoles < ActiveRecord::Migration[5.0]
2
2
 
3
3
  def change
4
4
  create_table(:roles) do |t|
5
- t.string :name, limit: 256
5
+ t.string :name
6
6
  t.timestamps
7
7
  end
8
8
 
@@ -0,0 +1,17 @@
1
+ class CreateOtpRegistrations < ActiveRecord::Migration[5.1]
2
+ def change
3
+ create_table :otp_registrations do |t|
4
+
5
+ t.references :user, index: true
6
+ t.references :country, index: true
7
+
8
+ t.string :mobile_number
9
+
10
+ t.integer :otp
11
+ t.datetime :otp_sent_at
12
+ t.string :status, :null => false, :default=>"pending", :limit=>16
13
+
14
+ t.timestamps
15
+ end
16
+ end
17
+ end
@@ -2,48 +2,72 @@ require 'csv'
2
2
  require 'open-uri'
3
3
  require 'time'
4
4
 
5
- RAILS_ENV = ENV["RAILS_ENV"] || "development"
6
-
7
5
  namespace 'usman' do
8
6
  namespace 'import' do
9
7
 
10
8
  desc "Import all data in sequence"
11
9
  task 'all' => :environment do
12
10
 
13
- import_list = ["users", "features", "permissions"]
11
+ import_list = ["users", "features", "permissions", "roles"]
14
12
 
15
13
  import_list.each do |item|
16
- puts ""
17
- puts "Importing #{item.titleize}".yellow
14
+ print "Importing #{item.titleize} \t".yellow
18
15
  begin
19
16
  Rake::Task["usman:import:#{item}"].invoke
17
+ rescue ArgumentError => e
18
+ puts "Loading #{item} - Failed - #{e.message}".red
20
19
  rescue Exception => e
21
20
  puts "Importing #{item.titleize} - Failed - #{e.message}".red
22
21
  puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
23
22
  end
24
23
  end
24
+ puts " "
25
+ end
25
26
 
27
+ ["Feature", "User", "Role", "Permission"].each do |cls_name|
28
+ name = cls_name.underscore.pluralize
29
+ desc "Import #{cls_name.pluralize}"
30
+ task name => :environment do
31
+ verbose = true
32
+ verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
33
+ path = ENV['path']
34
+ cls_name.constantize.import_data(Usman::Engine, path, false, verbose)
35
+ end
26
36
  end
27
37
 
28
38
  namespace 'dummy' do
39
+
29
40
  desc "Import all dummy data in sequence"
30
41
  task 'all' => :environment do
31
42
 
32
- import_list = ["dummy:users", "dummy:features", "dummy:permissions"]
43
+ import_list = ["dummy:users", "dummy:features", "dummy:permissions", "dummy:roles"]
33
44
 
34
45
  import_list.each do |item|
35
- puts ""
36
- puts "Importing #{item}".yellow
46
+ print "Loading #{item.split(':').last.titleize} \t".yellow
37
47
  begin
38
48
  Rake::Task["usman:import:#{item}"].invoke
49
+ rescue ArgumentError => e
50
+ puts "Loading #{item} - Failed - #{e.message}".red
39
51
  rescue Exception => e
40
- puts "Importing #{item} - Failed - #{e.message}".red
52
+ puts "Loading #{item} - Failed - #{e.message}".red
41
53
  puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
42
54
  end
43
55
  end
56
+ puts " "
57
+ end
44
58
 
59
+ ["Feature", "User", "Role", "Permission"].each do |cls_name|
60
+ name = cls_name.underscore.pluralize
61
+ desc "Load Dummy #{cls_name.pluralize}"
62
+ task name => :environment do
63
+ verbose = true
64
+ verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
65
+ cls_name.constantize.import_data(Usman::Engine, nil, true, verbose)
66
+ end
45
67
  end
68
+
46
69
  end
47
70
 
48
71
  end
49
- end
72
+ end
73
+
@@ -2,25 +2,22 @@ require 'csv'
2
2
  require 'open-uri'
3
3
  require 'time'
4
4
 
5
- RAILS_ENV = ENV["RAILS_ENV"] || "development" unless defined?(RAILS_ENV)
6
-
7
5
  namespace 'usman' do
8
6
  namespace 'import' do
9
7
  desc "Import Features"
10
8
  task 'features' => :environment do
11
9
  verbose = true
12
10
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
13
- Feature.import_from_csv(false, verbose)
11
+ path = ENV['path']
12
+ Feature.import_data(Usman::Engine, path, false, verbose)
14
13
  end
15
14
  namespace 'dummy' do
16
15
  desc "Load Dummy Features"
17
16
  task 'features' => :environment do
18
- path = "db/import_data/dummy/features.csv"
19
17
  verbose = true
20
18
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
21
- Feature.import_from_csv(true, verbose)
19
+ Feature.import_data(Usman::Engine, nil, true, verbose)
22
20
  end
23
21
  end
24
22
  end
25
-
26
23
  end
@@ -2,23 +2,21 @@ require 'csv'
2
2
  require 'open-uri'
3
3
  require 'time'
4
4
 
5
- RAILS_ENV = ENV["RAILS_ENV"] || "development" unless defined?(RAILS_ENV)
6
-
7
5
  namespace 'usman' do
8
6
  namespace 'import' do
9
7
  desc "Import Permissions"
10
8
  task 'permissions' => :environment do
11
9
  verbose = true
12
10
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
13
- Permission.import_from_csv(false, verbose)
11
+ path = ENV['path']
12
+ Permission.import_data(Usman::Engine, path, false, verbose)
14
13
  end
15
14
  namespace 'dummy' do
16
15
  desc "Load Dummy Permissions"
17
16
  task 'permissions' => :environment do
18
- path = "db/import_data/dummy/permissions.csv"
19
17
  verbose = true
20
18
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
21
- Permission.import_from_csv(true, verbose)
19
+ Permission.import_data(Usman::Engine, nil, true, verbose)
22
20
  end
23
21
  end
24
22
  end
@@ -0,0 +1,24 @@
1
+ require 'csv'
2
+ require 'open-uri'
3
+ require 'time'
4
+
5
+ namespace 'usman' do
6
+ namespace 'import' do
7
+ desc "Import Roles"
8
+ task 'roles' => :environment do
9
+ verbose = true
10
+ verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
11
+ path = ENV['path']
12
+ Role.import_data(Usman::Engine, path, false, verbose)
13
+ end
14
+ namespace 'dummy' do
15
+ desc "Load Dummy Roles"
16
+ task 'roles' => :environment do
17
+ verbose = true
18
+ verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
19
+ Role.import_data(Usman::Engine, nil, true, verbose)
20
+ end
21
+ end
22
+ end
23
+
24
+ end
@@ -2,23 +2,21 @@ require 'csv'
2
2
  require 'open-uri'
3
3
  require 'time'
4
4
 
5
- RAILS_ENV = ENV["RAILS_ENV"] || "development" unless defined?(RAILS_ENV)
6
-
7
5
  namespace 'usman' do
8
6
  namespace 'import' do
9
7
  desc "Import Users"
10
8
  task 'users' => :environment do
11
9
  verbose = true
12
10
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
13
- User.import_from_csv(false, verbose)
11
+ path = ENV['path']
12
+ User.import_data(Usman::Engine, path, false, verbose)
14
13
  end
15
14
  namespace 'dummy' do
16
15
  desc "Load Dummy Users"
17
16
  task 'users' => :environment do
18
- path = "db/import_data/dummy/users.csv"
19
17
  verbose = true
20
18
  verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
21
- User.import_from_csv(true, verbose)
19
+ User.import_data(Usman::Engine, nil, true, verbose)
22
20
  end
23
21
  end
24
22
  end
data/lib/usman/engine.rb CHANGED
@@ -5,15 +5,14 @@ module Usman
5
5
  require 'kuppayam'
6
6
  require 'colorize'
7
7
  require 'colorized_string'
8
+ require 'pry'
8
9
 
9
10
  isolate_namespace Usman
10
11
 
11
- config.autoload_paths << File.expand_path("../extras", __FILE__)
12
-
13
12
  config.before_initialize do
14
13
  config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
15
14
  end
16
-
15
+
17
16
  config.generators do |g|
18
17
  g.test_framework :rspec, :fixture => false
19
18
  g.fixture_replacement :factory_girl, :dir => 'spec/dummy/spec/factories'
data/lib/usman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Usman
2
- VERSION = '0.1.5'
2
+ VERSION = '0.1.6dev2'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usman
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6dev2
5
5
  platform: ruby
6
6
  authors:
7
7
  - kpvarma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-31 00:00:00.000000000 Z
11
+ date: 2017-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -90,42 +90,42 @@ dependencies:
90
90
  requirements:
91
91
  - - "~>"
92
92
  - !ruby/object:Gem::Version
93
- version: 0.1.5
93
+ version: 0.1.5dev4
94
94
  type: :runtime
95
95
  prerelease: false
96
96
  version_requirements: !ruby/object:Gem::Requirement
97
97
  requirements:
98
98
  - - "~>"
99
99
  - !ruby/object:Gem::Version
100
- version: 0.1.5
100
+ version: 0.1.5dev4
101
101
  - !ruby/object:Gem::Dependency
102
102
  name: bcrypt
103
103
  requirement: !ruby/object:Gem::Requirement
104
104
  requirements:
105
- - - ">="
105
+ - - "~>"
106
106
  - !ruby/object:Gem::Version
107
- version: '0'
107
+ version: '3.0'
108
108
  type: :runtime
109
109
  prerelease: false
110
110
  version_requirements: !ruby/object:Gem::Requirement
111
111
  requirements:
112
- - - ">="
112
+ - - "~>"
113
113
  - !ruby/object:Gem::Version
114
- version: '0'
114
+ version: '3.0'
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: colorize
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
- - - ">="
119
+ - - "~>"
120
120
  - !ruby/object:Gem::Version
121
- version: '0'
121
+ version: '0.8'
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
- - - ">="
126
+ - - "~>"
127
127
  - !ruby/object:Gem::Version
128
- version: '0'
128
+ version: '0.8'
129
129
  - !ruby/object:Gem::Dependency
130
130
  name: pry
131
131
  requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,7 @@ files:
306
306
  - app/controllers/usman/admin/permissions_controller.rb
307
307
  - app/controllers/usman/admin/resource_controller.rb
308
308
  - app/controllers/usman/admin/roles_controller.rb
309
+ - app/controllers/usman/admin/user_roles_controller.rb
309
310
  - app/controllers/usman/admin/users_controller.rb
310
311
  - app/controllers/usman/application_controller.rb
311
312
  - app/controllers/usman/sessions_controller.rb
@@ -329,39 +330,25 @@ files:
329
330
  - app/views/layouts/kuppayam/_navbar.html.erb
330
331
  - app/views/layouts/kuppayam/_sidebar.html.erb
331
332
  - app/views/usman/admin/dashboard/index.html.erb
332
- - app/views/usman/admin/features/_action_buttons.html.erb
333
333
  - app/views/usman/admin/features/_form.html.erb
334
334
  - app/views/usman/admin/features/_index.html.erb
335
335
  - app/views/usman/admin/features/_row.html.erb
336
336
  - app/views/usman/admin/features/_show.html.erb
337
337
  - app/views/usman/admin/features/index.html.erb
338
- - app/views/usman/admin/features/temp/create.js.erb
339
- - app/views/usman/admin/features/temp/destroy.js.erb
340
- - app/views/usman/admin/features/temp/edit.js.erb
341
- - app/views/usman/admin/features/temp/index.js.erb
342
- - app/views/usman/admin/features/temp/new.js.erb
343
- - app/views/usman/admin/features/temp/row.js.erb
344
- - app/views/usman/admin/features/temp/show.js.erb
345
- - app/views/usman/admin/features/temp/update.js.erb
346
338
  - app/views/usman/admin/permissions/_action_buttons.html.erb
347
339
  - app/views/usman/admin/permissions/_form.html.erb
348
340
  - app/views/usman/admin/permissions/_index.html.erb
349
341
  - app/views/usman/admin/permissions/_row.html.erb
350
342
  - app/views/usman/admin/permissions/_show.html.erb
351
343
  - app/views/usman/admin/permissions/index.html.erb
352
- - app/views/usman/admin/permissions/temp/create.js.erb
353
- - app/views/usman/admin/permissions/temp/destroy.js.erb
354
- - app/views/usman/admin/permissions/temp/edit.js.erb
355
- - app/views/usman/admin/permissions/temp/index.js.erb
356
- - app/views/usman/admin/permissions/temp/new.js.erb
357
- - app/views/usman/admin/permissions/temp/row.js.erb
358
- - app/views/usman/admin/permissions/temp/show.js.erb
359
- - app/views/usman/admin/permissions/temp/update.js.erb
360
344
  - app/views/usman/admin/roles/_form.html.erb
361
345
  - app/views/usman/admin/roles/_index.html.erb
362
346
  - app/views/usman/admin/roles/_row.html.erb
363
347
  - app/views/usman/admin/roles/_show.html.erb
364
348
  - app/views/usman/admin/roles/index.html.erb
349
+ - app/views/usman/admin/user_roles/_form.html.erb
350
+ - app/views/usman/admin/user_roles/_index.html.erb
351
+ - app/views/usman/admin/user_roles/_row.html.erb
365
352
  - app/views/usman/admin/users/_form.html.erb
366
353
  - app/views/usman/admin/users/_index.html.erb
367
354
  - app/views/usman/admin/users/_row.html.erb
@@ -370,33 +357,29 @@ files:
370
357
  - app/views/usman/sessions/_form.html.erb
371
358
  - app/views/usman/sessions/_sign_in.js.erb
372
359
  - app/views/usman/sessions/sign_in.html.erb
360
+ - config/initializers/overide_kuppayam_controllers.rb
373
361
  - config/locales/kuppayam/authentication.ar.yml
374
362
  - config/locales/kuppayam/authentication.en.yml
375
363
  - config/routes.rb
376
364
  - db/import_data/dummy/features.csv
377
- - db/import_data/dummy/images/users/guna.neweast.png
378
- - db/import_data/dummy/images/users/junaid.ramzan.jpg
379
- - db/import_data/dummy/images/users/kpvarma.png
380
- - db/import_data/dummy/images/users/stephen.price.png
381
- - db/import_data/dummy/images/users/vinodh.jpg
382
365
  - db/import_data/dummy/permissions.csv
366
+ - db/import_data/dummy/roles.csv
383
367
  - db/import_data/dummy/users.csv
384
368
  - db/import_data/features.csv
385
- - db/import_data/images/users/junaid.ramzan.jpg
386
- - db/import_data/images/users/kpvarma.png
387
- - db/import_data/images/users/vinodh.jpg
388
369
  - db/import_data/permissions.csv
370
+ - db/import_data/roles.csv
389
371
  - db/import_data/users.csv
390
372
  - db/migrate/20170000000100_create_users.rb
391
373
  - db/migrate/20170000000101_create_features.rb
392
374
  - db/migrate/20170000000102_create_roles.rb
375
+ - db/migrate/20170728095744_create_otp_registrations.rb
393
376
  - lib/tasks/usman/all.rake
394
- - lib/tasks/usman/features.rake
395
- - lib/tasks/usman/permissions.rake
396
- - lib/tasks/usman/users.rake
377
+ - lib/temp/features.rake
378
+ - lib/temp/permissions.rake
379
+ - lib/temp/roles.rake
380
+ - lib/temp/users.rake
397
381
  - lib/usman.rb
398
382
  - lib/usman/engine.rb
399
- - lib/usman/extras/import_error_handler.rb
400
383
  - lib/usman/version.rb
401
384
  homepage: https://github.com/right-solutions/usman
402
385
  licenses:
@@ -413,14 +396,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
413
396
  version: '0'
414
397
  required_rubygems_version: !ruby/object:Gem::Requirement
415
398
  requirements:
416
- - - ">="
399
+ - - ">"
417
400
  - !ruby/object:Gem::Version
418
- version: '0'
401
+ version: 1.3.1
419
402
  requirements: []
420
403
  rubyforge_project:
421
- rubygems_version: 2.5.1
404
+ rubygems_version: 2.6.11
422
405
  signing_key:
423
406
  specification_version: 4
424
407
  summary: Simple User & Feature Permission Management
425
408
  test_files: []
426
- has_rdoc:
@@ -1,29 +0,0 @@
1
- <% if @feature.errors.blank? %>
2
-
3
- // Inserting the row on top of the table and highlighting it
4
- $('#tr_feature_index table > tbody > tr:first').before("<%= escape_javascript(render(:partial=>'/usman/admin/features/row', locals: {feature: @feature})) %>")
5
- $("#tr_feature_<%= @feature.id %>").css("background-color", "#fffddd");
6
-
7
- // Showing the saved data in the modal
8
- var heading = "<%= raw @feature.name %>";
9
- var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/show')) %>";
10
- showLargeModal(heading, bodyContent, false);
11
-
12
- // Showing Growl Like Message
13
- notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
14
-
15
- <% else %>
16
-
17
- // Reload the form with errors
18
- var heading = "Add a User";
19
- var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
20
- showLargeModal(heading, bodyContent);
21
-
22
- // Show Main Error Message on the form
23
- <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
24
- $("#feature_form_error").html("<%= escape_javascript(error_message) %>");
25
-
26
- // Showing Growl Like Message
27
- notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
28
-
29
- <% end %>
@@ -1,16 +0,0 @@
1
- <% if @destroyed %>
2
- closeGenericModal();
3
- $('#div_feature_index').html("<%= escape_javascript(render(:partial=>'/usman/admin/features/index')) %>");
4
- <% else %>
5
- // Show the error in a modal
6
- <%
7
- text = Feature::DELETE_MESSAGE
8
- error_message = content_tag(:div, text, class: 'alert alert-danger')
9
- %>
10
- heading = "Remove '<%= @feature.name %>'";
11
- bodyContent = "<%= escape_javascript(error_message) %>";
12
- showGenericModal(heading, bodyContent);
13
- var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');
14
- <% end %>
15
-
16
-
@@ -1,7 +0,0 @@
1
- // Show the new form in the right box.
2
- heading = "Edit '<%= raw @feature.name_was %>'";
3
- bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
4
- showGenericModal(heading, bodyContent);
5
-
6
- // When the image upload form is submitted, the server response will appear in this iframe -->
7
- var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');
@@ -1,8 +0,0 @@
1
- closeGenericModal();
2
- <% if @features.any? %>
3
- // Fill the right box with first enquiry details in the list
4
- $('#div_feature_index').html("<%= escape_javascript(render(:partial=>'/usman/admin/features/index')) %>");
5
- <% else %>
6
- var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
7
- $('#div_feature_index').html(noResultsText);
8
- <% end %>
@@ -1,7 +0,0 @@
1
- // Show the new form in the right box.
2
- heading = "Add a Feature";
3
- bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
4
- showGenericModal(heading, bodyContent);
5
-
6
- // When the image upload form is submitted, the server response will appear in this iframe -->
7
- var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');