phcdevworks_accounts 1.13.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/phcdevworks_accounts/{account/dashboard.coffee → admin/pages.coffee} +0 -0
  3. data/app/assets/javascripts/phcdevworks_accounts/{admin/accounts.coffee → user/pages.coffee} +0 -0
  4. data/app/assets/stylesheets/phcdevworks_accounts/admin/{accounts.scss → pages.scss} +1 -1
  5. data/app/assets/stylesheets/phcdevworks_accounts/{account/dashboard.scss → user/pages.scss} +1 -1
  6. data/app/controllers/phcdevworks_accounts/admin/pages_controller.rb +25 -0
  7. data/app/controllers/phcdevworks_accounts/application_controller.rb +17 -17
  8. data/app/controllers/phcdevworks_accounts/user/pages_controller.rb +15 -0
  9. data/app/helpers/phcdevworks_accounts/admin/{accounts_helper.rb → pages_helper.rb} +1 -1
  10. data/app/helpers/phcdevworks_accounts/application_helper.rb +2 -2
  11. data/app/helpers/phcdevworks_accounts/{account/dashboard_helper.rb → user/pages_helper.rb} +1 -1
  12. data/app/views/layouts/phcdevworks_accounts/components/backend/footer/_footer.html.erb +1 -2
  13. data/app/views/layouts/phcdevworks_accounts/components/backend/navigation/_top_menu.html.erb +1 -1
  14. data/app/views/layouts/phcdevworks_accounts/components/backend/sidebars/_side_menu.html.erb +55 -33
  15. data/app/views/phcdevworks_accounts/{account/dashboard/index.html.erb → admin/pages/dashboard.html.erb} +0 -0
  16. data/app/views/phcdevworks_accounts/admin/pages/user_id.html.erb +2 -0
  17. data/app/views/phcdevworks_accounts/admin/pages/users_list.html.erb +4 -0
  18. data/app/views/phcdevworks_accounts/{admin/accounts/index.html.erb → user/pages/profile.html.erb} +0 -0
  19. data/app/views/users/confirmations/new.html.erb +1 -1
  20. data/app/views/users/passwords/edit.html.erb +1 -1
  21. data/app/views/users/passwords/new.html.erb +1 -1
  22. data/app/views/users/registrations/edit.html.erb +1 -1
  23. data/app/views/users/registrations/new.html.erb +1 -1
  24. data/app/views/users/sessions/new.html.erb +1 -1
  25. data/app/views/users/unlocks/new.html.erb +1 -1
  26. data/config/routes.rb +9 -5
  27. data/db/migrate/20191012042035_devise_create_phcdevworks_accounts_users.rb +17 -15
  28. data/lib/phcdevworks_accounts/version.rb +1 -1
  29. metadata +42 -39
  30. data/app/controllers/phcdevworks_accounts/account/dashboard_controller.rb +0 -11
  31. data/app/controllers/phcdevworks_accounts/admin/accounts_controller.rb +0 -15
  32. data/app/views/phcdevworks_accounts/admin/accounts/users_index.html.erb +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a6b80136ffb11be0e9e84289d74211150f9d8c8751a86473bc380346e0435f77
4
- data.tar.gz: 2d73c8bb09703588489c40d1f945e26776c425cddb2e3c986370cd1fdef16fb5
3
+ metadata.gz: d92e06856f84fc051f6130132aba04d57e44b2bcfe2bf46f7f749c2fb7e98ba8
4
+ data.tar.gz: dcbfbf053d98940f04a8f98176983fff658707f501afd537b8a9652b6f26b140
5
5
  SHA512:
6
- metadata.gz: 2bb474f8f9c921db2613f6bbf79158bdb1288924bd3945323d6f43b8d2a8db99bee148640c5ccb2ca8501423f9e13542f5556819ec097422ae2fba3689f10fb4
7
- data.tar.gz: fe6b12a814cbc4a13252e9b2b2bfdb90b10e6e6b3c860de57afecbe13ece81e8b6bc152604da90c8eaddde4dba9bc87428df718037e6ed005e85488af3dfc59d
6
+ metadata.gz: 56e13396a39a216ca777a816ac7d2eb1ebcf592d22f01e43ef534ed7d9342d75783db07384c9dbaadd6e5027eb8792f9a928bb04ca520afe30b9bf0e127ad255
7
+ data.tar.gz: 5f609afd6f4d1f10a37a80544e198e81e09879e9b6ac09cc0cb27aab5aff23c75df58f26c2db0175341346925c115942f07339ce80583065f725b827f835b51b
@@ -1,3 +1,3 @@
1
- // Place all the styles related to the admin/accounts controller here.
1
+ // Place all the styles related to the admin/pages controller here.
2
2
  // They will automatically be included in application.css.
3
3
  // You can use Sass (SCSS) here: https://sass-lang.com/
@@ -1,3 +1,3 @@
1
- // Place all the styles related to the account/dashboard controller here.
1
+ // Place all the styles related to the user/pages controller here.
2
2
  // They will automatically be included in application.css.
3
3
  // You can use Sass (SCSS) here: https://sass-lang.com/
@@ -0,0 +1,25 @@
1
+ require_dependency "phcdevworks_accounts/application_controller"
2
+
3
+ module PhcdevworksAccounts
4
+ class Admin::PagesController < ApplicationController
5
+
6
+ # Filters
7
+ include PhcdevworksCore::PhcdevworksPluginsHelper
8
+ before_action :phcdevworks_accounts_admin_only
9
+
10
+
11
+ # Account Admin
12
+ def dashboard
13
+ end
14
+
15
+ # User Admin
16
+ def users_list
17
+ @admin_users = User.all
18
+ end
19
+
20
+ def user_id
21
+ @admin_user = User.find_by_id(params[:id])
22
+ end
23
+
24
+ end
25
+ end
@@ -1,25 +1,25 @@
1
1
  module PhcdevworksAccounts
2
- class ApplicationController < ActionController::Base
2
+ class ApplicationController < ActionController::Base
3
+
4
+ # Devise Filter
5
+ before_action :phcdevworks_accounts_permitted_parameters, if: :devise_controller?
3
6
 
4
- # Devise Filter
5
- before_action :phcdevworks_accounts_permitted_parameters, if: :devise_controller?
7
+ # Security Filters
8
+ protect_from_forgery with: :exception
6
9
 
7
- # Security Filters
8
- protect_from_forgery with: :exception
10
+ # Load Requried Helper Files
11
+ helper PhcdevworksActiveMenus::Engine.helpers
12
+ helper PhcdevworksNotifications::Engine.helpers
13
+ helper PhcdevworksTitleseo::Engine.helpers
9
14
 
10
- # Load Requried Helper Files
11
- helper PhcdevworksActiveMenus::Engine.helpers
12
- helper PhcdevworksNotifications::Engine.helpers
13
- helper PhcdevworksTitleseo::Engine.helpers
15
+ private
14
16
 
15
- private
17
+ # Whitelist Additional Fields
18
+ def phcdevworks_accounts_permitted_parameters
19
+ added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :password, :password_confirmation, :remember_me]
20
+ devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
21
+ devise_parameter_sanitizer.permit :account_update, keys: added_attrs
22
+ end
16
23
 
17
- # Whitelist Additional Fields
18
- def phcdevworks_accounts_permitted_parameters
19
- added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :password, :password_confirmation, :remember_me]
20
- devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
21
- devise_parameter_sanitizer.permit :account_update, keys: added_attrs
22
24
  end
23
-
24
- end
25
25
  end
@@ -0,0 +1,15 @@
1
+ require_dependency "phcdevworks_accounts/application_controller"
2
+
3
+ module PhcdevworksAccounts
4
+ class User::PagesController < ApplicationController
5
+
6
+ # Security Filters
7
+ before_action :authenticate_user!
8
+
9
+ # Pages - User
10
+ def profile
11
+ @user_profile = User.find_by_id(params[:id])
12
+ end
13
+
14
+ end
15
+ end
@@ -1,4 +1,4 @@
1
1
  module PhcdevworksAccounts
2
- module Admin::AccountsHelper
2
+ module Admin::PagesHelper
3
3
  end
4
4
  end
@@ -1,4 +1,4 @@
1
1
  module PhcdevworksAccounts
2
- module ApplicationHelper
3
- end
2
+ module ApplicationHelper
3
+ end
4
4
  end
@@ -1,4 +1,4 @@
1
1
  module PhcdevworksAccounts
2
- module Account::DashboardHelper
2
+ module User::PagesHelper
3
3
  end
4
4
  end
@@ -2,8 +2,7 @@
2
2
  <span>
3
3
  <!-- -PHC- Footer Content - Left - Time in Production -->
4
4
  <i class="fab fa-osi font-weight-bolder"></i> 2012-<%= Time.now.year %> -
5
- <span class="font-weight-bold">PHC</span>Devworks Accounts -
6
- Engine v<%= Gem.loaded_specs["phcdevworks_accounts"].version.to_s %>
5
+ <span class="font-weight-bold">PHC</span>Devworks Accounts - Engine v<%= Gem.loaded_specs["phcdevworks_accounts"].version.to_s %>
7
6
  <!-- -PHC- Footer Content - Left - Time in Production -->
8
7
  </span>
9
8
  <!-- -PHC- Footer Content - Left -->
@@ -37,4 +37,4 @@
37
37
 
38
38
  </ul>
39
39
  <% end %>
40
- <!-- -PHC- Topbar - Navigation Main -->
40
+ <!-- -PHC- Topbar - Navigation Main -->
@@ -25,7 +25,7 @@
25
25
  <% end %>
26
26
  </li>
27
27
  <li>
28
- <%= link_to phcdevworks_accounts.destroy_user_session_path do %>
28
+ <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete do %>
29
29
  <i class="fad fa-sign-out-alt"></i> Logout
30
30
  <% end %>
31
31
  </li>
@@ -45,18 +45,40 @@
45
45
  <a href="javascript:;">
46
46
  <b class="caret"></b>
47
47
  <i class="fad fa-newspaper"></i>
48
- <span>Article Posts</span>
48
+ <span>Blog Articles</span>
49
49
  </a>
50
50
  <ul class="sub-menu">
51
51
  <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts") %>"><%= link_to("Article Index", phcdevworks_press.article_posts_path) %></li>
52
- <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("New Aritcle", phcdevworks_press.new_article_post_path) %></li>
52
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("Add a New Aritcle", phcdevworks_press.new_article_post_path) %></li>
53
+ </ul>
54
+ </li>
55
+ <li class="has-sub">
56
+ <a href="javascript:;">
57
+ <b class="caret"></b>
58
+ <i class="fad fa-star-half"></i>
59
+ <span>Review Articles</span>
60
+ </a>
61
+ <ul class="sub-menu">
62
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts") %>"><%= link_to("Reviews Index", phcdevworks_press.review_posts_path) %></li>
63
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/review/posts#new") %>"><%= link_to("Add a New Review", phcdevworks_press.new_review_post_path) %></li>
64
+ </ul>
65
+ </li>
66
+ <li class="has-sub">
67
+ <a href="javascript:;">
68
+ <b class="caret"></b>
69
+ <i class="fad fa-th-list"></i>
70
+ <span>List Articles</span>
71
+ </a>
72
+ <ul class="sub-menu">
73
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts") %>"><%= link_to("Lists Index", phcdevworks_press.list_posts_path) %></li>
74
+ <li class="<%= phc_menu_active_controller("phcdevworks_press/list/posts#new") %>"><%= link_to("Add a New List", phcdevworks_press.new_list_post_path) %></li>
53
75
  </ul>
54
76
  </li>
55
77
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
56
78
  <% end %>
57
79
 
58
80
  <% if defined?phcdevworks_portfolio %>
59
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
81
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
60
82
  <li class="nav-header">Portfolio</li>
61
83
  <li class="has-sub">
62
84
  <a href="javascript:;">
@@ -80,7 +102,7 @@
80
102
  <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Types", phcdevworks_portfolio.new_project_type_path) %></li>
81
103
  </ul>
82
104
  </li>
83
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
105
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Portfolio -->
84
106
  <% end %>
85
107
 
86
108
  <% if defined?phcdevworks_tutorials %>
@@ -112,34 +134,6 @@
112
134
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
113
135
  <% end %>
114
136
 
115
- <% if defined?phcdevworks_core_modules %>
116
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
117
- <li class="nav-header">Core Modules</li>
118
- <li class="has-sub">
119
- <a href="javascript:;">
120
- <b class="caret"></b>
121
- <i class="fad fa-sitemap"></i>
122
- <span>Categories</span>
123
- </a>
124
- <ul class="sub-menu">
125
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
126
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
127
- </ul>
128
- </li>
129
- <li class="has-sub">
130
- <a href="javascript:;">
131
- <b class="caret"></b>
132
- <i class="fad fa-analytics"></i>
133
- <span>Marketing</span>
134
- </a>
135
- <ul class="sub-menu">
136
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
137
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
138
- </ul>
139
- </li>
140
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
141
- <% end %>
142
-
143
137
  <% if defined?phcdevworks_members %>
144
138
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
145
139
  <li class="nav-header">Membership Manager</li>
@@ -238,6 +232,34 @@
238
232
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
239
233
  <% end %>
240
234
 
235
+ <% if defined?phcdevworks_core_modules %>
236
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
237
+ <li class="nav-header">Core Modules</li>
238
+ <li class="has-sub">
239
+ <a href="javascript:;">
240
+ <b class="caret"></b>
241
+ <i class="fad fa-sitemap"></i>
242
+ <span>Categories</span>
243
+ </a>
244
+ <ul class="sub-menu">
245
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
246
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
247
+ </ul>
248
+ </li>
249
+ <li class="has-sub">
250
+ <a href="javascript:;">
251
+ <b class="caret"></b>
252
+ <i class="fad fa-analytics"></i>
253
+ <span>Marketing</span>
254
+ </a>
255
+ <ul class="sub-menu">
256
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
257
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
258
+ </ul>
259
+ </li>
260
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
261
+ <% end %>
262
+
241
263
  <% if current_user && current_user.admin? %>
242
264
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
243
265
  <li class="nav-header">User Administration</li>
@@ -0,0 +1,2 @@
1
+ <h1><%= @admin_user.username %></h1>
2
+ <h5><%= @admin_user.email%></h5>
@@ -0,0 +1,4 @@
1
+ <% @admin_users.each do |user| %>
2
+ <%= user.username %><br/>
3
+ <%= user.email %><br/>
4
+ <% end %>
@@ -36,7 +36,7 @@
36
36
  <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |form| %>
37
37
 
38
38
  <!-- Devise Error Message -->
39
- <%= devise_error_messages! %>
39
+ <%= render "devise/shared/error_messages", resource: resource %>
40
40
  <!-- Devise Error Message -->
41
41
 
42
42
  <div class="form-group">
@@ -36,7 +36,7 @@
36
36
  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |form| %>
37
37
 
38
38
  <!-- Devise Error Message -->
39
- <%= devise_error_messages! %>
39
+ <%= render "devise/shared/error_messages", resource: resource %>
40
40
  <!-- Devise Error Message -->
41
41
 
42
42
  <!-- Reset Password Token -->
@@ -36,7 +36,7 @@
36
36
  <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |form| %>
37
37
 
38
38
  <!-- Devise Error Message -->
39
- <%= devise_error_messages! %>
39
+ <%= render "devise/shared/error_messages", resource: resource %>
40
40
  <!-- Devise Error Message -->
41
41
 
42
42
  <div class="form-group">
@@ -38,7 +38,7 @@
38
38
  <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |form| %>
39
39
 
40
40
  <!-- Devise Error Message -->
41
- <%= devise_error_messages! %>
41
+ <%= render "devise/shared/error_messages", resource: resource %>
42
42
  <!-- Devise Error Message -->
43
43
 
44
44
  <div class="form-group">
@@ -34,7 +34,7 @@
34
34
  <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |form| %>
35
35
 
36
36
  <!-- Devise Error Message -->
37
- <%= devise_error_messages! %>
37
+ <%= render "devise/shared/error_messages", resource: resource %>
38
38
  <!-- Devise Error Message -->
39
39
 
40
40
  <label class="control-label">Name <span class="text-danger">*</span></label>
@@ -35,7 +35,7 @@
35
35
 
36
36
  <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |form| %>
37
37
 
38
- <%= devise_error_messages! %>
38
+ <%= render "devise/shared/error_messages", resource: resource %>
39
39
 
40
40
  <div class="form-group m-b-15">
41
41
  <%= form.email_field :email, autofocus: true, autocomplete: "email", placeholder: "Email", class: "form-control form-control-lg" %>
@@ -38,7 +38,7 @@
38
38
 
39
39
  <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |form| %>
40
40
 
41
- <%= devise_error_messages! %>
41
+ <%= render "devise/shared/error_messages", resource: resource %>
42
42
 
43
43
  <div class="form-group">
44
44
  <%= form.label :email %>
@@ -3,15 +3,19 @@ PhcdevworksAccounts::Engine.routes.draw do
3
3
  # User Routes
4
4
  devise_for :users, {
5
5
  class_name: "PhcdevworksAccounts::User",
6
- module: :devise,
7
- controllers: { registrations: "users/registrations"}
6
+ module: :devise
8
7
  }
9
8
 
10
9
  # User Dashboard
11
- get 'dashboard', to: 'accounts/dashboard#index'
10
+ match "user/profile", to: "user/pages#profile", via: "get"
12
11
 
13
12
  # Admin Routes
14
- get "admin_dashboard", to: "admin/accounts#index"
15
- get "admin_users_index", to: "admin/accounts#users_index"
13
+ match "/admin", to: "admin/pages#dashboard", via: "get"
14
+ match "/admin/users/all", to: "admin/pages#users_list", via: "get"
15
+ match "/admin/user/:id", to: "admin/pages#user_id", via: "get"
16
+
17
+ # Old Path Support (Will be Depricated)
18
+ get "dashboard", to: "user/pages#profile"
19
+ get "admin_users_index", to: "admin/pages#dashboard"
16
20
 
17
21
  end
@@ -3,6 +3,7 @@
3
3
  class DeviseCreatePhcdevworksAccountsUsers < ActiveRecord::Migration[6.0]
4
4
  def change
5
5
  create_table :phcdevworks_accounts_users do |t|
6
+
6
7
  ## Database authenticatable
7
8
  t.string :email, null: false, default: ""
8
9
  t.string :encrypted_password, null: false, default: ""
@@ -15,30 +16,31 @@ class DeviseCreatePhcdevworksAccountsUsers < ActiveRecord::Migration[6.0]
15
16
  t.datetime :remember_created_at
16
17
 
17
18
  ## Trackable
18
- # t.integer :sign_in_count, default: 0, null: false
19
- # t.datetime :current_sign_in_at
20
- # t.datetime :last_sign_in_at
21
- # t.string :current_sign_in_ip
22
- # t.string :last_sign_in_ip
19
+ t.integer :sign_in_count, default: 0, null: false
20
+ t.datetime :current_sign_in_at
21
+ t.datetime :last_sign_in_at
22
+ t.string :current_sign_in_ip
23
+ t.string :last_sign_in_ip
23
24
 
24
25
  ## Confirmable
25
- # t.string :confirmation_token
26
- # t.datetime :confirmed_at
27
- # t.datetime :confirmation_sent_at
28
- # t.string :unconfirmed_email # Only if using reconfirmable
26
+ t.string :confirmation_token
27
+ t.datetime :confirmed_at
28
+ t.datetime :confirmation_sent_at
29
+ t.string :unconfirmed_email # Only if using reconfirmable
29
30
 
30
31
  ## Lockable
31
- # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
32
- # t.string :unlock_token # Only if unlock strategy is :email or :both
33
- # t.datetime :locked_at
34
-
32
+ t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
33
+ t.string :unlock_token # Only if unlock strategy is :email or :both
34
+ t.datetime :locked_at
35
35
 
36
36
  t.timestamps null: false
37
+
37
38
  end
38
39
 
39
40
  add_index :phcdevworks_accounts_users, :email, unique: true
40
41
  add_index :phcdevworks_accounts_users, :reset_password_token, unique: true
41
- # add_index :phcdevworks_accounts_users, :confirmation_token, unique: true
42
- # add_index :phcdevworks_accounts_users, :unlock_token, unique: true
42
+ add_index :phcdevworks_accounts_users, :confirmation_token, unique: true
43
+ add_index :phcdevworks_accounts_users, :unlock_token, unique: true
44
+
43
45
  end
44
46
  end
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksAccounts
2
- VERSION = "1.13.0"
2
+ VERSION = "2.2.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcdevworks_accounts
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHCDevworks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-06 00:00:00.000000000 Z
11
+ date: 2020-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: '6.0'
20
20
  - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: 6.0.3.2
22
+ version: 6.0.3.3
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: '6.0'
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: 6.0.3.2
32
+ version: 6.0.3.3
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: jbuilder
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -50,98 +50,98 @@ dependencies:
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: '10.3'
53
+ version: '11.0'
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: '10.3'
60
+ version: '11.0'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: phcthemes_admin_panel_pack
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '1.10'
67
+ version: '3.0'
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
- version: '1.10'
74
+ version: '3.0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: phcthemes_web_theme_pack
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
79
  - - "~>"
80
80
  - !ruby/object:Gem::Version
81
- version: '1.10'
81
+ version: '3.0'
82
82
  type: :runtime
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - "~>"
87
87
  - !ruby/object:Gem::Version
88
- version: '1.10'
88
+ version: '3.0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: phcdevworks_active_menus
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: '1.4'
95
+ version: '2.1'
96
96
  type: :runtime
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: '1.4'
102
+ version: '2.1'
103
103
  - !ruby/object:Gem::Dependency
104
104
  name: phcdevworks_core
105
105
  requirement: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - "~>"
108
108
  - !ruby/object:Gem::Version
109
- version: '1.4'
109
+ version: '2.1'
110
110
  type: :runtime
111
111
  prerelease: false
112
112
  version_requirements: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - "~>"
115
115
  - !ruby/object:Gem::Version
116
- version: '1.4'
116
+ version: '2.1'
117
117
  - !ruby/object:Gem::Dependency
118
118
  name: phcdevworks_notifications
119
119
  requirement: !ruby/object:Gem::Requirement
120
120
  requirements:
121
121
  - - "~>"
122
122
  - !ruby/object:Gem::Version
123
- version: '1.4'
123
+ version: '2.1'
124
124
  type: :runtime
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
128
  - - "~>"
129
129
  - !ruby/object:Gem::Version
130
- version: '1.4'
130
+ version: '2.1'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: phcdevworks_titleseo
133
133
  requirement: !ruby/object:Gem::Requirement
134
134
  requirements:
135
135
  - - "~>"
136
136
  - !ruby/object:Gem::Version
137
- version: '2.3'
137
+ version: '3.1'
138
138
  type: :runtime
139
139
  prerelease: false
140
140
  version_requirements: !ruby/object:Gem::Requirement
141
141
  requirements:
142
142
  - - "~>"
143
143
  - !ruby/object:Gem::Version
144
- version: '2.3'
144
+ version: '3.1'
145
145
  - !ruby/object:Gem::Dependency
146
146
  name: wicked
147
147
  requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
162
162
  requirements:
163
163
  - - "~>"
164
164
  - !ruby/object:Gem::Version
165
- version: '5.3'
165
+ version: '5.4'
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
169
169
  requirements:
170
170
  - - "~>"
171
171
  - !ruby/object:Gem::Version
172
- version: '5.3'
172
+ version: '5.4'
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: gravtastic
175
175
  requirement: !ruby/object:Gem::Requirement
@@ -190,28 +190,28 @@ dependencies:
190
190
  requirements:
191
191
  - - "~>"
192
192
  - !ruby/object:Gem::Version
193
- version: '1.67'
193
+ version: '1.80'
194
194
  type: :runtime
195
195
  prerelease: false
196
196
  version_requirements: !ruby/object:Gem::Requirement
197
197
  requirements:
198
198
  - - "~>"
199
199
  - !ruby/object:Gem::Version
200
- version: '1.67'
200
+ version: '1.80'
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: google-cloud-storage
203
203
  requirement: !ruby/object:Gem::Requirement
204
204
  requirements:
205
205
  - - "~>"
206
206
  - !ruby/object:Gem::Version
207
- version: '1.26'
207
+ version: '1.28'
208
208
  type: :runtime
209
209
  prerelease: false
210
210
  version_requirements: !ruby/object:Gem::Requirement
211
211
  requirements:
212
212
  - - "~>"
213
213
  - !ruby/object:Gem::Version
214
- version: '1.26'
214
+ version: '1.28'
215
215
  - !ruby/object:Gem::Dependency
216
216
  name: mini_magick
217
217
  requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
260
260
  requirements:
261
261
  - - "~>"
262
262
  - !ruby/object:Gem::Version
263
- version: '1.108'
263
+ version: '1.114'
264
264
  type: :runtime
265
265
  prerelease: false
266
266
  version_requirements: !ruby/object:Gem::Requirement
267
267
  requirements:
268
268
  - - "~>"
269
269
  - !ruby/object:Gem::Version
270
- version: '1.108'
270
+ version: '1.114'
271
271
  - !ruby/object:Gem::Dependency
272
272
  name: sqlite3
273
273
  requirement: !ruby/object:Gem::Requirement
@@ -282,9 +282,11 @@ dependencies:
282
282
  - - "~>"
283
283
  - !ruby/object:Gem::Version
284
284
  version: '1.4'
285
- description: Ruby on Rails 6 Authentication and User Management Engine.
285
+ description: Ruby on Rails 6 Authentication and User Management Engine using Devise
286
+ with a nice-looking dashboard, admin panel and login views to get you going fast
287
+ on your next project.
286
288
  email:
287
- - developers@phcdevworks.com
289
+ - imfo@phcdevworks.com
288
290
  executables: []
289
291
  extensions: []
290
292
  extra_rdoc_files: []
@@ -293,24 +295,24 @@ files:
293
295
  - README.md
294
296
  - Rakefile
295
297
  - app/assets/config/phcdevworks_accounts_manifest.js
296
- - app/assets/javascripts/phcdevworks_accounts/account/dashboard.coffee
297
- - app/assets/javascripts/phcdevworks_accounts/admin/accounts.coffee
298
+ - app/assets/javascripts/phcdevworks_accounts/admin/pages.coffee
298
299
  - app/assets/javascripts/phcdevworks_accounts/application.js
299
- - app/assets/stylesheets/phcdevworks_accounts/account/dashboard.scss
300
- - app/assets/stylesheets/phcdevworks_accounts/admin/accounts.scss
300
+ - app/assets/javascripts/phcdevworks_accounts/user/pages.coffee
301
+ - app/assets/stylesheets/phcdevworks_accounts/admin/pages.scss
301
302
  - app/assets/stylesheets/phcdevworks_accounts/application.scss
302
- - app/controllers/phcdevworks_accounts/account/dashboard_controller.rb
303
- - app/controllers/phcdevworks_accounts/admin/accounts_controller.rb
303
+ - app/assets/stylesheets/phcdevworks_accounts/user/pages.scss
304
+ - app/controllers/phcdevworks_accounts/admin/pages_controller.rb
304
305
  - app/controllers/phcdevworks_accounts/application_controller.rb
306
+ - app/controllers/phcdevworks_accounts/user/pages_controller.rb
305
307
  - app/controllers/users/confirmations_controller.rb
306
308
  - app/controllers/users/omniauth_callbacks_controller.rb
307
309
  - app/controllers/users/passwords_controller.rb
308
310
  - app/controllers/users/registrations_controller.rb
309
311
  - app/controllers/users/sessions_controller.rb
310
312
  - app/controllers/users/unlocks_controller.rb
311
- - app/helpers/phcdevworks_accounts/account/dashboard_helper.rb
312
- - app/helpers/phcdevworks_accounts/admin/accounts_helper.rb
313
+ - app/helpers/phcdevworks_accounts/admin/pages_helper.rb
313
314
  - app/helpers/phcdevworks_accounts/application_helper.rb
315
+ - app/helpers/phcdevworks_accounts/user/pages_helper.rb
314
316
  - app/jobs/phcdevworks_accounts/application_job.rb
315
317
  - app/mailers/phcdevworks_accounts/application_mailer.rb
316
318
  - app/models/phcdevworks_accounts/application_record.rb
@@ -322,9 +324,10 @@ files:
322
324
  - app/views/layouts/phcdevworks_accounts/components/backend/navigation/_top_menu.html.erb
323
325
  - app/views/layouts/phcdevworks_accounts/components/backend/sidebars/_side_menu.html.erb
324
326
  - app/views/layouts/phcdevworks_accounts/devise.html.erb
325
- - app/views/phcdevworks_accounts/account/dashboard/index.html.erb
326
- - app/views/phcdevworks_accounts/admin/accounts/index.html.erb
327
- - app/views/phcdevworks_accounts/admin/accounts/users_index.html.erb
327
+ - app/views/phcdevworks_accounts/admin/pages/dashboard.html.erb
328
+ - app/views/phcdevworks_accounts/admin/pages/user_id.html.erb
329
+ - app/views/phcdevworks_accounts/admin/pages/users_list.html.erb
330
+ - app/views/phcdevworks_accounts/user/pages/profile.html.erb
328
331
  - app/views/users/confirmations/new.html.erb
329
332
  - app/views/users/mailer/confirmation_instructions.html.erb
330
333
  - app/views/users/mailer/email_changed.html.erb
@@ -1,11 +0,0 @@
1
- require_dependency "phcdevworks_accounts/application_controller"
2
-
3
- module PhcdevworksAccounts
4
- class Account::DashboardController < ApplicationController
5
-
6
- # Dashboard
7
- def index
8
- end
9
-
10
- end
11
- end
@@ -1,15 +0,0 @@
1
- require_dependency "phcdevworks_accounts/application_controller"
2
-
3
- module PhcdevworksAccounts
4
- class Admin::AccountsController < ApplicationController
5
-
6
- # Admin Main Dashboard
7
- def index
8
- end
9
-
10
- # Admin User List
11
- def users_index
12
- end
13
-
14
- end
15
- end