simple_discussion 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2f5e88baaa6845d27866a70baa5facf3c48e13798cb4889b83b7e6aa7cc5c3
-  data.tar.gz: 2bb6cf3b10096223a6c06cf48aab740c1ead7f9cd6515d0bef25f0151555d028
+  metadata.gz: 20ef7fd5da8bb052ef36f73fbbd24661032fe5e14453e611a208a6f0f405e80a
+  data.tar.gz: 1e4c484430c87b3122358dce54c744c7c5611710d3175b27c24dad9c58f39257
 SHA512:
-  metadata.gz: bcd1f320d3ea9c3d7015315e8a924700e7f6648545e2297184c3e5eb575f7fb77fc6c7f4d8c3ad99220b638f868100a9cce51b0fe89a5e74c9512dd387c9efbe
-  data.tar.gz: 2423d0d19d3495edb17d3789b8372770a98739f19f15df2555cb7d4945624c6f34c9070ca7ec4826fe727361c93ee1e9c46763c12bbf0667742656cabe171c1a
+  metadata.gz: 29755f4463b66a8420840b4639c520441b9c9820e2759e351d4d4e8056f2c0f867cf635f771b5f13f5393bd2ce86bb340307cb9367635eec0ab60d67a86e80ee
+  data.tar.gz: d7a0af8b494062a347310281a22a7f41b79ba10a060a82130586160f584a007c1166ff294b6881da3b05c5f9ee4ab2f9ae5d14110e6461e6b10d4b2bfa93d786

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+### 1.2.0
+
+* Update to require Font Awesome 5.x+

data/app/controllers/simple_discussion/forum_posts_controller.rb

@@ -1,8 +1,8 @@
 class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationController
   before_action :authenticate_user!
   before_action :set_forum_thread
-  before_action :set_forum_post, only: [:edit, :update]
-  before_action :require_mod_or_author_for_post!, only: [:edit, :update]
+  before_action :set_forum_post, only: [:edit, :update, :destroy]
+  before_action :require_mod_or_author_for_post!, only: [:edit, :update, :destroy]
   before_action :require_mod_or_author_for_thread!, only: [:solved, :unsolved]
 
   def create
@@ -28,6 +28,11 @@ class SimpleDiscussion::ForumPostsController < SimpleDiscussion::ApplicationCont
     end
   end
 
+  def destroy
+    @forum_post.destroy!
+    redirect_to simple_discussion.forum_thread_path(@forum_thread)
+  end
+
   def solved
     @forum_post = @forum_thread.forum_posts.find(params[:id])
 

data/app/views/layouts/simple_discussion.html.erb

@@ -19,32 +19,32 @@
         </h5>
         <div>
           <%= forum_link_to simple_discussion.forum_threads_path, exact: true do %>
-            <%= icon "bars" %>
+            <%= icon "fa-fw fas", "bars" %>
             <%= t('.all_threads') %>
           <% end %>
         </div>
         <% if user_signed_in? %>
           <div>
-            <%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "user-circle-o" %>
+            <%= forum_link_to simple_discussion.mine_forum_threads_path do %><%= icon "fa-fw far", "user-circle" %>
               <%= t('.my_questions') %>
             <% end %>
           </div>
           <div>
             <%= forum_link_to simple_discussion.participating_forum_threads_path do %>
-              <%= icon "comments-o" %>
+              <%= icon "fa-fw far", "comments" %>
               <%= t('.participating') %>
             <% end %>
           </div>
         <% end %>
         <div>
           <%= forum_link_to simple_discussion.answered_forum_threads_path do %>
-            <%= icon "check" %>
+            <%= icon "fa-fw fas", "check" %>
             <%= t('.answered') %>
           <% end %>
         </div>
         <div>
           <%= forum_link_to simple_discussion.unanswered_forum_threads_path do %>
-            <%= icon "question" %>
+            <%= icon "fa-fw fas", "question" %>
             <%= t('.unanswered') %>
           <% end %>
         </div>
@@ -58,11 +58,11 @@
             <%= t('.by_category') %>
           </strong>
         </h6>
-        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "circle" %> All<% end %></div>
+        <div><%= forum_link_to simple_discussion.forum_threads_path, exact: true do %><%= icon "fa-fw fas", "circle" %> All<% end %></div>
         <% ForumCategory.sorted.each do |category| %>
           <div>
             <%= forum_link_to simple_discussion.forum_category_forum_threads_path(category) do %>
-              <%= icon "circle", style: "color: #{category.color}" %>
+              <%= icon "fa-fw fas", "circle", style: "color: #{category.color}" %>
               <%= category.name %>
             <% end %>
           </div>
@@ -77,9 +77,9 @@
 
         <%= link_to simple_discussion.forum_thread_notifications_path(@forum_thread), method: :post, class: "btn btn-secondary btn-sm btn-block mb-2" do %>
           <% if @forum_thread.subscribed? current_user %>
-            <%= icon "bell-slash" %> t('.unsubscribe')
+            <%= icon "fa-fw fas", "bell-slash" %> <%= t('.unsubscribe') %>
           <% else %>
-            <%= icon "bell" %>
+            <%= icon "fa-fw fas", "bell" %>
             <%= t('.suscribe') %>
           <% end %>
         <% end %>

data/app/views/simple_discussion/forum_posts/_forum_post.html.erb

@@ -4,12 +4,19 @@
   <div class="card-header">
 
     <% if is_moderator_or_owner?(forum_post) %>
-      <div class="pull-right">
-        <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),
+      <div class="float-right">
+        <%= link_to icon("fas","edit"), simple_discussion.edit_forum_thread_forum_post_path(@forum_thread, forum_post),
           class: "text-muted",
           data: { toggle: "tooltip", placement: "left" },
           title: t('edit_this_post')
         %>
+        &nbsp;
+        <%= link_to icon("fas","trash"), simple_discussion.forum_thread_forum_post_path(@forum_thread, forum_post),
+          class: "text-muted",
+          method: :delete, 
+          data: { toggle: "tooltip", placement: "left", confirm: "Are you sure you want to delete this post?" },
+          title: t('edit_this_post')
+        %>
       </div>
     <% end %>
 
@@ -33,7 +40,7 @@
   <% if @forum_thread.solved? && forum_post.solved? %>
     <div class="card-footer">
       <div class="pull-right">
-        <strong class="text-success"><%= icon("check") %> <%= t('solved') %></strong>
+        <strong class="text-success"><%= icon("fas","check") %> <%= t('solved') %></strong>
 
         <% if is_moderator_or_owner?(@forum_thread) %>
           <small>
@@ -48,7 +55,7 @@
       <div class="pull-right">
         <small>
           <%= link_to simple_discussion.solved_forum_thread_forum_post_path(@forum_thread, forum_post), method: :put do %>
-            <%= icon("check") %>
+            <%= icon("fas","fas","check") %>
             <%= t('this_solved_my_question') %>
           <% end %>
         </small>

data/app/views/simple_discussion/forum_threads/_forum_thread.html.erb

@@ -9,11 +9,11 @@
       <div class="col">
         <h4>
           <% if forum_thread.solved? %>
-            <span class="text-success"><%= icon "check-circle" %></span>
+            <span class="text-success"><%= icon "fas", "check-circle" %></span>
           <% end %>
 
           <%= link_to simple_discussion.forum_thread_path(forum_thread) do %>
-            <%= icon "thumb-tack", class: "text-muted" if forum_thread.pinned? %> <%= forum_thread.title %>
+            <%= icon "fas", "thumb-tack", class: "text-muted" if forum_thread.pinned? %> <%= forum_thread.title %>
           <% end %>
         </h4>
 

data/app/views/simple_discussion/forum_threads/show.html.erb

@@ -1,11 +1,11 @@
 <div class="row">
   <div class="col-md-11">
-    <h1><%= icon "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
+    <h1><%= icon "fas", "thumb-tack", class: "text-muted" if @forum_thread.pinned? %> <%= @forum_thread.title %></h1>
   </div>
 
   <% if is_moderator_or_owner?(@forum_thread) %>
     <div class="col-md-1">
-      <%= link_to icon("pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
+      <%= link_to icon("fas","pencil"), simple_discussion.edit_forum_thread_path(@forum_thread),
         class: "text-muted",
         data: { toggle: "tooltip", placement: "left" },
         title: t('edit_this_thread') %>

data/config/locales/en.yml

@@ -4,7 +4,7 @@ en:
   ask_a_question: Ask A Question
   asked_time_ago: "Asked %{time} ago by %{author}"
   choose_a_category: Choose a Category
-  comment: comment
+  comment: Comment
   commented_on: Commented on
   community: Community
   edit_this_post: Edit this post

data/lib/simple_discussion/version.rb

@@ -1,3 +1,3 @@
 module SimpleDiscussion
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/simple_discussion.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'font-awesome-sass', '>= 4.7.0'
+  spec.add_dependency 'font-awesome-sass', '~> 5.13.0'
   spec.add_dependency 'friendly_id', '>= 5.2.0'
   spec.add_dependency 'gravatar_image_tag'
   spec.add_dependency 'rails', '>= 4.2'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simple_discussion
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 5.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 5.13.0
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - ".github/FUNDING.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt