tramway-landing 3.2 → 3.3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1173a00383661feff98ffb68918d16347cf47f9a64295d0aa10825abb2a51dc2
-  data.tar.gz: bd45201e8a212c7abbeeebf2ae9d7f83f90715cb2f531ce4d5b4f282af0019de
+  metadata.gz: 21e172d1a3cf9dd66b4b5a57c888757897350582b258f7afaee10f8e0e189ff8
+  data.tar.gz: b9ba5725b3838b201056acfb065988f91d74ca28f49ac919f77e45245a042fce
 SHA512:
-  metadata.gz: 1af9464dc5d86e6ba1dd6ac45d7de7aa35b6f6d925d5fc69472bae4888d99bc51d38ac2a1cee575c001389011cbb08d896171159f1190e4195c44f5193be565c
-  data.tar.gz: 0af0304af1452fd235cd0b020cb11f034e9f91d0c1f9c948b02eb9db42bd3b4ef866dd8109da102b179c1a5875d0e46bc833dd47103c1dc38f57639b02d58ae1
+  metadata.gz: 2bffa41e45f1cc453e703182ad19c309662c69258debc181471704f6c0cb47733afee1317068a6e0f08adb8dc275cbca14e6f27bb2590792a201cd06cd1af8bc
+  data.tar.gz: 29276bb24509250f6f8d29eb2eed4ef68fdf77a7cfe4dc173f9a6ee3c95bee66a57382434b7d10648c3d7371f04e4e4b0b2ce6aad650938259f0298bcec8df26

data/README.md

@@ -232,6 +232,52 @@ How create blocks you can find here
 * [Just text](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/just_text/main.md)
 * Link to object
 
+## Tools
+
+### Google Tag Manager, Google Analytics, Yandex Metrika
+
+#### 1. Add landing tools to the initializer
+
+*config/initializers/tramway.rb*
+```ruby
+Tramway::Admin.set_available_models(
+  ::Tramway::Landing::Block,
+  ::Tramway::Landing::Tool,
+  project: #{project_name_which_you_use_in_the_application}
+)
+
+Tramway::Admin.navbar_structure(
+  ::Tramway::Landing::Block,
+  ::Tramway::Landing::Tool
+)
+```
+
+#### 2. Click on `Tools`, create new tool with type `[Google Tag Manager, Google Analytics, Yandex Metrika]` and add account_id for your profile in this tool.
+
+#### 3. Add to `WelcomeController` query to get `@tools`
+
+*app/controllers/web/welcome_controller.rb*
+```ruby
+class Web::WelcomeController < ApplicationController
+  before_action :application
+  
+  layout 'tramway/landing/application'
+
+  def index
+    @blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.on_main_page
+    @tools = ::Tramway::Landing::Tool.active
+  end
+  
+  private
+  
+  def application
+    @application = ::Tramway::Core.application_object
+  end
+end
+```
+
+And now all we need to integrate tool to your web page will be integrated automatically. **Enjoy!**
+
 ## Contributing
 Contribution directions go here.
 

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,6 +1,6 @@
-- if Tramway::Landing.navbar_for(@application_engine || @application.name)
+- 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'
+    = 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

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/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/config/locales/ru.state_machines.yml

@@ -3,13 +3,12 @@ ru:
     tramway/landing/block:
       published: Опубликованные
       hidden: Скрытые
-  activerecord:
-    state_machines:
-      tramway/landing/block:
-        view_state:
-          states:
-            published: Виден
-            hidden: Скрытый
-          events:
-            publish: Показать на сайте
-            hide: Скрыть с сайта
+  state_machines:
+    tramway/landing/block:
+      view_state:
+        states:
+          published: Виден
+          hidden: Скрытый
+        events:
+          publish: Показать на сайте
+          hide: Скрыть с сайта

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.2'
+    VERSION = '3.3.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: 3.3.0.2
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-03-22 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:
@@ -114,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Landing Engine for your Rails projects

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