phcmembers 64.0.0 → 64.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a7a77f758f83218a62b127bfd5b57a123fe7276bac4a137a2dfbf864c22ecf
-  data.tar.gz: b6c410703cda24273cae6432b1b6767dcd401f5f8b85cd8e3f2ff088ab7d9d65
+  metadata.gz: e053d460db74a80f9e0f5e3e9a69e21e4abe832c0a35bd84b9801b258d255784
+  data.tar.gz: c54064211474418428c78f5556f70b4681250227bb5318c26b0e5cdf94b95da9
 SHA512:
-  metadata.gz: cef4f33435818f2c256d9ad633ff41c52067ab30c4b628cf106a2f54589503f4f7855a383aef7af217f3458b69a6d50215f94e7182fe2523ff84d3f7533a35d8
-  data.tar.gz: a29058bc5a6d57426ed5760d58a3712e65d942fe1e9554064ac5065ecf627a0fd8dd877f18ff9b35f573c6623bfe5c3f3aee80527c3958a301b7e5e997e17538
+  metadata.gz: e11ab82bbb3117d85e4609308c43449c42ecf6eec5858fd0346ef8488320f208bdc0a3ea08a78936330421b54bfcc6d0a6afbaf1d1adbe53c41951e872f096fc
+  data.tar.gz: 8ab1a189fd327ce9fce36fd0844c9aa0813c7bceb5f7cf90adf7c153b0b7fe85bbadf8634237425826ad3de0d04cb5a2c500ec42f2640bdaed2239007e7c1992

data/app/controllers/phcmembers/directory/categories_controller.rb

@@ -34,7 +34,7 @@ module Phcmembers
       @directory_category = Directory::Category.new(directory_category_params)
       @directory_category.user_id = current_user.id
       if @directory_category.save
-        redirect_to directory_categories_url, notice: 'Category was successfully created.'
+        redirect_to directory_categories_url, :flash => { :success => 'Category was successfully created.' }
       else
           render :new
       end
@@ -43,7 +43,7 @@ module Phcmembers
     # PATCH/PUT - Directory Category
     def update
       if @directory_category.update(directory_category_params)
-        redirect_to directory_categories_url, notice: 'Category was successfully updated.'
+        redirect_to directory_categories_url, :flash => { :success => 'Category was successfully updated.' }
       else
           render :edit
       end
@@ -52,7 +52,7 @@ module Phcmembers
     # DELETE - Directory Category
     def destroy
       @directory_category.destroy
-      redirect_to directory_categories_url, notice: 'Category was successfully destroyed.'
+      redirect_to directory_categories_url, :flash => { :error => 'Category was successfully destroyed.' }
     end
 
     private

data/app/controllers/phcmembers/member/addresses_controller.rb

@@ -39,7 +39,7 @@ module Phcmembers
       @member_address = @profile.addresses.create(member_address_params)
       @member_address.user_id = current_user.id
       if @member_address.save
-        redirect_to member_profile_addresses_url, notice: 'Address was successfully created.'
+        redirect_to member_profile_addresses_url, :flash => { :success => 'Address was successfully created.' }
       else
         render :new
       end
@@ -49,7 +49,7 @@ module Phcmembers
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_address.update(member_address_params)
-        redirect_to member_profile_addresses_url, notice: 'Address was successfully updated.'
+        redirect_to member_profile_addresses_url, :flash => { :success => 'Address was successfully updated.' }
       else
         render :edit
       end
@@ -60,7 +60,7 @@ module Phcmembers
       @profile = Member::Profile.find(params[:profile_id])
       @member_address = @profile.addresses.find(params[:id])
       @member_address.destroy
-      redirect_to member_profile_addresses_url, notice: 'Listing was successfully destroyed.'
+      redirect_to member_profile_addresses_url, :flash => { :error => 'Listing was successfully destroyed.' }
     end
 
     private

data/app/controllers/phcmembers/member/listings_controller.rb

@@ -39,7 +39,7 @@ module Phcmembers
       @member_listing = @profile.listings.create(member_listing_params)
       @member_listing.user_id = current_user.id
       if @member_listing.save
-        redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
+        redirect_to member_profile_listings_url, :flash => { :success => 'Listing was successfully created.' }
       else
           render :new
       end
@@ -49,7 +49,7 @@ module Phcmembers
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_listing.update(member_listing_params)
-        redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
+        redirect_to member_profile_listings_url, :flash => { :success => 'Listing was successfully updated.' }
       else
           render :edit
       end
@@ -60,7 +60,7 @@ module Phcmembers
       @profile = Member::Profile.find(params[:profile_id])
       @member_listing = @profile.listings.find(params[:id])
       @member_listing.destroy
-      redirect_to member_profile_listings_url, notice: 'Listing was successfully destroyed.'
+      redirect_to member_profile_listings_url, :flash => { :error => 'Listing was successfully destroyed.' }
     end
 
     private

data/app/controllers/phcmembers/member/profiles_controller.rb

@@ -35,7 +35,7 @@ module Phcmembers
       @member_profile = Member::Profile.new(member_profile_params)
       @member_profile.user_id = current_user.id
       if @member_profile.save
-        redirect_to member_profiles_url, notice: 'Profile was successfully created.'
+        redirect_to member_profiles_url, :flash => { :success => 'Profile was successfully created.' }
       else
         render :new
       end
@@ -44,7 +44,7 @@ module Phcmembers
     # PATCH/PUT - Member Profile
     def update
       if @member_profile.update(member_profile_params)
-        redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
+        redirect_to member_profiles_url, :flash => { :success => 'Profile was successfully updated.' }
       else
         render :edit
       end
@@ -53,7 +53,7 @@ module Phcmembers
     # DELETE - Member Profile
     def destroy
       @member_profile.destroy
-      redirect_to member_profiles_url, notice: 'Profile was successfully destroyed.'
+      redirect_to member_profiles_url, :flash => { :error => 'Profile was successfully destroyed.' }
     end
 
     private

data/app/models/phcmembers/member/listing.rb

@@ -46,7 +46,8 @@ module Phcmembers
     
     validates :listing_website,
     	presence: true,
-    	length: { minimum: 6 }
+    	length: { minimum: 6 },
+    	format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
     
     validates :listing_phone,
     	presence: true,

data/app/views/layouts/phcmembers/application.html.erb

@@ -50,6 +50,7 @@
 
     <!-- Page Content -->
     <div id="content" class="content">
+      <%= render 'phcnotifi/default/notifications' %>
       <%= yield %>
     </div>
     <!-- Page Content -->

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

@@ -1,4 +1,4 @@
-<!-- Sidebar for Users and Admin -->
+<!-- Sidebar for PHCDevworks Engines -->
 <div data-scrollbar="true" data-height="100%">
 
   <!-- Sidebar - User Profile Menu -->
@@ -34,11 +34,29 @@
     <% end %>
   </ul>
   <!-- Sidebar - User Profile Menu -->
+
   <!-- Sidebar - Sidebar Navigation -->
   <ul class="nav">
-    
+
+    <% if defined?phccodesnipper %>
+      <!-- Sidebar - Sidebar Navigation - PHCCodeSnipper -->
+      <li class="nav-header">Code Snippets</li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-newspaper"></i>
+          <span>Code Snippets</span>
+        </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phccodesnipper/script/posts') %>"><%= link_to 'Snippet Index', phccodesnipper.script_snippets_path %></li>
+          <li class="<%= phc_menus_active_controller('phccodesnipper/script/posts#new') %>"><%= link_to 'New Snippet', phccodesnipper.new_script_snippet_path %></li>
+        </ul>
+      </li>
+      <!-- Sidebar - Sidebar Navigation - PHCCodeSnipper -->
+    <% end %>
+
     <% if defined?phcpress %>
-      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCPress -->
       <li class="nav-header">Article Management</li>
       <li class="has-sub">
         <a href="javascript:;">
@@ -62,11 +80,11 @@
           <li class="<%= phc_menus_active_controller('phcpress/article/categories#new') %>"><%= link_to('New Category', phcpress.new_article_category_path) %></li>
         </ul>
       </li>
-      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCPress -->
     <% end %>
 
     <% if defined?phcmembers %>
-      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCMembers -->
       <li class="nav-header">Membership Manager</li>
       <li class="has-sub">
         <a href="javascript:;">
@@ -90,11 +108,11 @@
           <li class="<%= phc_menus_active_controller('phcmembers/directory/categories#new') %>"><%= link_to('New Directory Listing', phcmembers.new_directory_category_path) %></li>
         </ul>
       </li>
-      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCMembers -->
     <% end %>
 
     <% if defined?phcscriptcdn %>
-      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN -->
       <li class="nav-header">Script Management</li>
       <li class="has-sub">
         <a href="javascript:;">
@@ -104,7 +122,7 @@
         </a>
         <ul class="sub-menu">
           <li class="<%= phc_menus_active_controller('phcscriptcdn/script/listings') %>"><%= link_to "All Script Listings", phcscriptcdn.script_listings_path %></li>
-      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/listings#new') %>"><%= link_to "Add a New Listing", phcscriptcdn.new_script_listing_path %></li>
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/listings#new') %>"><%= link_to "Add a New Listing", phcscriptcdn.new_script_listing_path %></li>
         </ul>
       </li>
       <li class="has-sub">
@@ -114,41 +132,58 @@
           <span>Script Extras</span>
         </a>
         <ul class="sub-menu">
-      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/authors') %>"><%= link_to "Script Authors", phcscriptcdn.script_authors_path %></li>
-      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/licences') %>"><%= link_to "Script Licences", phcscriptcdn.script_licences_path %></li>
-      		<li class="<%= phc_menus_active_controller('phcscriptcdn/script/extensions') %>"><%= link_to "Script Extensions", phcscriptcdn.script_extensions_path %></li>
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/authors') %>"><%= link_to "Script Authors", phcscriptcdn.script_authors_path %></li>
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/licences') %>"><%= link_to "Script Licences", phcscriptcdn.script_licences_path %></li>
+          <li class="<%= phc_menus_active_controller('phcscriptcdn/script/extensions') %>"><%= link_to "Script Extensions", phcscriptcdn.script_extensions_path %></li>
           <li class="<%= phc_menus_active_controller('phcscriptcdn/script/versions') %>"><%= link_to "Script Versions", phcscriptcdn.script_versions_path %></li>
         </ul>
       </li>
-      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN(Pro) -->
+      <!-- Sidebar - Sidebar Navigation - PHCScriptCDN -->
+    <% end %>
+
+    <% if current_user && current_user.admin? %>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
+      <li class="nav-header">User Administration</li>
+        <li class="has-sub">
+          <a href="javascript:;">
+            <b class="caret"></b>
+            <i class="fas fa-user"></i>
+            <span>Admin</span>
+          </a>
+          <ul class="sub-menu">
+            <li class="<%= phc_menus_active_controller('phcaccounts/admin/users') %>"><%= link_to 'User List', phcaccounts.admin_users_path %></li>
+        </ul>
+      </li>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
     <% end %>
 
     <% if current_user %>
-      <!-- Sidebar - Sidebar Navigation - PHCAccounts -->
-      <li class="nav-header">Account Settings</li>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
+      <li class="nav-header">Your Account</li>
       <li class="has-sub">
         <a href="javascript:;">
           <b class="caret"></b>
           <i class="fas fa-user"></i>
-          <span>Accounts Dashboard</span>
+          <span>Accounts Settings</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcaccounts/admin/edit') %>"><%= link_to('Settings', phcaccounts.edit_user_registration_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcaccounts/admin/new') %>"><%= link_to('Logout', phcaccounts.destroy_user_session_path, method: :delete) %></li>
+          <li class="<%= phc_menus_active_controller('phcaccounts/user/edit') %>"><%= link_to 'Settings', phcaccounts.edit_user_registration_path %></li>
+          <li class="<%= phc_menus_active_controller('phcaccounts/user/new') %>"><%= link_to 'Logout', phcaccounts.destroy_user_session_path, method: :delete %></li>
         </ul>
       </li>
-      <!-- Sidebar - Sidebar Navigation - PHCAccounts -->
-      <!-- Sidebar - Sidebar Minifier -->
-      <li>
-        <a href="javascript:;" class="sidebar-minify-btn" data-click="sidebar-minify">
-          <i class="fa fa-angle-double-left"></i>
-        </a>
-      </li>
-      <!-- Sidebar - Sidebar Minifier -->
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
     <% end %>
+    
+    <!-- Sidebar - Sidebar Minifier -->
+    <li>
+      <a href="javascript:;" class="sidebar-minify-btn" data-click="sidebar-minify">
+        <i class="fa fa-angle-double-left"></i>
+      </a>
+    </li>
+    <!-- Sidebar - Sidebar Minifier -->
 
   </ul>
   <!-- Sidebar - Sidebar Navigation -->
 
 </div>
-<!-- Sidebar for Users and Admin -->
+<!-- Sidebar for PHCDevworks Engines -->

data/app/views/phcmembers/directory/categories/_form.html.erb

@@ -2,7 +2,7 @@
 <%= form_with(model: @directory_category, local: true) do |form| %>
 
 	<!-- PHCNotifi Render Validation -->
-	<%= render 'phcnotifi/validations', :object => @directory_category %>
+	<%= render 'phcnotifi/default/validations', :object => @directory_category %>
 	<!-- PHCNotifi Render Validation -->
 
 	<!-- PHCMembers Field - Directory Categories -->

data/app/views/phcmembers/member/addresses/_form.html.erb

@@ -2,7 +2,7 @@
 <%= form_with(model: [ @member_profile, @member_address], url: form_url, local: true) do |form| %>
 
 	<!-- PHCNotifi Render Validation -->
-	<%= render 'phcnotifi/validations', :object => @member_address %>
+	<%= render 'phcnotifi/default/validations', :object => @member_address %>
 	<!-- PHCNotifi Render Validation -->
 
 	<!-- PHCMembers Fields - Address -->

data/app/views/phcmembers/member/listings/_form.html.erb

@@ -2,7 +2,7 @@
 <%= form_for([@member_listing.profile, @member_listing], url: form_url) do |phc_members_member_listings| %>
 
 	<!-- PHCNotifi Render Validation -->
-	<%= render 'phcnotifi/validations', :object => @member_listing %>
+	<%= render 'phcnotifi/default/validations', :object => @member_listing %>
 	<!-- PHCNotifi Render Validation -->
 
 	<!-- PHCMembers Fields - Web Directory Listings -->

data/app/views/phcmembers/member/profiles/_form.html.erb

@@ -2,7 +2,7 @@
 <%= form_with(model: @member_profile, local: true) do |phc_members_member_profile| %>
 
 	<!-- PHCNotifi Render Validation -->
-	<%= render 'phcnotifi/validations', :object => @member_profile %>
+	<%= render 'phcnotifi/default/validations', :object => @member_profile %>
 	<!-- PHCNotifi Render Validation -->
 
 	<!-- PHCMembers Fields - Profiles -->

data/lib/phcmembers/version.rb

@@ -1,3 +1,3 @@
 module Phcmembers
-  VERSION = "64.0.0"
+  VERSION = "64.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmembers
 version: !ruby/object:Gem::Version
-  version: 64.0.0
+  version: 64.1.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,14 +232,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: phcmenus
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '45.0'
+        version: '47.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '45.0'
+        version: '47.2'
 - !ruby/object:Gem::Dependency
   name: phctitleseo
   requirement: !ruby/object:Gem::Requirement
@@ -456,14 +456,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '37.0'
+        version: '38.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '37.0'
+        version: '38.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement