RubyGems - katalyst-navigation - Versions diffs - 1.0.0 → 1.0.3 - Mend

katalyst-navigation 1.0.0 → 1.0.3

Files changed (15) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0149b9c1ba7f7a1ecfcc1e085fbe33b2b0eb11d0d5372b743f05d0261daf88e3'
-  data.tar.gz: 2648b6258ac7a7f2b4800f0b1371687cba043d9d4a647f5753076bc8a1b04327
+  metadata.gz: 94de0bbf95ab99d4893ec9decb52fa6c1a7231f1d58d17b1263e63124baaf10a
+  data.tar.gz: 3ec009c2845a80e4371aca788ac2b06de9a602cc468afecbbb5666d5a50fcb07
 SHA512:
-  metadata.gz: d31db0f384749242de03b5bc04da8a0d3137092c702a3c4eda5769bf53fe1f764bb457bd672af5a60c1f3ef1daa22a7d2830e4f53b78b0f2161bdc2db675b54a
-  data.tar.gz: 615fd376052d6b4e48351ef2d0d144a8bd66bfbe615d01b65eed57eb90a1679f4eae630abddbfe82d3aff9f1a47baa09987f4c3a536625f5ea00849612109805
+  metadata.gz: 043ce598613d8f99b98d777be94b0805d1504989eab5dba1e651a8d7fa2a2d8d4f89135530e300e65d37fea900237cba0e2a30caa7e95e81ab17000639bba5bb
+  data.tar.gz: c0795c1f30ed8ecea198e90d90097bcb6728bcbe2e7116ecd106e0c21c6e97e9c68a4ff981586bfa9436a22a7e63adf8c33da00f593541b17e77d316675fe4bb

data/app/assets/javascripts/utils/navigation/editor/menu.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import Item from "./item";
+import Item from "utils/navigation/editor/item";
 /**
  * @param nodes {NodeList}

data/app/assets/javascripts/utils/navigation/editor/rules-engine.js CHANGED Viewed

@@ -7,7 +7,6 @@ export default class RulesEngine {
     "denyRemove",
     "denyDrag",
     "denyEdit",
-    "invalidDepth",
   ];
   /**
@@ -19,8 +18,12 @@ export default class RulesEngine {
   update(item) {
     this.rules = {};
+    // structural rules enforce a valid tree structure
     this.firstItemDepthZero(item);
     this.depthMustBeSet(item);
+    this.itemCannotHaveInvalidDepth(item);
+    // behavioural rules define what the user is allowed to do
     this.parentsCannotDeNest(item);
     this.rootsCannotDeNest(item);
     this.nestingNeedsParent(item);
@@ -28,7 +31,6 @@ export default class RulesEngine {
     this.needHiddenItemsToExpand(item);
     this.parentsCannotBeDeleted(item);
     this.parentsCannotBeDragged(item);
-    this.itemCannotHaveInvalidDepth(item);
     RulesEngine.rules.forEach((rule) => {
       item.toggleRule(rule, !!this.rules[rule]);
@@ -55,6 +57,18 @@ export default class RulesEngine {
     }
   }
+  /**
+   * Depth must increase stepwise.
+   *
+   * @param {Item} item
+   */
+  itemCannotHaveInvalidDepth(item) {
+    const previous = item.previousItem;
+    if (previous && previous.depth < item.depth - 1) {
+      item.depth = previous.depth + 1;
+    }
+  }
   /**
    * De-nesting an item would create a gap of 2 between itself and its children
    *
@@ -119,16 +133,6 @@ export default class RulesEngine {
     if (item.hasExpandedDescendants()) this.#deny("denyDrag");
   }
-  /**
-   * Depth must increase stepwise.
-   *
-   * @param {Item} item
-   */
-  itemCannotHaveInvalidDepth(item) {
-    const previous = item.previousItem;
-    if (previous && previous.depth < item.depth - 1) this.#deny("invalidDepth");
-  }
   /**
    * Record a deny.
    *

data/app/assets/stylesheets/katalyst/navigation/editor/_index.scss CHANGED Viewed

@@ -80,7 +80,7 @@ $status-dirty-color: #aaa !default;
     // Dragged visuals
     &[data-dragging] {
-      border: 2px dashed;
+      box-shadow: inset 0 0 0 2px var(--icon-passive-color);
       > * {
         visibility: hidden;

data/app/assets/stylesheets/katalyst/navigation/editor/_item-actions.scss CHANGED Viewed

@@ -31,6 +31,7 @@
     border-radius: 2px;
     background: var(--icon-active-color);
     margin-right: 0.5rem;
+    flex-shrink: 0;
     [data-invisible="true"] & {
       background: var(--icon-passive-color);

data/app/assets/stylesheets/katalyst/navigation/editor/_item-rules.scss CHANGED Viewed

@@ -16,9 +16,4 @@
     display: none !important;
     pointer-events: none;
   }
-  [data-invalid-depth] {
-    border-color: red;
-    background-color: indianred;
-  }
 }

data/app/assets/stylesheets/katalyst/navigation/editor/_new-items.scss CHANGED Viewed

@@ -3,7 +3,7 @@
 .navigation--editor--new-items {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
-  gap: 0.25rem;
+  gap: 0.5rem;
   [role="listitem"] {
     display: flex;
@@ -12,11 +12,28 @@
     align-items: center;
     transform: translate3d(0, 0, 0);
     cursor: grab;
+    background: white;
+    box-shadow: rgb(0 0 0 / 25%) 0 1px 1px, rgb(0 0 0 / 31%) 0 0 2px;
+    min-height: 5rem;
+    padding: 1.5rem;
+    &:hover {
+      box-shadow: rgb(0 0 0 / 25%) 0 1px 2px, rgb(0 0 0 / 31%) 0 0 5px;
+    }
     &::before {
       @extend %icon;
+      width: 2.5rem;
+      height: 2.5rem;
       position: unset;
-      background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M16 3.66667V13.3333C16 14.8 14.6909 16 13.0909 16H7.78182C6.99636 16 6.25455 15.7133 5.70909 15.2067L0 9.88667C0 9.88667 0.916364 9.06667 0.945455 9.05333C1.10545 8.92667 1.30182 8.86 1.52 8.86C1.68 8.86 1.82545 8.9 1.95636 8.96667C1.98545 8.97333 5.09091 10.6067 5.09091 10.6067V2.66667C5.09091 2.11333 5.57818 1.66667 6.18182 1.66667C6.78545 1.66667 7.27273 2.11333 7.27273 2.66667V7.33333H8V1C8 0.446667 8.48727 0 9.09091 0C9.69455 0 10.1818 0.446667 10.1818 1V7.33333H10.9091V1.66667C10.9091 1.11333 11.3964 0.666667 12 0.666667C12.6036 0.666667 13.0909 1.11333 13.0909 1.66667V7.33333H13.8182V3.66667C13.8182 3.11333 14.3055 2.66667 14.9091 2.66667C15.5127 2.66667 16 3.11333 16 3.66667Z' fill='white'/%3E%3C/svg%3E");
+    }
+    &[data-item-type="link"]:before {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 48 48' xmlns='http://www.w3.org/2000/svg'%3E%3Cg clip-path='url(%23clip0_67_1273)'%3E%3Cpath d='M16 22H32V26H16V22ZM40.2 24H44C44 18.48 39.52 14 34 14H26V17.8H34C37.42 17.8 40.2 20.58 40.2 24ZM7.8 24C7.8 20.58 10.58 17.8 14 17.8H22V14H14C8.48 14 4 18.48 4 24C4 29.52 8.48 34 14 34H22V30.2H14C10.58 30.2 7.8 27.42 7.8 24ZM38 24H34V30H28V34H34V40H38V34H44V30H38V24Z' /%3E%3C/g%3E%3Cdefs%3E%3CclipPath id='clip0_67_1273'%3E%3Crect width='48' height='48' /%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E");
+    }
+    &[data-item-type="button"]:before {
+      background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 48 48' xmlns='http://www.w3.org/2000/svg'%3E%3Cg clip-path='url(%23clip0_67_1276)'%3E%3Cpath d='M44 18V30C44 32.2 42.2 34 40 34H38V30H40V18H8V30H20V34H8C5.8 34 4 32.2 4 30V18C4 15.8 5.8 14 8 14H40C42.2 14 44 15.8 44 18ZM29 38L31.18 33.18L36 31L31.18 28.82L29 24L26.82 28.82L22 31L26.82 33.18L29 38ZM34 28L35.24 25.24L38 24L35.24 22.76L34 20L32.76 22.76L30 24L32.76 25.24L34 28ZM29 38L31.18 33.18L36 31L31.18 28.82L29 24L26.82 28.82L22 31L26.82 33.18L29 38ZM34 28L35.24 25.24L38 24L35.24 22.76L34 20L32.76 22.76L30 24L32.76 25.24L34 28Z' /%3E%3C/g%3E%3Cdefs%3E%3CclipPath id='clip0_67_1276'%3E%3Crect width='48' height='48' /%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E");
     }
   }
 }

data/app/controllers/concerns/katalyst/navigation/has_navigation.rb ADDED Viewed

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Katalyst
+  module Navigation
+    module HasNavigation
+      extend ActiveSupport::Concern
+      module NavigationHelper
+        def navigation_menu_for(slug)
+          @navigation_menus[slug.to_s]
+        end
+      end
+      included do
+        helper Katalyst::Navigation::FrontendHelper
+        helper NavigationHelper
+        before_action :set_navigation_menus
+      end
+      protected
+      def set_navigation_menus
+        @navigation_menus = Katalyst::Navigation::Menu.includes(:published_version).index_by(&:slug)
+      end
+    end
+  end
+end

data/app/controllers/katalyst/navigation/menus_controller.rb CHANGED Viewed

@@ -62,7 +62,7 @@ module Katalyst
         menu.destroy!
-        redirect_to action: :index
+        redirect_to action: :index, status: :see_other
       end
       private

data/app/views/katalyst/navigation/menus/_item.html.erb CHANGED Viewed

@@ -8,7 +8,7 @@
   </div>
   <div class="url">
-    <%= link_to item.url || "", item.url || "" %>
+    <%= link_to item.url || "", item.url || "", data: { turbo: false } %>
   </div>
   <%= builder.item_actions %>

data/app/views/katalyst/navigation/menus/edit.html.erb CHANGED Viewed

@@ -11,5 +11,10 @@
     <%= form.text_field :slug %>
   </div>
-  <%= form.submit :save %>
+  <div class="button-row">
+    <%= form.submit :save %>
+    <%= link_to "Delete", url_for(action: :show),
+                class: "button button-secondary",
+                data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
+  </div>
 <% end %>

data/app/views/katalyst/navigation/menus/index.html.erb CHANGED Viewed

@@ -11,7 +11,4 @@
     <%= link_to cell.value, menu %>
   <% end %>
   <%= row.cell :slug %>
-  <%= row.cell :actions do |cell| %>
-    <%= button_to "Delete", menu, method: :delete, class: "button button--text" %>
-  <% end %>
 <% end %>

data/lib/katalyst/navigation/version.rb CHANGED Viewed

@@ -2,6 +2,6 @@
 module Katalyst
   module Navigation
-    VERSION = "1.0.0"
+    VERSION = "1.0.3"
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -17,7 +17,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - app/assets/config/katalyst-navigation.js
@@ -35,6 +34,7 @@ files:
 - app/assets/stylesheets/katalyst/navigation/editor/_item-rules.scss
 - app/assets/stylesheets/katalyst/navigation/editor/_new-items.scss
 - app/assets/stylesheets/katalyst/navigation/editor/_status-bar.scss
+- app/controllers/concerns/katalyst/navigation/has_navigation.rb
 - app/controllers/katalyst/navigation/base_controller.rb
 - app/controllers/katalyst/navigation/items_controller.rb
 - app/controllers/katalyst/navigation/menus_controller.rb
@@ -83,9 +83,6 @@ homepage: https://github.com/katalyst/navigation
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/katalyst/navigation
-  source_code_uri: https://github.com/katalyst/navigation
-  changelog_uri: https://github.com/katalyst/navigation/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/CHANGELOG.md DELETED Viewed

@@ -1,5 +0,0 @@
-## [Unreleased]
-## [1.0.0] - 2022-09-05
-- Initial release