phcpresspro 69.1.0 → 70.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0138333c244580dc30772861e545b87c60a720b855f644ae3c9d5021cb64056e'
-  data.tar.gz: 39de8c705388577f132a97acb20ebd50138d3c3e127f4acd4ed24c1d85972102
+  metadata.gz: 568a5f49b83362679e43aaadabc34f79fa54a165743cf464d7080f0ca5894d69
+  data.tar.gz: 82c886ab0c714a0bc1a9890e8860c447587b0ea24f602a42d9b77ee67429b0c6
 SHA512:
-  metadata.gz: 1a6a5e236bb6018dd4316e40f6a58525fa6e985ee558f152c03f6e7f1a043f447d64a6f960e9811c722d3de4604faf067a0ad852fc78ff62781a140c480c7593
-  data.tar.gz: bef38fda5cc2535d9da09945ac99149e34a5a76e016884161f29fc6f72ce36680b0ecf701ef060951cf5c6bb77a6e5ce58ff3053cf9f8d9422f5958d98196498
+  metadata.gz: c87e78eb8cfe8d8291be7fe4d8eac05fd32531f02d56f11085cdb02547061a9c38e7f6152118c324a32e850f9654f578526fd81c1f1fa46f7962b6fd7568d12d
+  data.tar.gz: 68a7ec8af071cbaaa9e861f4edfbc9a0f0ad9077818e4a38eed93343c163c101d48026c424dae5570d0f2fa363a7a1ad2c1682f17dcd4ad6b9a7ad268e7be0ee

data/MIT-LICENSE

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

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/phcpresspro.svg)](https://badge.fury.io/rb/phcpresspro)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/bradpotts/phc-press-pro/blob/master/MIT-LICENSEru)  
+
 ### PHCPress(PRO) (News/Blog Engine) Documentation
 PHCPress(PRO) rails CMS engine to manage your website's articles, categories and media.
 
@@ -7,7 +10,7 @@ PHCPress(PRO) rails CMS engine to manage your website's articles, categories and
 
 #### Step 1 - Add PHCPress to your gemfile  and run command  
 
-	gem 'phcpresspro', '~> 63.0'
+	gem 'phcpresspro', '~> 59.0'
 	bundle install
 
 #### Step 2 - Copy PHCPress Database Tables  
@@ -31,3 +34,7 @@ To properly function re-compile your application's assets to copy over requried
 All PHCPress views and layouts can be overwritten by copying files to your application.
 
 	rails generate phcpresspro:views
+
+- [How to Override PHCPress Uploader](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader---Override)
+- [How to Override Cloudinary Uploader](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader-(Cloudinary))
+- [Critical Security Updates](https://github.com/PHCNetworks/phc-press/wiki/Critical-Security-Updates)

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

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

data/app/assets/javascripts/phcpresspro/article/categories.js

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

data/app/assets/javascripts/phcpresspro/article/posts.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

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

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

data/app/controllers/phcpresspro/application_controller.rb

@@ -8,7 +8,7 @@ module Phcpresspro
     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'

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

@@ -0,0 +1,75 @@
+require_dependency "phcpresspro/application_controller"
+
+module Phcpresspro
+  class Article::CategoriesController < ApplicationController
+
+    # Security & Action Filters
+    before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
+    before_action :set_article_category, only: [:show, :edit, :update, :destroy]
+
+    # Categories Index
+    def index
+      @article_categories = Article::Category.where(org_id: current_user.org_id)
+    end
+
+    # Categories Show
+    def show
+      @article_category = Article::Category.friendly.find(params[:id])
+      @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcpresspro::Article::Category')
+    end
+
+    # Categories New
+    def new
+      @article_category = Article::Category.new
+      @article_category.user_id = current_user.id
+      @article_category.org_id = current_user.org_id
+    end
+
+    # Categories Edit
+    def edit
+    end
+
+    # POST
+    def create
+      @article_category = 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.'
+      else
+          render :new
+      end
+    end
+
+    # PATCH/PUT
+    def update
+      @article_category.user_id = current_user.id
+      @article_category.org_id = current_user.org_id
+      if @article_category.update(article_category_params)
+        redirect_to article_categories_url, notice: 'Category was successfully updated.'
+      else
+        render :edit
+      end
+    end
+
+    # DELETE
+    def destroy
+      @article_category.destroy
+      redirect_to article_categories_url, notice: 'Category was successfully destroyed.'
+    end
+
+    private
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_article_category
+      @article_category = Article::Category.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def article_category_params
+      params.require(:article_category).permit(:catname, :slug, :user_id, :org_id)
+    end
+
+  end
+end

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

@@ -7,7 +7,6 @@ module Phcpresspro
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_article_post, only: [:show, :edit, :update, :destroy]
-    layout "phcpresspro/application"
 
     # Article Index
     def index
@@ -51,8 +50,8 @@ module Phcpresspro
       if @article_post.update(article_post_params)
         @article_post.connections.build
         redirect_to article_posts_url, notice: 'Post was successfully updated.'
-        else
-          render :edit
+      else
+        render :edit
       end
     end
 
@@ -64,14 +63,14 @@ module Phcpresspro
 
     private
 
-    # Common Callbacks
+    # Use callbacks to share common setup or constraints between actions.
     def set_article_post
-      @article_post = Article::Post.friendly.find(params[:id])
+      @article_post = Article::Post.find(params[:id])
     end
 
-    # Params Whitelist
+    # Only allow a trusted parameter "white list" through.
     def article_post_params
-      params.require(:article_post).permit(:psttitle, :psttext, :pststatus, :pstimage, :remove_pstimage, :slug, :user_id, :org_id, category_ids: [])
+      params.require(:article_post).permit(:psttittle, :psttext, :pststatus, :pstimage, :remove_pstimage, :slug, :user_id, :org_id, category_ids: [])
     end
 
   end

data/app/helpers/phcpresspro/article/categories_helper.rb

@@ -0,0 +1,4 @@
+module Phcpresspro
+  module Article::CategoriesHelper
+  end
+end

data/app/helpers/phcpresspro/article/posts_helper.rb

@@ -0,0 +1,4 @@
+module Phcpresspro
+  module Article::PostsHelper
+  end
+end

data/app/mailers/phcpresspro/application_mailer.rb

@@ -1,6 +1,6 @@
 module Phcpresspro
   class ApplicationMailer < ActionMailer::Base
-    default from: 'no-reply@phcnetworks.net'
+    default from: 'from@example.com'
     layout 'mailer'
   end
 end

data/app/models/phcpresspro/{modules → article}/category.rb

@@ -1,5 +1,5 @@
 module Phcpresspro
-  class Modules::Category < ApplicationRecord
+  class Article::Category < ApplicationRecord
 
     # Clean URL Initialize
     extend FriendlyId
@@ -8,8 +8,7 @@ module Phcpresspro
     has_paper_trail :class_name => 'Phcpresspro::CategoryVersions'
 
     # Relationships
-    has_many :connections, class_name: 'Phcpresspro::Modules::Connection', dependent: :destroy
-    has_many :posts, class_name: 'Phcpresspro::Modules::Category', :through => :connections
+    has_many :posts, class_name: 'Phcpresspro::Article::Post'
 
     # Validation for Form Fields
     validates :catname,

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

@@ -11,11 +11,10 @@ module Phcpresspro
     has_one_attached :pstimage
 
     # Model Relationships
-    has_many :connections, class_name: 'Phcpresspro::Modules::Connection', dependent: :destroy
-    has_many :categories, class_name: 'Phcpresspro::Modules::Category', :through => :connections
+    has_many :categories, class_name: 'Phcpresspro::Article::Category'
 
     # Validation for Form Fields
-    validates :psttitle,
+    validates :psttittle,
       presence: true,
       length: { minimum: 3 }
 
@@ -32,7 +31,7 @@ module Phcpresspro
     # Define for Multiple Records
     def phcpresspro_post_slug
       [
-        [:psttitle]
+        [:psttittle]
       ]
     end
 

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

@@ -16,7 +16,7 @@
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
 
   <!-- Requried Style Sheets -->
-  <%= stylesheet_link_tag "backend", media: "all", 'data-turbolinks-track': 'reload' %>
+  <%= stylesheet_link_tag "phcpresspro/application", media: "all", 'data-turbolinks-track': 'reload' %>
 
   <!-- Security -->
   <%= csrf_meta_tags %>
@@ -61,17 +61,8 @@
   <!-- Page Container -->
 
   <!-- Requried JavaScripts -->
-  <%= javascript_include_tag "backend", 'data-turbolinks-track': 'reload' %>
+  <%= javascript_include_tag "phcpresspro/application", 'data-turbolinks-track': 'reload' %>
   <script src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
-
-  <!-- WTF Slowing Down my Site. Nothing Nice to Say. Keep Bad Comments to Myself -->
-  <!--[if lt IE 9]>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/html5shiv.js"></script>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/respond.min.js"></script>
-		<script src="https://frmwrks.phcnetworks.net/coloradmin/version-latest/admin/template/assets/crossbrowserjs/excanvas.min.js"></script>
-	<![endif]-->
-  <!-- WTF Slowing Down my Site. Nothing Nice to Say. Keep Bad Comments to Myself -->
-
   <script>
 		$(document).ready(function() {
 			App.init();

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

@@ -1 +1 @@
-<span class="float-left">&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 <strong>PHC</strong>Networks</span>
+<span class="float-left">&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 <strong>PHC</strong>Devworks</span>

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

@@ -44,8 +44,8 @@
           <span>Article Posts</span>
         </a>
         <ul class="sub-menu">
-          <li><%= link_to('Article Index', phcpresspro.article_posts_path) %></li>
-          <li><%= link_to('New Aritcle', phcpresspro.new_article_post_path) %></li>
+          <li class="<%= is_active_controller('phcpresspro/article/posts') %>"><%= link_to('Article Index', phcpresspro.article_posts_path) %></li>
+          <li class="<%= is_active_controller('phcpresspro/article/posts#new') %>"><%= link_to('New Aritcle', phcpresspro.new_article_post_path) %></li>
         </ul>
       </li>
       <li class="has-sub">
@@ -55,10 +55,8 @@
           <span>Article Categories</span>
         </a>
         <ul class="sub-menu">
-          <li><%= link_to('Category Index', phcpresspro.modules_categories_path) %></li>
-          <li><%= link_to('New Category', phcpresspro.new_modules_category_path) %></li>
-          <li><%= link_to('Category Manager', phcpresspro.modules_connections_path) %></li>
-          <li><%= link_to('Connect Article', phcpresspro.new_modules_connection_path) %></li>
+          <li class="<%= is_active_controller('phcpresspro/article/categories') %>"><%= link_to('Category Index', phcpresspro.article_categories_path) %></li>
+          <li class="<%= is_active_controller('phcpresspro/article/categories#new') %>"><%= link_to('New Category', phcpresspro.new_article_category_path) %></li>
         </ul>
       </li>
       <!-- Sidebar - Sidebar Navigation - PHCPressPro -->

data/app/views/phcpresspro/article/categories/_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_with(model: article_category, local: true) do |form| %>
+
+  <!-- PHCPressPro - Category Form -->
+  <div class="form-group">
+    <%= form.label :catname, "Category Name" %>
+    <%= form.text_field :catname, class: "form-control" %>
+  </div>
+  <div class="actions">
+    <%= form.submit class: "btn btn-primary" %>
+  </div>
+  <!-- PHCPressPro - Category Form -->
+
+<% end %>

data/app/views/phcpresspro/{modules → article}/categories/edit.html.erb

@@ -17,7 +17,7 @@
 	</div>
 	<div class="panel-body">
 		<!-- Table - Category Edit Form -->
-		<%= render 'form', modules_category: @modules_category %>
+		<%= render 'form', article_category: @article_category %>
 		<!-- Table - Category Edit Form -->
 	</div>
 </div>

data/app/views/phcpresspro/{modules → article}/categories/index.html.erb

@@ -25,10 +25,10 @@
 					</tr>
 				</thead>
 				<tbody>
-					<% @modules_categories.each do |modules_category| %>
+					<% @article_categories.each do |article_category| %>
 						<tr>
-							<td><%= link_to modules_category.catname, phcpresspro.edit_modules_category_path(modules_category) %></td>
-							<td><%= link_to 'Trash', modules_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %></td>
+							<td><%= link_to article_category.catname, phcpresspro.edit_article_category_path(article_category) %></td>
+							<td><%= link_to 'Trash', article_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %></td>
 						</tr>
 					<% end %>
 				</tbody>

data/app/views/phcpresspro/{modules → article}/categories/new.html.erb

@@ -1,7 +1,7 @@
 <!-- Title System -->
 <% phc_title "Plugin: Article Category Manager" %>
 <% phc_title_tagline "Create a New Category" %>
-<% phc_breadcrumb_one link_to "Category Index", phcpresspro.modules_categories_path %>
+<% phc_breadcrumb_one link_to "Category Index", phcpresspro.article_categories_path %>
 <% phc_breadcrumb_two yield(:phc_title_tagline) %>
 <!-- Title System -->
 
@@ -17,7 +17,7 @@
 	</div>
 	<div class="panel-body">
 		<!-- Table - Category New Form -->
-		<%= render 'form', modules_category: @modules_category %>
+		<%= render 'form', article_category: @article_category %>
 		<!-- Table - Category New Form -->
 	</div>
 </div>

data/app/views/phcpresspro/article/categories/show.html.erb

@@ -0,0 +1,9 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Catname:</strong>
+  <%= @article_category.catname %>
+</p>
+
+<%= link_to 'Edit', edit_article_category_path(@article_category) %> |
+<%= link_to 'Back', article_categories_path %>

data/app/views/phcpresspro/article/posts/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(@article_post, :html => {:multipart => true}) do |f| %>
+<%= form_with(model: article_post, local: true) do |form| %>
 <div class="row">
 	<div class="col-md-3">
 
@@ -8,11 +8,11 @@
 			</div>
 			<div class="panel-body">
 				<div class="form-group">
-					<%= f.label :pststatus, "Post Status" %>
-					<%= f.select( :pststatus, [['Draft','draft'],['Published','published'],['Review','review']], {}, {class: "form-control form-control-sm"}) %>
+					<%= form.label :pststatus, "Post Status" %>
+					<%= form.select( :pststatus, [['Draft','draft'],['Published','published'],['Review','review']], {}, {class: "form-control form-control-sm"}) %>
 				</div>
 				<div class="actions">
-					<%= f.submit class: "btn btn-primary waves-effect" %>
+					<%= form.submit class: "btn btn-primary waves-effect" %>
 				</div>
 			</div>
 		</div>
@@ -23,13 +23,13 @@
 			</div>
 			<div class="panel-body">
 				<div class="form-group">
-					<%= f.label :pstimage, "Featured Image" %>
-					<%= f.file_field :pstimage, class: "form-control" %>
+					<%= form.label :pstimage, "Featured Image" %>
+					<%= form.file_field :pstimage, class: "form-control" %>
 				</div>
-				<% if f.object.pstimage? %>
-					<%= image_tag f.object.pstimage_url, class: "img-responsive img-thumbnail" %>
-					<%= f.label :remove_pstimage %>
-					<%= f.check_box :remove_pstimage %>
+				<% if form.object.pstimage? %>
+					<%= image_tag form.object.pstimage_url, class: "img-responsive img-thumbnail" %>
+					<%= form.label :remove_pstimage %>
+					<%= form.check_box :remove_pstimage %>
 				<% end %>
 			</div>
 		</div>
@@ -39,7 +39,7 @@
 				<h4 class="panel-title">Post Categories</h4>
 			</div>
 			<div class="panel-body">
-				<%= f.collection_check_boxes :category_ids, Phcpresspro::Modules::Category.all, :id, :catname do |post_category| %>
+				<%= form.collection_check_boxes :category_ids, Phcpresspro::Article::Category.all, :id, :catname do |post_category| %>
 					<%= post_category.check_box %>
 					<%= post_category.label %></br>
 				<% end %>
@@ -54,8 +54,8 @@
 		<!-- PHCNotifi Render Validation -->
 
 		<div class="form-group">
-			<%= f.label :psttitle, "Article Title" %>
-			<%= f.text_field :psttitle, class: "form-control" %>
+			<%= form.label :psttittle, "Article Title" %>
+			<%= form.text_field :psttittle, class: "form-control" %>
 		</div>
 
 		<div class="panel panel-inverse">
@@ -69,7 +69,7 @@
 			</div>
 			<div class="panel-body panel-form">
 				<div class="form-group">
-					<%= f.text_area :psttext, :class => "ckeditor form-control", :id => "editor1", :rows => 20, :cols => 60 %>
+					<%= form.text_area :psttext, :class => "ckeditor form-control", :id => "editor1", :rows => 20, :cols => 60 %>
 				</div>
 			</div>
 		</div>

data/app/views/phcpresspro/article/posts/index.html.erb

@@ -30,7 +30,7 @@
 				<tbody>
 					<% @article_posts.each do |article_post| %>
 						<tr>
-							<td><%= article_post.psttitle %></td>
+							<td><%= article_post.psttittle %></td>
 							<td><%= truncate(article_post.psttext, :length => 80, :escape => false) %></td>
 							<td><%= article_post.pststatus.capitalize %></td>
 							<td><div class="btn-group" role="group" aria-label="Blog Articles">

data/config/routes.rb

@@ -1,11 +1,15 @@
 Phcpresspro::Engine.routes.draw do
 
-  # Frontend
-  namespace :frontend do
-    resources :articles
+  # Add Accounts and Logins
+  mount Phcaccountspro::Engine => "/"
+  
+  # Application Routes
+  namespace :article do
+    resources :categories, class_name: 'Phcpresspro::Articles::Category'
+    resources :posts, class_name: 'Phcpresspro::Articles::Post'
   end
-
-  # API
+  
+  # Application API
   namespace :api do
     namespace :v1 do
       resources :posts, defaults: {format: 'json'}
@@ -13,15 +17,4 @@ Phcpresspro::Engine.routes.draw do
     end
   end
 
-  # Article Routes
-  namespace :article do
-    resources :posts, class_name: 'Phcpresspro::Articles::Post'
-  end
-
-  # Module Routes
-  namespace :modules do
-    resources :connections, class_name: 'Phcpresspro::Modules::Connection'
-    resources :categories, class_name: 'Phcpresspro::Modules::Category'
-  end
-
 end

data/db/migrate/{20160718204718_create_phcpresspro_article_posts.rb → 20190315010932_create_phcpresspro_article_posts.rb}

@@ -2,13 +2,12 @@ class CreatePhcpressproArticlePosts < ActiveRecord::Migration[5.2]
   def change
     create_table :phcpresspro_article_posts do |t|
 
-      t.string :psttitle
-      t.text :psttext
+      t.string :psttittle
+      t.string :psttext
       t.string :pststatus
       t.string :pstimage
 
       t.string :slug
-
       t.string :user_id
       t.string :org_id
 

data/db/migrate/{20160716182936_create_phcpresspro_modules_categories.rb → 20190315040834_create_phcpresspro_article_categories.rb}

@@ -1,11 +1,10 @@
-class CreatePhcpressproModulesCategories < ActiveRecord::Migration[5.2]
+class CreatePhcpressproArticleCategories < ActiveRecord::Migration[5.2]
   def change
-    create_table :phcpresspro_modules_categories do |t|
+    create_table :phcpresspro_article_categories do |t|
 
       t.string :catname
 
       t.string :slug
-
       t.string :user_id
       t.string :org_id
 

data/db/migrate/20190315173237_create_phcpresspro_join_table_categories_posts.rb

@@ -0,0 +1,8 @@
+class CreatePhcpressproJoinTableCategoriesPosts < ActiveRecord::Migration[5.2]
+  def change
+    create_join_table :categories, :posts do |t|
+      # t.index [:category_id, :post_id]
+      # t.index [:post_id, :category_id]
+    end
+  end
+end

data/lib/phcpresspro/version.rb

@@ -1,3 +1,3 @@
 module Phcpresspro
-  VERSION = "69.1.0"
+  VERSION = "70.0.0"
 end