phcdevworks_members 6.7.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a00f19f9b7b19e6b2d7babd1d7dfe23f8f51d46f7c54f1f92f97a7f5ce17a8
-  data.tar.gz: aaef6a6c3524e595df8ccb000202644489cc7b01fb3af4fdf029c6f0149c40ce
+  metadata.gz: 21810a72893c535f30b0f52568d33de3da893f913907e2dec5b617fc4a3c730e
+  data.tar.gz: 7db1142baa97a83aa1bbdc710e008cd816fe27ea96b3fdbd29b9d9594f409e9f
 SHA512:
-  metadata.gz: b57f849f9a0fff3c2c616889418a6ac9fba62a004eb04d80df44ab6fc2eab6b9f2b85a93730c576bbbe5389e69393865276fbb95564e4ca4238b226eaa6c47ca
-  data.tar.gz: ba92a33acf1a8f7489078df65454e8e0f4341b6b94ce52a7679f728e15fc2e7488b670c9de8ff2248873fab2852e37d583ace3b18a50eef64e1261f107a18150
+  metadata.gz: 03e77d89e434cee234bcb77b24d708bde76af5097cd6a999de75ae70a1556903919f16b1837aba83144578f72d3ec2c9afbe65d3ba51d972b370e114f59982e2
+  data.tar.gz: c5c900a49ed0d570037c451285e51a12d6cd25b5cce19565203aea33783818ec45fed41e73b7075c49b0ecb840e42c26a7088c8b91548f85979342d7cb42bc3f

data/app/assets/config/phcdevworks_members_manifest.js

@@ -1,2 +1,4 @@
 //= link_directory ../javascripts/phcdevworks_members .js
 //= link_directory ../stylesheets/phcdevworks_members .scss
+//= link phcdevworks_core_modules/application.js
+//= link phcdevworks_core_modules/application.css

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

@@ -80,7 +80,7 @@ module PhcdevworksMembers
 
     # Whitelist
     def directory_category_params
-      params.require(:directory_category).permit(:category_name, :slug, :user_id, :org_id)
+      params.require(:directory_category).permit(:directory_category_name, :slug, :user_id, :org_id)
     end
 
   end

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

@@ -88,7 +88,7 @@ module PhcdevworksMembers
 
     # Whitelist
     def member_address_params
-      params.require(:member_address).permit(:address_line_1, :address_line_2, :address_city, :address_province, :address_country, :address_postal_code, :address_type, :profile_id, :slug, :user_id, :org_id)
+      params.require(:member_address).permit(:member_address_line_1, :member_address_line_2, :member_address_city, :member_address_province, :member_address_country, :member_address_postal_code, :member_address_type, :profile_id, :slug, :user_id, :org_id)
     end
 
   end

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

@@ -88,7 +88,7 @@ module PhcdevworksMembers
 
     # Whitelist
     def member_listing_params
-      params.require(:member_listing).permit(:listing_company_name, :listing_contact_name, :listing_address_line_1, :listing_address_line_2, :listing_city, :listing_country, :listing_province, :listing_postal_code, :listing_phone, :listing_contact_email, :listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
+      params.require(:member_listing).permit(:member_listing_company_name, :member_listing_contact_name, :member_listing_address_line_1, :member_listing_address_line_2, :member_listing_city, :member_listing_country, :member_listing_province, :member_listing_postal_code, :member_listing_phone, :member_listing_contact_email, :member_listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
     end
 
   end

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

@@ -81,7 +81,7 @@ module PhcdevworksMembers
 
     # Whitelist
     def member_profile_params
-      params.require(:member_profile).permit(:profile_first_name, :profile_last_name, :profile_title, :profile_email, :profile_phone, :profile_notes, :slug, :user_id, :org_id)
+      params.require(:member_profile).permit(:member_profile_first_name, :member_profile_last_name, :member_profile_title, :member_profile_email, :member_profile_phone, :member_profile_notes, :slug, :user_id, :org_id)
     end
 
   end

data/app/models/phcdevworks_members/directory/category.rb

@@ -11,15 +11,15 @@ module PhcdevworksMembers
     has_and_belongs_to_many :listings, class_name: "PhcdevworksMembers::Member::Listing", :join_table => "phcdevworks_members_categories_lstings", :dependent => :destroy
 
     # Form Fields Validation
-    validates :category_name,
+    validates :directory_category_name,
       presence: true
 
     # Clean URL Define
-    friendly_id :phcdev_directory_category_nice_urls, use: [:slugged, :finders]
+    friendly_id :directory_category_nice_urls, use: [:slugged, :finders]
 
-    def phcdev_directory_category_nice_urls
+    def directory_category_nice_urls
       [
-        [:category_name]
+        [:directory_category_name]
       ]
     end
 

data/app/models/phcdevworks_members/directory_category_versions.rb

@@ -1,5 +1,5 @@
 module PhcdevworksMembers
   class DirectoryCategoryVersions < PaperTrail::Version
-    self.table_name = :phcdevworks_members_category_versions
+    self.table_name = :phcdevworks_members_directory_category_versions
   end
 end

data/app/models/phcdevworks_members/member/address.rb

@@ -11,27 +11,27 @@ module PhcdevworksMembers
     belongs_to :profile, class_name: 'PhcdevworksMembers::Member::Profile'
 
     # Form Fields Validation
-    validates :address_line_1,
+    validates :member_address_line_1,
       presence: true
 
-    validates :address_city,
+    validates :member_address_city,
       presence: true
 
-    validates :address_province,
+    validates :member_address_province,
       presence: true
 
-    validates :address_country,
+    validates :member_address_country,
       presence: true
 
-    validates :address_postal_code,
+    validates :member_address_postal_code,
       presence: true
 
     # Clean URL Define
-    friendly_id :phcdev_members_address_nice_urls, use: [:slugged, :finders]
+    friendly_id :members_address_nice_urls, use: [:slugged, :finders]
 
-    def phcdev_members_address_nice_urls
+    def members_address_nice_urls
       [
-        [:address_type, :address_city, :address_province]
+        [:member_address_type, :member_address_city, :member_address_province]
       ]
     end
 

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

@@ -9,48 +9,49 @@ module PhcdevworksMembers
 
     # Relationships
     belongs_to :profile, class_name: "PhcdevworksMembers::Member::Profile"
+    belongs_to :optimization, class_name: "PhcdevworksCoreModules::Marketing::Optimization", optional: true
     has_and_belongs_to_many :categories, class_name: "PhcdevworksMembers::Directory::Category", :join_table => "phcdevworks_members_categories_lstings"
 
     # Form Fields Validation
-    validates :listing_company_name,
+    validates :member_listing_company_name,
       presence: true
 
-    validates :listing_contact_name,
+    validates :member_listing_contact_name,
       presence: true
 
-    validates :listing_address_line_1,
+    validates :member_listing_address_line_1,
       presence: true
 
-    validates :listing_city,
+    validates :member_listing_city,
       presence: true
 
-    validates :listing_country,
+    validates :member_listing_country,
       presence: true
 
-    validates :listing_province,
+    validates :member_listing_province,
       presence: true
 
-    validates :listing_postal_code,
+    validates :member_listing_postal_code,
       presence: true
 
-    validates :listing_contact_email,
+    validates :member_listing_contact_email,
       presence: true,
       format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
-    validates :listing_website,
+    validates :member_listing_website,
       presence: true,
       format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
 
-    validates :listing_phone,
+    validates :member_listing_phone,
       presence: true,
       format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Member Format: ***-***-****" }
 
     # Clean URL Define
-    friendly_id :phcdev_members_listing_nice_urls, use: [:slugged, :finders]
+    friendly_id :members_listing_nice_urls, use: [:slugged, :finders]
 
-    def phcdev_members_listing_nice_urls
+    def members_listing_nice_urls
       [
-        [:listing_company_name, :listing_contact_name]
+        [:member_listing_company_name, :member_listing_contact_name]
       ]
     end
 

data/app/models/phcdevworks_members/member/profile.rb

@@ -9,36 +9,36 @@ module PhcdevworksMembers
 
     # Profile Gravatar
     include Gravtastic
-    gravtastic :profile_email
+    gravtastic :member_profile_email
 
     # Relationships
     has_many :addresses, class_name: 'Member::Address', :dependent => :destroy
     has_many :listings, class_name: 'Member::Listing', :dependent => :destroy
 
     # Form Fields Validation
-    validates :profile_first_name,
+    validates :member_profile_first_name,
       presence: true
 
-    validates :profile_last_name,
+    validates :member_profile_last_name,
       presence: true
 
-    validates :profile_title,
+    validates :member_profile_title,
       presence: true
 
-    validates :profile_email,
+    validates :member_profile_email,
       presence: true,
       format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
-    validates :profile_phone,
+    validates :member_profile_phone,
       presence: true,
       format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
 
     # Clean URL Define
-    friendly_id :phcdev_members_profile_nice_urls, use: [:slugged, :finders]
+    friendly_id :members_profile_nice_urls, use: [:slugged, :finders]
 
-    def phcdev_members_profile_nice_urls
+    def members_profile_nice_urls
       [
-        [:profile_first_name, :profile_last_name]
+        [:member_profile_first_name, :member_profile_last_name]
       ]
     end
 

data/app/models/phcdevworks_members/member_address_versions.rb

@@ -1,5 +1,5 @@
 module PhcdevworksMembers
   class MemberAddressVersions < PaperTrail::Version
-    self.table_name = :phcdevworks_members_address_versions
+    self.table_name = :phcdevworks_members_member_address_versions
   end
 end

data/app/models/phcdevworks_members/member_listing_versions.rb

@@ -1,5 +1,5 @@
 module PhcdevworksMembers
   class MemberListingVersions < PaperTrail::Version
-    self.table_name = :phcdevworks_members_listing_versions
+    self.table_name = :phcdevworks_members_member_listing_versions
   end
 end

data/app/models/phcdevworks_members/member_profile_versions.rb

@@ -1,5 +1,5 @@
 module PhcdevworksMembers
   class MemberProfileVersions < PaperTrail::Version
-    self.table_name = :phcdevworks_members_profile_versions
+    self.table_name = :phcdevworks_members_member_profile_versions
   end
 end

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

@@ -38,33 +38,21 @@
     <!-- -PHC- Sidebar - Sidebar Navigation -->
     <ul class="nav">
 
-        <% if defined?phcdevworks_members %>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
-            <li class="nav-header">Membership Manager</li>
-            <li class="has-sub">
-                <a href="javascript:;">
-                    <b class="caret"></b>
-                    <i class="fad fa-users"></i>
-                    <span>Member"s Data</span>
-                </a>
-                <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_members/member/profiles") %>"><%= link_to("Profile Index", phcdevworks_members.member_profiles_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_members/member/profiles#new") %>"><%= link_to("New Member Profile", phcdevworks_members.new_member_profile_path) %></li>
-                </ul>
-            </li>
-            <li class="nav-header">Member"s Directory</li>
+        <% if defined?phcdevworks_press %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
+            <li class="nav-header">Articles & Blogging</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-list-alt"></i>
-                    <span>Member"s Directory</span>
+                    <i class="fad fa-newspaper"></i>
+                    <span>Article Posts</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_members/directory/categories") %>"><%= link_to("Directory Index", phcdevworks_members.directory_categories_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_members/directory/categories#new") %>"><%= link_to("New Directory Listing", phcdevworks_members.new_directory_category_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts") %>"><%= link_to("Article Index", phcdevworks_press.article_posts_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("New Aritcle", phcdevworks_press.new_article_post_path) %></li>
                 </ul>
             </li>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
         <% end %>
 
         <% if defined?phcdevworks_portfolio %>
@@ -84,54 +72,73 @@
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-sitemap"></i>
-                    <span>Project Categories</span>
+                    <i class="fad fa-folders"></i>
+                    <span>Project Types</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts") %>"><%= link_to("Project Category", phcdevworks_portfolio.project_categories_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Category", phcdevworks_portfolio.new_project_category_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts") %>"><%= link_to("Project Type", phcdevworks_portfolio.project_types_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Types", phcdevworks_portfolio.new_project_type_path) %></li>
                 </ul>
             </li>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
+        <% end %>
+
+        <% if defined?phcdevworks_tutorials %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
+            <li class="nav-header">Tutorial Posts</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-folders"></i>
-                    <span>Project Types</span>
+                    <i class="fad fa-chalkboard-teacher"></i>
+                    <span>Tutorial Posts</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts") %>"><%= link_to("Project Type", phcdevworks_portfolio.project_types_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_portfolio/project/posts#new") %>"><%= link_to("New Types", phcdevworks_portfolio.new_project_type_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/posts") %>"><%= link_to "Tutorial Index", phcdevworks_tutorials.tutorial_posts_path %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/posts#new") %>"><%= link_to "New Tutorial", phcdevworks_tutorials.new_tutorial_post_path %></li>
                 </ul>
             </li>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
+            <li class="nav-header">Command Lists & Items</li>
+            <li class="has-sub">
+                <a href="javascript:;">
+                    <b class="caret"></b>
+                    <i class="fad fa-terminal"></i>
+                    <span>Command Lists</span>
+                </a>
+                <ul class="sub-menu">
+                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/command/posts") %>"><%= link_to "List Index", phcdevworks_tutorials.command_posts_path %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/command/posts#new") %>"><%= link_to "New List", phcdevworks_tutorials.new_command_post_path %></li>
+                </ul>
+            </li>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
         <% end %>
 
-        <% if defined?phcdevworks_press %>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
-            <li class="nav-header">Articles & Blogging</li>
+        <% if defined?phcdevworks_members %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
+            <li class="nav-header">Membership Manager</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-newspaper"></i>
-                    <span>Article Posts</span>
+                    <i class="fad fa-users"></i>
+                    <span>Member"s Data</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts") %>"><%= link_to("Article Index", phcdevworks_press.article_posts_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/posts#new") %>"><%= link_to("New Aritcle", phcdevworks_press.new_article_post_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_members/member/profiles") %>"><%= link_to("Profile Index", phcdevworks_members.member_profiles_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_members/member/profiles#new") %>"><%= link_to("New Member Profile", phcdevworks_members.new_member_profile_path) %></li>
                 </ul>
             </li>
+            <li class="nav-header">Member"s Directory</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-sitemap"></i>
-                    <span>Article Categories</span>
+                    <i class="fad fa-list-alt"></i>
+                    <span>Member"s Directory</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/categories") %>"><%= link_to("Category Index", phcdevworks_press.article_categories_path) %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_press/article/categories#new") %>"><%= link_to("New Category", phcdevworks_press.new_article_category_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_members/modules/categories") %>"><%= link_to("Directory Index", phcdevworks_members.directory_categories_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_members/modules/categories#new") %>"><%= link_to("New Directory Listing", phcdevworks_members.new_directory_category_path) %></li>
                 </ul>
             </li>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Press -->
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
         <% end %>
 
         <% if defined?phcdevworks_scripts %>
@@ -203,44 +210,32 @@
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
         <% end %>
 
-        <% if defined?phcdevworks_tutorials %>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
-            <li class="nav-header">Tutorial Posts</li>
-            <li class="has-sub">
-                <a href="javascript:;">
-                    <b class="caret"></b>
-                    <i class="fad fa-chalkboard-teacher"></i>
-                    <span>Tutorial Posts</span>
-                </a>
-                <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/posts") %>"><%= link_to "Tutorial Index", phcdevworks_tutorials.tutorial_posts_path %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/posts#new") %>"><%= link_to "New Tutorial", phcdevworks_tutorials.new_tutorial_post_path %></li>
-                </ul>
-            </li>
+        <% if defined?phcdevworks_core_modules %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
+            <li class="nav-header">Core Modules</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
                     <i class="fad fa-sitemap"></i>
-                    <span>Tutorial Categories</span>
+                    <span>Categories</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/categories") %>"><%= link_to "Category Index", phcdevworks_tutorials.tutorial_categories_path %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/tutorials/categories#new") %>"><%= link_to "New Category", phcdevworks_tutorials.new_tutorial_category_path %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
+                    <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>
-            <li class="nav-header">Command Lists & Items</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-terminal"></i>
-                    <span>Command Lists</span>
+                    <i class="fad fa-analytics"></i>
+                    <span>Marketing</span>
                 </a>
                 <ul class="sub-menu">
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/command/posts") %>"><%= link_to "List Index", phcdevworks_tutorials.command_posts_path %></li>
-                    <li class="<%= phc_menu_active_controller("phcdevworks_tutorials/command/posts#new") %>"><%= link_to "New List", phcdevworks_tutorials.new_command_post_path %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
                 </ul>
             </li>
-            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
         <% end %>
 
         <% if current_user && current_user.admin? %>

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

@@ -7,8 +7,8 @@
 	
 	<!-- Form Input Fields -->
 	<div class="form-group field_with_errors">
-		<%= form.label :category_name, "Category Name" %>
-		<%= form.text_field :category_name, placeholder: "Directory Category", class: "form-control" %>
+		<%= form.label :directory_category_name, "Category Name" %>
+		<%= form.text_field :directory_category_name, placeholder: "Directory Category", class: "form-control" %>
 	</div>
 	<!-- Form Input Fields -->