phcmembers 64.1.0 → 65.0.0

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

@@ -3,64 +3,55 @@ module Phcmembers
 
     # Clean URL Initialize
     extend FriendlyId
-    
-    # Add Paper Trail
+
+		# Paper Trail Initialize
     has_paper_trail :class_name => 'Phcmembers::ListingVersions'
-    
-    # Model Relationships
+
+    # Relationships
     belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
     has_and_belongs_to_many :categories, class_name: 'Phcmembers::Directory::Category', :join_table => 'categories_listings'
-    
-    # Validation for Form Fields
+
+    # Form Fields Validation
     validates :listing_company_name,
-      presence: true,
-      length: { minimum: 2 }
-    
+      presence: true
+
     validates :listing_contact_name,
-      presence: true,
-      length: { minimum: 2 }
-    
+      presence: true
+
     validates :listing_address_line_1,
-      length: { minimum: 3 }
-    
+      presence: true
+
     validates :listing_city,
-      presence: true,
-      length: { minimum: 3 }
-    
+      presence: true
+
     validates :listing_country,
-      presence: true,
-      length: { minimum: 2 }
-    
+      presence: true
+
     validates :listing_province,
-      presence: true,
-      length: { minimum: 2 }
-    
+      presence: true
+
     validates :listing_postal_code,
-      presence: true,
-      length: { minimum: 3 }
-    
+      presence: true
+
     validates :listing_contact_email,
-    	presence: true,
-    	length: { minimum: 3 },
-    	format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
-    
+      presence: true,
+      format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
+
     validates :listing_website,
-    	presence: true,
-    	length: { minimum: 6 },
-    	format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
-    
+      presence: true,
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
+
     validates :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: ***-***-****" }
-    
+      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 :phcmembers_listings_slug, use: [:slugged, :finders]
-    
-    # Define for Multiple Records
-    def phcmembers_listings_slug
-    	[
-    		[:listing_company_name, :listing_contact_name]
-    	]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
+
+    def phc_nice_url_slug
+      [
+        [:listing_company_name, :listing_contact_name]
+      ]
     end
 
   end

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

@@ -4,32 +4,29 @@ module Phcmembers
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+		# Paper Trail Initialize
     has_paper_trail :class_name => 'Phcmembers::ProfileVersions'
 
-    # Gravatar
+    # Profile Gravatar
     include Gravtastic
     gravtastic :member_email
 
-    # Model Relationships
+    # Relationships
     has_many :addresses, class_name: 'Phcmembers::Member::Address', :dependent => :destroy
     has_many :listings, class_name: 'Phcmembers::Member::Listing', :dependent => :destroy
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :member_first_name,
-      presence: true,
-      length: { minimum: 1 }
+      presence: true
 
     validates :member_last_name,
-      presence: true,
-      length: { minimum: 1 }
+      presence: true
 
     validates :member_title,
-      length: { minimum: 2 }
+      presence: true
 
     validates :member_email,
       presence: true,
-      length: { minimum: 6 },
       format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
     validates :member_phone,
@@ -37,10 +34,9 @@ module Phcmembers
       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 :phcmembers_profiles_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcmembers_profiles_slug
+    def phc_nice_url_slug
       [
         [:member_first_name, :member_last_name]
       ]

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

@@ -22,7 +22,6 @@
 
   <!-- CSS Styles -->
   <%= stylesheet_link_tag 'phcmembers/application', media: 'all', 'data-turbolinks-track': 'reload' %>
-
   <!-- CSS Styles -->
 
   <!-- Font -->
@@ -33,7 +32,7 @@
 <body>
 
   <!-- Page Container -->
-  <div id="page-container" class="page-container fade page-sidebar-fixed page-header-fixed">
+  <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
 
     <!-- Page Header -->
     <div id="header" class="header navbar-default">
@@ -70,11 +69,11 @@
 
   <!-- JavaScript Loader -->
   <script>
-		$(document).ready(function() {
-			App.init();
-		});
-	</script>
+    $(document).ready(function() {
+      App.init();
+    });
+  </script>
   <!-- JavaScript Loader -->
 
 </body>
-</html>
+</html>

data/app/views/layouts/phcmembers/components/backend/footer/_footer.html.erb

@@ -1,9 +1,9 @@
 <span class="float-left">
-    2012-<%= Time.now.year %> - 
-    <strong>PHC</strong>Members - 
-    Engine v<%= Gem.loaded_specs["phcmembers"].version.to_s %>
+  2012-<%= Time.now.year %> -
+  <strong>PHC</strong>Members -
+  Engine v<%= Gem.loaded_specs["phcmembers"].version.to_s %>
 </span>
 <span class="float-right">
-    Developed with <i class="fas fa-heart hanna_hearts"></i> by 
-    <a class="phcnet_copyright" href="https://phcdevworks.com/"><strong>PHC</strong>Devworks</a>
+  Developed with <i class="fas fa-heart hanna_hearts"></i> by
+  <a class="phcnet_copyright" href="https://phcdevworks.com/"><strong>PHC</strong>Devworks</a>
 </span>

data/app/views/layouts/phcmembers/components/backend/navigation/_top_menu.html.erb

@@ -15,47 +15,6 @@
 <% if current_user %>
   <ul class="navbar-nav navbar-right">
 
-    <!-- Topbar - Navigation Main - Search
-    <li>
-      <form class="navbar-form">
-        <div class="form-group">
-          <input type="text" class="form-control" placeholder="Enter keyword" />
-          <button type="submit" class="btn btn-search"><i class="fa fa-search"></i></button>
-        </div>
-      </form>
-    </li>
-    Topbar - Navigation Main - Search -->
-
-    <!-- Topbar - Navigation Main - Notifications Menu
-    <li class="dropdown">
-      <a href="javascript:;" data-toggle="dropdown" class="dropdown-toggle f-s-14">
-        <i class="fa fa-bell"></i>
-        <span class="label">5</span>
-      </a>
-      <ul class="dropdown-menu media-list dropdown-menu-right">
-        <li class="dropdown-header">NOTIFICATIONS (5)</li>
-        <li class="media">
-          <a href="javascript:;">
-            <div class="media-left">
-              <i class="fa fa-bug media-object bg-silver-darker"></i>
-            </div>
-            <div class="media-body">
-              <h6 class="media-heading">
-                Server Error Reports
-                <i class="fa fa-exclamation-circle text-danger"></i>
-              </h6>
-              <div class="text-muted f-s-11">3 minutes ago</div>
-            </div>
-          </a>
-        </li>
-        ...
-        <li class="dropdown-footer text-center">
-          <a href="javascript:;">View more</a>
-        </li>
-      </ul>
-    </li>
-    Topbar - Navigation Main - Notifications Menu -->
-
     <!-- Topbar - Navigation Main - User Menu -->
     <li class="dropdown navbar-user">
       <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">

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

@@ -144,14 +144,14 @@
     <% 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>
+      <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 -->
@@ -173,7 +173,7 @@
       </li>
       <!-- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
     <% end %>
-    
+
     <!-- Sidebar - Sidebar Minifier -->
     <li>
       <a href="javascript:;" class="sidebar-minify-btn" data-click="sidebar-minify">

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

@@ -3,7 +3,6 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <style>
-      /* Email styles need to be inline */
     </style>
   </head>
   <body>

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

@@ -8,7 +8,7 @@
   <!-- SEO System -->
 
   <!-- SEO and Site Description -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <title><%= yield(:phc_seo_title) %></title>
   <meta name="description" content="<%= yield(:phc_seo_description) %>">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
@@ -32,7 +32,7 @@
 <body>
 
   <!-- Page Container -->
-  <div id="page-container" class="page-container fade page-sidebar-fixed page-header-fixed">
+  <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
 
     <!-- Page Header -->
     <div id="header" class="header navbar-default">
@@ -49,6 +49,7 @@
 
     <!-- Page Content -->
     <div id="content" class="content content-full-width">
+      <%= render 'phcnotifi/default/notifications' %>
       <%= yield %>
     </div>
     <!-- Page Content -->
@@ -68,10 +69,10 @@
 
   <!-- JavaScript Loader -->
   <script>
-		$(document).ready(function() {
-			App.init();
-		});
-	</script>
+    $(document).ready(function() {
+      App.init();
+    });
+  </script>
   <!-- JavaScript Loader -->
 
 </body>

data/app/views/phcmembers/api/v1/listings/index.json.rabl

@@ -1,2 +1,2 @@
 object @member_listings
-	attributes :id, :mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbprovince, :mbcountry, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite
+	attributes :id, :listing_company_name, :listing_contact_name, :listing_address_line_1, :listing_address_line_2, :listing_city, :listing_province, :listing_country, :listing_postal_code, :listing_phone, :listing_contact_email, :listing_website

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

@@ -1,21 +1,22 @@
-<!-- PHCMembers Form - Directory Categories -->
+<!-- Form - Directory - Category -->
 <%= form_with(model: @directory_category, local: true) do |form| %>
 
 	<!-- PHCNotifi Render Validation -->
 	<%= render 'phcnotifi/default/validations', :object => @directory_category %>
 	<!-- PHCNotifi Render Validation -->
 
-	<!-- PHCMembers Field - Directory Categories -->
+	<!-- Form Input Fields -->
 	<div class="form-group field_with_errors">
 		<%= form.label :category_name, "Category Name" %>
 		<%= form.text_field :category_name, class: "form-control", placeholder: "Directory Category" %>
 	</div>
-	<br>
+	<!-- Form Input Fields -->
+
+	<!-- Form Submition Button -->
 	<div class="actions">
-		<%= form.submit class: "btn btn-primary btn-gradient waves-effect waves-light btn-md" %>
+		<%= form.submit class: "btn btn-primary btn-md" %>
 	</div>
-	<br>
-	<!-- PHCMembers Field - Directory Categories -->
+	<!-- For Submition Button -->
 
 <% end %>
-<!-- PHCMembers Form - Directory Categories -->
+<!-- Form - Directory - Category -->

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

@@ -17,7 +17,7 @@
 <!-- Page Header -->
 <h1 class="page-header"><%= yield(:phc_title) %></h1>
 <!-- Page Header -->
-			
+
 <!-- Page Content -->
 <div class="panel panel-inverse">
 	<div class="panel-heading">
@@ -29,7 +29,9 @@
 		<h4 class="panel-title"><%= yield(:phc_title) %></h4>
 	</div>
 	<div class="panel-body">
+		<!-- Form to Edit Directory Category -->
 		<%= render 'form', directory_category: @directory_category %>
+		<!-- Form to Edit Directory Category -->
 	</div>
 </div>
 <!-- Page Content -->

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

@@ -7,26 +7,29 @@
 
 <!-- Page Bradcrumbs -->
 <ol class="breadcrumb pull-right">
-	<li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
-	<li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_two) %></li>
+  <li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
+  <li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_two) %></li>
 </ol>
 <!-- Page Bradcrumbs -->
 
 <!-- Page Header -->
 <h1 class="page-header"><%= yield(:phc_title) %></h1>
 <!-- Page Header -->
-			
-<!-- Page Content -->
+
+<!-- Page & Panel Content -->
 <div class="panel panel-inverse">
-	<div class="panel-heading">
-		<div class="panel-heading-btn">
-			<a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
-			<a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
-			<a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
-		</div>
-		<h4 class="panel-title"><%= yield(:phc_title) %></h4>
-	</div>
-	<div class="panel-body">
+  <!-- Panel Heading -->
+  <div class="panel-heading">
+    <div class="panel-heading-btn">
+      <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
+      <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
+      <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
+    </div>
+    <h4 class="panel-title"><%= yield(:phc_title_tagline) %></h4>
+  </div>
+  <!-- Panel Heading -->
+  <!-- Panel Body -->
+  <div class="panel-body">
 		<!-- Un-Ordered List - Listing Categories -->
 		<ul class="list-group">
 			<% @directory_categories.each do |directory_category| %>
@@ -37,11 +40,13 @@
 			<% end %>
 		</ul>
 		<!-- Un-Ordered List - Listing Categories -->
-		</br>
+		<br>
 		<%= link_to phcmembers.new_directory_category_path, class: "btn btn-primary" do %>
 			<i class="fas fa-plus-circle"></i>
 			<%= "Add a New Directory Category" %>
 		<% end %>
-	</div>
+		<!-- Un-Ordered List - Listing Categories -->
+  </div>
+  <!-- Panel Body -->
 </div>
-<!-- Page Content -->
+<!-- Page & Panel Content -->

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

@@ -17,7 +17,7 @@
 <!-- Page Header -->
 <h1 class="page-header"><%= yield(:phc_title) %></h1>
 <!-- Page Header -->
-			
+
 <!-- Page Content -->
 <div class="panel panel-inverse">
 	<div class="panel-heading">
@@ -29,7 +29,9 @@
 		<h4 class="panel-title"><%= yield(:phc_title) %></h4>
 	</div>
 	<div class="panel-body">
+		<!-- Form for New Directory Category  -->
 		<%= render 'form', directory_category: @directory_category %>
+		<!-- Form for New Directory Category  -->
 	</div>
 </div>
 <!-- Page Content -->