phcscriptcdn 51.0.0 → 52.0.0

data/app/models/phcscriptcdn/application_record.rb

@@ -1,7 +1,5 @@
 module Phcscriptcdn
   class ApplicationRecord < ActiveRecord::Base
-
     self.abstract_class = true
-
   end
 end

data/app/models/phcscriptcdn/script.rb

@@ -1,9 +1,7 @@
 module Phcscriptcdn
   module Script
-
     def self.table_name_prefix
       'phcscriptcdn_script_'
     end
-
   end
 end

data/app/models/phcscriptcdn/script/author.rb

@@ -4,20 +4,29 @@ module Phcscriptcdn
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::AuthorVersions'
 
     # Relationships
     has_many :listings, class_name: 'Phcscriptcdn::Script::Listing'
 
+    # Form Fields Validation
+    validates :author_first_name,
+      presence: true
+
+    validates :author_website,
+      presence: true,
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
+
+    validates :author_github,
+      presence: true,
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
+
     # Clean URL Define
-    friendly_id :phcscriptcdn_author_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcscriptcdn_author_slug
-      [
-        [:author_first_name, :author_last_name]
-      ]
+    def phc_nice_url_slug
+      [:author_first_name, :author_last_name]
     end
 
   end

data/app/models/phcscriptcdn/script/extension.rb

@@ -4,14 +4,14 @@ module Phcscriptcdn
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::ExtensionVersions'
 
     # Relationships
     has_many :listings, class_name: 'Phcscriptcdn::Script::Listing', :through => :urls
     has_many :urls, class_name: 'Phcscriptcdn::Script::Url'
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :script_extension_name,
       presence: true
 
@@ -22,13 +22,10 @@ module Phcscriptcdn
       presence: true
 
     # Clean URL Define
-    friendly_id :phcscriptcdn_extentension_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcscriptcdn_extentension_slug
-      [
-        [:script_extension]
-      ]
+    def phc_nice_url_slug
+      [:script_extension]
     end
 
   end

data/app/models/phcscriptcdn/script/licence.rb

@@ -4,13 +4,13 @@ module Phcscriptcdn
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::LicenceVersions'
 
     # Relationships
     has_many :listings, class_name: 'Phcscriptcdn::Script::Listing'
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :licence_name,
       presence: true
 
@@ -18,13 +18,10 @@ module Phcscriptcdn
       presence: true
 
     # Clean URL Define
-    friendly_id :phcscriptcdn_licence_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcscriptcdn_licence_slug
-      [
-        [:licence_name]
-      ]
+    def phc_nice_url_slug
+      [:licence_name]
     end
 
   end

data/app/models/phcscriptcdn/script/listing.rb

@@ -4,7 +4,7 @@ module Phcscriptcdn
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::ListingVersions'
 
     # Relationships
@@ -12,32 +12,27 @@ module Phcscriptcdn
     belongs_to :author, class_name: 'Phcscriptcdn::Script::Author'
     belongs_to :licence, class_name: 'Phcscriptcdn::Script::Licence'
 
-    # Validation for Form Fields
-    validates :script_tittle,
-      presence: true,
-      length: { minimum: 3 }
+    # Form Fields Validation
+    validates :script_title,
+      presence: true
 
     validates :script_description,
-      presence: true,
-      length: { minimum: 4 }
+      presence: true
 
     validates :script_source,
-      length: { minimum: 5 }
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
 
-     validates :script_website,
-      length: { minimum: 5 }
+    validates :script_website,
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
 
     validates :script_github,
-      length: { minimum: 5 }
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
 
     # Clean URL Define
-    friendly_id :phcscriptcdn_listing_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcscriptcdn_listing_slug
-      [
-        [:script_tittle]
-      ]
+    def phc_nice_url_slug
+      [:script_title]
     end
 
   end

data/app/models/phcscriptcdn/script/url.rb

@@ -1,10 +1,7 @@
 module Phcscriptcdn
   class Script::Url < ApplicationRecord
 
-    # Clean URL Initialize
-    extend FriendlyId
-
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::UrlVersions'
 
     # Relationships
@@ -12,9 +9,10 @@ module Phcscriptcdn
     belongs_to :extension, class_name: 'Phcscriptcdn::Script::Extension'
     belongs_to :version, class_name: 'Phcscriptcdn::Script::Version', optional: true
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :script_url,
-      presence: true
+      presence: true,
+      format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
 
     validates :script_url_release,
       presence: true
@@ -22,15 +20,5 @@ module Phcscriptcdn
     validates :script_url_cdn_update,
       presence: true
 
-    # Clean URL Define
-    friendly_id :phcscriptcdn_url_slug, use: [:slugged, :finders]
-
-    # Define for Multiple Records
-    def phcscriptcdn_url_slug
-      [
-        [:id]
-      ]
-    end
-
   end
 end

data/app/models/phcscriptcdn/script/version.rb

@@ -4,25 +4,22 @@ module Phcscriptcdn
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcscriptcdn::ScriptversionVersions'
 
     # Relationships
     has_many :listings, class_name: 'Phcscriptcdn::Script::Listing', :through => :urls
     has_many :urls, class_name: 'Phcscriptcdn::Script::Url'
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :script_version_number,
-    presence: true
+      presence: true
 
     # Clean URL Define
-    friendly_id :phcscriptcdn_version_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcscriptcdn_version_slug
-      [
-        [:script_version_number]
-      ]
+    def phc_nice_url_slug
+      [:script_version_number]
     end
 
   end

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

@@ -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">
+      <%= 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/layouts/phcscriptcdn/components/backend/footer/_footer.html.erb

@@ -1,9 +1,9 @@
 <span class="float-left">
-    &copy; 2012-<%= Time.now.year %> - 
-    <strong>PHC</strong>Press - 
-    Engine v<%= Gem.loaded_specs["phcscriptcdn"].version.to_s %>
+  &copy; 2012-<%= Time.now.year %> -
+  <strong>PHC</strong>Press -
+  Engine v<%= Gem.loaded_specs["phcscriptcdn"].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/phcscriptcdn/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 %>
-      <!-- Sidebar - Sidebar Navigation - PHCAccounts -->
-      <li class="nav-header">Account Settings</li>
+    <% 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>Accounts Dashboard</span>
+          <span>Admin</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/admin/users') %>"><%= link_to 'User List', phcaccounts.admin_users_path %></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>
+      <!-- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
+    <% end %>
+
+    <% if current_user %>
+      <!-- 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 Settings</span>
         </a>
+        <ul class="sub-menu">
+          <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 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/phcscriptcdn/script/authors/_form.html.erb

@@ -1,22 +1,23 @@
 <%= form_with(model: script_author, local: true) do |form| %>
 
 	<!-- PHCNotifi Render Validation -->
-	<%= render 'phcnotifi/validations', :object => @script_author %>
+	<%= render 'phcnotifi/default/validations', :object => @script_author %>
+	<!-- PHCNotifi Render Validation -->
 
 	<!-- Form Input Fields -->
-	<div class="form-group field_with_error">
+	<div class="form-group field_with_errors">
 		<%= form.label :author_first_name, "Author First Name" %>
 		<%= form.text_field :author_first_name, placeholder: "Author First Name", class: "form-control"  %>
 	</div>
-	<div class="form-group field_with_error">
+	<div class="form-group field_with_errors">
 		<%= form.label :author_last_name, "Author Last Name" %>
 		<%= form.text_field :author_last_name, placeholder: "Author Last Name", class: "form-control"  %>
 	</div>
-	<div class="form-group field_with_error">
+	<div class="form-group field_with_errors">
 		<%= form.label :author_website, "Author Website" %>
 		<%= form.text_field :author_website, placeholder: "Author Website", class: "form-control"  %>
 	</div>
-	<div class="form-group field_with_error">
+	<div class="form-group field_with_errors">
 		<%= form.label :author_github, "Author Github Address" %>
 		<%= form.text_field :author_github, placeholder: "Author Github Address", class: "form-control"  %>
 	</div>