phcpresspro 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446f8f04e7549df339ad72e1389e56f794eeb868
-  data.tar.gz: 00f5eccca3ba173a8447315fb2d0681b7231194b
+  metadata.gz: 9aa51c93d01be3180790ea6cfb685b2709cc676e
+  data.tar.gz: b7ab6aee232a30ae4c480774dfaa92a2610cb7fc
 SHA512:
-  metadata.gz: 9a743e6747191e0ffaee0b7517384de0c36c759c5479db211fc1a6271d6fdfccd8e9c5d21b2fe91d88b3f840822e741b7d1ac5f8691373bc7df90deec1213830
-  data.tar.gz: 2cbbe746f3612ea38e5e04da5855c867a30e0e9b2f8536d364f5e0d01156beedd95368bbe270929f98638eeb77ff3597819b116df3527eb0ef62aab84d14c5d2
+  metadata.gz: 03d069b8d6a399367c601d05c50b8a89cf4912c87ea3e94b55851e36ab85215315585f75c1309850c195023279b480771729196349dac6ca35c064c9a501b9e9
+  data.tar.gz: e17e27029bb12bdab4d395c4ce9830d580de86173744c7c8edb215cbb251cc9b31547dbc6cc8cb791c9f865bbda6187508ccd88c4cbfa3bf72d338a80664f31f

data/README.md

@@ -1,4 +0,0 @@
-[![security](https://hakiri.io/github/PHCNetworks/phc-press/master.svg)](https://hakiri.io/github/PHCNetworks/phc-press/master)
-[![Code Climate](https://codeclimate.com/github/PHCNetworks/phc-press/badges/gpa.svg)](https://codeclimate.com/github/PHCNetworks/phc-press)
-[![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/phcpresspro.svg)](https://badge.fury.io/rb/phcpresspro)

data/Rakefile

@@ -1,17 +1,17 @@
 begin
-	require 'bundler/setup'
+  require 'bundler/setup'
 rescue LoadError
-	puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
 require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
-	rdoc.rdoc_dir = 'rdoc'
-	rdoc.title    = 'Phcpresspro'
-	rdoc.options << '--line-numbers'
-	rdoc.rdoc_files.include('README.rdoc')
-	rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'phcpresspro'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 APP_RAKEFILE = File.expand_path("../spec/test_app/Rakefile", __FILE__)

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

@@ -1,16 +1,3 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap-sprockets

data/app/controllers/phcpresspro/application_controller.rb

@@ -1,6 +1,20 @@
 module Phcpresspro
 	class ApplicationController < ActionController::Base
+
+		# Prevent CSRF attacks by raising an exception.
+		# For APIs, you may want to use :null_session instead.
+		before_action :authenticate_user!, if: -> { defined?(Devise) }
 		protect_from_forgery with: :exception
+		
+		# Make Current User Sitewide
+		def current_user
+			return unless session[:user_id]
+			@current_user ||= User.find(session[:user_id])
+		end
+
+		# Load Helpers
+		helper Phctitleseo::Engine.helpers
+		helper Phcnotifi::Engine.helpers
 
 	end
 end

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

@@ -7,7 +7,7 @@ module Phcpresspro
 
 		# Filters & Security
 		layout 'layouts/phcpresspro/blogpost/blog_layout'
-		#before_action :authenticate_user!
+		before_action :authenticate_user!, if: -> { defined?(Devise) }
 		before_action :set_blog_post, only: [:edit, :update, :destroy]
 
 		# Blog Post Index (/blog/posts)
@@ -28,15 +28,14 @@ module Phcpresspro
 		def edit
 		end
 
-		# POST
+		# Create News Post /news/posts/new
 		def create
-			@blog_post.user_id = current_user
 			@blog_post = Blog::Post.new(blog_post_params)
-
-			if @blog_post.save
+			@blog_post.user_id = current_user.id
+			if @blog_post.save  
 				redirect_to blog_posts_path, notice: 'Blog post was successfully created.'
-			else
-				render :new
+				else
+					render 'new'
 			end
 		end
 
@@ -59,12 +58,18 @@ module Phcpresspro
 
 		# Common Callbacks
 		def set_blog_post
-		@blog_post = Blog::Post.find(params[:id])
+			@blog_post = Blog::Post.find(params[:id])
 		end
 
 		# Whitelist on what can be posted
 		def blog_post_params
-			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage)
+			params.require(:blog_post).permit(:blogpsttitle, :blogpsttext, :blogpstexcerpts, :pststatus, :pstimage, :user_id)
+		end
+	
+		# Current User
+		def current_user
+			return unless session[:user_id]
+			@current_user ||= User.find(session[:user_id])
 		end
 
 	end

data/app/controllers/phcpresspro/categories_controller.rb

@@ -0,0 +1,63 @@
+require_dependency "phcpresspro/application_controller"
+
+module Phcpresspro
+	class CategoriesController < ApplicationController
+
+		# Security and Filters
+		before_action :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :set_category, only: [:edit, :update, :destroy]
+
+		# Categories Index
+		def index
+			@categories = Category.all
+		end
+
+		# New News/Blog Category
+		def new
+			@category = Category.new
+		end
+
+		# Edit News/Blog Category
+		def edit
+		end
+
+		# Create News/Blog Category
+		def create
+			@category = Category.new(category_params)
+
+			if @category.save
+				redirect_to categories_path, notice: 'Category was Successfully Created.'
+			else
+				render :new
+			end
+		end
+
+		# Update News/Blog Category
+		def update
+			if @category.update(category_params)
+				redirect_to categories_path, notice: 'Category was Successfully Updated.'
+			else
+				render :edit
+			end
+		end
+
+		# Delete News/Blog Category
+		def destroy
+			@category.destroy
+			redirect_to categories_path, notice: 'Category was Successfully Destroyed.'
+		end
+
+		private
+
+		# Common Callbacks
+		def set_category
+			@category = Category.find(params[:id])
+		end
+
+		# Whitelist
+		def category_params
+			params.require(:category).permit(:catname)
+		end
+
+	end
+end

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

@@ -1,58 +1,51 @@
-# Load General Controller for Engine
 require_dependency "phcpresspro/application_controller"
 
-# Code for News Posting
 module Phcpresspro
 	class News::PostsController < ApplicationController
 
 		# Filters & Security
 		layout 'layouts/phcpresspro/newspost/news_layout'
-		before_action :authenticate_user!
+		before_action :authenticate_user!, if: -> { defined?(Devise) }
 		before_action :set_news_post, only: [:edit, :update, :destroy]
 
-		# News Post Index (/news/posts)
+		# News Post Index
 		def index
 			@news_posts = News::Post.all
 		end
 
-		# Single News Post (/news/posts/1)
-		#def show
-		#end
-
-		# Create a New News Post (/news/posts/new)
+		# New News Article
 		def new
 			@news_post = News::Post.new
 		end
 
-		# Edit News Post /news/posts/1/edit
+		# Edit News Article
 		def edit
 		end
 
-		# POST
+		# Create News Article
 		def create
+			@news_post = News::Post.new(news_post_params)
 			@news_post.user_id = current_user
-			@news_post = News::Post.current_user.(news_post_params)
-
-			if @news_post.save
-				redirect_to news_posts_path, notice: 'News post was successfully created.'
-			else
-				render :new
+			if @news_post.save  
+				redirect_to news_posts_path, notice: 'News Article was Successfully Created.'
+				else
+					render 'new'
 			end
 		end
 
-		# PATCH/PUT
+		# Update News Article
 		def update
 			if @news_post.update(news_post_params)
-				redirect_to news_posts_path, notice: 'News post was successfully updated.'
+				redirect_to news_posts_path, notice: 'News Article was Successfully Updated.'
 			else
 				render :edit
 			end
 		end
 
-		# DELETE
+		# Delete News Destroy
 		def destroy
 			@news_post.destroy
-			redirect_to news_posts_path, notice: 'News post was successfully destroyed.'
+			redirect_to news_posts_path, notice: 'News Article was Successfully Destroyed.'
 		end
 
 		private
@@ -62,9 +55,15 @@ module Phcpresspro
 			@news_post = News::Post.find(params[:id])
 		end
 
-		# Whitelist on what can be posted
+		# Whitelist
 		def news_post_params
-			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage)
+			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :user_id, :category_id)
+		end
+
+		# Current User
+		def current_user
+			return unless session[:user_id]
+			@current_user ||= User.find(session[:user_id])
 		end
 
 	end

data/app/helpers/phcpresspro/application_helper.rb

@@ -1,4 +1,4 @@
 module Phcpresspro
-	module ApplicationHelper
-	end
+  module ApplicationHelper
+  end
 end

data/app/models/phcpresspro/blog.rb

@@ -1,7 +1,7 @@
 module Phcpresspro
 	module Blog
 		def self.table_name_prefix
-			'phcpress_blog_'
+			'phcpresspro_blog_'
 		end
 	end
 end

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

@@ -1,19 +1,11 @@
 module Phcpresspro
 	class Blog::Post < ActiveRecord::Base
 
-		# Filters Before Post
-		before_create :authour
-
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpresspro::PstimageUploader
 
 		# Associate Post Authour to User
 		belongs_to :user, class_name: 'Phcengine::User'
 
-		# Define r Devise
-		def authour
-			self.user_id = current_user.id
-		end
-
 	end
 end

data/app/models/phcpresspro/category.rb

@@ -0,0 +1,4 @@
+module Phcpresspro
+	class Category < ActiveRecord::Base
+	end
+end

data/app/models/phcpresspro/news.rb

@@ -1,7 +1,7 @@
 module Phcpresspro
 	module News
 		def self.table_name_prefix
-			'phcpress_news_'
+			'phcpresspro_news_'
 		end
 	end
 end

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

@@ -1,19 +1,11 @@
 module Phcpresspro
 	class News::Post < ActiveRecord::Base
 
-		# Filters Before Post
-		before_create :authour
-
 		# For Image Uploads
 		mount_uploader :pstimage, Phcpresspro::PstimageUploader
 		
 		# Associate Post Authour to User
 		belongs_to :user, class_name: 'Phcengine::User'
-		
-		# Define r Devise
-		def authour
-			self.user_id = current_user.id
-		end
 
 	end
 end

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

@@ -2,7 +2,7 @@
 <html>
 	<head>
 
-		<title>PHCPress - News Post & Blogging System</title>
+		<title>PHCPressPro - News Post & Blogging System</title>
 
 		<%= stylesheet_link_tag    "phcpresspro/application", media: "all" %>
 		<%= javascript_include_tag "phcpresspro/application" %>

data/app/views/layouts/phcpresspro/blogpost/blog_layout.html.erb

@@ -2,7 +2,7 @@
 <html>
 	<head>
 
-		<title>PHCPress - News Post & Blogging System</title>
+		<title>PHCPressPro - News Post & Blogging System</title>
 
 		<%= stylesheet_link_tag    "phcpresspro/application", media: "all" %>
 		<%= javascript_include_tag "phcpresspro/application" %>

data/app/views/layouts/phcpresspro/newspost/news_layout.html.erb

@@ -2,7 +2,7 @@
 <html>
 	<head>
 
-		<title>PHCPress - News Post & Blogging System</title>
+		<title>PHCPressPro - News Post & Blogging System</title>
 
 		<%= stylesheet_link_tag    "phcpresspro/application", media: "all" %>
 		<%= javascript_include_tag "phcpresspro/application" %>

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

@@ -5,21 +5,25 @@
 		<%= render 'phcnotifi/validations', :object => @blog_post %>
 	
 		<div class="col-md-3">
-			<div class="panel panel-default">
+			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-paper-plane-o"></i> Publish Panel
 				</div>
 				<div class="panel-body">
 					<div class="form-group">
-						<label><%= f.label :pststatus, "Post Status" %></label>
-						<%= f.select :pststatus, [['Draft','draft'],['Publish','publish'],['Review','review']], class: "form-control" %>
+						<%= 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, Phcpresspro::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" %>
 					</div>
 				</div>
 			</div>
-			<div class="panel panel-default">
+			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-camera-retro"></i> Post Images
 				</div>
@@ -33,7 +37,7 @@
 			</div>
 		</div>
 		<div class="col-md-9 ">
-			<div class="panel panel-default">
+			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<i class="fa fa-pencil-square-o"></i> Blog Post Publisher
 				</div>

data/app/views/phcpresspro/blog/posts/edit.html.erb

@@ -1,3 +1,12 @@
-<div class="wrapper wrapper-content">
-	<%= render 'form' %>
+<!-- Main Content -->
+<div class="panel panel-primary">
+
+	<div class="panel-heading">
+		<i class="fa fa-pencil-square-o"></i> Edit Blog Post
+	</div>
+
+	<div class="panel-body">
+		<%= render 'form' %>
+	</div>
+
 </div>