phcdevworks_accounts 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82bb61ee080fe523381201e30431473d97d4fc51ff5befc6fd1a0cc8f81ac5e
-  data.tar.gz: 4d6d773cf1e3101da970ec3b63650d0585913e09ad9c7dd488c7f3e1107d107a
+  metadata.gz: d92e06856f84fc051f6130132aba04d57e44b2bcfe2bf46f7f749c2fb7e98ba8
+  data.tar.gz: dcbfbf053d98940f04a8f98176983fff658707f501afd537b8a9652b6f26b140
 SHA512:
-  metadata.gz: b9e576364928c0e8713635f2d986cde3ca780aa6b925dfec8bdf1ff8411864d6ddfd3b70967f354b425c8d87d49e7912df2583d8f9195e23ebacb63d0d0f8c65
-  data.tar.gz: a60295a687133dbc3a9af33da3f8c59687b77130b5c0532158e4e205a1fccecae23bd726bbf24c74aafbf305e74e1eebc96e58e72505df5ec069e76398f34488
+  metadata.gz: 56e13396a39a216ca777a816ac7d2eb1ebcf592d22f01e43ef534ed7d9342d75783db07384c9dbaadd6e5027eb8792f9a928bb04ca520afe30b9bf0e127ad255
+  data.tar.gz: 5f609afd6f4d1f10a37a80544e198e81e09879e9b6ac09cc0cb27aab5aff23c75df58f26c2db0175341346925c115942f07339ce80583065f725b827f835b51b

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/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/{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/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: 'account/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/lib/phcdevworks_accounts/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksAccounts
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,7 +282,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 +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

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