phcpress 50.0.0 → 51.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42cc184eb57d70ec4210c99ce87744cfbdc242fa6a3552d4f0d038ffd8c1842f
-  data.tar.gz: b8757c7fbdac7092c85a87797fac8b55425c78965b1958f605a803de8264aa5a
+  metadata.gz: e1070dd44b5b298bbfc4eb7a31a340a8e5421299a8b305a4fc054c5775a709a8
+  data.tar.gz: 4a7a60ec096a23b1b17ddae135e627b9acc869968426184771ca08edb8eae211
 SHA512:
-  metadata.gz: fcafa8b1a8c83ee0e03db5dbb89afdc384a35251aa902003b22ac79aef3e2044caa2dc497d0dabd6fcf4f358cae7c54d29d070d1b6d1ff7b2ed44a9128c490f4
-  data.tar.gz: d006c815b3d2daced69207241c2160cb76876fb365d6f4d190e76bd0bdc0976be18b8f55c9dbaea8e910ff322905a88017586ad86c34116a271300dbcb9e279e
+  metadata.gz: cec17f084a06b3d7af9cbde652d597aac0ce39dbd8438eedfe33e8db23c0ad11ff3ef2eec89aec3cfc67ec0bf429c9706e3fcf7bfce9ec2a4897c651598def81
+  data.tar.gz: dc56c5f4954b21ed7a932cd48ce91c5c239fbd02434c725523c9340b5a310c7b03580ea330132f8d209fa2d2a7c25076435d8222811ae95adf7d3ef1e9d99406

data/README.md

@@ -30,4 +30,5 @@ To properly function re-compile your application's assets to copy over required
 #### Step 5 - Generate Contact Form View (Customization)  
 All PHCPress views and layouts can be overwritten by copying files to your application.
 
-	rails generate phcpress:views
+	rails generate phcpress:views
+	

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

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

data/app/assets/stylesheets/phcpress/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/phcpress/api/v1/post_index.json.rabl

@@ -0,0 +1,2 @@
+object @phcpress_posts_index
+    attributes :id, :psttittle, :psttext, :pststatus, :pstimage

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

@@ -0,0 +1,2 @@
+object @phcpress_posts_single
+    attributes :id, :psttittle, :psttext, :pststatus, :pstimage

data/app/controllers/phcpress/application_controller.rb

@@ -1,12 +1,22 @@
 module Phcpress
-  class ApplicationController < ActionController::Base
-
-    # Security
-    protect_from_forgery with: :exception
-
-    # Load Helpers
-    helper Phctitleseo::Engine.helpers
-    helper Phcnotifi::Engine.helpers
-
-  end
+    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 Phcaccounts::Engine.helpers
+    
+        # Papertrail Whodunnit Username
+        def user_for_paper_trail
+          current_user ? current_user.username : 'Public user'
+        end
+    
+        private
+    
+    end
 end

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

@@ -0,0 +1,72 @@
+require_dependency "phcpress/application_controller"
+
+module Phcpress
+  class Article::CategoriesController < ApplicationController
+
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
+    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 = Phcpress::Article::Category.where(org_id: current_user.org_id)
+    end
+
+    # Categories Show
+    def show
+      @article_category = Phcpress::Article::Category.friendly.find(params[:id])
+      @versions = Phcpress::CategoryVersions.where(item_id: params[:id], item_type: 'Phcpress::Article::Category')
+    end
+
+    # Categories New
+    def new
+      @article_category = Phcpress::Article::Category.new
+    end
+
+    # Categories Edit
+    def edit
+    end
+
+    # POST
+    def create
+      @article_category = Phcpress::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
+      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 = Phcpress::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/phcpress/article/posts_controller.rb

@@ -3,22 +3,26 @@ require_dependency "phcpress/application_controller"
 module Phcpress
   class Article::PostsController < ApplicationController
 
-    # Security & Action Filters
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::PhcpluginsproHelper
     before_action :authenticate_user!
+    before_action :set_paper_trail_whodunnit
     before_action :set_article_post, only: [:show, :edit, :update, :destroy]
 
     # Article Index
     def index
-      @article_posts = Article::Post.all
+      @article_posts = Phcpress::Article::Post.where(org_id: current_user.org_id)
     end
 
     # Article Show
     def show
+      @article_post = Phcpress::Article::Post.friendly.find(params[:id])
+      @versions = Phcpress::PostVersions.where(item_id: params[:id], item_type: 'Phcpress::Article::Post')
     end
 
     # Article New
     def new
-      @article_post = Article::Post.new
+      @article_post = Phcpress::Article::Post.new
     end
 
     # Article Edit
@@ -27,9 +31,10 @@ module Phcpress
 
     # POST
     def create
-      @article_post = Article::Post.new(article_post_params)
+      @article_post = Phcpress::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
-        @article_post.connections.build
         redirect_to article_posts_url, notice: 'Post was successfully created.'
         else
           render :new
@@ -39,29 +44,28 @@ module Phcpress
     # PATCH/PUT
     def update
       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
 
     # DELETE
     def destroy
-      @article_post.destroy
+    @article_post.destroy
       redirect_to article_posts_url, notice: 'Post was successfully destroyed.'
     end
 
     private
 
-    # Common Callbacks
+    # Use callbacks to share common setup or constraints between actions.
     def set_article_post
-      @article_post = Article::Post.find(params[:id])
+      @article_post = Phcpress::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, category_ids: [])
+      params.require(:article_post).permit(:psttittle, :psttext, :pststatus, :pstimage, :remove_pstimage, :slug, :user_id, :org_id, category_ids: [])
     end
 
   end

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

@@ -0,0 +1,20 @@
+require_dependency "phcpress/application_controller"
+
+module Phcpress
+  class Blog::ArticlesController < ApplicationController
+
+    # Security, Layouts & Action Filters
+    layout 'phcpress/frontend'
+
+    # Index for All Published Posts
+    def index
+      @phcpress_posts_index = Article::Post.where(pststatus: "published")
+    end
+
+    # Single Page for Published Post
+    def show
+      @phcpress_posts_single = Article::Post.friendly.find(params[:id])
+    end
+
+  end
+end

data/app/helpers/phcpress/application_helper.rb

@@ -1,14 +1,4 @@
 module Phcpress
-	module ApplicationHelper
-
-    # Add Active to Menu
-    def is_active_controller(controller_name)
-    	params[:controller] == controller_name ? "active open selected" : nil
-    end
-
-    def is_active_action(action_name)
-    	params[:action] == action_name ? "active" : nil
-    end
-
-	end
+  module ApplicationHelper
+  end
 end

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

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

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

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

data/app/jobs/phcpress/application_job.rb

@@ -1,4 +1,4 @@
 module Phcpress
-	class ApplicationJob < ActiveJob::Base
-	end
+  class ApplicationJob < ActiveJob::Base
+  end
 end

data/app/mailers/phcpress/application_mailer.rb

@@ -1,6 +1,6 @@
 module Phcpress
-	class ApplicationMailer < ActionMailer::Base
-		default from: 'info@example.com'
-		layout 'mailer'
-	end
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
 end

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

@@ -1,5 +1,5 @@
 module Phcpress
-  class Modules::Category < ApplicationRecord
+  class Article::Category < ApplicationRecord
 
     # Clean URL Initialize
     extend FriendlyId
@@ -8,12 +8,13 @@ module Phcpress
     has_paper_trail :class_name => 'Phcpress::CategoryVersions'
 
     # Relationships
-    has_many :connections, class_name: 'Phcpress::Modules::Connection', dependent: :destroy
-    has_many :posts, class_name: 'Phcpress::Modules::Category', :through => :connections
+    has_and_belongs_to_many :posts, class_name: 'Phcpress::Article::Post', :join_table => 'categories_posts'
+    belongs_to :user, class_name: 'Phcaccounts::User'
 
     # Validation for Form Fields
     validates :catname,
       presence: true,
+      uniqueness: true,
       length: { minimum: 3 }
 
     # Clean URL Define

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

@@ -11,11 +11,11 @@ module Phcpress
     has_one_attached :pstimage
 
     # Model Relationships
-    has_many :connections, class_name: 'Phcpress::Modules::Connection', dependent: :destroy
-    has_many :categories, class_name: 'Phcpress::Modules::Category', :through => :connections
+    has_and_belongs_to_many :categories, class_name: 'Phcpress::Article::Category', :join_table => 'categories_posts'
+    belongs_to :user, class_name: 'Phcaccounts::User'
 
     # Validation for Form Fields
-    validates :psttitle,
+    validates :psttittle,
       presence: true,
       length: { minimum: 3 }
 
@@ -32,7 +32,7 @@ module Phcpress
     # Define for Multiple Records
     def phcpress_post_slug
       [
-        [:psttitle]
+        [:psttittle]
       ]
     end
 

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

@@ -2,24 +2,29 @@
 <html>
 <head>
 
-  <% phc_seo_title "PHCPress" %>
-  <% phc_seo_description "Content Management Engine for Ruby on Rails" %>
+  <% phc_seo_title "PHCPress CMS" %>
+  <% phc_seo_description "Content Management System by PHCDevworks" %>
 
+  <!-- -PHC- SEO and Site Description -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <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" >
-  <link rel="canonical" href="http://phcpress.com">
+  <link rel="canonical" href="http://phcmembers.com">
+  <!-- -PHC- SEO and Site Description -->
+  
+  <!-- -PHC- Security -->
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+  <!-- -PHC- Security -->
+  
+  <!-- -PHC- CSS -->
+  <%= stylesheet_link_tag 'phcpress/application', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <!-- -PHC- CSS -->
 
   <!-- Font -->
   <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 "phcpress/application", media: "all", 'data-turbolinks-track': 'reload' %>
-
-  <!-- Security -->
-  <%= csrf_meta_tags %>
+  <!-- Font -->
 
 </head>
 <body>
@@ -62,15 +67,7 @@
 
   <!-- Requried JavaScripts -->
   <%= javascript_include_tag "phcpress/application", 'data-turbolinks-track': 'reload' %>
-
-  <!-- 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 src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
   <script>
 		$(document).ready(function() {
 			App.init();

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

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

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

@@ -1,9 +1,7 @@
-<!-- Topbar - Navigation -->
 <!-- Topbar - Navigation Header -->
 <div class="navbar-header">
-  <%= link_to phcpress.root_path, class: "navbar-brand" do %>
-    <!--<span class="navbar-logo"></span>-->
-    <strong>PHC</strong>Press
+  <%= link_to phcpress.article_posts_path, class: "navbar-brand" do %>
+    <strong>PHC</strong><i>Press</i>
   <% end %>
   <button type="button" class="navbar-toggle" data-click="sidebar-toggled">
     <span class="icon-bar"></span>
@@ -62,7 +60,7 @@
     <li class="dropdown navbar-user">
       <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
         <%= image_tag current_user.gravatar_url %>
-        <span class="d-none d-md-inline"><%= current_user.firstname %> <%= current_user.lastname  %></span> <b class="caret"></b>
+        <span class="d-none d-md-inline"><%= current_user.firstname + ' ' + current_user.lastname  %></span> <b class="caret"></b>
       </a>
       <div class="dropdown-menu dropdown-menu-right">
         <%= link_to phcaccounts.edit_user_registration_path, class: "dropdown-item" do %>
@@ -77,67 +75,4 @@
 
   </ul>
 <% end %>
-<% if current_admin %>
-  <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">
-        <%= image_tag current_admin.gravatar_url %>
-        <span class="d-none d-md-inline"><%= current_admin.firstname + ' ' + current_admin.lastname  %></span> <b class="caret"></b>
-      </a>
-      <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to phcaccounts.edit_admin_registration_path, class: "dropdown-item" do %>
-          <i class="fas fa-cogs"></i> Account Settings
-        <% end %>
-        <%= link_to phcaccounts.destroy_admin_session_path, method: :delete, class: "dropdown-item" do %>
-          <i class="fas fa-sign-out-alt"></i> Logout
-        <% end %>
-      </div>
-    </li>
-    <!-- Topbar - Navigation Main - User Menu -->
-
-  </ul>
-<% end %>
 <!-- Topbar - Navigation Main -->