help_center 0.0.4 → 0.0.5

data/app/views/help_center/support_threads/_form.html.erb

@@ -13,15 +13,15 @@
   <% end %>
   <div class="mb-4">
     <%= f.label :support_category_id, t('choose_a_category') %>
-    <%= f.collection_select :support_category_id, SupportCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control"} %>
+    <%= f.collection_select :support_category_id, SupportCategory.sorted, :id, :name, {include_blank: t('pick_a_category')}, {autofocus: true, class: "form-control form-input"} %>
   </div>
   <div class="mb-4">
     <%= f.label t('title') %>
-    <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control" %>
+    <%= f.text_field :title, placeholder: t('how_do_i'), class: "form-control form-input" %>
   </div>
   <div class="mb-4">
     <%= f.label t('position') %>
-    <%= f.text_field :position, class: "form-control" %>
+    <%= f.text_field :position, class: "form-control form-input" %>
   </div>
   <div class="mb-4">
     <%= f.label t('content')  %>
@@ -37,11 +37,13 @@
     <% end %>
     <% end %>
   <% end %>
-  <div class="mb-4 text-right">
+  <div class="flex justify-between mb-4 text-right">
     <% if f.object.new_record? %>
       <%= f.button t('add'), class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% else %>
       <%= f.button t('update'), class: "btn btn-primary", data: {disable_with: "<i class='fa fa-spinner fa-spin'></i> #{t('saving')}"} %>
     <% end %>
+
+    <%= link_to "Cancel", :back, class: "btn btn-link" %>
   </div>
 <% end %>

data/app/views/help_center/support_threads/edit.html.erb

@@ -1,7 +1,7 @@
-<%= content_for :title, "Edit Thread" %>
-
-<h1><%= t('edit_thread') %></h1>
-
-<div class="support_post">
-  <%= render 'form', posts: false %>
-</div>
+<%= content_for :title, "Edit Thread" %>
+
+<h1 class="mb-4 font-bold"><%= t('edit_thread') %></h1>
+
+<div class="support_post">
+  <%= render 'form', posts: false %>
+</div>

data/app/views/help_center/support_threads/index.html.erb

@@ -10,7 +10,7 @@
       <hr>
       <%= render partial: "help_center/support_threads/support_thread", collection: @support_threads, spacer_template: "shared/spacer" %>
       <div class="support-threads-nav text-center">
-      <%= will_paginate @support_threads, url_builder: help_center, renderer: HelpCenter::BootstrapLinkRenderer %>
+      <%== pagy_nav(@pagy) %>
      </div>
     <% else %>
      <%# Set default index here %>

data/app/views/help_center/support_threads/new.html.erb

@@ -1,5 +1,5 @@
-<h1><%= t('add_an_article') %></h1>
-
-<div class="support_post">
-  <%= render 'form' %>
-</div>
+<h1 class="mb-4 font-bold"><%= t('add_category') %></h1>
+
+<div class="support_post">
+  <%= render 'form' %>
+</div>

data/app/views/help_center/support_threads/show.html.erb

@@ -1 +1,42 @@
-<%= render "article" %>
+<div class="container mx-auto">
+<div class="flex flex-wrap mb-8">
+  <% if is_moderator_or_owner?(@support_thread) %>
+    <div class="mb-4 bg-purple-600 flex w-full px-4 py-2 text-sm justify-end items-center">
+      <span class="mr-4 text-gray-200"><i class="far fa-sort-amount-down"></i> <%= @support_thread.position %> </span>
+      <%= link_to icon("fas","pencil") + " Edit", help_center.edit_support_thread_path(@support_thread),
+        class: "text-gray-200",
+        data: { toggle: "tooltip", placement: "left" },
+        title: t('edit_this_thread') %>
+
+        <%= link_to icon("fas","trash") + " Delete", help_center.support_thread_path(@support_thread),
+          method: :delete,
+          class: "text-gray-200 ml-4",
+          data: { toggle: "tooltip", placement: "left", confirm: "Are you sure?" },
+          title: t('delete_category') %>
+    </div>
+  <% end %>
+  <div class="md:w-full pr-4 pl-41">
+    <small class="mb-2" style="color: <%= @support_thread.support_category.color %>"><%= link_to @support_thread.support_category.name, help_center.support_category_path(@support_thread.support_category) %> > <%= @support_thread.title %></small>
+    <h1 class="mb-4 font-bold"><%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %></h1>
+  </div>
+
+</div>
+
+<%= @support_thread.content %>
+
+<p class="mt-6 italic text-gray-400">Last Updated: <%= @support_thread.updated_at.strftime("%B %e, %Y") %> <p>
+<!--
+<div class="thread-reaction">
+  <p>Did this answer your question?</p>
+  <p class="thread-reaction-links">
+    <a>😞<a>
+    <a>😃<a>
+  </p>
+<div>
+-->
+<% if HelpCenter.enable_comments %>
+ <hr>
+ <%= render partial: "help_center/support_posts/support_post", collection: @support_thread.support_posts.includes(:user).sorted %>
+ <%= render partial: "help_center/support_posts/form" if user_signed_in? %>
+<% end %>
+</div>

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

@@ -1,24 +1,28 @@
-<% @layout = 'website' %>
+<% if  current_user && (current_user.admin? || current_user.moderator?) %>
+  <div class="fixed bottom-0 w-full z-50 bg-purple-600 text-purple-200 text-sm text-center font-brand-semibold px-4 py-3" role="alert">
+    You're logged in as <b>help center moderator user</b> (<%= current_user.email %>)</b>
+    <%= link_to t('add_an_article'), help_center.new_support_thread_path, class: "text-purple-100 hover:no-underline font-semibold underline mr-4 ml-6" %>
+    <%= link_to t('add_category'), help_center.new_support_category_path, class: "text-purple-100 hover:no-underline font-semibold underline" %>
+
+    <%= link_to "Logout", back_masquerade_path(current_user), class: "text-purple-100 hover:no-underline font-semibold underline ml-6" %>
+  </div>
+<% end %>
 
 <div class="container mx-auto mt-2">
 <div class="flex flex-wrap help_center">
  <div class="md:w-1/4 pr-4 pl-4 mb-3">
    <div class="relative flex flex-col min-w-0 rounded break-words border bg-white border-1 border-grey-light flex-auto p-6">
-     <% if current_user && (current_user.admin? || current_user.moderator?) %>
-      <%= link_to t('add_an_article'), help_center.new_support_thread_path, class: "btn btn-outline-primary btn-block" %>
-      <hr />
-     <% end %>
      <div class="support-thread-filters">
        <% SupportCategory.sorted.each do |category| %>
          <div class="pb-3">
-           <%= support_link_to help_center.support_category_support_threads_path(category) do %>
+           <%= support_link_to help_center.support_category_path(category) do %>
             <div class="mb-2 mt-3">
               <span class="font-extrabold">
              <%= category.name %>
              </span>
              </div>
            <% end %>
-           <div>
+           <div class="ml-2 pl-1">
             <% threads = SupportThread.where(support_category_id: category.id).order(:position) %>
             <% threads.each do |thread| %>
               <div class="mb-2">
@@ -27,7 +31,7 @@
               <% end %>
               </div>
             <% end %>
-            </div> 
+            </div>
          </div>
        <% end %>
      </div>
@@ -75,7 +79,7 @@
        <hr />
        <%# User has not posted in the thread or subscribed %>
        <h5><%= t('.notifications') %></h5>
-       <%= link_to help_center.support_thread_notifications_path(@support_thread), method: :post, class: "btn btn-secondary btn-sm btn-block mb-2" do %>
+       <%= link_to help_center.support_thread_notifications_path(@support_thread), method: :post, class: "btn-secondary btn-sm btn-block mb-2" do %>
          <% if @support_thread.subscribed? current_user %>
            <%= icon "fa-fw fas", "bell-slash" %> <%= t('.unsubscribe') %>
          <% else %>
@@ -90,15 +94,35 @@
  </div>
  <div class="md:w-3/4 pr-4 pl-4 mb-3">
    <div class="relative flex flex-col min-w-0 rounded break-words bg-white flex-auto p-6">
-      <% if request.env['REQUEST_URI'] == "/support" %>
-        <% if SupportThread.exists?(id: 1) %>
-          <% @support_thread = SupportThread.find(1) %>
-          <%= render "help_center/support_threads/article"%>        
+     <%# Show first article by default on home pag %>
+      <% if current_page?(help_center_path) %>
+        <% if SupportThread.all.count > 0 %>
+          <% @support_thread = SupportThread.all.first %>
+          <div class="container mx-auto">
+            <div class="flex flex-wrap mb-8">
+              <% if is_moderator_or_owner?(@support_thread) %>
+                <div class="flex w-full pr-4 pl-4 justify-end">
+                  <%= link_to icon("fas","pencil"), help_center.edit_support_thread_path(@support_thread),
+                    class: "text-muted",
+                    data: { toggle: "tooltip", placement: "left" },
+                    title: t('edit_this_thread') %>
+                </div>
+              <% end %>
+              <div class="md:w-full pr-4 pl-41">
+                <small class="mb-2"><%= support_category_link(@support_thread.support_category) %> > <%= @support_thread.title %></small>
+                <h1><%= icon "fas", "thumb-tack", class: "text-muted" if @support_thread.pinned? %> <%= @support_thread.title %></h1>
+              </div>
+
+            </div>
+            <%= @support_thread.content %>
+          </div>
         <% end %>
       <% end %>
+
      <%= yield %>
    </div>
  </div>
 </div>
 </div>
+
 <% parent_layout("application") %>

data/app/views/shared/_spacer.html.erb

@@ -1 +1 @@
-<hr/>
+<hr/>

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "help_center"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "help_center"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/config/locales/en.yml

@@ -1,52 +1,55 @@
-en:
-  start_a_discussion: Start A Discussion
-  add: Add
-  update: Update
-  add_a_comment: Add A Comment
-  add_an_article: Add Article
-  ask_a_question: Ask A Question
-  asked_time_ago: "Asked %{time} ago by %{author}"
-  choose_a_category: Choose a Category
-  comment: Comment
-  commented_on: Commented on
-  documentation: Documentation
-  edit_this_post: Edit this post
-  edit_this_thread: Edit this thread
-  edit_thread: Edit thread
-  filters: Filters
-  how_do_i: How do I...?
-  ignoring_thread: You're ignoring this thread.
-  not_receiving_notifications: You’re not receiving notifications from this thread.
-  layouts:
-    simple_discussion:
-      all_threads: All Threads
-      answered: Answered
-      by_category: By Category
-      my_questions: My Questions
-      notifications: Notifications
-      participating: Participating
-      suscribe: Subscribe
-      unsubscribe: Unsubscribe
-      unanswered: Unanswered
-  pick_a_category: Pick a category...
-  post:
-    one: post
-    other: posts
-  receiving_notifications_because_subscribed: You're receiving notifications because you've subscribed to this thread.
-  receiving_notifications_because_posted: You're receiving notifications because you've posted in this thread.
-  saving_comment: Saving comment...
-  saving: Saving
-  this_solved_my_question: This solved my question
-  title: title
-  content: content
-  position: position
-  what_help_needed: What do you need help with?
-  ask_your_question: Ask Your Question
-  update_comment: Update comment
-  your_changes_were_saved: Your changes were saved
-  search_not_found: No results found for your search
-  check_out: Check out
-  latest_questions: the latest questions
-  instead: instead?
-  written_by_author: "Written by %{author}"
-  content_updated_at: "Updated %{update_time} ago"
+en:
+  start_a_discussion: Start A Discussion
+  add: Add
+  update: Update
+  add_a_comment: Add A Comment
+  add_an_article: Add Article
+  ask_a_question: Ask A Question
+  asked_time_ago: "Asked %{time} ago by %{author}"
+  choose_a_category: Choose a Category
+  comment: Comment
+  commented_on: Commented on
+  documentation: Documentation
+  edit_this_post: Edit this post
+  edit_this_thread: Edit this thread
+  edit_thread: Edit thread
+  edit_category: Edit category
+  filters: Filters
+  how_do_i: How do I...?
+  ignoring_thread: You're ignoring this thread.
+  not_receiving_notifications: You’re not receiving notifications from this thread.
+  layouts:
+    simple_discussion:
+      all_threads: All Threads
+      answered: Answered
+      by_category: By Category
+      my_questions: My Questions
+      notifications: Notifications
+      participating: Participating
+      suscribe: Subscribe
+      unsubscribe: Unsubscribe
+      unanswered: Unanswered
+  pick_a_category: Pick a category...
+  post:
+    one: post
+    other: posts
+  receiving_notifications_because_subscribed: You're receiving notifications because you've subscribed to this thread.
+  receiving_notifications_because_posted: You're receiving notifications because you've posted in this thread.
+  saving_comment: Saving comment...
+  saving: Saving
+  this_solved_my_question: This solved my question
+  title: title
+  content: content
+  position: position
+  color: color
+  what_help_needed: What do you need help with?
+  ask_your_question: Ask Your Question
+  update_comment: Update comment
+  your_changes_were_saved: Your changes were saved
+  successfully_deleted: Successfully deleted
+  search_not_found: No results found for your search
+  check_out: Check out
+  latest_questions: the latest questions
+  instead: instead?
+  written_by_author: "Written by %{author}"
+  content_updated_at: "Updated %{update_time} ago"

data/config/routes.rb

@@ -1,24 +1,24 @@
-HelpCenter::Engine.routes.draw do
-  scope module: :help_center do
-    resources :support_threads, path: :threads do
-      collection do
-        get :answered
-        get :unanswered
-        get :mine
-        get :participating
-        get "category/:id", to: "support_categories#index", as: :support_category
-      end
-
-      resources :support_posts, path: :posts do
-        member do
-          put :solved
-          put :unsolved
-        end
-      end
-
-      resource :notifications
-    end
-  end
-
-  root to: "help_center/support_threads#index"
-end
+HelpCenter::Engine.routes.draw do
+  scope module: :help_center do
+    resources :support_categories, path: :categories
+    resources :support_threads, path: :articles do
+      collection do
+        get :answered
+        get :unanswered
+        get :mine
+        get :participating
+      end
+
+      resources :support_posts, path: :posts do
+        member do
+          put :solved
+          put :unsolved
+        end
+      end
+
+      resource :notifications
+    end
+  end
+
+  root to: "help_center/support_threads#index"
+end

data/db/migrate/20170417012930_create_support_categories.rb

@@ -1,19 +1,19 @@
-class CreateSupportCategories < ActiveRecord::Migration[4.2]
-  def change
-    create_table :support_categories do |t|
-      t.string   :name, null: false
-      t.string   :slug, null: false
-      t.string   :color, default: "000000"
-      t.integer  :position, default: 0
-
-      t.timestamps
-    end
-
-    SupportCategory.reset_column_information
-
-    SupportCategory.create(
-      name: "Getting Started",
-      color: "#4ea1d3",
-    )
-  end
-end
+class CreateSupportCategories < ActiveRecord::Migration[4.2]
+  def change
+    create_table :support_categories do |t|
+      t.string   :name, null: false
+      t.string   :slug, null: false
+      t.string   :color, default: "000000"
+      t.integer  :position, default: 0
+
+      t.timestamps
+    end
+
+    SupportCategory.reset_column_information
+
+    SupportCategory.create(
+      name: "Getting Started",
+      color: "#4ea1d3",
+    )
+  end
+end