phcdevworks_tutorials 1.0.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a45e1901641ed89f76059cfe021ce3f8b02b585bf7956aaa424ad3e0e31e3fd
-  data.tar.gz: 3e9929250fcb7c624194d78673f720c1b8dd50f1fcd6ba9f57e1e6187b450a11
+  metadata.gz: 4f20962d4a1dcee4e01f921bb7fe0e413d3f57f9de8c71d1b0413cb7f516e7fd
+  data.tar.gz: '09615f03b8c76ce654fc100cc73c6eca19d2a884a84458da7718560ebf2e5793'
 SHA512:
-  metadata.gz: 9d069541f5e14f712aa693d7a33d06b45fab873f2a0c57a3a2ded462ff8eb6e6ffe4e1d302c465da1b7b4f8a6d279bc82ef9244a9b07a675b0a2d63f0bdc93ff
-  data.tar.gz: 62778941f02f41342af967d6eaf46f8045848c693be3ad442ab74af5ca2eaf57430f4a3f4c2d2654f7087b8f83568709053e1bb3ebfcf9769bfeeed61ad31beb
+  metadata.gz: 07dcd4698effa6821abfd3315bdac1661827a2cb1e48eac822ab64ff08118056cc77461471c5ef7c82617728566d53d6bd5961e97ea6c2131dd4589bf22cc4c1
+  data.tar.gz: 6ce3ecd655f8a390c99ac6c313f8e7802b7ee846382ce963a071ec52cee2fb6d15fcdfc81b642f83c1b1d53194cbc400d5a22a776b0c3582665f279d851ff8b1

data/app/controllers/phcdevworks_tutorials/blog/tutorials_controller.rb

@@ -2,13 +2,13 @@ require_dependency "phcdevworks_tutorials/application_controller"
 
 module PhcdevworksTutorials
   class Blog::TutorialsController < ApplicationController
-  
+
     # Layout
     layout 'phcdevworks_tutorials/frontend'
 
     # INDEX
     def index
-     @phcdevworks_tutorials_index = Tutorial::Post.where(org_id: current_user.org_id)
+      @phcdevworks_tutorials_index = Tutorial::Post.where(tutorial_post_status: "published")
     end
 
     # SHOW

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, :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

@@ -39,7 +39,7 @@ module PhcdevworksTutorials
       @tutorial_step.org_id = current_user.org_id
       respond_to do |format|
         if @tutorial_step.save
-          format.html { redirect_to tutorial_post_steps_path, notice: 'Step was successfully created.' }
+          format.html { redirect_to tutorial_post_steps_path, :flash => { :success => 'Tutorial Step has been Added' }}
           format.json { render :show, status: :created, location: @tutorial_step }
         else
           format.html { render :new }
@@ -54,7 +54,7 @@ module PhcdevworksTutorials
       @tutorial_post = Tutorial::Post.friendly.find(params[:post_id])
       respond_to do |format|
         if @tutorial_step.update(tutorial_step_params)
-          format.html { redirect_to @tutorial_step, notice: 'Step was successfully updated.' }
+          format.html { redirect_to tutorial_post_steps_path, :flash => { :notice => 'Tutorial Step has been Updated.' }}
           format.json { render :show, status: :ok, location: @tutorial_step }
         else
           format.html { render :edit }
@@ -69,7 +69,7 @@ module PhcdevworksTutorials
       @tutorial_step = tutorial_post.steps.find(params[:id])
       @tutorial_step.destroy
       respond_to do |format|
-        format.html { redirect_to tutorial_steps_url, notice: 'Step was successfully destroyed.' }
+        format.html { redirect_to tutorial_post_steps_path, :flash => { :error => 'Tutorial Step has been Removed' }}
         format.json { head :no_content }
       end
     end
@@ -79,7 +79,7 @@ module PhcdevworksTutorials
     # Common Callbacks
 
     def set_tutorial_step
-      @tutorial_step = Tutorial::Step.friendly.find(params[:id])
+      @tutorial_step = Tutorial::Step.find(params[:id])
     end
 
     def tutorial_post
@@ -88,7 +88,7 @@ module PhcdevworksTutorials
 
     # Whitelist
     def tutorial_step_params
-      params.require(:tutorial_step).permit(:steps_number, :steps_body, :post_id, :slug, :user_id, :org_id)
+      params.require(:tutorial_step).permit(:steps_number, :steps_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

@@ -4,9 +4,12 @@ module PhcdevworksTutorials
     # Clean URL Initialize
     extend FriendlyId
 
+    # Image Upload
+    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"
 
     # Form Fields Validation
     validates :tutorial_post_title,

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

@@ -1,6 +1,9 @@
 module PhcdevworksTutorials
   class Tutorial::Step < ApplicationRecord
 
+    # Image Upload
+    has_one_attached :tutorial_step_image
+
     # Relationships
     belongs_to :post, class_name: "PhcdevworksTutorials::Tutorial::Post"
 

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

@@ -10,9 +10,34 @@
     <%= form.text_field :tutorial_post_title, placeholder: "Tutorial Title", class: "form-control" %>
   </div>
 
+  <div class="form-group field_with_errors">
+    <%= form.label :tutorial_post_description, "Tutorial Description" %>
+    <%= form.text_area :tutorial_post_description, class: "form-control", rows: "10" %>
+  </div>
+
+  <div class="form-group field_with_errors">
+    <%= form.label :tutorial_post_status, "Tutorial Status" %>
+    <%= form.select( :tutorial_post_status, [['Draft','draft'],['Published','published'],['Review','review']], {}, {class: "form-control form-control"}) %>
+  </div>
+
+  <div class="form-group field_with_errors">
+	<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

@@ -10,12 +10,22 @@
 		<%= form.select( :tutorial_step_number, [["1","1"],["2","2"],["3","3"],["4","4"],["5","5"],["6","6"],["7","7"],["8","8"],["9","9"],["10","10"],["11","11"],["12","12"],["13","13"],["14","14"]], {}, {class: "form-control"}) %>
   </div>
 
-  <div class="field">
-    <%= form.label :tutorial_step_body %>
-    <%= form.text_area :tutorial_step_body %>
+  <div class="form-group field_with_errors">
+    <%= form.label :tutorial_step_body, "Step Text" %>
+    <%= form.text_area :tutorial_step_body, class: "form-control", rows: "10" %>
+  </div>
+
+  <div class="form-group field_with_errors">
+	<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 -->
-  
+
   <!-- Form Submition Button -->
   <div class="actions">
     <%= form.submit class: "btn btn-primary" %>

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

@@ -47,9 +47,9 @@
         <tr>
         <td><%= tutorial_step.tutorial_step_number %></td>
         <td><%= tutorial_step.tutorial_step_body %></td>
-        <td><%= link_to 'Show', tutorial_step %></td>
-        <td><%= link_to 'Edit', edit_tutorial_step_path(tutorial_step) %></td>
-        <td><%= link_to 'Destroy', tutorial_step, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Show', tutorial_post_step_path(tutorial_step.post, tutorial_step) %></td>
+        <td><%= link_to 'Edit', edit_tutorial_post_step_path(tutorial_step.post, tutorial_step) %></td>
+        <td><%= link_to 'Destroy', tutorial_post_step_path(tutorial_step.post, tutorial_step), method: :delete, data: { confirm: 'Are you sure?' } %></td>
         </tr>
         <% end %>
         </tbody>

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/20190929044403_add_info_to_phcdevworks_tutorials_tutorial_posts.rb

@@ -0,0 +1,9 @@
+class AddInfoToPhcdevworksTutorialsTutorialPosts < ActiveRecord::Migration[6.0]
+  def change
+
+    add_column :phcdevworks_tutorials_tutorial_posts, :tutorial_post_images, :string
+    add_column :phcdevworks_tutorials_tutorial_posts, :tutorial_post_description, :text
+    add_column :phcdevworks_tutorials_tutorial_posts, :tutorial_post_status, :string
+
+  end
+end

data/db/migrate/20190929044505_add_info_to_phcdevworks_tutorials_tutorial_steps.rb

@@ -0,0 +1,7 @@
+class AddInfoToPhcdevworksTutorialsTutorialSteps < ActiveRecord::Migration[6.0]
+  def change
+
+    add_column :phcdevworks_tutorials_tutorial_steps, :tutorial_step_images, :string
+
+  end
+end

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.0.2'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_tutorials
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.2
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,84 +58,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: phcthemes_web_theme_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: phcdevworks_active_menus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: phcdevworks_notifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: phcdevworks_titleseo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: gravtastic
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.46'
+        version: '1.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.46'
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -213,9 +213,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -223,9 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
 description: Ruby on Rails 6 Tutorial engine to manage and post tutorials.
 email:
 - developers@phcdevworks.com
@@ -292,6 +286,10 @@ files:
 - db/migrate/20190911225813_create_phcdevworks_tutorials_tutorial_posts.rb
 - db/migrate/20190911225925_create_phcdevworks_tutorials_tutorial_categories.rb
 - 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