tramway-landing 3.1.1.10 → 3.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6357cedad3d2422008f3d4e6bad426889c79ece0e777041fe34988f72536b757
-  data.tar.gz: be5301c2c4dfc3e64ca2db13b6e8d4b3bf69f1e82388ad99f8139a48dc55968d
+  metadata.gz: 9049dba4967149cb1ee00c67192845a31730ca9421a416f5d3244bbc148cdace
+  data.tar.gz: 9791a682642002981bf6d07ba7156ec323df728a65ee209318179a90de8ce48f
 SHA512:
-  metadata.gz: 9caf4587006b41ca494e6af23b18bbd383213c99ac61a47a802c70f4e8483aaf03ed452998b4e27865d0b0e1e59b3e15d8f10311bc6e0f1615f4f39bf624014b
-  data.tar.gz: 0dcc7a118571778183d033984de220038de36ba3808c7647652487cd2c6963c6572e54dedda32d10922a970fd38c52b60c57a9cfbaf1db5821fec33ff81912eb
+  metadata.gz: cf3e443a1a10e4d29f9fce38308e254aa10d83e9397f68e0a4aec9e317f13bc75c59c011355e343129694536a1794658cc71532d66e8b6f43ea5b6ec0709496c
+  data.tar.gz: 924a4a230033865f9c0a52994c1639ce33c0e684f23506e4aba8f96171c616ad91138c0594c485ce2c6ab6068724f5395e2964c278c02b2f6968d80e24bf507c

data/app/decorators/tramway/landing/block_decorator.rb

@@ -13,8 +13,6 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     def show_associations
       [:forms]
     end
-
-    delegate :human_view_state_event_name, to: :model_class
   end
 
   decorate_association :forms
@@ -39,7 +37,7 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def view_state
-    object.human_view_state_name
+    object.view_state
   end
 
   def link

data/app/helpers/tramway/landing/application_helper.rb

@@ -20,18 +20,22 @@ module Tramway
         else
           if block.page.page_type.main?
             content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+          else
+            block.page.title
           end
         end
       end
 
       def block_tagline(block)
-        unless block.is_a? Array
+        if block.is_a? Array
+          block.each do |_current_block|
+            raw _current_block.page.body
+          end
+        else
           if block.page.page_type.main?
             content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
           else
-            block.each do |_current_block|
-              raw block.page.body
-            end
+            raw block.page.body
           end
         end
       end

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

@@ -10,16 +10,16 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
 
   uploader :background, :photo, extensions: %i[jpg jpeg gif png]
 
-  state_machine :view_state, initial: :published do
-    state :published
+  aasm :view_state do
+    state :published, initial: true
     state :hidden
 
     event :publish do
-      transition hidden: :published
+      transitions from: :hidden, to: :published
     end
 
     event :hide do
-      transition published: :hidden
+      transitions from: :published, to: :hidden
     end
   end
 

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

@@ -1,5 +1,5 @@
 %meta{ content: 'text/html; charset=UTF-8', http: { equiv: 'Content-Type' } }
 %meta{ content: "width=device-width, initial-scale=1, maximum-scale=0.8", name: "viewport" }
-- main_image = @application.main_image.present? ? "/#{@application.main_image}" : yield(:main_image)
+- main_image = @application&.main_image.present? ? "/#{@application.main_image}" : yield(:main_image)
 %meta{ property: 'vk:image', content: main_image }
 %meta{ property: 'og:image', content: main_image }

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

@@ -1,16 +1,17 @@
-%nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
-  = link_to @application.public_name || yield(:application_name), '/', class: 'navbar-brand'
-  %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
-    - if @links&.any?
-      = fa_icon :bars
-  .collapse.navbar-collapse#navbarSupportedContent
-    - left_links = @links.is_a?(Hash) ? @links[:left] : @links
-    - if left_links&.any?
-      %ul.navbar-nav.mr-auto
-        - left_links.each do |link|
-          = render 'layouts/tramway/landing/navbar/link', link: link
-    - right_links = @links.is_a?(Hash) ? @links.dig(:right) : []
-    - if right_links&.any?
-      %ul.navbar-nav.ml-auto
-        - right_links.each do |link|
-          = render 'layouts/tramway/landing/navbar/link', link: link
+- if Tramway::Landing.navbar_for(@application_engine || @application&.name)
+  %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
+    = link_to @application&.public_name || yield(:application_name), '/', class: 'navbar-brand'
+    %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
+      - if @links&.any?
+        = fa_icon :bars
+    .collapse.navbar-collapse#navbarSupportedContent
+      - left_links = @links.is_a?(Hash) ? @links[:left] : @links
+      - if left_links&.any?
+        %ul.navbar-nav.mr-auto
+          - left_links.each do |link|
+            = render 'layouts/tramway/landing/navbar/link', link: link
+      - right_links = @links.is_a?(Hash) ? @links.dig(:right) : []
+      - if right_links&.any?
+        %ul.navbar-nav.ml-auto
+          - right_links.each do |link|
+            = render 'layouts/tramway/landing/navbar/link', link: link

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

@@ -10,11 +10,11 @@
     = javascript_include_tag 'https://code.jquery.com/jquery-3.2.1.slim.min.js', integrity: 'sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN', crossorigin: 'anonymous'
     = javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', integrity: 'sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q', crossorigin: 'anonymous'
     = csrf_meta_tags
-    - if @application.favicon.present?
+    - if @application&.favicon.present?
       = favicon_link_tag @application.favicon
     - ::Tramway::Landing.head_content.each do |content|
       - self.instance_exec &content
-  %body{ class: @application.name }
+  %body{ class: @application&.name }
     = stylesheet_link_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/css/mdb.min.css'
     = javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.4.5/js/mdb.js'
     = javascript_include_tag 'https://cdn.rawgit.com/CezarLuiz0/anchor.js/master/dist/anchor.min.js'

data/app/views/layouts/tramway/landing/navbar/_link.html.haml

@@ -1,7 +1,7 @@
 - if link.is_a? Hash
   .nav-item.dropdown
     %a.nav-link.dropdown-toggle.scrollable{id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
-      = link.keys.first
+      = t("navbar.links.#{link.keys.first}")
     .dropdown-menu.dropdown-primary.scrollable{ aria: { labelledby: "dropdown_menu_button_#{link.keys.first}" } }
       - link.values.first.each do |menu_item|
         = link_to menu_item.title, menu_item.link, class: 'dropdown-item'

data/app/views/tramway/landing/templates/_section_with_image_and_text.html.haml

@@ -1,5 +1,9 @@
 .row.page{ id: block.anchor }
   .col-md-7
-    = image_tag block.background.url, class: 'img-fluid'
+    - if block.background.present?
+      - background_url = block.background.is_a?(String) ? block.background : block.background.url
+      = image_tag background_url, class: 'img-fluid'
+    - else
+      - raise "Block background should valid image URL or PhotoUploader object. Block: #{block}"
   .col-md-5{ style: 'text-align: justify' }
     = render 'tramway/landing/templates/text', block: block

data/lib/tramway/landing.rb

@@ -14,6 +14,15 @@ module Tramway
       def head_content
         (defined?(@@head_content) && @@head_content) || []
       end
+
+      def set_navbar(bool, project:)
+        @@navbars ||= {}
+        @@navbars.merge! project => bool
+      end
+
+      def navbar_for(project)
+        @@navbars.with_indifferent_access[project]
+      end
     end
   end
 end

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.1.10'
+    VERSION = '3.2.0.3'
   end
 end

metadata

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