phcpresspro 82.0.0 → 83.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a052a0cd5fcd5cbfa1e325ed796d713c668a3bf49c7b8072d7acf8a2bdde16ca
-  data.tar.gz: 3d14bdb7a22bbbee6d1a80d6a2c70160c3df3feeb02d40b0a92a55d9e9212df4
+  metadata.gz: 3bb90277a5d7d57ce20b5ae8ff24ec31a5c1be8a25c9c9000e63e2f62c96f095
+  data.tar.gz: 1c1654ca8a48ec5e83bb7d8171462f14bb51fc9b4615f417a59aee812b451f89
 SHA512:
-  metadata.gz: 128f540b6349892e4f7ae8f7d9b085893c5b1ab3f0a7e42c1b02d2a79c23dd98831fe168c7e9b87e4bf4406d16b339da48f040bf4a669c16105d1f8827f469cc
-  data.tar.gz: 35cd0b118152320577f36550a7c2839c8f1cc9def7ee433123ff345d0ada2e510df12401ce725a638b8dffca63f3960624bf7c65200186348ca75aa00be8ab4c
+  metadata.gz: 5d858e20043c7099ac9c365596434b8ae2b54fcac4deb870f445494e12f09c9b67cbcc2f1b361b6adbca46e09afdabcb51c6acd36c608072cf225be72b0c4845
+  data.tar.gz: b80357105d349f61e091717350e311890d2679062bd91d3cd677a66079c4e82e0f3ea83a36835fe16fd20d42ccfdab854e95fb145700187e4d043a1cfedc55fb

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2019 BradPotts - PHCNetco/PHCDevworks/PHCNetworks
+Copyright 2012-2019 BradPotts - PHCNetCo/PHCDevworks/PHCNetworks
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/phcpresspro/application.js

@@ -1,5 +1,2 @@
 // Load Admin Theme
 //= require phc_admin_theme_scripts_four
-//= require phcpresspro/custom/custom
-//= require phcpresspro/article/posts
-//= requrie phcpresspro/article/categories

data/app/assets/stylesheets/phcpresspro/application.scss

@@ -1,4 +1,2 @@
 // Load Admin Theme
 @import "phc_admin_theme_styles_four";
-@import "article/posts";
-@import "article/categories";

data/app/controllers/phcpresspro/api/v1/post_index.json.rabl

@@ -1,2 +1,2 @@
-object @phcpresspro_posts_index
-    attributes :id, :psttittle, :psttext, :pststatus, :pstimage
+object @phcpress_posts_index
+    attributes :id, :post_title, :post_text, :post_status

data/app/controllers/phcpresspro/api/v1/post_single.json.rabl

@@ -1,2 +1,2 @@
-object @phcpresspro_posts_single
-    attributes :id, :psttittle, :psttext, :pststatus, :pstimage
+object @phcpress_posts_single
+    attributes :id, :post_title, :post_text, :post_status

data/app/controllers/phcpresspro/application_controller.rb

@@ -1,22 +1,22 @@
 module Phcpresspro
-    class ApplicationController < ActionController::Base
-    
-        # Security Filters
-        protect_from_forgery with: :exception
-    
-        # Load Requried Helper Files
-        helper Phccorehelpers::Engine.helpers
-        helper Phcmenus::Engine.helpers
-        helper Phctitleseo::Engine.helpers
-        helper Phcnotifi::Engine.helpers
-        helper Phcaccountspro::Engine.helpers
-    
-        # Papertrail Whodunnit Username
-        def user_for_paper_trail
-          current_user ? current_user.username : 'Public user'
-        end
-    
-        private
-    
+  class ApplicationController < ActionController::Base
+
+    # Security Filters
+    protect_from_forgery with: :exception
+
+    # Load Requried Helper Files
+    helper Phcaccountspro::Engine.helpers
+    helper Phccorehelpers::Engine.helpers
+    helper Phcmenus::Engine.helpers
+    helper Phctitleseo::Engine.helpers
+    helper Phcnotifi::Engine.helpers
+
+    # Papertrail Whodunnit Username
+    def user_for_paper_trail
+      current_user ? current_user.username : 'Public user'
     end
+
+    private
+
+  end
 end

data/app/controllers/phcpresspro/article/categories_controller.rb

@@ -7,44 +7,43 @@ module Phcpresspro
     include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
-    before_action :set_article_category, only: [:show, :edit, :update, :destroy]
+    before_action :set_article_category, only: [:edit, :update, :destroy]
 
-    # Categories Index
+    # INDEX
     def index
-      @article_categories = Phcpresspro::Article::Category.where(org_id: current_user.org_id)
+      @article_categories = Phcpresspro::Article::Category.all
     end
 
-    # Categories Show
+    # SHOW
     def show
       @article_category = Phcpresspro::Article::Category.friendly.find(params[:id])
       @versions = Phcpresspro::CategoryVersions.where(item_id: params[:id], item_type: 'Phcpresspro::Article::Category')
     end
 
-    # Categories New
+    # NEW
     def new
       @article_category = Phcpresspro::Article::Category.new
     end
 
-    # Categories Edit
+    # EDIT
     def edit
     end
 
-    # POST
+    # CREATE
     def create
       @article_category = Phcpresspro::Article::Category.new(article_category_params)
       @article_category.user_id = current_user.id
-      @article_category.org_id = current_user.org_id
       if @article_category.save
-        redirect_to article_categories_url, notice: 'Category was successfully created.'
+        redirect_to article_categories_url, :flash => { :success => 'Category was successfully created.' }
       else
-          render :new
+        render :new
       end
     end
 
-    # PATCH/PUT
+    # UPDATE
     def update
       if @article_category.update(article_category_params)
-        redirect_to article_categories_url, notice: 'Category was successfully updated.'
+        redirect_to article_categories_url, :flash => { :success => 'Category was successfully updated.' }
       else
         render :edit
       end
@@ -53,19 +52,19 @@ module Phcpresspro
     # DELETE
     def destroy
       @article_category.destroy
-      redirect_to article_categories_url, notice: 'Category was successfully destroyed.'
+      redirect_to article_categories_url, :flash => { :success => 'Category was successfully destroyed.' }
     end
 
     private
 
-    # Use callbacks to share common setup or constraints between actions.
+    # Common Callbacks
     def set_article_category
       @article_category = Phcpresspro::Article::Category.find(params[:id])
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Whitelist
     def article_category_params
-      params.require(:article_category).permit(:category_name, :slug, :user_id, :org_id)
+      params.require(:article_category).permit(:category_name, :slug, :user_id)
     end
 
   end

data/app/controllers/phcpresspro/article/posts_controller.rb

@@ -7,44 +7,43 @@ module Phcpresspro
     include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
-    before_action :set_article_post, only: [:show, :edit, :update, :destroy]
+    before_action :set_article_post, only: [:edit, :update, :destroy]
 
-    # Article Index
+    # INDEX
     def index
-      @article_posts = Phcpresspro::Article::Post.where(org_id: current_user.org_id)
+      @article_posts = Phcpresspro::Article::Post.all
     end
 
-    # Article Show
+    # SHOW
     def show
       @article_post = Phcpresspro::Article::Post.friendly.find(params[:id])
       @versions = Phcpresspro::PostVersions.where(item_id: params[:id], item_type: 'Phcpresspro::Article::Post')
     end
 
-    # Article New
+    # NEW
     def new
       @article_post = Phcpresspro::Article::Post.new
     end
 
-    # Article Edit
+    # EDIT
     def edit
     end
 
-    # POST
+    # CREATE
     def create
       @article_post = Phcpresspro::Article::Post.new(article_post_params)
       @article_post.user_id = current_user.id
-      @article_post.org_id = current_user.org_id
       if @article_post.save
-        redirect_to article_posts_url, notice: 'Post was successfully created.'
-        else
-          render :new
+        redirect_to article_posts_url, :flash => { :success => 'Post was successfully created.' }
+      else
+        render :new
       end
     end
 
-    # PATCH/PUT
+    # UPDATE
     def update
       if @article_post.update(article_post_params)
-        redirect_to article_posts_url, notice: 'Post was successfully updated.'
+        redirect_to article_posts_url, :flash => { :success => 'Post was successfully updated.' }
       else
         render :edit
       end
@@ -52,20 +51,20 @@ module Phcpresspro
 
     # DELETE
     def destroy
-    @article_post.destroy
-      redirect_to article_posts_url, notice: 'Post was successfully destroyed.'
+      @article_post.destroy
+      redirect_to article_posts_url, :flash => { :error => 'Post was successfully destroyed.' }
     end
 
     private
 
-    # Use callbacks to share common setup or constraints between actions.
+    # Common Callbacks
     def set_article_post
       @article_post = Phcpresspro::Article::Post.find(params[:id])
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Whitelist
     def article_post_params
-      params.require(:article_post).permit(:post_tittle, :post_text, :post_status, :post_image, :remove_post_image, :slug, :user_id, :org_id, category_ids: [])
+      params.require(:article_post).permit(:post_title, :post_text, :post_status, :post_image, :remove_post_image, :slug, :user_id, category_ids: [])
     end
 
   end

data/app/controllers/phcpresspro/blog/articles_controller.rb

@@ -3,17 +3,17 @@ require_dependency "phcpresspro/application_controller"
 module Phcpresspro
   class Blog::ArticlesController < ApplicationController
 
-    # Security, Layouts & Action Filters
+    # Layout
     layout 'phcpresspro/frontend'
 
-    # Index for All Published Posts
+    # INDEX
     def index
-      @phcpresspro_posts_index = Article::Post.where(pststatus: "published")
+      @phcpress_posts_index = Article::Post.where(pststatus: "published")
     end
 
-    # Single Page for Published Post
+    # SHOW
     def show
-      @phcpresspro_posts_single = Article::Post.friendly.find(params[:id])
+      @phcpress_posts_single = Article::Post.friendly.find(params[:id])
     end
 
   end

data/app/models/phcpresspro/article/category.rb

@@ -4,27 +4,23 @@ module Phcpresspro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcpresspro::CategoryVersions'
 
     # Relationships
-    has_and_belongs_to_many :posts, class_name: 'Phcpresspro::Article::Post', :join_table => 'categories_posts'
+    has_and_belongs_to_many :posts, class_name: 'Phcpresspro::Article::Post', :join_table => 'categories_posts', :dependent => :destroy
     belongs_to :user, class_name: 'Phcaccountspro::User'
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :category_name,
       presence: true,
-      uniqueness: true,
-      length: { minimum: 3 }
+      uniqueness: true
 
     # Clean URL Define
-    friendly_id :phcpresspro_category_slug, use: [:slugged, :finders]
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcpresspro_category_slug
-      [
-        [:org_id, :category_name]
-      ]
+    def phc_nice_url_slug
+      [:category_name]
     end
 
   end

data/app/models/phcpresspro/article/post.rb

@@ -4,36 +4,28 @@ module Phcpresspro
     # Clean URL Initialize
     extend FriendlyId
 
-    # Add Paper Trail
+    # Paper Trail Initialize
     has_paper_trail :class_name => 'Phcpresspro::PostVersions'
 
     # Image Upload
     has_one_attached :post_image
 
-    # Model Relationships
+    # Relationships
     has_and_belongs_to_many :categories, class_name: 'Phcpresspro::Article::Category', :join_table => 'categories_posts'
     belongs_to :user, class_name: 'Phcaccountspro::User'
 
-    # Validation for Form Fields
-    validates :post_tittle,
-      presence: true,
-      length: { minimum: 3 }
+    # Form Fields Validation
+    validates :post_title,
+      presence: true
 
     validates :post_text,
-      presence: true,
-      length: { minimum: 3 }
-
-    validates :post_status,
       presence: true
 
     # Clean URL Define
-    friendly_id :phcpresspro_post_slug, use: [:slugged, :finders]
+    friendly_id :phcpress_post_slug, use: [:slugged, :finders]
 
-    # Define for Multiple Records
-    def phcpresspro_post_slug
-      [
-        [:org_id, :post_tittle]
-      ]
+    def phcpress_post_slug
+      [:post_title]
     end
 
   end

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

@@ -4,7 +4,7 @@
 
   <!-- SEO System -->
   <% phc_seo_title "PHCPress by PHCDevworks" %>
-  <% phc_seo_description "PHCPress rails CMS engine to manage your website's articles, categories and media." %>
+  <% phc_seo_description "PHCPress rails CMS application to manage your website's articles, categories and media." %>
   <!-- SEO System -->
 
   <!-- SEO and Site Description -->
@@ -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 -->
@@ -59,25 +60,20 @@
     </div>
     <!-- Footer Content -->
 
-    <!-- Scroll to Top -->
-    <a href="javascript:;" class="btn btn-icon btn-circle btn-success btn-scroll-to-top fade" data-click="scroll-top">
-      <i class="fa fa-angle-up"></i>
-    </a>
-    <!-- Scroll to Top -->
-
   </div>
   <!-- Page Container -->
 
   <!-- JavaScript -->
   <%= javascript_include_tag "phcpresspro/application", 'data-turbolinks-track': 'reload' %>
+  <script src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
   <!-- JavaScript -->
 
   <!-- JavaScript Loader -->
   <script>
-		$(document).ready(function() {
-			App.init();
-		});
-	</script>
+    $(document).ready(function() {
+      App.init();
+    });
+  </script>
   <!-- JavaScript Loader -->
 
 </body>

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

@@ -1,9 +1,9 @@
 <span class="float-left">
-    &copy; 2012-<%= Time.now.year %> - 
-    <strong>PHC</strong>Press(Pro) - 
-    Engine v<%= Gem.loaded_specs["phcpresspro"].version.to_s %>
+  &copy; 2012-<%= Time.now.year %> -
+  <strong>PHC</strong>Press(Pro) -
+  Engine v<%= Gem.loaded_specs["phcpresspro"].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/phcpresspro/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">