phcpress 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f51ee17fa7b7216e9d8acee8cf62dd32e5e0050e
-  data.tar.gz: 62595f2af30b49c4437e0139c6fc18bfc6e472f5
+  metadata.gz: bbc269366d81527369f7b9587a583cda84c973f8
+  data.tar.gz: 594aeff4503c50fabe4ce714c61c03b88c994229
 SHA512:
-  metadata.gz: 7e641049a74ba00b09807b55a05b53d303eb01c815dcbe97b412313d688f230e0ae17fd5658c346efd8756b5312ecb7dde7e5367ab5f8ef1e9f1e052e2a00d29
-  data.tar.gz: 79bd5162c729e5bfe1ae6a6df892eb7a5984adcc75abca37013a57b0a3f787dc78b2620c46c64255fe4e1e87a38d6e81e128d92d9ea55286c78628e8b91b5a32
+  metadata.gz: de9aeece950c6456fc9c797151a071bec57a50de375468b8a5654af7d5f0064a63e51856a4d01ee40aafae3a039558f1107ce5fd60f87d8ed91755861694f201
+  data.tar.gz: 8b25b3934796402f5bc18cb4590f159f2f2e239637560395f6f1ef879c1c42b9b904cd75f3b1b16dd322ba513d66260fdd560935715705fe303a73af5ed8394a

data/README.md

@@ -3,12 +3,12 @@
 [![Issue Count](https://codeclimate.com/github/PHCNetworks/phc-press/badges/issue_count.svg)](https://codeclimate.com/github/PHCNetworks/phc-press)
 [![Gem Version](https://badge.fury.io/rb/phcpress.svg)](https://badge.fury.io/rb/phcpress)  
   
-### PHCPress(4) (Blog & News Post Engine) Documentation
+### PHCPress(5) (Blog & News Post Engine) Documentation
 PHCPress is a basic open source news & blog engine.
   
 #### Step 1 - Add PHCPress Engine to your gemfile  
 
-	gem 'phcpress', '~> 3.8', '>= 3.8.5'
+	gem 'phcpress', '~> 4.0'
 	bundle exec install
   
 #### Step 2 - Copy over database migration files  
@@ -17,7 +17,7 @@ PHCPress is a basic open source news & blog engine.
 	rake db:migrate
   
 #### Step 3 - Recompile Assets  
-PHCPress included Virws & UI requires bootstrap and fontawesome.  
+PHCPress included Views & UI requires bootstrap and FontAwesome.  
   
 	rake assets:clobber
 	rake assets:precompile
@@ -27,4 +27,3 @@ PHCPress default Carrierwave settings can be overwritten (suggested).
   
 - [How to Override PHCPress Uploader](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader---Override)
 - [How to Override - Cloudinary Example](https://github.com/PHCNetworks/phc-press/wiki/Image-Uploader-(Cloudinary))
-- 

data/app/assets/javascripts/phcpress/modules/connections.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/phcpress/_custom.scss

@@ -0,0 +1,4 @@
+// Top Padding Override
+.container {
+	padding-top:40px;
+}

data/app/assets/stylesheets/phcpress/modules/connections.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the modules::connections controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/app/assets/stylesheets/scaffolds.scss

@@ -0,0 +1,89 @@
+body {
+  background-color: #fff;
+  color: #333;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding-bottom: 7px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}

data/app/controllers/phcpress/application_controller.rb

@@ -2,14 +2,7 @@ module Phcpress
 	class ApplicationController < ActionController::Base
 
 		# Prevent CSRF attacks by raising an exception.
-		before_action :authenticate_user!, if: -> { defined?(Devise) }
 		protect_from_forgery with: :exception
-		
-		# Current User
-		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
-		end
 
 		# Load Helpers
 		helper Phctitleseo::Engine.helpers

data/app/controllers/phcpress/articles/posts_controller.rb

@@ -0,0 +1,68 @@
+require_dependency "phcpress/application_controller"
+
+module Phcpress
+	class Articles::PostsController < ApplicationController
+
+		# Filters & Security
+		before_action :set_articles_post, only: [:show, :edit, :update, :destroy]
+
+		# Article Index
+		def index
+			@articles_posts = Articles::Post.all
+		end
+
+		# Article Show
+		def show
+		end
+
+		# Article New
+		def new
+			@articles_post = Articles::Post.new
+
+		end
+
+		# Article Edit
+		def edit
+		end
+
+		# POST
+		def create
+			@articles_post = Articles::Post.new(articles_post_params)
+			if @articles_post.save
+				@articles_post.connections.build
+				redirect_to articles_posts_url, notice: 'Post was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# PATCH/PUT
+		def update
+			if @articles_post.update(articles_post_params)
+				@articles_post.connections.build
+				redirect_to articles_posts_url, notice: 'Post was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# DELETE
+		def destroy
+			@articles_post.destroy
+			redirect_to articles_posts_url, notice: 'Post was successfully destroyed.'
+		end
+
+		private
+
+		# Common Callbacks
+		def set_articles_post
+			@articles_post = Articles::Post.find(params[:id])
+		end
+
+		# Params Whitelist
+		def articles_post_params
+			params.require(:articles_post).permit(:psttitle, :psttext, :pstexcerpts, :pststatus, :pstimage, :remove_pstimage, category_ids: [])
+		end
+
+	end
+end

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

@@ -4,8 +4,6 @@ module Phcpress
 	class Modules::CategoriesController < ApplicationController
 
 		# Security and Filters
-		layout 'layouts/phcpress/category/category_layout'
-		before_action :authenticate_user!
 		before_action :set_modules_category, only: [:show, :edit, :update, :destroy]
 
 		# Categories Index
@@ -13,20 +11,20 @@ module Phcpress
 			@modules_categories = Modules::Category.all
 		end
 
-		# Detail News/Blog Category
+		# Categories Show
 		def show
 		end
 
-		# New News/Blog Category
+		# Categories New
 		def new
 			@modules_category = Modules::Category.new
 		end
 
-		# Edit News/Blog Category
+		# Categories Edit
 		def edit
 		end
 
-		# Create News/Blog Category
+		# POST
 		def create
 			@modules_category = Modules::Category.new(modules_category_params)
 
@@ -37,7 +35,7 @@ module Phcpress
 			end
 		end
 
-		# Update News/Blog Category
+		# PATCH/PUT
 		def update
 			if @modules_category.update(modules_category_params)
 				redirect_to modules_categories_url, notice: 'Category was successfully updated.'
@@ -46,7 +44,7 @@ module Phcpress
 			end
 		end
 
-		# Delete News/Blog Category
+		# DELETE
 		def destroy
 			@modules_category.destroy
 			redirect_to modules_categories_url, notice: 'Category was successfully destroyed.'
@@ -61,7 +59,7 @@ module Phcpress
 
 		# Whitelist
 		def modules_category_params
-			params.require(:modules_category).permit(:catname, :user_id)
+			params.require(:modules_category).permit(:catname)
 		end
 
 	end

data/app/controllers/phcpress/modules/connections_controller.rb

@@ -0,0 +1,66 @@
+require_dependency "phcpress/application_controller"
+
+module Phcpress
+	class Modules::ConnectionsController < ApplicationController
+
+		# Security and Filters
+		before_action :set_modules_connection, only: [:show, :edit, :update, :destroy]
+
+		# Connections Index
+		def index
+			@modules_connections = Modules::Connection.all
+		end
+
+		# Connections Show
+		def show
+		end
+
+		# Connections New
+		def new
+			@modules_connection = Modules::Connection.new
+		end
+
+		# Connections Edit
+		def edit
+		end
+
+		# POST
+		def create
+			@modules_connection = Modules::Connection.new(modules_connection_params)
+
+			if @modules_connection.save
+				redirect_to modules_connections_url, notice: 'Connection was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# PATCH/PUT
+		def update
+			if @modules_connection.update(modules_connection_params)
+				redirect_to modules_connections_url, notice: 'Connection was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# DELETE
+		def destroy
+			@modules_connection.destroy
+			redirect_to modules_connections_url, notice: 'Connection was successfully destroyed.'
+		end
+
+		private
+
+		# Use callbacks to share common setup or constraints between actions.
+		def set_modules_connection
+			@modules_connection = Modules::Connection.find(params[:id])
+		end
+
+		# Only allow a trusted parameter "white list" through.
+		def modules_connection_params
+			params.require(:modules_connection).permit(:post_id, :category_id)
+		end
+
+	end
+end

data/app/helpers/phcpress/modules/connections_helper.rb

@@ -0,0 +1,4 @@
+module Phcpress
+  module Modules::ConnectionsHelper
+  end
+end

data/app/models/phcpress/{news.rb → articles.rb}

@@ -1,7 +1,7 @@
 module Phcpress
-	module News
+	module Articles
 		def self.table_name_prefix
-			'phcpress_news_'
+			'phcpress_articles_'
 		end
 	end
 end

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

@@ -0,0 +1,12 @@
+module Phcpress
+	class Articles::Post < ApplicationRecord
+
+		# For Image Uploads
+		mount_uploader :pstimage, Phcpress::PstimageUploader
+		
+		# Relationships
+		has_many :connections, class_name: 'Modules::Connection'
+		has_many :categories, class_name: 'Modules::Category', :through => :connections
+
+	end
+end

data/app/models/phcpress/modules/category.rb

@@ -1,5 +1,9 @@
 module Phcpress
 	class Modules::Category < ApplicationRecord
 
+		# Relationships
+		has_many :connections, class_name: 'Modules::Connection'
+		has_many :posts, class_name: 'Modules::Category', :through => :connections
+
 	end
 end

data/app/models/phcpress/modules/connection.rb

@@ -0,0 +1,9 @@
+module Phcpress
+	class Modules::Connection < ApplicationRecord
+
+		# Relationships
+		belongs_to :post, class_name: 'Articles::Post'
+		belongs_to :category, class_name: 'Modules::Category'
+
+	end
+end

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

@@ -12,9 +12,7 @@
 
 	<body>
 		<div class="container">
-			<div class="row">
-				<%= yield %>
-			</div> 
+			<%= yield %>
 		</div>
 	</body>
 

data/app/views/phcpress/{blog → articles}/posts/_form.html.erb

@@ -1,8 +1,8 @@
 <div class="row">
-	<%= form_for(@blog_post, :html => {:multipart => true}) do |f| %>
+	<%= form_for(@articles_post, :html => {:multipart => true}) do |f| %>
 	
 		<!-- PHC-Notifi Render Validation -->
-		<%= render 'phcnotifi/validations', :object => @blog_post %>
+		<%= render 'phcnotifi/validations', :object => @articles_post %>
 	
 		<div class="col-md-3">
 
@@ -15,12 +15,8 @@
 						<%= f.label :pststatus, "Post Status" %>
 						<%= f.select( :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], {}, {class: "form-control form-control-sm"}) %>
 					</div>
-					<div class="form-group">
-						<%= f.label :pstcategory, "Post Category" %>
-						<%= collection_select(:pstcategory, :pstcategory_id, Phcpress::Modules::Category.order('catname'), :id, :catname, {}, {class: "form-control form-control-sm"}) %>
-					</div>
 					<div class="actions">
-						<%= f.submit "Publish Blog Article", class: "btn btn-primary btn-sm" %>
+						<%= f.submit "Publish", class: "btn btn-primary btn-sm" %>
 					</div>
 				</div>
 			</div>
@@ -31,7 +27,7 @@
 				</div>
 				<div class="panel-body">
 					<div class="form-group">
-						<label><%= f.label :pstimage, "Featured Image" %></label>
+						<%= f.label :pstimage, "Featured Image" %>
 						<%= f.file_field :pstimage, class: "form-control" %>
 					</div>
 					<% if f.object.pstimage? %>
@@ -42,6 +38,20 @@
 				</div>
 			</div>
 
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<i class="fa fa-sitemap"></i> Post Categories & Tags
+				</div>
+				<div class="panel-body">
+					<div class="form-group">
+						<%= f.collection_check_boxes :category_ids, Phcpress::Modules::Category.all, :id, :catname do |post_category| %>
+							<%= post_category.check_box %>
+							<%= post_category.label %></br>
+						<% end %>
+					</div>
+				</div>
+			</div>
+
 		</div>
 
 		<div class="col-md-9 ">
@@ -52,16 +62,16 @@
 				</div>
 				<div class="panel-body">
 					<div class="form-group">
-						<label><%= f.label :blogpsttitle, "Title" %></label>
-						<%= f.text_field :blogpsttitle, class: "form-control" %>
+						<%= f.label :psttitle, "Title" %>
+						<%= f.text_field :psttitle, class: "form-control" %>
 					</div>
 					<div class="form-group">
-						<label><%= f.label :blogpsttext, "Text" %></label>
-						<%= f.text_area :blogpsttext, class: "form-control" %>
+						<%= f.label :psttext, "Text" %>
+						<%= f.text_area :psttext, class: "form-control" %>
 					</div>
 					<div class="form-group">
-						<label><%= f.label :blogpstexcerpts, "Excerpts/Text Leads" %></label>
-						<%= f.text_area :blogpstexcerpts, class: "form-control" %>
+						<%= f.label :pstexcerpts, "Excerpts/Text Leads" %>
+						<%= f.text_area :pstexcerpts, class: "form-control" %>
 					</div>
 				</div>
 			</div>