phcpress 4.0.0 → 5.0.0

data/app/views/phcpress/articles/posts/edit.html.erb

@@ -0,0 +1,2 @@
+<!-- Main Form -->
+<%= render 'form' %>

data/app/views/phcpress/articles/posts/index.html.erb

@@ -0,0 +1,42 @@
+<!-- Main Content -->
+<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+
+		<div class="panel-heading">
+			<i class="fa fa-pencil-square-o"></i> Article List
+		</div>
+
+		<div class="panel-body">
+
+			<table class="table table-bordered table-striped table-hover">
+
+				<thead>
+					<tr>
+						<th>Title</th>
+						<th>Text Preview</th>
+						<th>Article Status</th>
+						<th></th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<% @articles_posts.each do |articles_post| %>
+						<tr>
+							<td><%= articles_post.psttitle %></td>
+							<td><%= truncate(articles_post.psttext, :length => 80) %></td>
+							<td><%= articles_post.pststatus %></td>
+							<td><div class="btn-group" role="group" aria-label="Blog Articles">
+								<%= link_to 'Edit', edit_articles_post_path(articles_post), class: "btn btn-primary btn-xs" %>
+								<%= link_to 'Trash', articles_post, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
+							</div></td>
+						</tr>
+					<% end %>
+				</tbody>
+
+			</table>
+
+			<%= link_to 'New Blog Post', new_articles_post_path, class: "btn btn-primary" %>
+		</div>
+
+	</div>
+</div>

data/app/views/phcpress/articles/posts/new.html.erb

@@ -0,0 +1,2 @@
+<!-- Main From -->
+<%= render 'form' %>

data/app/views/phcpress/articles/posts/show.html.erb

@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_articles_post_path(@articles_post) %> |
+<%= link_to 'Back', articles_posts_path %>

data/app/views/phcpress/modules/categories/index.html.erb

@@ -17,11 +17,11 @@
 				</thead>
 
 				<tbody>
-					<% @categories.each do |modules_category| %>
+					<% @modules_categories.each do |modules_category| %>
 						<tr>
 							<td><%= modules_category.catname %></td>
         					<td><div class="btn-group" role="group" aria-label="Blog Articles">
-								<%= link_to 'Edit', edit_modules_category_path(category) , class: "btn btn-primary btn-xs" %>
+								<%= link_to 'Edit', edit_modules_category_path(modules_category) , class: "btn btn-primary btn-xs" %>
 								<%= link_to 'Trash', modules_category, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure?' } %>
 								</div>
 							</td>

data/app/views/phcpress/modules/connections/_form.html.erb

@@ -0,0 +1,27 @@
+<%= form_for(modules_connection) do |f| %>
+  <% if modules_connection.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(modules_connection.errors.count, "error") %> prohibited this modules_connection from being saved:</h2>
+
+      <ul>
+      <% modules_connection.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :post_id %>
+    <%= f.text_field :post_id %>
+  </div>
+
+  <div class="field">
+    <%= f.label :category_id %>
+    <%= f.text_field :category_id %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/phcpress/modules/connections/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Modules Connection</h1>
+
+<%= render 'form', modules_connection: @modules_connection %>
+
+<%= link_to 'Show', @modules_connection %> |
+<%= link_to 'Back', modules_connections_path %>

data/app/views/phcpress/modules/connections/index.html.erb

@@ -0,0 +1,29 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Modules Connections</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Post</th>
+      <th>Category</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @modules_connections.each do |modules_connection| %>
+      <tr>
+        <td><%= modules_connection.post %></td>
+        <td><%= modules_connection.category %></td>
+        <td><%= link_to 'Show', modules_connection %></td>
+        <td><%= link_to 'Edit', edit_modules_connection_path(modules_connection) %></td>
+        <td><%= link_to 'Destroy', modules_connection, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Modules Connection', new_modules_connection_path %>

data/app/views/phcpress/modules/connections/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Modules Connection</h1>
+
+<%= render 'form', modules_connection: @modules_connection %>
+
+<%= link_to 'Back', modules_connections_path %>

data/app/views/phcpress/modules/connections/show.html.erb

@@ -0,0 +1,14 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Post:</strong>
+  <%= @modules_connection.post %>
+</p>
+
+<p>
+  <strong>Category:</strong>
+  <%= @modules_connection.category %>
+</p>
+
+<%= link_to 'Edit', edit_modules_connection_path(@modules_connection) %> |
+<%= link_to 'Back', modules_connections_path %>

data/config/routes.rb

@@ -1,16 +1,14 @@
 Phcpress::Engine.routes.draw do
 
-	# Blog Routes
-	namespace :blog do
-		resources :posts, class_name: 'Phcpress::News::Post'
+	# Article Routes
+	namespace :articles do
+		resources :posts, class_name: 'Articles::Post'
 	end
 
-	# News Routes
-	namespace :news do
-		resources :posts, class_name: 'Phcpress::Blog::Post'
+	# Module Routes
+	namespace :modules do
+		resources :connections, class_name: 'Modules::Connection'
+		resources :categories, class_name: 'Modules::Category'
 	end
 
-	# Categories
-	resources :categories, class_name: 'Phcpress::Modules::Category'
-
 end

data/db/migrate/20160716182848_create_phcpress_modules_categories.rb

@@ -1,11 +1,11 @@
 class CreatePhcpressModulesCategories < ActiveRecord::Migration[5.0]
-  def change
-    create_table :phcpress_modules_categories do |t|
+	def change
+		create_table :phcpress_modules_categories do |t|
 
-      t.string :catname
-	
-      t.timestamps null: false
+			t.string :catname
 
-    end
-  end
-end
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/20160720181307_create_phcpress_articles_posts.rb

@@ -0,0 +1,15 @@
+class CreatePhcpressArticlesPosts < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcpress_articles_posts do |t|
+
+			t.string :psttitle
+			t.text :psttext
+			t.string :pststatus
+			t.text :pstexcerpts
+			t.string :pstimage
+
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/20160720235314_create_phcpress_modules_connections.rb

@@ -0,0 +1,10 @@
+class CreatePhcpressModulesConnections < ActiveRecord::Migration[5.0]
+  def change
+    create_table :phcpress_modules_connections do |t|
+      t.references :post, foreign_key: true
+      t.references :category, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/phcpress/version.rb

@@ -1,3 +1,3 @@
 module Phcpress
-    VERSION = "4.0.0"
+    VERSION = "5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcpress
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -500,7 +500,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.53.4
-description: PHCPress(4) is a basic open source news & blog engine.
+description: PHCPress(5) is a basic open source news & blog engine.
 email:
 - developers@phcnetworks.net
 executables: []
@@ -512,43 +512,46 @@ files:
 - Rakefile
 - app/assets/config/phcpress_manifest.js
 - app/assets/javascripts/phcpress/application.js
+- app/assets/javascripts/phcpress/modules/connections.js
 - app/assets/stylesheets/phcpress/_custom.scss
 - app/assets/stylesheets/phcpress/application.scss
+- app/assets/stylesheets/phcpress/modules/connections.scss
+- app/assets/stylesheets/scaffolds.scss
 - app/controllers/phcpress/application_controller.rb
-- app/controllers/phcpress/blog/posts_controller.rb
+- app/controllers/phcpress/articles/posts_controller.rb
 - app/controllers/phcpress/modules/categories_controller.rb
-- app/controllers/phcpress/news/posts_controller.rb
+- app/controllers/phcpress/modules/connections_controller.rb
 - app/helpers/phcpress/application_helper.rb
+- app/helpers/phcpress/modules/connections_helper.rb
 - app/jobs/phcpress/application_job.rb
 - app/mailers/phcpress/application_mailer.rb
 - app/models/phcpress/application_record.rb
-- app/models/phcpress/blog.rb
-- app/models/phcpress/blog/post.rb
+- app/models/phcpress/articles.rb
+- app/models/phcpress/articles/post.rb
 - app/models/phcpress/modules.rb
 - app/models/phcpress/modules/category.rb
-- app/models/phcpress/news.rb
-- app/models/phcpress/news/post.rb
+- app/models/phcpress/modules/connection.rb
 - app/uploaders/phcpress/pstimage_uploader.rb
 - app/views/layouts/phcpress/application.html.erb
-- app/views/phcpress/blog/posts/_form.html.erb
-- app/views/phcpress/blog/posts/edit.html.erb
-- app/views/phcpress/blog/posts/index.html.erb
-- app/views/phcpress/blog/posts/new.html.erb
-- app/views/phcpress/blog/posts/show.html.erb
+- app/views/phcpress/articles/posts/_form.html.erb
+- app/views/phcpress/articles/posts/edit.html.erb
+- app/views/phcpress/articles/posts/index.html.erb
+- app/views/phcpress/articles/posts/new.html.erb
+- app/views/phcpress/articles/posts/show.html.erb
 - app/views/phcpress/modules/categories/_form.html.erb
 - app/views/phcpress/modules/categories/edit.html.erb
 - app/views/phcpress/modules/categories/index.html.erb
 - app/views/phcpress/modules/categories/new.html.erb
 - app/views/phcpress/modules/categories/show.html.erb
-- app/views/phcpress/news/posts/_form.html.erb
-- app/views/phcpress/news/posts/edit.html.erb
-- app/views/phcpress/news/posts/index.html.erb
-- app/views/phcpress/news/posts/new.html.erb
-- app/views/phcpress/news/posts/show.html.erb
+- app/views/phcpress/modules/connections/_form.html.erb
+- app/views/phcpress/modules/connections/edit.html.erb
+- app/views/phcpress/modules/connections/index.html.erb
+- app/views/phcpress/modules/connections/new.html.erb
+- app/views/phcpress/modules/connections/show.html.erb
 - config/routes.rb
-- db/migrate/20160716182441_create_phcpress_news_posts.rb
-- db/migrate/20160716182510_create_phcpress_blog_posts.rb
 - db/migrate/20160716182848_create_phcpress_modules_categories.rb
+- db/migrate/20160720181307_create_phcpress_articles_posts.rb
+- db/migrate/20160720235314_create_phcpress_modules_connections.rb
 - lib/phcpress.rb
 - lib/phcpress/engine.rb
 - lib/phcpress/version.rb

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

@@ -1,75 +0,0 @@
-# Load General Controller for Engine
-require_dependency "phcpress/application_controller"
-
-# Code for Blog Posting
-module Phcpress
-	class Blog::PostsController < ApplicationController
-
-		# Filters & Security
-		#layout 'layouts/phcpress/blogpost/blog_layout'
-		#before_action :authenticate_user!
-		before_action :set_blog_post, only: [:edit, :update, :destroy]
-
-		# Blog Post Index (/blog/posts)
-		def index
-			@blog_posts = Blog::Post.all
-		end
-
-		# Single Blog Post (/blog/posts/1)
-		#def show
-		#end
-
-		# Create a New Blog Post (/blog/posts/new)
-		def new
-			@blog_post = Blog::Post.new
-		end
-
-		# Edit Blog Post (/blog/posts/1/edit)
-		def edit
-		end
-
-		# Create News Post /news/posts/new
-		def create
-			@blog_post = Blog::Post.new(blog_post_params)
-			if @blog_post.save  
-				redirect_to blog_posts_path, notice: 'Blog post was successfully created.'
-				else
-					render 'new'
-			end
-		end
-
-		# PATCH/PUT
-		def update
-			if @blog_post.update(blog_post_params)
-				redirect_to blog_posts_path, notice: 'Blog post was successfully updated.'
-			else
-				render :edit
-			end
-		end
-
-		# DELETE
-		def destroy
-			@blog_post.destroy
-			redirect_to blog_posts_path, notice: 'Blog post was successfully destroyed.'
-		end
-
-		private
-
-		# Common Callbacks
-		def set_blog_post
-			@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, :remove_pstimage, category_id, :user_id)
-		end
-	
-		# Current User
-		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
-		end
-
-	end
-end

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

@@ -1,70 +0,0 @@
-require_dependency "phcpress/application_controller"
-
-module Phcpress
-	class News::PostsController < ApplicationController
-
-		# Filters & Security
-		#layout 'layouts/phcpress/newspost/news_layout'
-		#before_action :authenticate_user!
-		before_action :set_news_post, only: [:edit, :update, :destroy]
-
-		# News Post Index
-		def index
-			@news_posts = News::Post.all
-		end
-
-		# New News Article
-		def new
-			@news_post = News::Post.new
-		end
-
-		# Edit News Article
-		def edit
-		end
-
-		# Create News Article
-		def create
-			@news_post = News::Post.new(news_post_params)
-			#@news_post.user_id = current_user
-			if @news_post.save  
-				redirect_to news_posts_path, notice: 'News Article was Successfully Created.'
-				else
-					render 'new'
-			end
-		end
-
-		# Update News Article
-		def update
-			if @news_post.update(news_post_params)
-				redirect_to news_posts_path, notice: 'News Article was Successfully Updated.'
-			else
-				render :edit
-			end
-		end
-
-		# Delete News Destroy
-		def destroy
-			@news_post.destroy
-			redirect_to news_posts_path, notice: 'News Article was Successfully Destroyed.'
-		end
-
-		private
-
-		# Common Callbacks
-		def set_news_post
-			@news_post = News::Post.find(params[:id])
-		end
-
-		# Whitelist
-		def news_post_params
-			params.require(:news_post).permit(:newspsttitle, :newspsttext, :newspstexcerpts, :pststatus, :pstimage, :remove_pstimage, :category_id, :user_id)
-		end
-
-		# Current User
-		def current_user
-			return unless session[:user_id]
-			@current_user ||= User.find(session[:user_id])
-		end
-
-	end
-end