dokno 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08352501c3a71f5edef7bd7bf311d8459dc5d38adc20dff5540f755bf04033b6'
-  data.tar.gz: 19aedf91902b6fc6e30378074740578c347041702d849999a7c62c4a0fff53cd
+  metadata.gz: df8bbd2d17e134f0298f31fc97d049b245c4830e9d44655a8c4659507c6ebe6f
+  data.tar.gz: bdeb9513295036198a8f30a476a1ea8a4c34d35330c9e6e75e2364aadddf0b3b
 SHA512:
-  metadata.gz: f44728981b2004cb703d75641f72f02dc0cf4e92b697ae10d8ef69f1e1b099aa536499c139ae6931748331bbfe3c77bbcbeb3395e59b7fa99398aaeb45b25761
-  data.tar.gz: 32a8b4f6cbf26d8ef35a6894e3d668f10b81f085c47b65fa44abba17fec7fa337c7e917a532af45bf258c80ecdf869c3ec48cdd6386f96e3e029e3100ee84776
+  metadata.gz: 97c1353f3c85e9a6e40de60a0947101978bb101b0dc85be48945ee7e54bb13596fd0f1afbd011113f538c5dfe0ed8784c09c87643b5813e5021292c49244273b
+  data.tar.gz: 1bfda031b688b21b65fc8b43fd550e006fec2d5b5f1fd50d4f536db9724ef4853ed47f49e8b2e3ed3329f9ecd6092eb2d678dc6562fa1c07d092da0412ff1e12

data/app/assets/javascripts/dokno.js

@@ -61,6 +61,17 @@ function deleteArticle(id) {
   sendRequest(dokno__base_path + 'articles/' + id, {}, callback, 'DELETE');
 }
 
+function deleteCategory(id) {
+  if (!confirm('Delete Category\n\nThis will remove this category. Any articles in this category will become uncategorized and appear on the home page until re-categorized.')) {
+    return true;
+  }
+
+  const callback = function(_data) {
+    location.href = dokno__base_path;
+  }
+  sendRequest(dokno__base_path + 'categories/' + id, {}, callback, 'DELETE');
+}
+
 function previewArticleToggle() {
   const markdown = elem('div#dokno-content-container textarea#markdown').value;
   const callback = function(data) {

data/app/controllers/dokno/application_controller.rb

@@ -1,7 +1,10 @@
 module Dokno
   class ApplicationController < ::ApplicationController
     protect_from_forgery with: :exception
+
     include UserConcern
     include PaginationConcern
+
+    add_flash_types :green, :yellow, :red
   end
 end

data/app/controllers/dokno/articles_controller.rb

@@ -27,9 +27,11 @@ module Dokno
       set_editor_username
 
       if @article.save
+        flash[:green] = 'Article was created'
         @article.categories = Category.where(code: params[:category_code]) if params[:category_code].present?
         redirect_to article_path @article.slug
       else
+        flash.now[:red] = 'Article could not be created'
         @category_codes = params[:category_code]
         render :new
       end
@@ -42,9 +44,11 @@ module Dokno
       set_editor_username
 
       if @article.update(article_params)
+        flash[:green] = 'Article was updated'
         @article.categories = Category.where(code: params[:category_code])
         redirect_to article_path @article.slug
       else
+        flash.now[:red] = 'Article could not be updated'
         @category_codes = params[:category_code]
         render :edit
       end
@@ -52,6 +56,8 @@ module Dokno
 
     def destroy
       Article.find(params[:id].to_i).destroy!
+
+      flash[:green] = 'Article was deleted'
       render json: {}, layout: false
     end
 

data/app/controllers/dokno/categories_controller.rb

@@ -35,8 +35,10 @@ module Dokno
       @category = Category.new(name: params[:name], parent: Category.find_by(code: params[:parent_category_code]))
 
       if @category.save
+        flash[:green] = 'Category was created'
         redirect_to article_index_path(@category.code)
       else
+        flash.now[:red] = 'Category could not be created'
         @parent_category_code = params[:parent_category_code]
         render :new
       end
@@ -46,13 +48,22 @@ module Dokno
       return redirect_to root_path if @category.blank?
 
       if @category.update(name: params[:name], parent: Category.find_by(code: params[:parent_category_code]))
+        flash[:green] = 'Category was updated'
         redirect_to article_index_path(@category.code)
       else
+        flash.now[:red] = 'Category could not be updated'
         @parent_category_code = params[:parent_category_code]
         render :edit
       end
     end
 
+    def destroy
+      Category.find(params[:id].to_i).destroy!
+
+      flash[:green] = 'Category was deleted'
+      render json: {}, layout: false
+    end
+
     private
 
     def fetch_category

data/app/helpers/dokno/application_helper.rb

@@ -9,9 +9,7 @@ module Dokno
 
       return "Dokno article slug '#{slug}' not found" if article.blank?
 
-      %Q(
-        <a href="javascript:;" onclick="doknoOpenPanel('#{j article.slug}');">#{link_text.presence || article.title}</a>
-      ).html_safe
+      %Q(<a href="javascript:;" onclick="doknoOpenPanel('#{j article.slug}');">#{link_text.presence || article.title}</a>).html_safe
     end
   end
 end

data/app/models/dokno/category.rb

@@ -20,6 +20,8 @@ module Dokno
 
     before_validation :set_code
 
+    scope :alpha_order, -> { order(:name) }
+
     # The display breadcrumb for the Category
     def breadcrumb
       crumbs = [name]
@@ -71,19 +73,40 @@ module Dokno
       categories.flatten
     end
 
-    # HTML markup for Category SELECT field OPTION lists
-    def self.select_option_markup(selected_category_codes: nil, exclude_category_id: nil)
-      breadcrumbs = all
-        .reject { |category| category.id == exclude_category_id.to_i }
-        .map { |category| { code: category.code, name: category.breadcrumb } }
-      breadcrumbs.sort_by { |category_hash| category_hash[:name] }.map do |category_hash|
-        selected = selected_category_codes&.include?(category_hash[:code])
-        %(<option value="#{category_hash[:code]}" #{'selected="selected"' if selected}>#{category_hash[:name]}</option>)
-      end.join
+    def self.select_option_markup(selected_category_codes: nil, exclude_category_id: nil, context_category: nil, level: 0)
+      return '' if level.positive? && context_category.blank?
+
+      options = []
+      level_categories = where(category_id: context_category&.id).alpha_order
+
+      level_categories.each do |category|
+        options << option_markup(
+          category:                category,
+          selected_category_codes: selected_category_codes,
+          exclude_category_id:     exclude_category_id,
+          level:                   level
+        )
+
+        options << select_option_markup(
+          selected_category_codes: selected_category_codes,
+          exclude_category_id:     exclude_category_id,
+          context_category:        category,
+          level:                   (level + 1)
+        )
+      end
+
+      options.join
     end
 
     private
 
+    def self.option_markup(category:, selected_category_codes:, exclude_category_id:, level: 0)
+      return '' if category.id == exclude_category_id
+
+      selected = selected_category_codes&.include?(category.code)
+      %(<option value="#{category.code}" #{'selected="selected"' if selected}>#{('&nbsp;&nbsp;' * level)}#{category.name}</option>)
+    end
+
     # Never allow setting of parent to self
     def circular_parent_check
       return unless persisted? && id.to_i == category_id.to_i

data/app/views/dokno/_article_panel.html.erb

@@ -67,6 +67,7 @@
 
         // Close on escape
         document.addEventListener('keydown', dokno__keydown_listener, false);
+        document.addEventListener('click', dokno__click_listener, false);
       }
     };
 
@@ -78,6 +79,7 @@
     dokno__panel.classList.remove('open');
     document.body.classList.remove('dokno-no-scroll');
     document.removeEventListener('keydown', dokno__keydown_listener, false);
+    document.removeEventListener('click', dokno__click_listener, false);
 
     dokno__slug = null;
   }
@@ -106,6 +108,11 @@
     if (e.key === 'Escape') { doknoClosePanel(); }
   }
 
+  const dokno__click_listener = function(e) {
+    var isClickInside = dokno__panel.contains(e.target);
+    if (!isClickInside) { doknoClosePanel(); }
+  }
+
   dokno__close.onclick = function() { doknoClosePanel(); }
 
   var dokno__id, dokno__slug;

data/app/views/dokno/articles/_article_form.html.erb

@@ -58,3 +58,5 @@
   </div>
 
 </section>
+
+<script> elem('input#slug').focus(); </script>

data/app/views/dokno/articles/show.html.erb

@@ -1,6 +1,14 @@
 <%= render 'dokno/article_formatting' %>
 
 <section>
+  <% if @article.categories.present? %>
+    <div class="text-gray-500 mb-5">
+      <% @article.categories.each do |category| %>
+        <div><a href="<%= article_index_path(category.code) %>"><%= category.breadcrumb %></a></div>
+      <% end %>
+    </div>
+  <% end %>
+
   <div class="flex">
     <div id="dokno-article-sidebar" class="w-2/5 pr-10">
       <div id="article-deprecated-alert" class="<%= 'hidden' if @article.active %> bg-yellow-700 p-4 mb-5 rounded text-lg border-t-4 border-yellow-900 text-white font-base">

data/app/views/dokno/categories/_category_form.html.erb

@@ -28,6 +28,11 @@
 
   <div class="mt-10">
     <button type="submit" class="bg-gray-700 text-gray-300 hover:bg-gray-900 hover:text-white rounded py-2 px-3 font-bold"><i data-feather="check" class="inline h-5"></i> SAVE CATEGORY</button>
+    <% if category.persisted? %>
+      <button type="button" class="bg-red-700 text-gray-300 hover:bg-red-900 hover:text-white rounded py-2 px-3 font-bold ml-5" onclick="deleteCategory('<%= category.id %>');"><i data-feather="trash" class="inline h-5"></i> DELETE</button>
+    <% end %>
     <span class="text-lg ml-5"><a class="no-underline" href="<%= category.persisted? ? "#{root_path}?id=#{category.id}" : root_path %>">Cancel</a></span>
   </div>
 </section>
+
+<script> elem('input#name').focus(); </script>

data/app/views/dokno/categories/index.html.erb

@@ -1,3 +1,8 @@
+<% if @category&.parent.present? %>
+  <div class="text-gray-500 mb-5">
+    <div><%= @category.breadcrumb %></div>
+  </div>
+<% end %>
 
 <div class="flex items-center mb-10">
   <% if Dokno::Category.exists? %>

data/app/views/layouts/dokno/application.html.erb

@@ -63,6 +63,13 @@
     <% end %>
 
     <div id="dokno-content-container" class="w-full max-w-screen-xl m-auto print-this">
+      <% flash.each do |color, msg| %>
+        <div class="bg-<%= color %>-700 p-4 mb-5 rounded text-lg border-t-4 border-<%= color %>-900 text-white font-base">
+          <i data-feather="<%= (color == 'green' ? 'check-circle' : (color == 'yellow' ? 'alert-circle' : 'x-circle')) %>" class="inline mr-2"></i>
+          <%= msg %>
+        </div>
+      <% end %>
+
       <%= yield %>
     </div>
   </main>

data/lib/dokno/version.rb

@@ -1,3 +1,3 @@
 module Dokno
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokno
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Courtney Payne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -169,8 +169,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.15'
 description: Dokno allows you to easily mount a self-contained knowledgebase / wiki
-  / help system to your Rails app where you and your users can author articles relevant
-  to your app.
+  / help system to your Rails app.
 email:
 - cpayne624@gmail.com
 executables: []