phcdevworks_accounts 3.2.4 → 3.3.0

data/config/locales/devise.en.yml

@@ -1,65 +1,65 @@
-# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
-
-en:
-  devise:
-    confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
-      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
-    mailer:
-      confirmation_instructions:
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        subject: "Reset password instructions"
-      unlock_instructions:
-        subject: "Unlock instructions"
-      email_changed:
-        subject: "Email Changed"
-      password_change:
-        subject: "Password Changed"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
-    registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
-      updated: "Your account has been updated successfully."
-      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again"
-    sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
-    unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
-  errors:
-    messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
-      expired: "has expired, please request a new one"
-      not_found: "not found"
-      not_locked: "was not locked"
-      not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again"
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/config/routes.rb

@@ -1,19 +1,19 @@
-PhcdevworksAccounts::Engine.routes.draw do
-
-    # 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_profile", via: "get"
-
-    # User Routes
-    devise_for :users, class_name: "PhcdevworksAccounts::User",
-        module: :devise, 
-        controllers: {
-            registrations: 'users/registrations'
-    }
-
-end
+PhcdevworksAccounts::Engine.routes.draw do
+
+    # 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_profile", via: "get"
+
+    # User Routes
+    devise_for :users, class_name: "PhcdevworksAccounts::User",
+        module: :devise, 
+        controllers: {
+            registrations: 'users/registrations'
+    }
+
+end

data/config/spring.rb

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

data/db/migrate/20191012042035_devise_create_phcdevworks_accounts_users.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-
-class DeviseCreatePhcdevworksAccountsUsers < ActiveRecord::Migration[6.0]
-  def change
-    create_table :phcdevworks_accounts_users do |t|
-
-      ## Database authenticatable
-      t.string :email,              null: false, default: ""
-      t.string :encrypted_password, null: false, default: ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
-      t.datetime :confirmation_sent_at
-      t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
-      t.datetime :locked_at
-
-      t.timestamps null: false
-    
-    end
-
-    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
-
-  end
-end
+# frozen_string_literal: true
+
+class DeviseCreatePhcdevworksAccountsUsers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :phcdevworks_accounts_users do |t|
+
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.datetime :locked_at
+
+      t.timestamps null: false
+    
+    end
+
+    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
+
+  end
+end

data/db/migrate/20191012060241_add_userinfo_to_users.rb

@@ -1,15 +1,15 @@
-class AddUserinfoToUsers < ActiveRecord::Migration[6.0]
-  def change
-
-    add_column :phcdevworks_accounts_users, :firstname, :string
-    add_column :phcdevworks_accounts_users, :lastname, :string
-    add_column :phcdevworks_accounts_users, :username, :string
-    add_column :phcdevworks_accounts_users, :org_id, :string
-
-    add_index :phcdevworks_accounts_users, :firstname
-    add_index :phcdevworks_accounts_users, :lastname
-    add_index :phcdevworks_accounts_users, :username, unique: true
-    add_index :phcdevworks_accounts_users, :org_id, unique: true
-
-  end
-end
+class AddUserinfoToUsers < ActiveRecord::Migration[6.0]
+  def change
+
+    add_column :phcdevworks_accounts_users, :firstname, :string
+    add_column :phcdevworks_accounts_users, :lastname, :string
+    add_column :phcdevworks_accounts_users, :username, :string
+    add_column :phcdevworks_accounts_users, :org_id, :string
+
+    add_index :phcdevworks_accounts_users, :firstname
+    add_index :phcdevworks_accounts_users, :lastname
+    add_index :phcdevworks_accounts_users, :username, unique: true
+    add_index :phcdevworks_accounts_users, :org_id, unique: true
+
+  end
+end

data/db/migrate/20191012060308_add_role_to_users.rb

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

data/db/migrate/20191012060324_add_tos_to_users.rb

@@ -1,7 +1,7 @@
-class AddTosToUsers < ActiveRecord::Migration[6.0]
-  def change
-
-    add_column :phcdevworks_accounts_users, :terms_of_service, :boolean
-
-  end
-end
+class AddTosToUsers < ActiveRecord::Migration[6.0]
+  def change
+
+    add_column :phcdevworks_accounts_users, :terms_of_service, :boolean
+
+  end
+end

data/db/migrate/20210407121952_add_customer_id_to_users.rb

@@ -1,7 +1,7 @@
-class AddCustomerIdToUsers < ActiveRecord::Migration[6.1]
-    def change
-
-        add_column :phcdevworks_accounts_users, :payments_customer_id, :string
-
-    end
-end
+class AddCustomerIdToUsers < ActiveRecord::Migration[6.1]
+    def change
+
+        add_column :phcdevworks_accounts_users, :payments_customer_id, :string
+
+    end
+end

data/db/migrate/20210425060053_add_subscription_id_to_users.rb

@@ -1,7 +1,7 @@
-class AddSubscriptionIdToUsers < ActiveRecord::Migration[6.1]
-    def change
-
-        add_column :phcdevworks_accounts_users, :payments_subscription_id, :string
-
-    end
-end
+class AddSubscriptionIdToUsers < ActiveRecord::Migration[6.1]
+    def change
+
+        add_column :phcdevworks_accounts_users, :payments_subscription_id, :string
+
+    end
+end

data/lib/phcdevworks_accounts/engine.rb

@@ -1,48 +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 & 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
+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 & 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 = "3.2.4"
-end
+module PhcdevworksAccounts
+    VERSION = "3.3.0"
+end

data/lib/phcdevworks_accounts.rb

@@ -1,6 +1,6 @@
-require "phcdevworks_accounts/version"
-require "phcdevworks_accounts/engine"
-
-module PhcdevworksAccounts
-  # Your code goes here...
-end
+require "phcdevworks_accounts/version"
+require "phcdevworks_accounts/engine"
+
+module PhcdevworksAccounts
+  # Your code goes here...
+end

data/lib/tasks/phcdevworks_accounts_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :phcdevworks_accounts do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :phcdevworks_accounts do
+#   # Task goes here
+# end