phcdevworks_accounts 2.0.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d797d98c20d648b31acba248ef3513ba3bd8feeb8c4792e923fa1f76e4b1d7a
-  data.tar.gz: 1bd92451779dd6651fa05f8083ec89739c962fc7b3cab078488e9df37e5c0155
+  metadata.gz: 989cf6d939270a6ababe48ac017dbaf42dc3cd6d37370d1d4ac3eee9d29d8ce0
+  data.tar.gz: a12ff3a7feeffc58b4387e9e31fa62cf42faf9c2ff2e4cd8e85534a66af062da
 SHA512:
-  metadata.gz: 14c9dcc7d62988a43ed697f55abbf4c014c47626c308ba315fa452bd4f469f846f1197b170c15dfa68c551dda259178a0e5bac1ca395ae6d4dacc2b7b68625cb
-  data.tar.gz: 755d9b159fe444356b93837ad8d1b6de3264c11b5c465c5a19ae6f967bfbbb56fb214d2bd9adc6f527a413357159f9a12468f7ba54f9eced2fb0b9af08036a5f
+  metadata.gz: 792f07a6268d04ad937bd8392bea1e728103d3f9a816a1ade62dd9155823775ac060d1e0669452ed7576f9a14fb5d01e463092d6763061aa849f6b94fb39c7b7
+  data.tar.gz: e12e957700cfeb435da8b762a499ed74835b38f075f8742dc8ef87f17089fe146e2c8a49e6402af8679dae33cd702cde2bb2f18922a57d3f18ec164b4d5b02c5

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
+
+
+        # Account Admin
+        def dashboard
+        end
+
+        # User Admin
+        def users_list
+            @admin_users = User.all
+        end
+
+        def user_id
+            @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/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>

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

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

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

@@ -0,0 +1,4 @@
+<% @admin_users.each do |user| %>
+  <%= user.username %><br/>
+  <%= user.email %><br/>
+<% end %>

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

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

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

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

@@ -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,19 @@ 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/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_id", via: "get"
+
+    # Old Path Support (Will be Depricated)
+    get "dashboard", to: "user/pages#profile"
+    get "admin_users_index", to: "admin/pages#dashboard"
 
 end

data/db/migrate/20191012042035_devise_create_phcdevworks_accounts_users.rb

@@ -39,8 +39,8 @@ class DeviseCreatePhcdevworksAccountsUsers < ActiveRecord::Migration[6.0]
 
     add_index :phcdevworks_accounts_users, :email,                unique: true
     add_index :phcdevworks_accounts_users, :reset_password_token, unique: true
-    # add_index :phcdevworks_accounts_users, :confirmation_token,   unique: true
-    # add_index :phcdevworks_accounts_users, :unlock_token,         unique: true
+    add_index :phcdevworks_accounts_users, :confirmation_token,   unique: true
+    add_index :phcdevworks_accounts_users, :unlock_token,         unique: true
 
   end
 end

data/db/migrate/20201005111000_add_stripe_to_users.rb

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

data/lib/phcdevworks_accounts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.3
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.0.3.3
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -50,98 +50,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: phcthemes_admin_panel_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: phcthemes_web_theme_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_active_menus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_notifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_titleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: gravtastic
   requirement: !ruby/object:Gem::Requirement
@@ -190,28 +190,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.74'
+        version: '1.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.74'
+        version: '1.80'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.109'
+        version: '1.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.109'
+        version: '1.114'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -282,9 +282,11 @@ 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:
-- developers@phcdevworks.com
+- imfo@phcdevworks.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -293,24 +295,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
@@ -322,9 +324,10 @@ files:
 - 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/dashboard.html.erb
+- app/views/phcdevworks_accounts/admin/pages/user_id.html.erb
+- app/views/phcdevworks_accounts/admin/pages/users_list.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
@@ -345,6 +348,7 @@ 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

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