phcdevworks_tutorials 1.1.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b324808e0004e12334cf196183959b04361b66044b92f5f0ea2a3b8b652073d
-  data.tar.gz: 8645eefd185aec204f02dd518a8a609952748d72841a51f906739b10939278cc
+  metadata.gz: 2ff71cf7890e9431a3c6aeb70737f58e3949ce986a891ea908ec663a7dd9d0a8
+  data.tar.gz: d078f7ef2afdcb5ee40b42903b0b020083ff7b3bf6f2a0260cbc001d39ad87d9
 SHA512:
-  metadata.gz: 0c5f2b33ab00ac78a83401986a1e79e77dec89af3b5def70046e48a11a8f2597a34c852459e01e8e5e879c4e26f455b76b0a59171eda5003923a409fd9fdaabc
-  data.tar.gz: 0e4d7326c1dec8efc96c70b279e2500246cdbcdf5b4345b011d17294d58ae393d1417c5afc075de75b76d8d3c9ced7cb8c22ad61b35317e6b9404b9f47189112
+  metadata.gz: d56273632043b9429e4ec8c696e12942aaff4696b8d11c3cee50dc05e25d77b4dfe73e798018ca4b46b3e3a7afd6ac830247e94275c018b04b6dd47a0c90024b
+  data.tar.gz: 9004b26ba26941eb7363a5837d306b54c7fc451ce47f3d900222c52f59a39f2513a4628748f18a7b259f9a6320a08e324fb17e6fe2e74d8b890aa970c036e682

data/app/controllers/phcdevworks_tutorials/tutorial/posts_controller.rb

@@ -75,7 +75,7 @@ module PhcdevworksTutorials
 
     # Whitelist
     def tutorial_post_params
-      params.require(:tutorial_post).permit(:tutorial_post_step, :tutorial_post_title, :tutorial_post_text,:tutorial_post_description, :tutorial_post_status, :tutorial_post_images, :category_id, :slug, :user_id, :org_id)
+      params.require(:tutorial_post).permit(:tutorial_post_step, :tutorial_post_title, :tutorial_post_text,:tutorial_post_description, :tutorial_post_status, :tutorial_post_image, :slug, :user_id, :org_id, category_ids: [])
     end
 
   end

data/app/controllers/phcdevworks_tutorials/tutorial/steps_controller.rb

@@ -88,7 +88,7 @@ module PhcdevworksTutorials
 
     # Whitelist
     def tutorial_step_params
-      params.require(:tutorial_step).permit(:steps_number, :steps_body, :tutorial_step_images, :post_id, :slug, :user_id, :org_id)
+      params.require(:tutorial_step).permit(:tutorial_step_number, :tutorial_step_body, :tutorial_step_image, :post_id, :slug, :user_id, :org_id)
     end
 
   end

data/app/models/phcdevworks_tutorials/tutorial/category.rb

@@ -5,7 +5,7 @@ module PhcdevworksTutorials
     extend FriendlyId
 
     #Relationships
-      has_many :posts, class_name: 'PhcdevworksTutorials::Tutorial::Post'
+    has_and_belongs_to_many :posts, class_name: 'Tutorial::Post', :join_table => 'categories_posts', :dependent => :destroy
 
     # Form Fields Validation
     validates :tutorial_category_name,

data/app/models/phcdevworks_tutorials/tutorial/post.rb

@@ -5,16 +5,20 @@ module PhcdevworksTutorials
     extend FriendlyId
 
     # Image Upload
-    has_one_attached :tutorial_post_images
+    has_one_attached :tutorial_post_image
 
     # Relationships
-    belongs_to :category, class_name: 'PhcdevworksTutorials::Tutorial::Category'
-    has_many :steps, class_name: "PhcdevworksTutorials::Tutorial::Step"
+    has_and_belongs_to_many :categories, class_name: "Tutorial::Category", :join_table => "categories_posts", :dependent => :destroy
+    has_many :steps, class_name: "Tutorial::Step"
+    belongs_to :user, class_name: "PhcdevworksAccounts::User"
 
     # Form Fields Validation
     validates :tutorial_post_title,
       presence: true
 
+    validates :tutorial_post_description,
+      presence: true
+
     # Clean URL Define
     friendly_id :phcdev_tutorials_post_nice_urls, use: [:slugged, :finders]
 

data/app/models/phcdevworks_tutorials/tutorial/step.rb

@@ -2,10 +2,12 @@ module PhcdevworksTutorials
   class Tutorial::Step < ApplicationRecord
 
     # Image Upload
-    has_one_attached :tutorial_step_images
+    has_one_attached :tutorial_step_image
 
     # Relationships
     belongs_to :post, class_name: "PhcdevworksTutorials::Tutorial::Post"
+    has_many :categories, class_name: "Tutorial::Category", :through => :post
+    belongs_to :user, class_name: "PhcdevworksAccounts::User"
 
   end
 end

data/app/views/phcdevworks_tutorials/tutorial/posts/_form.html.erb

@@ -21,18 +21,23 @@
   </div>
 
   <div class="form-group field_with_errors">
-    <%= form.label :remove_tutorial_post_images, "Step Image" %>
-    <%= form.file_field :remove_tutorial_post_images, class: "form-control" %>
-    <% if form.object.tutorial_post_images? %>
-      <%= image_tag form.object.tutorial_post_images_url, class: "img-responsive img-thumbnail" %>
-      <%= form.label :remove_tutorial_post_images %>
-      <%= form.check_box :remove_tutorial_post_images %>
-    <% end %>
+	<div class="form-group field_with_errors">
+		<%= form.label :tutorial_post_image, "Featured Image" %>
+		<%= form.file_field :tutorial_post_image, class: "form-control" %>
+	</div>
+	<% if form.object.tutorial_post_image.attached? %>
+		<%= image_tag main_app.url_for(form.object.tutorial_post_image), class: "img-responsive img-thumbnail" %>
+	<% end %>
   </div>
 
   <div class="form-group field_with_errors">
     <label>Select a Category</label>
-    <%= form.collection_select :category_id, PhcdevworksTutorials::Tutorial::Category.order(:tutorial_category_name),:id, :tutorial_category_name, {}, {class: "form-control"} %>
+	<div class="panel-body">
+		<%= form.collection_check_boxes :category_ids, PhcdevworksTutorials::Tutorial::Category.order(:tutorial_category_name), :id, :tutorial_category_name do |post_category| %>
+			<%= post_category.check_box %>
+			<%= post_category.label %><br>
+		<% end %>
+	</div>
   </div>
   <!-- Form Input Fields -->
   

data/app/views/phcdevworks_tutorials/tutorial/posts/index.html.erb

@@ -37,7 +37,8 @@
         <thead>
           <tr>
             <th>Tutorial Title</th>
-            <th>Tutorial Category</th>
+            <th>Tutorial Description</th>
+            <th>Tutorial Status</th>
             <th></th>
           </tr>
         </thead>
@@ -46,7 +47,8 @@
           <% @tutorial_posts.each do |tutorial_post| %>
             <tr>
               <td><%= tutorial_post.tutorial_post_title %></td>
-              <td><%= tutorial_post.category.tutorial_category_name %></td>
+              <td><%= tutorial_post.tutorial_post_description %></td>
+              <td><%= tutorial_post.tutorial_post_status %></td>
               <td>
                 <div class="btn-group d-flex" role="group">
                   <%= link_to "Details", tutorial_post, class: "btn btn-purple btn-xs" %>

data/app/views/phcdevworks_tutorials/tutorial/steps/_form.html.erb

@@ -16,13 +16,13 @@
   </div>
 
   <div class="form-group field_with_errors">
-    <%= form.label :remove_tutorial_step_images, "Step Image" %>
-    <%= form.file_field :remove_tutorial_step_images, class: "form-control" %>
-    <% if form.object.tutorial_step_images? %>
-      <%= image_tag form.object.tutorial_step_images_url, class: "img-responsive img-thumbnail" %>
-      <%= form.label :remove_tutorial_step_images %>
-      <%= form.check_box :remove_tutorial_step_images %>
-    <% end %>
+	<div class="form-group field_with_errors">
+		<%= form.label :tutorial_step_image, "Step Image" %>
+		<%= form.file_field :tutorial_step_image, class: "form-control" %>
+	</div>
+	<% if form.object.tutorial_step_image.attached? %>
+		<%= image_tag main_app.url_for(form.object.tutorial_step_image), class: "img-responsive img-thumbnail" %>
+	<% end %>
   </div>
   <!-- Form Input Fields -->
 

data/db/migrate/20190911225813_create_phcdevworks_tutorials_tutorial_posts.rb

@@ -4,8 +4,6 @@ class CreatePhcdevworksTutorialsTutorialPosts < ActiveRecord::Migration[6.0]
 
       t.string :tutorial_post_title
 
-      t.references :category
-
       t.string :slug
       t.string :user_id
       t.string :org_id

data/db/migrate/20191002093451_add_image_to_phcdevworks_tutorials_tutorial_posts.rb

@@ -0,0 +1,8 @@
+class AddImageToPhcdevworksTutorialsTutorialPosts < ActiveRecord::Migration[6.0]
+  def change
+
+    add_column :phcdevworks_tutorials_tutorial_steps, :tutorial_step_image, :string
+    add_column :phcdevworks_tutorials_tutorial_posts, :tutorial_post_image, :string
+
+  end
+end

data/db/migrate/20191003235303_create_join_table_categories_posts.rb

@@ -0,0 +1,10 @@
+class CreateJoinTableCategoriesPosts < ActiveRecord::Migration[6.0]
+  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/phcdevworks_tutorials/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksTutorials
-  VERSION = '1.1.1'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_tutorials
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.4
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,6 +288,8 @@ files:
 - db/migrate/20190923113101_create_phcdevworks_tutorials_tutorial_steps.rb
 - db/migrate/20190929044403_add_info_to_phcdevworks_tutorials_tutorial_posts.rb
 - db/migrate/20190929044505_add_info_to_phcdevworks_tutorials_tutorial_steps.rb
+- db/migrate/20191002093451_add_image_to_phcdevworks_tutorials_tutorial_posts.rb
+- db/migrate/20191003235303_create_join_table_categories_posts.rb
 - lib/phcdevworks_tutorials.rb
 - lib/phcdevworks_tutorials/engine.rb
 - lib/phcdevworks_tutorials/version.rb