tramway-landing 2.2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d274ed464699dd86651509ed97542e65a67cb859abf6490ce2bff27a89712da
-  data.tar.gz: 40af83c558e9e5dd732a39ed0b5fc47e360a255b089312ad2fb950753dbbe29d
+  metadata.gz: 1d63028e269a1417dc70a9245fb5d898b3670a8ad0c62c48f1d76a9674f9ec43
+  data.tar.gz: f61e1ef1a39bd3cdd053f83522e1bd98232798ceb03c95a6ba1926f1fde80a82
 SHA512:
-  metadata.gz: 2a9dcd96fb521367b355aa1f73c33d004a7ebc24b2ab8c481f58dab5945381b64cc7cc093320501a67ec7792933d3f6f15f171fe82bc33b49fdc75e25472455a
-  data.tar.gz: 6255e55b99e512824a67f7e663d44682599b84ca1a973e410b39ef59a10e41ee783144cafdc334f4a612613568d44ab2ef8134539c16149e86203b782a1dca89
+  metadata.gz: d4e86f26f412353fa6ba17190b8fa973b7d3fcda3fb4b0e3b2474e38c7bf0fc37dbcb3becbf8f4fcd7ef0dbb9e59705690a8b933246c6de5c87e6fd73f82ac5e
+  data.tar.gz: 70d3e7c847fc74247f3553d251a30fadfc2d2e07d5b6157060796200078c725ba9bf1e0c302cf83be0f14e10e38ed135975a93e9730c5c7b837d4380df4d1cb8

data/app/forms/admin/tramway/landing/block_form.rb

@@ -2,7 +2,7 @@
 
 class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationForm
   properties :title, :background, :view_state_event, :block_type, :position, :navbar_link, :anchor, :description,
-    :link_object_type, :link_object_id, :button_title, :button_link, :view_name, :form_url
+    :link_object_type, :link_object_id, :button_title, :button_link, :view_name, :form_url, :page
 
   def initialize(object = nil)
     super(object).tap do
@@ -21,7 +21,16 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
                       button_title: :string,
                       button_link: :string,
                       view_name: :string,
-                      form_url: :string
+                      form_url: :string,
+                      page: {
+                        type: :select,
+                        input_options: {
+                          hint: I18n.t('hints.tramway.landing.block.page'),
+                          collection: Tramway::Page::Page.landings.active.reduce({}) do |hash, page|
+                            hash.merge! page.title => page.id
+                          end
+                        }
+                      }
     end
   end
 
@@ -52,4 +61,18 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
     model.values.merge! form_url: value
     model.save
   end
+
+  def form_url
+    model.values&.dig 'form_url'
+  end
+
+  def page=(value)
+    model.values ||= {} 
+    model.values.merge! page: value
+    model.save
+  end
+
+  def page
+    model.values&.dig 'page'
+  end
 end

data/app/models/tramway/landing/block.rb

@@ -20,7 +20,12 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
     end
   end
 
-  scope :on_main_page, -> { active.where(view_state: :published).order :position }
+  store_accessor :values, :page
+  store_accessor :values, :form_url
+
+  scope :on_main_page, -> do
+    active.where(view_state: :published).where("(values -> 'page') IS NOT NULL").order :position 
+  end
   scope :with_navbar_link, -> { where navbar_link: :exist }
   scope :header, -> { on_main_page.where(block_type: :header).first }
   scope :footer, -> { on_main_page.where(block_type: :footer).first }

data/app/views/layouts/tramway/landing/_navbar.html.haml

@@ -1,5 +1,5 @@
 %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
-  = link_to yield(:application_name), '#', class: 'navbar-brand'
+  = link_to @application.public_name || yield(:application_name), '#', class: 'navbar-brand'
   - if @links&.any?
     %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
     = fa_icon :bars

data/config/locales/en.forms.yml

@@ -4,3 +4,4 @@ en:
       landing:
         block:
           position: "Busy positions. Block type 'Header' should be always the first. Block type 'Footer' should be always the last"
+          page: "Leave it empty, if you want this block on a main page"

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '2.2.2.1'
+    VERSION = '2.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 2.2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email: