phcdevworks_accounts 2.2.3 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 989cf6d939270a6ababe48ac017dbaf42dc3cd6d37370d1d4ac3eee9d29d8ce0
-  data.tar.gz: a12ff3a7feeffc58b4387e9e31fa62cf42faf9c2ff2e4cd8e85534a66af062da
+  metadata.gz: dddf4f2146b9e2a14ae6e8e4532873dca908d9a4b0b5137f513765550b3a7857
+  data.tar.gz: 07ab68826fbd3e390a08aa05f5476d9cbfd0e2d193b105a35a809de27f60ebf8
 SHA512:
-  metadata.gz: 792f07a6268d04ad937bd8392bea1e728103d3f9a816a1ade62dd9155823775ac060d1e0669452ed7576f9a14fb5d01e463092d6763061aa849f6b94fb39c7b7
-  data.tar.gz: e12e957700cfeb435da8b762a499ed74835b38f075f8742dc8ef87f17089fe146e2c8a49e6402af8679dae33cd702cde2bb2f18922a57d3f18ec164b4d5b02c5
+  metadata.gz: ac9ffded82e1aef56bfd01c6afb28763ad7584943416a2ffa5b23b2a91fbaf2078098ae1016d51a6500f92ca854ff4fed6f41a6b3f89559b710316b8d3c497b7
+  data.tar.gz: ef73d1ad5db666bd71793fe62169845b7bdaa6c5e0019418d0a38464e94631e7d97f7d47b633c9cab5b823975a387eb976f58a3a3cb066c0d55dde64960189c0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2020 BradPotts - PHCDevworks
+Copyright 2020 BradPotts
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,7 @@
 #### PHCDevworks Accounts
-Rails devise based user accounts and administration engine.
-
-Using Devise for Authentication
-Extra user information built in
-Custom login views included
+  
+Rails devise based user accounts and administration engine.  
+  
+- Using Devise for Authentication
+- Extra user information built in
+- Custom login views included

data/Rakefile

@@ -1,32 +1,8 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require "bundler/setup"
 
-require 'rdoc/task'
+APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'PhcdevworksAccounts'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+load "rails/tasks/statistics.rake"
 
-APP_RAKEFILE = File.expand_path("test/test_app/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task default: :test
+require "bundler/gem_tasks"

data/app/assets/config/phcdevworks_accounts_manifest.js

@@ -1,2 +1,3 @@
-//= link_directory ../javascripts/phcdevworks_accounts .js
 //= link_directory ../stylesheets/phcdevworks_accounts .scss
+//= link phcthemes_admin_panel_pack_coloradmin.css
+//= link phcthemes_admin_panel_pack_coloradmin.js

data/app/assets/stylesheets/phcdevworks_accounts/application.scss

@@ -1,2 +0,0 @@
-// Load Admin Theme
-@import "phcthemes_admin_panel_pack_coloradmin";

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

@@ -6,7 +6,7 @@ module PhcdevworksAccounts
         # Filters
         include PhcdevworksCore::PhcdevworksPluginsHelper
         before_action :phcdevworks_accounts_admin_only
-
+        layout "phcdevworks_accounts/application_profile", :only => [ :user_profile ]
 
         # Account Admin
         def dashboard
@@ -17,7 +17,7 @@ module PhcdevworksAccounts
             @admin_users = User.all
         end
 
-        def user_id
+        def user_profile
             @admin_user = User.find_by_id(params[:id])
         end
 

data/app/controllers/phcdevworks_accounts/application_controller.rb

@@ -1,6 +1,6 @@
 module PhcdevworksAccounts
     class ApplicationController < ActionController::Base
-    
+
         # Devise Filter
         before_action :phcdevworks_accounts_permitted_parameters, if: :devise_controller?
 

data/app/helpers/phcdevworks_accounts/application_helper.rb

@@ -1,4 +1,4 @@
 module PhcdevworksAccounts
-    module ApplicationHelper
-    end
+  module ApplicationHelper
+  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/navigation/_top_menu.html.erb

@@ -1,7 +1,7 @@
 <!-- -PHC- Topbar - Navigation Header -->
 <div class="navbar-header">
 
-    <%= link_to main_app.root_path, class: "navbar-brand" do %>
+    <%= link_to phcdevworks_accounts.user_path, class: "navbar-brand" do %>
         <strong>PHCDevworks</strong>Accounts
     <% end %>
 

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

@@ -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

@@ -1,4 +1,70 @@
-<% @admin_users.each do |user| %>
-  <%= user.username %><br/>
-  <%= user.email %><br/>
-<% end %>
+<!-- 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_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 

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_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 

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

@@ -1,7 +1,7 @@
 <!-- PHCTitleSEO Title Variables -->
 <% phc_title "Send Password Reset Link" %>
 <% phc_title_tagline "Password Reset Form" %>
-<% phc_breadcrumb_one link_to "Home", main_app.root_path %>
+<% phc_breadcrumb_one link_to "Home", phcdevworks_accounts.user_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 

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

@@ -1,8 +1,8 @@
 <!-- PHCTitleSEO Title Variables -->
 <% 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_one link_to "Home", phcdevworks_accounts.admin_users_all_path %>
+<% phc_breadcrumb_two link_to "Accounts Dashboard", phcdevworks_accounts.user_path %>
 <% phc_breadcrumb_three yield(:phc_title_tagline) %>
 <!-- PHCTitleSEO Title Variables -->
 

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_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- Title System -->
 

data/config/initializers/devise.rb

@@ -10,8 +10,7 @@ Devise.setup do |config|
   # Devise will use the `secret_key_base` as its `secret_key`
   # by default. You can change it below and use your own secret key.
   config.secret_key = ENV['SECRET_KEY_BASE'] if Rails.env.production?
-  # config.secret_key = 'c820cfaf52fdef30f175df6613d15419b36c28179b3853c7a2814f1e804286c6b82a7b88677aa958ac56937a8c9331575fee09fa25ac4295d007cc5c7cfa5117'
-  
+
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
   config.parent_controller = 'PhcdevworksAccounts::ApplicationController'

data/config/locales/devise.en.yml

@@ -1,4 +1,4 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
 
 en:
   devise:

data/config/routes.rb

@@ -1,21 +1,18 @@
 PhcdevworksAccounts::Engine.routes.draw do
 
-    # User Routes
-    devise_for :users, {
-        class_name: "PhcdevworksAccounts::User",
-        module: :devise
-    }
-
     # User Dashboard
+    match "user", to: "user/pages#dashboard", via: "get"
     match "user/profile", to: "user/pages#profile", via: "get"
 
     # Admin Routes
     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_id", via: "get"
+    match "/admin/user/:id", to: "admin/pages#user_profile", via: "get"
 
-    # Old Path Support (Will be Depricated)
-    get "dashboard", to: "user/pages#profile"
-    get "admin_users_index", to: "admin/pages#dashboard"
+    # User Routes
+    devise_for :users, {
+        class_name: "PhcdevworksAccounts::User",
+        module: :devise
+    }
 
 end

data/lib/phcdevworks_accounts.rb

@@ -1,3 +1,4 @@
+require "phcdevworks_accounts/version"
 require "phcdevworks_accounts/engine"
 
 module PhcdevworksAccounts

data/lib/phcdevworks_accounts/engine.rb

@@ -1,40 +1,47 @@
 module PhcdevworksAccounts
-  class Engine < ::Rails::Engine
-
-    # Load Main Dependencies
-    require "jbuilder"
-    require "paper_trail"
-    require "friendly_id"
-
-    # Load Theme Dependencies
-    require "phcthemes_admin_panel_pack"
-    require "phcthemes_web_theme_pack"
-
-    # Load Helper Dependencies
-    require "phcdevworks_core"
-    require "phcdevworks_active_menus"
-    require "phcdevworks_notifications"
-    require "phcdevworks_titleseo"
-
-    # Load Upload Dependencies
-    require "aws-sdk-s3"
-    require "google-cloud-storage"
-    require "mini_magick"
-
-    # Frontend Dependencies
-    require "wicked"
-    require "gravtastic"
-    require "friendly_id"
-
-    # Security Dependencies
-    require "devise"
-    require "simple_token_authentication"
-
-    # Payment Dependencies
-    require "activemerchant"
-
-    # Plugin Namespace
-    isolate_namespace PhcdevworksAccounts
-
-  end
+    class Engine < ::Rails::Engine
+
+        # Load Main Dependencies
+        require "jbuilder"
+        require "paper_trail"
+        require "friendly_id"
+
+        # Load Theme Dependencies
+        require "phcthemes_admin_panel_pack"
+        require "phcthemes_web_theme_pack"
+
+        # Load Helper Dependencies
+        require "phcdevworks_core"
+        require "phcdevworks_active_menus"
+        require "phcdevworks_notifications"
+        require "phcdevworks_titleseo"
+
+        # Load Upload Dependencies
+        require "aws-sdk-s3"
+        require "google-cloud-storage"
+        require "mini_magick"
+
+        # Frontend Dependencies
+        require "wicked"
+        require "gravtastic"
+        require "friendly_id"
+
+        # Mailer Dependencies
+        require "mail_form"
+
+        # Security Dependencies
+        require "devise"
+        require "simple_token_authentication"
+
+        # Plugin Namespace
+        isolate_namespace PhcdevworksAccounts
+
+        # Rspec Generators
+        config.generators do |g|
+            g.test_framework :rspec
+            g.fixture_replacement :factory_bot
+            g.factory_bot dir: 'spec/factories'
+        end
+
+    end
 end

data/lib/phcdevworks_accounts/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksAccounts
-    VERSION = "2.2.3"
+    VERSION = "3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 3.0.1
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,132 +16,156 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.3
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: phcthemes_admin_panel_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: phcthemes_web_theme_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_active_menus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: phcdevworks_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: phcdevworks_notifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: phcdevworks_titleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -185,89 +209,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.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.80'
+        version: '1.9'
 - !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.88'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.88'
 - !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.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.10'
+        version: '1.30'
 - !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
@@ -295,9 +319,6 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/phcdevworks_accounts_manifest.js
-- app/assets/javascripts/phcdevworks_accounts/admin/pages.coffee
-- app/assets/javascripts/phcdevworks_accounts/application.js
-- app/assets/javascripts/phcdevworks_accounts/user/pages.coffee
 - app/assets/stylesheets/phcdevworks_accounts/admin/pages.scss
 - app/assets/stylesheets/phcdevworks_accounts/application.scss
 - app/assets/stylesheets/phcdevworks_accounts/user/pages.scss
@@ -320,13 +341,16 @@ 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/admin/pages/components/_profile_header.html.erb
 - app/views/phcdevworks_accounts/admin/pages/dashboard.html.erb
-- app/views/phcdevworks_accounts/admin/pages/user_id.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
@@ -348,7 +372,6 @@ files:
 - db/migrate/20191012060241_add_userinfo_to_users.rb
 - db/migrate/20191012060308_add_role_to_users.rb
 - db/migrate/20191012060324_add_tos_to_users.rb
-- db/migrate/20201005111000_add_stripe_to_users.rb
 - lib/phcdevworks_accounts.rb
 - lib/phcdevworks_accounts/engine.rb
 - lib/phcdevworks_accounts/version.rb
@@ -356,7 +379,11 @@ files:
 homepage: https://phcdevworks.com/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org/
+  homepage_uri: https://phcdevworks.com/
+  source_code_uri: https://github.com/phcdevworks/phcdevworks_accounts
+  changelog_uri: https://github.com/phcdevworks/phcdevworks_accounts/releases
 post_install_message: 
 rdoc_options: []
 require_paths:

data/app/assets/javascripts/phcdevworks_accounts/admin/pages.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

data/app/assets/javascripts/phcdevworks_accounts/application.js

@@ -1,2 +0,0 @@
-// Load Admin Theme
-//= require phcthemes_admin_panel_pack_coloradmin

data/app/assets/javascripts/phcdevworks_accounts/user/pages.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/

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

@@ -1,2 +0,0 @@
-<h1><%= @admin_user.username %></h1>
-<h5><%= @admin_user.email%></h5>

data/db/migrate/20201005111000_add_stripe_to_users.rb

@@ -1,7 +0,0 @@
-class AddStripeToUsers < ActiveRecord::Migration[6.0]
-  def change
-
-    add_column :phcdevworks_accounts_users, :stripe_id, :integer
-
-  end
-end