phcdevworks_accounts 2.5.0 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661b7b49dc5b80d794d51a7fad2f9e5e7e5e1475f6feada9ec22ddf6023862ca
-  data.tar.gz: cd044de09145a204a12787d7af605fbf4be8effbb2f202488df91e8cc849e868
+  metadata.gz: 7e16f70391b389d6427707887237b467995710bbc9dbc1827dd9aa92d302b393
+  data.tar.gz: a2c8fa10b554897a7ffc735451069bc1a4d6d0bc630a046c7cb039daeb05f635
 SHA512:
-  metadata.gz: 66a13c34e8f136b769e4c8b2c4c429a044203e265e716d1e33becc8ffcc64250c7f8062ecd40c7c158d0d0d78c87b0766a704e2e4d954dce9b170e936b88ec33
-  data.tar.gz: 23b2528fe0aed46a1a4c371112e54b1f9fb9cc81368c78c94123d1ebe2756cad3cde2564bb4b40c52f4797b8f2afc84686cbfb04226b23bbcd8b3d7bd0772b5d
+  metadata.gz: 3e0ea8708c0a06602fc1d16da94df17ab3e996d07ac61cc2a9d8f216b4057434944808b6d09d5565d2173e718dda5ce048056b80aec5ab85c1e29b1333d05289
+  data.tar.gz: 95cd11384fa56bbd68443032a225988dc3ade2be48cce01bd0a8c6e12cae6325bf820c7908dfbc4b1fed0b87b9c420a969f7c4fffc8ef278b4d6c47a7adf3cca

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,4 +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/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/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

@@ -234,7 +234,7 @@
 
         <% if defined?phcdevworks_core_modules %>
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
-            <li class="nav-header">Core Modules</li>
+            <li class="nav-header">Categories</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
@@ -246,11 +246,28 @@
                     <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
                 </ul>
             </li>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
+        <% end %>
+
+        <% if defined?phcdevworks_core_modules %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
+            <li class="nav-header">Marketing</li>
+            <li class="has-sub">
+                <a href="javascript:;">
+                    <b class="caret"></b>
+                    <i class="fad fa-link"></i>
+                    <span>Affiliate Links</span>
+                </a>
+                <ul class="sub-menu">
+                    <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/affiliate/links") %>"><%= link_to("Affiliate Link Index", phcdevworks_core_modules.affiliate_links_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/affiliate/links#new") %>"><%= link_to("New Affiliate Link", phcdevworks_core_modules.new_affiliate_link_path) %></li>
+                </ul>
+            </li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
                     <i class="fad fa-analytics"></i>
-                    <span>Marketing</span>
+                    <span>Search Optimization</span>
                 </a>
                 <ul class="sub-menu">
                     <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>

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.user_dashboard_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.user_dashboard_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.user_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.user_dashboard_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,13 +1,7 @@
 PhcdevworksAccounts::Engine.routes.draw do
 
-    # User Routes
-    devise_for :users, {
-        class_name: "PhcdevworksAccounts::User",
-        module: :devise
-    }
-
     # User Dashboard
-    match "user/dashboard", to: "user/pages#dashboard", via: "get"
+    match "user", to: "user/pages#dashboard", via: "get"
     match "user/profile", to: "user/pages#profile", via: "get"
 
     # Admin Routes
@@ -15,4 +9,10 @@ PhcdevworksAccounts::Engine.routes.draw do
     match "/admin/users/all", to: "admin/pages#users_list", via: "get"
     match "/admin/user/:id", to: "admin/pages#user_profile", via: "get"
 
+    # User Routes
+    devise_for :users, {
+        class_name: "PhcdevworksAccounts::User",
+        module: :devise
+    }
+
 end

data/config/spring.rb

@@ -0,0 +1,2 @@
+ Spring.application_root = './spec/test_app'
+  

data/db/migrate/20210402042717_add_stripe_id_to_users.rb

@@ -0,0 +1,7 @@
+class AddStripeIdToUsers < ActiveRecord::Migration[6.1]
+  def change
+
+    add_column :phcdevworks_accounts_users, :stripe_customer_id, :string
+
+  end
+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,48 @@
 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"
-
-    # Mailer Dependencies
-    require "mail_form"
-
-    # Security Dependencies
-    require "devise"
-    require "simple_token_authentication"
-
-    # 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 & Payment Dependencies
+        require "devise"
+        require "simple_token_authentication"
+        require "stripe"
+
+        # 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.5.0"
+    VERSION = "3.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.4
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,56 +30,56 @@ dependencies:
     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.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: phcthemes_web_theme_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: phcdevworks_active_menus
   requirement: !ruby/object:Gem::Requirement
@@ -184,42 +184,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.86'
+        version: '1.89'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.86'
+        version: '1.89'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: '1.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.29'
+        version: '1.30'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: stripe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.30'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.30'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: spring
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: spring-commands-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -289,9 +359,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
@@ -341,10 +408,12 @@ files:
 - config/initializers/devise.rb
 - config/locales/devise.en.yml
 - config/routes.rb
+- config/spring.rb
 - db/migrate/20191012042035_devise_create_phcdevworks_accounts_users.rb
 - 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/20210402042717_add_stripe_id_to_users.rb
 - lib/phcdevworks_accounts.rb
 - lib/phcdevworks_accounts/engine.rb
 - lib/phcdevworks_accounts/version.rb
@@ -352,7 +421,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/