phcdevworks_accounts 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc6079465bd7b0619b92ce0864f40b0429d652661443af5c6500b46700ae089
-  data.tar.gz: f0258990ffa7a96b2c18679005e80bdb9dbc0c93e05311df83c2680683d748ec
+  metadata.gz: 69c3f6fc45363975ce0ca7a1079d54cadd77d459dfd07f1e6a39445ddb0bf1d2
+  data.tar.gz: 5710d7ae20f011c5ede7d2f5de15413c580bb6920692839b06210cfbd5c81db5
 SHA512:
-  metadata.gz: 4601edd039e8a5045f3ce9bd66bf1c29831b3b6dc40a50c9a1d1c1fd33d3ad299de6ce138c770e25f1aff2d98874501cd700a6125eb1724d8f528e27baeeafe4
-  data.tar.gz: f149e07318aebad67958add7b92413343bf95a084f4720279b31396e2fdf451b535ef75261ec70f1c7d2db288fa1fbc156e4ef30f03a2ba58b88b3f429b12a15
+  metadata.gz: '0906276c4f161774b28b7c258f0fa69fcd317d45adf52fd1611c3f438c0929e789a7a1cb1c296ac61ea290a60bc8aa52158c557c4ba6c1c29a1907d5bf0bd47f'
+  data.tar.gz: b556b41b0208121cdba54f22fb029cef7bbe28b6d87e4d9d4b198c19f585a49615608ce9ee68aceb57a26b0f6b3f7a42762052720fa1069a02dd296236e456b6

data/app/assets/stylesheets/phcdevworks_accounts/admin/{accounts.scss → pages.scss}

@@ -1,3 +1,3 @@
-// Place all the styles related to the admin/accounts controller here.
+// Place all the styles related to the admin/pages controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/

data/app/assets/stylesheets/phcdevworks_accounts/{account/dashboard.scss → user/pages.scss}

@@ -1,3 +1,3 @@
-// Place all the styles related to the account/dashboard controller here.
+// Place all the styles related to the user/pages controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/

data/app/controllers/phcdevworks_accounts/admin/pages_controller.rb

@@ -0,0 +1,25 @@
+require_dependency "phcdevworks_accounts/application_controller"
+
+module PhcdevworksAccounts
+    class Admin::PagesController < ApplicationController
+
+        # Filters
+        include PhcdevworksCore::PhcdevworksPluginsHelper
+        before_action :phcdevworks_accounts_admin_only
+        layout "phcdevworks_accounts/application_profile", :only => [ :user_profile ]
+
+        # Account Admin
+        def dashboard
+        end
+
+        # User Admin
+        def users_list
+            @admin_users = User.all
+        end
+
+        def user_profile
+            @admin_user = User.find_by_id(params[:id])
+        end
+
+    end
+end

data/app/controllers/phcdevworks_accounts/application_controller.rb

@@ -1,25 +1,25 @@
 module PhcdevworksAccounts
-  class ApplicationController < ActionController::Base
+    class ApplicationController < ActionController::Base
+    
+        # Devise Filter
+        before_action :phcdevworks_accounts_permitted_parameters, if: :devise_controller?
 
-    # Devise Filter
-    before_action :phcdevworks_accounts_permitted_parameters, if: :devise_controller?
+        # Security Filters
+        protect_from_forgery with: :exception
 
-    # Security Filters
-    protect_from_forgery with: :exception
+        # Load Requried Helper Files
+        helper PhcdevworksActiveMenus::Engine.helpers
+        helper PhcdevworksNotifications::Engine.helpers
+        helper PhcdevworksTitleseo::Engine.helpers
 
-    # Load Requried Helper Files
-    helper PhcdevworksActiveMenus::Engine.helpers
-    helper PhcdevworksNotifications::Engine.helpers
-    helper PhcdevworksTitleseo::Engine.helpers
+        private
 
-    private
+        # Whitelist Additional Fields
+        def phcdevworks_accounts_permitted_parameters
+            added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :password, :password_confirmation, :remember_me]
+            devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
+            devise_parameter_sanitizer.permit :account_update, keys: added_attrs
+        end
 
-    # Whitelist Additional Fields
-    def phcdevworks_accounts_permitted_parameters
-      added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :password, :password_confirmation, :remember_me]
-      devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
-      devise_parameter_sanitizer.permit :account_update, keys: added_attrs
     end
-
-  end
 end

data/app/controllers/phcdevworks_accounts/user/pages_controller.rb

@@ -0,0 +1,15 @@
+require_dependency "phcdevworks_accounts/application_controller"
+
+module PhcdevworksAccounts
+    class User::PagesController < ApplicationController
+
+        # Security Filters
+        before_action :authenticate_user!
+
+        # Pages - User
+        def profile
+            @user_profile = User.find_by_id(params[:id])
+        end
+
+    end
+end

data/app/helpers/phcdevworks_accounts/admin/{accounts_helper.rb → pages_helper.rb}

@@ -1,4 +1,4 @@
 module PhcdevworksAccounts
-  module Admin::AccountsHelper
+  module Admin::PagesHelper
   end
 end

data/app/helpers/phcdevworks_accounts/application_helper.rb

@@ -1,4 +1,4 @@
 module PhcdevworksAccounts
-  module ApplicationHelper
-  end
+    module ApplicationHelper
+    end
 end

data/app/helpers/phcdevworks_accounts/{account/dashboard_helper.rb → user/pages_helper.rb}

@@ -1,4 +1,4 @@
 module PhcdevworksAccounts
-  module Account::DashboardHelper
+  module User::PagesHelper
   end
 end

data/app/views/layouts/phcdevworks_accounts/application.html.erb

@@ -6,27 +6,26 @@
     <% phc_seo_title "PHCDevworks Accounts" %>
     <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
     <!-- SEO System -->
-    
+
     <!-- SEO and Site Description -->
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= yield(:phc_seo_title) %></title>
-    <meta name="description" content="<%= yield(:phc_seo_description) %>">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-    <link rel="canonical" href="http://phcdevworks.com">
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
     <!-- SEO and Site Description -->
-    
+
     <!-- Rails Security Tags -->
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <!-- Rails Security Tags -->
-    
+
     <!-- CSS Styles -->
-    <%= stylesheet_link_tag "phcdevworks_accounts/application", media: "all" %>
+    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
     <!-- CSS Styles -->
-    
-    <!-- Font -->
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
-    <!-- Font -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
 
 </head>
 <body>
@@ -63,9 +62,5 @@
     </div>
     <!-- Page Container -->
 
-    <!-- JavaScript -->
-    <%= javascript_include_tag "phcdevworks_accounts/application", "data-turbolinks-track": "reload" %>
-    <!-- JavaScript -->
-
 </body>
 </html>

data/app/views/layouts/phcdevworks_accounts/application_full_width.html.erb

@@ -6,27 +6,26 @@
     <% phc_seo_title "PHCDevworks Accounts" %>
     <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
     <!-- SEO System -->
-    
+
     <!-- SEO and Site Description -->
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= yield(:phc_seo_title) %></title>
-    <meta name="description" content="<%= yield(:phc_seo_description) %>">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-    <link rel="canonical" href="http://phcdevworks.com">
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
     <!-- SEO and Site Description -->
-    
+
     <!-- Rails Security Tags -->
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <!-- Rails Security Tags -->
-    
+
     <!-- CSS Styles -->
-    <%= stylesheet_link_tag "phcdevworks_accounts/application", media: "all" %>
+    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
     <!-- CSS Styles -->
-    
-    <!-- Font -->
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
-    <!-- Font -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
 
 </head>
 <body>
@@ -63,9 +62,5 @@
     </div>
     <!-- Page Container -->
 
-    <!-- JavaScript -->
-    <%= javascript_include_tag "phcdevworks_accounts/application", "data-turbolinks-track": "reload" %>
-    <!-- JavaScript -->
-
 </body>
 </html>

data/app/views/layouts/phcdevworks_accounts/application_no_sidebar.html.erb

@@ -6,27 +6,26 @@
     <% phc_seo_title "PHCDevworks Accounts" %>
     <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
     <!-- SEO System -->
-    
+
     <!-- SEO and Site Description -->
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= yield(:phc_seo_title) %></title>
-    <meta name="description" content="<%= yield(:phc_seo_description) %>">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-    <link rel="canonical" href="http://phcdevworks.com">
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
     <!-- SEO and Site Description -->
-    
+
     <!-- Rails Security Tags -->
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <!-- Rails Security Tags -->
-    
+
     <!-- CSS Styles -->
-    <%= stylesheet_link_tag "phcdevworks_accounts/application", media: "all" %>
+    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
     <!-- CSS Styles -->
-    
-    <!-- Font -->
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
-    <!-- Font -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
 
 </head>
 <body>
@@ -56,9 +55,5 @@
     </div>
     <!-- Page Container -->
 
-    <!-- JavaScript -->
-    <%= javascript_include_tag "phcdevworks_accounts/application", "data-turbolinks-track": "reload" %>
-    <!-- JavaScript -->
-
 </body>
 </html>

data/app/views/layouts/phcdevworks_accounts/application_profile.html.erb

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+    <!-- SEO System -->
+    <% phc_seo_title "PHCDevworks Accounts" %>
+    <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
+    <!-- SEO System -->
+
+    <!-- SEO and Site Description -->
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
+    <!-- SEO and Site Description -->
+
+    <!-- Rails Security Tags -->
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <!-- Rails Security Tags -->
+
+    <!-- CSS Styles -->
+    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
+    <!-- CSS Styles -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
+
+</head>
+<body>
+
+    <!-- Page Container -->
+    <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
+
+        <!-- Page Header -->
+        <div id="header" class="header navbar-default">
+            <%= render "layouts/phcdevworks_accounts/components/backend/navigation/top_menu" %>
+        </div>
+        <!-- Page Header -->
+
+        <!-- Page Sidebar -->
+        <div id="sidebar" class="sidebar">
+            <%= render "layouts/phcdevworks_accounts/components/backend/sidebars/side_menu" %>
+        </div>
+        <div class="sidebar-bg"></div>
+        <!-- Page Sidebar -->
+
+        <!-- Page Content -->
+        <div id="content" class="content content-full-width">
+            <%= yield %>
+        </div>
+        <!-- Page Content -->
+
+        <!-- Footer Content -->
+        <div id="footer" class="footer mb-4">
+            <%= render "layouts/phcdevworks_accounts/components/backend/footer/footer" %>
+        </div>
+        <!-- Footer Content -->
+
+    </div>
+    <!-- Page Container -->
+
+</body>
+</html>

data/app/views/layouts/phcdevworks_accounts/components/backend/footer/_footer.html.erb

@@ -2,8 +2,7 @@
 <span>
     <!-- -PHC- Footer Content - Left - Time in Production -->
     <i class="fab fa-osi font-weight-bolder"></i> 2012-<%= Time.now.year %> -
-    <span class="font-weight-bold">PHC</span>Devworks Accounts -
-    Engine v<%= Gem.loaded_specs["phcdevworks_accounts"].version.to_s %>
+    <span class="font-weight-bold">PHC</span>Devworks Accounts - Engine v<%= Gem.loaded_specs["phcdevworks_accounts"].version.to_s %>
     <!-- -PHC- Footer Content - Left - Time in Production -->
 </span>
 <!-- -PHC- Footer Content - Left -->

data/app/views/layouts/phcdevworks_accounts/components/backend/navigation/_top_menu.html.erb

@@ -37,4 +37,4 @@
 
     </ul>
 <% end %>
-<!-- -PHC- Topbar - Navigation Main -->
+<!-- -PHC- Topbar - Navigation Main -->

data/app/views/layouts/phcdevworks_accounts/components/backend/sidebars/_side_menu.html.erb

@@ -25,7 +25,7 @@
                         <% end %>
                     </li>
                     <li>
-                        <%= link_to phcdevworks_accounts.destroy_user_session_path do %>
+                        <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete do %>
                             <i class="fad fa-sign-out-alt"></i> Logout
                         <% end %>
                     </li>
@@ -270,7 +270,7 @@
                     <span>Admin</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_index_path %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_all_path %></li>
                 </ul>
             </li>
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->

data/app/views/layouts/phcdevworks_accounts/devise.html.erb

@@ -6,27 +6,26 @@
     <% phc_seo_title "PHCDevworks Accounts" %>
     <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
     <!-- SEO System -->
-    
+
     <!-- SEO and Site Description -->
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title><%= yield(:phc_seo_title) %></title>
-    <meta name="description" content="<%= yield(:phc_seo_description) %>">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-    <link rel="canonical" href="http://phcdevworks.com">
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
     <!-- SEO and Site Description -->
-    
+
     <!-- Rails Security Tags -->
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <!-- Rails Security Tags -->
-    
+
     <!-- CSS Styles -->
-    <%= stylesheet_link_tag "phcdevworks_accounts/application", media: "all" %>
+    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
     <!-- CSS Styles -->
-    
-    <!-- Font -->
-    <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
-    <!-- Font -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
 
 </head>
 <body class="pace-top bg-white">
@@ -35,9 +34,5 @@
     <%= yield %>
     <!-- Page Content -->
 
-    <!-- JavaScript -->
-    <%= javascript_include_tag "phcdevworks_accounts/application", "data-turbolinks-track": "reload" %>
-    <!-- JavaScript -->
-
 </body>
 </html>

data/app/views/phcdevworks_accounts/admin/pages/components/_profile_header.html.erb

@@ -0,0 +1,27 @@
+<div class="profile-header">
+
+  <!-- User Profiles - Header - Cover -->
+  <div class="profile-header-cover"></div>
+  <!-- User Profiles - Header - Cover -->
+
+  <!-- User Profiles - Header - Content -->
+  <div class="profile-header-content">
+    <div class="profile-header-img">
+      <%= image_tag @admin_user.gravatar_url :secure => true, :filetype => :png, :size => 128 %>
+    </div>
+    <div class="profile-header-info">
+      <h4 class="m-t-10 m-b-5"><%= @admin_user.firstname + ' ' + @admin_user.lastname  %></h4>
+      <p class="m-b-10"><%= @admin_user.username %></p>
+      <%= link_to edit_user_registration_path(@admin_user), class: "btn btn-xs btn-yellow" do %>
+        <i class="fad fa-user-edit"></i> Update Member Information
+      <% end %>
+    </div>
+  </div>
+  <!-- User Profiles - Header - Content -->
+
+  <!-- User Profiles - Header - Tab Bar -->
+  <ul class="profile-header-tab nav nav-tabs">
+  </ul>
+  <!-- User Profiles - Header - Tab Bar -->
+
+</div>

data/app/views/phcdevworks_accounts/admin/pages/user_profile.html.erb

@@ -0,0 +1,22 @@
+<!-- PHCTitleSEO Title Variables -->
+<% phc_title "User Manager" %>
+<% phc_title_tagline "Useer Profile" %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<!-- PHCTitleSEO Title Variables -->
+
+<!-- User Profiles - Header -->
+<div class="profile">
+	<%= render 'phcdevworks_accounts/admin/pages/components/profile_header' %>
+</div>
+<!-- User Profiles - Header -->
+
+<!-- User Profiles - Remove Full Page Width -->
+<div class="profile-content">
+	<div class="tab-content p-0">
+
+		<%= render 'phcdevworks_notifications/bootstrap/notifications' %>
+
+	</div>
+</div>
+<!-- User Profiles - Remove Full Page Width -->

data/app/views/phcdevworks_accounts/admin/pages/users_list.html.erb

@@ -0,0 +1,70 @@
+<!-- PHCTitleSEO Title Variables -->
+<% phc_title "User Manager" %>
+<% phc_title_tagline "Useer Index" %>
+<% phc_breadcrumb_one yield(:phc_title) %>
+<% phc_breadcrumb_two yield(:phc_title_tagline) %>
+<!-- PHCTitleSEO Title Variables -->
+
+<!-- Page Bradcrumbs -->
+<ol class="breadcrumb pull-right">
+	<li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
+	<li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_two) %></li>
+</ol>
+<!-- Page Bradcrumbs -->
+
+<!-- Page Header -->
+<h2 class="page-header"><%= yield(:phc_title) %></h2>
+<!-- Page Header -->
+
+<!-- Page Content -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<!-- Panel -->
+		<div class="panel panel-inverse">
+
+			<!-- Panel - Heading -->
+			<div class="panel-heading">
+				<h4 class="panel-title"><%= yield(:phc_title) %></h4>
+			</div>
+			<!-- Panel - Heading -->
+
+			<!-- Panel - Body -->
+			<div class="panel-body">
+
+				<!-- Index - Table -->
+				<div class="table-responsive">
+					<table class="table table-striped table-bordered">
+
+						<thead>
+							<tr>
+								<th>Username</th>
+								<th>Full Name</th>
+								<th>Email</th>
+							</tr>
+						</thead>
+
+						<tbody>
+                            <% @admin_users.each do |user| %>
+                                <td><%= user.username %></td>
+                                <td><%= user.email %> <%= user.email %></td>
+                                <td><%= user.email %></td>
+                            <% end %>
+						</tbody>
+
+					</table>
+				</div>
+				<!-- Index - Table -->
+
+				<!-- New Button -->
+				<!-- New Button -->
+
+			</div>
+			<!-- Panel - Body -->
+
+		</div>
+		<!-- Panel -->
+
+	</div>
+</div>
+<!-- Page Content -->

data/app/views/users/confirmations/new.html.erb

@@ -1,7 +1,7 @@
 <!-- PHCTitleSEO Title Variables -->
 <% phc_title resource_name.to_s.humanize + " Unlock Password" %>
 <% phc_title_tagline "Unlock Your " + resource_name.to_s.humanize + " Unlock Password" %>
-<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Home", phcdevworks_accounts.welcome_status_page_path %>
+<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Home", phcdevworks_accounts.user_dashboard_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 
@@ -36,7 +36,7 @@
                 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |form| %>
 
 					<!-- Devise Error Message -->
-					<%= devise_error_messages! %>
+					<%= render "devise/shared/error_messages", resource: resource %>
 					<!-- Devise Error Message -->
 
                     <div class="form-group">

data/app/views/users/passwords/edit.html.erb

@@ -1,7 +1,7 @@
 <!-- PHCTitleSEO Title Variables -->
 <% phc_title resource_name.to_s.humanize + " Edit Password" %>
 <% phc_title_tagline "Edit Your " + resource_name.to_s.humanize + " Edit Password" %>
-<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Accounts Home", phcdevworks_accounts.welcome_status_page_path %>
+<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Accounts Home", phcdevworks_accounts.user_dashboard_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 
@@ -36,7 +36,7 @@
                 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |form| %>
 
 					<!-- Devise Error Message -->
-					<%= devise_error_messages! %>
+					<%= render "devise/shared/error_messages", resource: resource %>
 					<!-- Devise Error Message -->
 					
 					<!-- Reset Password Token -->

data/app/views/users/passwords/new.html.erb

@@ -36,7 +36,7 @@
                 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |form| %>
 
  					<!-- Devise Error Message -->
-					<%= devise_error_messages! %>
+					<%= render "devise/shared/error_messages", resource: resource %>
 					<!-- Devise Error Message -->
 
                     <div class="form-group">

data/app/views/users/registrations/edit.html.erb

@@ -2,7 +2,7 @@
 <% phc_title resource_name.to_s.humanize + " Account Information" %>
 <% phc_title_tagline "Edit Your " + resource_name.to_s.humanize + " Account Information" %>
 <% phc_breadcrumb_one link_to "Home", main_app.root_path %>
-<% phc_breadcrumb_two link_to "Accounts Dashboard", phcdevworks_accounts.dashboard_path %>
+<% phc_breadcrumb_two link_to "Accounts Dashboard", phcdevworks_accounts.user_dashboard_path %>
 <% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 
@@ -38,7 +38,7 @@
 				<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |form| %>
 
 					<!-- Devise Error Message -->
-					<%= devise_error_messages! %>
+					<%= render "devise/shared/error_messages", resource: resource %>
 					<!-- Devise Error Message -->
 
 					<div class="form-group">

data/app/views/users/registrations/new.html.erb

@@ -34,7 +34,7 @@
                 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |form| %>
 
 					<!-- Devise Error Message -->
-					<%= devise_error_messages! %>
+					<%= render "devise/shared/error_messages", resource: resource %>
 					<!-- Devise Error Message -->
 
                     <label class="control-label">Name <span class="text-danger">*</span></label>

data/app/views/users/sessions/new.html.erb

@@ -35,7 +35,7 @@
 
                 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |form| %>
 
-                    <%= devise_error_messages! %>
+                    <%= render "devise/shared/error_messages", resource: resource %>
 
                     <div class="form-group m-b-15">
                         <%= form.email_field :email, autofocus: true, autocomplete: "email", placeholder: "Email", class: "form-control form-control-lg" %>

data/app/views/users/unlocks/new.html.erb

@@ -1,7 +1,7 @@
 <!-- Title System -->
 <% phc_title resource_name.to_s.humanize + " Unlock Password" %>
 <% phc_title_tagline "Unlock Your " + resource_name.to_s.humanize + " Unlock Password" %>
-<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Home", phcdevworks_accounts.welcome_status_page_path %>
+<% phc_breadcrumb_one link_to resource_name.to_s.humanize + " Home", phcdevworks_accounts.user_dashboard_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- Title System -->
 
@@ -38,7 +38,7 @@
 
         <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |form| %>
 
-          <%= devise_error_messages! %>
+          <%= render "devise/shared/error_messages", resource: resource %>
 
           <div class="form-group">
             <%= form.label :email %>

data/config/routes.rb

@@ -3,15 +3,16 @@ PhcdevworksAccounts::Engine.routes.draw do
     # User Routes
     devise_for :users, {
         class_name: "PhcdevworksAccounts::User",
-        module: :devise,
-        controllers: { registrations: "users/registrations"}
+        module: :devise
     }
 
     # User Dashboard
-    get 'dashboard', to: 'accounts/dashboard#index'
+    match "user/dashboard", to: "user/pages#dashboard", via: "get"
+    match "user/profile", to: "user/pages#profile", via: "get"
 
     # Admin Routes
-    get "admin_dashboard", to: "admin/accounts#index"
-    get "admin_users_index", to: "admin/accounts#users_index"
+    match "/admin", to: "admin/pages#dashboard", via: "get"
+    match "/admin/users/all", to: "admin/pages#users_list", via: "get"
+    match "/admin/user/:id", to: "admin/pages#user_profile", via: "get"
 
 end

data/lib/phcdevworks_accounts/engine.rb

@@ -26,13 +26,13 @@ module PhcdevworksAccounts
     require "gravtastic"
     require "friendly_id"
 
+    # Mailer Dependencies
+    require "mail_form"
+
     # Security Dependencies
     require "devise"
     require "simple_token_authentication"
 
-    # Payment Dependencies
-    require "activemerchant"
-
     # Plugin Namespace
     isolate_namespace PhcdevworksAccounts
 

data/lib/phcdevworks_accounts/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksAccounts
-    VERSION = "2.1.0"
+    VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -64,84 +58,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: phcthemes_web_theme_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_active_menus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_notifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_titleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -185,89 +179,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: mail_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.80'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.80'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: google-cloud-storage
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.86'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.86'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.10'
+        version: '1.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.10'
+        version: '1.29'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
-  name: simple_token_authentication
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: activemerchant
+  name: simple_token_authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.114'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.114'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +276,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-description: Ruby on Rails 6 Authentication and User Management Engine.
+description: Ruby on Rails 6 Authentication and User Management Engine using Devise
+  with a nice-looking dashboard, admin panel and login views to get you going fast
+  on your next project.
 email:
 - imfo@phcdevworks.com
 executables: []
@@ -293,24 +289,24 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/phcdevworks_accounts_manifest.js
-- app/assets/javascripts/phcdevworks_accounts/account/dashboard.coffee
-- app/assets/javascripts/phcdevworks_accounts/admin/accounts.coffee
+- app/assets/javascripts/phcdevworks_accounts/admin/pages.coffee
 - app/assets/javascripts/phcdevworks_accounts/application.js
-- app/assets/stylesheets/phcdevworks_accounts/account/dashboard.scss
-- app/assets/stylesheets/phcdevworks_accounts/admin/accounts.scss
+- app/assets/javascripts/phcdevworks_accounts/user/pages.coffee
+- app/assets/stylesheets/phcdevworks_accounts/admin/pages.scss
 - app/assets/stylesheets/phcdevworks_accounts/application.scss
-- app/controllers/phcdevworks_accounts/account/dashboard_controller.rb
-- app/controllers/phcdevworks_accounts/admin/accounts_controller.rb
+- app/assets/stylesheets/phcdevworks_accounts/user/pages.scss
+- app/controllers/phcdevworks_accounts/admin/pages_controller.rb
 - app/controllers/phcdevworks_accounts/application_controller.rb
+- app/controllers/phcdevworks_accounts/user/pages_controller.rb
 - app/controllers/users/confirmations_controller.rb
 - app/controllers/users/omniauth_callbacks_controller.rb
 - app/controllers/users/passwords_controller.rb
 - app/controllers/users/registrations_controller.rb
 - app/controllers/users/sessions_controller.rb
 - app/controllers/users/unlocks_controller.rb
-- app/helpers/phcdevworks_accounts/account/dashboard_helper.rb
-- app/helpers/phcdevworks_accounts/admin/accounts_helper.rb
+- app/helpers/phcdevworks_accounts/admin/pages_helper.rb
 - app/helpers/phcdevworks_accounts/application_helper.rb
+- app/helpers/phcdevworks_accounts/user/pages_helper.rb
 - app/jobs/phcdevworks_accounts/application_job.rb
 - app/mailers/phcdevworks_accounts/application_mailer.rb
 - app/models/phcdevworks_accounts/application_record.rb
@@ -318,13 +314,17 @@ files:
 - app/views/layouts/phcdevworks_accounts/application.html.erb
 - app/views/layouts/phcdevworks_accounts/application_full_width.html.erb
 - app/views/layouts/phcdevworks_accounts/application_no_sidebar.html.erb
+- app/views/layouts/phcdevworks_accounts/application_profile.html.erb
 - app/views/layouts/phcdevworks_accounts/components/backend/footer/_footer.html.erb
 - app/views/layouts/phcdevworks_accounts/components/backend/navigation/_top_menu.html.erb
 - app/views/layouts/phcdevworks_accounts/components/backend/sidebars/_side_menu.html.erb
 - app/views/layouts/phcdevworks_accounts/devise.html.erb
-- app/views/phcdevworks_accounts/account/dashboard/index.html.erb
-- app/views/phcdevworks_accounts/admin/accounts/index.html.erb
-- app/views/phcdevworks_accounts/admin/accounts/users_index.html.erb
+- app/views/phcdevworks_accounts/admin/pages/components/_profile_header.html.erb
+- app/views/phcdevworks_accounts/admin/pages/dashboard.html.erb
+- app/views/phcdevworks_accounts/admin/pages/user_profile.html.erb
+- app/views/phcdevworks_accounts/admin/pages/users_list.html.erb
+- app/views/phcdevworks_accounts/user/pages/dashboard.html.erb
+- app/views/phcdevworks_accounts/user/pages/profile.html.erb
 - app/views/users/confirmations/new.html.erb
 - app/views/users/mailer/confirmation_instructions.html.erb
 - app/views/users/mailer/email_changed.html.erb

data/app/controllers/phcdevworks_accounts/account/dashboard_controller.rb

@@ -1,11 +0,0 @@
-require_dependency "phcdevworks_accounts/application_controller"
-
-module PhcdevworksAccounts
-  class Account::DashboardController < ApplicationController
-
-    # Dashboard
-    def index
-    end
-
-  end
-end

data/app/controllers/phcdevworks_accounts/admin/accounts_controller.rb

@@ -1,15 +0,0 @@
-require_dependency "phcdevworks_accounts/application_controller"
-
-module PhcdevworksAccounts
-  class Admin::AccountsController < ApplicationController
-
-    # Admin Main Dashboard
-    def index
-    end
-
-    # Admin User List
-    def users_index
-    end
-
-  end
-end