tramway-landing 3.1.1.11 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259d9429acccbee8e412ba037adf4381c0e4c172db64825b8fce1cc3d2b3656e
-  data.tar.gz: 18dfc48764721a6e6ce2758ccc3890998694d947fdbbbd81f0cda564b329b446
+  metadata.gz: a7c9610e7ca9a06693e66b7d02d8085dcf88c2ec1e4d3f0e2822d80406165e17
+  data.tar.gz: fd346a2b77c95906b9cee5a40df1d053806cfc94c6eff6d344aec1646c9e25fd
 SHA512:
-  metadata.gz: 1f651258e6e670687fa85e0d43d3d951a4f2f8a857394f907823e60926fbcf957e6213d3488a6b68ced67a0e3ea0a42385f4aa0a25bc235b0eb4a124a5366459
-  data.tar.gz: 7253ae02f50de70c4e0eef25a29022432af5ebd66eef3223e3e59cd650d3a8aa30d0227ab5cd718f5e31a81364aaa0ac8adb31492e869f7ad92cbed00d8dd93a
+  metadata.gz: bbbdb675f71c7b04d040e9e7dc78a707247916d0076b646bdacdb12c948e19b9f5f69a303a53032c4c79b5bde2de0b586e48acf23bdcae9018afc174fd41d827
+  data.tar.gz: e7ee9cfed8732ebbd60ea3df48a612d3e9405ebedfcc794a09697651d9dd7750cfcd61153befc78432e23b81cc707d1fc4e598084e8a6801656f770a30f3749b

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/decorators/tramway/landing/tool_decorator.rb

@@ -0,0 +1,3 @@
+class Tramway::Landing::ToolDecorator < Tramway::Core::ApplicationDecorator
+  delegate_attributes :title, :account_id
+end

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

@@ -0,0 +1,10 @@
+class Admin::Tramway::Landing::ToolForm < Tramway::Core::ApplicationForm
+  properties :title, :account_id
+
+  def initialize(object)
+    super(object).tap do
+      form_properties title: :default,
+        account_id: :string
+    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/models/tramway/landing/tool.rb

@@ -0,0 +1,7 @@
+class Tramway::Landing::Tool < Tramway::Core::ApplicationRecord
+  enumerize :title, in: [ :google_tag_manager, :google_analytics, :yandex_direct ]
+
+  def with_body_fragment?
+    title.google_tag_manager?
+  end
+end

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

@@ -0,0 +1,15 @@
+= render 'layouts/tramway/landing/meta'
+%title
+  = yield(:title).present? ? yield(:title) : @application.title
+= stylesheet_link_tag    'tramway/landing/application', media: 'all'
+= javascript_include_tag 'tramway/landing/application'
+= javascript_include_tag 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', integrity: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl', crossorigin: 'anonymous'
+= 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?
+  = favicon_link_tag @application.favicon
+- ::Tramway::Landing.head_content.each do |content|
+  - self.instance_exec &content
+- @tools.each do |tool|
+  = render "layouts/tramway/landing/tools/#{tool.title}_head", account_id: tool.account_id

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

@@ -1,20 +1,11 @@
 !!!
 %html
   %head
-    = render 'layouts/tramway/landing/meta'
-    %title
-      = yield(:title).present? ? yield(:title) : @application.title
-    = stylesheet_link_tag    'tramway/landing/application', media: 'all'
-    = javascript_include_tag 'tramway/landing/application'
-    = javascript_include_tag 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', integrity: 'sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl', crossorigin: 'anonymous'
-    = 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?
-      = favicon_link_tag @application.favicon
-    - ::Tramway::Landing.head_content.each do |content|
-      - self.instance_exec &content
-  %body{ class: @application.name }
+    = render 'layouts/tramway/landing/head'
+  %body{ class: @application&.name }
+    - @tools.each do |tool|
+      - if tool.with_body_fragment?
+        = render "layouts/tramway/landing/tools/#{tool.title}_body", account_id: tool.account_id
     = 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/layouts/tramway/landing/tools/_google_tag_manager_body.html.haml

@@ -0,0 +1,4 @@
+/ Google Tag Manager (noscript)
+%noscript
+  %iframe{height: "0", src: "https://www.googletagmanager.com/ns.html?id=#{account_id}", style: "display:none;visibility:hidden", width: "0"}
+/ End Google Tag Manager (noscript)

data/app/views/layouts/tramway/landing/tools/_google_tag_manager_head.html.haml

@@ -0,0 +1,8 @@
+/ Google Tag Manager
+:javascript
+  (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+  })(window,document,'script','dataLayer','#{account_id}');
+/ End Google Tag Manager

data/config/locales/ru.models.yml

@@ -2,6 +2,7 @@ ru:
   activerecord:
     models:
       tramway/landing/block: Блок
+      tramway/landing/tool: Инструмент
     attributes:
       tramway/landing/block:
         name: Название
@@ -26,6 +27,9 @@ ru:
       tramway/landing/form:
         title: Название формы
         form_name: Класс формы
+      tramway/landing/tool:
+        title: Выберите сервис
+        account_id: ID в системе
   cases:
     tramway/landing/block:
       plural: Блоки
@@ -33,6 +37,9 @@ ru:
     tramway/landing/form:
       plural: Публичные формы
       genitive: публичную форму
+    tramway/landing/tool:
+      plural: Инструменты
+      genitive: инструмент
   enumerize:
     tramway/landing/block:
       block_type:
@@ -54,4 +61,4 @@ ru:
         not_exist: Отсутствует
   errors:
     messages:
-      extension_whitelist_error: неверный формата, расширение файла должно быть jpg, jpeg, gif или png.
+      extension_whitelist_error: неверный формата, расширение файла должно быть jpg, jpeg, gif или png.

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/generates/install_generator.rb

@@ -26,6 +26,7 @@ module Tramway::Landing::Generators
         add_values_to_tramway_landing_blocks
         add_page_id_to_tramway_landing_blocks
         create_tramway_landing_forms
+        create_tramway_landing_tools
       ]
 
       migrations.each do |migration|

data/lib/tramway/landing/generates/templates/create_tramway_landing_tools.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateTramwayLandingTools < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_landing_tools do |t|
+      t.text :title
+      t.text :account_id
+      t.jsonb :options
+      t.text :state, default: :active
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.1.11'
+    VERSION = '3.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.1.11
+  version: '3.3'
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -38,20 +38,25 @@ files:
 - app/decorators/tramway/landing/form_decorator.rb
 - app/decorators/tramway/landing/navbar/link_decorator.rb
 - app/decorators/tramway/landing/navbar_decorator.rb
+- app/decorators/tramway/landing/tool_decorator.rb
 - app/forms/admin/tramway/landing/block_form.rb
 - app/forms/admin/tramway/landing/form_form.rb
+- app/forms/admin/tramway/landing/tool_form.rb
 - app/helpers/tramway/landing/application_helper.rb
 - app/jobs/tramway/landing/application_job.rb
 - app/mailers/tramway/landing/application_mailer.rb
 - app/models/tramway/landing/application_record.rb
 - app/models/tramway/landing/block.rb
 - app/models/tramway/landing/form.rb
+- app/models/tramway/landing/tool.rb
 - app/uploaders/tramway/landing/photo_versions.rb
+- app/views/layouts/tramway/landing/_head.html.haml
 - app/views/layouts/tramway/landing/_meta.html.haml
 - app/views/layouts/tramway/landing/_navbar.html.haml
-- app/views/layouts/tramway/landing/_yandex_metrika.html.haml
 - app/views/layouts/tramway/landing/application.html.haml
 - app/views/layouts/tramway/landing/navbar/_link.html.haml
+- app/views/layouts/tramway/landing/tools/_google_tag_manager_body.html.haml
+- app/views/layouts/tramway/landing/tools/_google_tag_manager_head.html.haml
 - app/views/tramway/landing/blocks/block_types/_cards.html.haml
 - app/views/tramway/landing/blocks/block_types/_contacts.html.haml
 - app/views/tramway/landing/blocks/block_types/_features.html.haml
@@ -94,6 +99,7 @@ files:
 - lib/tramway/landing/generates/templates/add_view_name_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/create_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/create_tramway_landing_forms.rb
+- lib/tramway/landing/generates/templates/create_tramway_landing_tools.rb
 - lib/tramway/landing/version.rb
 homepage: https://github.com/kalashnikovisme/tramway-landing
 licenses:

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

@@ -1,30 +0,0 @@
-/ Yandex.Metrika counter
-:javascript
-  (function (d, w, c) {
-      (w[c] = w[c] || []).push(function() {
-          try {
-              w.yaCounter49054148 = new Ya.Metrika({
-                  id:49054148,
-                  clickmap:true,
-                  trackLinks:true,
-                  accurateTrackBounce:true,
-                  webvisor:true
-              });
-          } catch(e) { }
-      });
-
-      var n = d.getElementsByTagName("script")[0],
-          s = d.createElement("script"),
-          f = function () { n.parentNode.insertBefore(s, n); };
-      s.type = "text/javascript";
-      s.async = true;
-      s.src = "https://mc.yandex.ru/metrika/watch.js";
-
-      if (w.opera == "[object Opera]") {
-          d.addEventListener("DOMContentLoaded", f, false);
-      } else { f(); }
-  })(document, window, "yandex_metrika_callbacks");
-%noscript
-  %div
-    %img{alt: "", src: "https://mc.yandex.ru/watch/49054148", style: "position:absolute; left:-9999px;"}/
-/ /Yandex.Metrika counter