RubyGems - tramway-landing - Versions diffs - 3.2.0.3 → 3.3 - Mend

tramway-landing 3.2.0.3 → 3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9049dba4967149cb1ee00c67192845a31730ca9421a416f5d3244bbc148cdace
-  data.tar.gz: 9791a682642002981bf6d07ba7156ec323df728a65ee209318179a90de8ce48f
+  metadata.gz: a7c9610e7ca9a06693e66b7d02d8085dcf88c2ec1e4d3f0e2822d80406165e17
+  data.tar.gz: fd346a2b77c95906b9cee5a40df1d053806cfc94c6eff6d344aec1646c9e25fd
 SHA512:
-  metadata.gz: cf3e443a1a10e4d29f9fce38308e254aa10d83e9397f68e0a4aec9e317f13bc75c59c011355e343129694536a1794658cc71532d66e8b6f43ea5b6ec0709496c
-  data.tar.gz: 924a4a230033865f9c0a52994c1639ce33c0e684f23506e4aba8f96171c616ad91138c0594c485ce2c6ab6068724f5395e2964c278c02b2f6968d80e24bf507c
+  metadata.gz: bbbdb675f71c7b04d040e9e7dc78a707247916d0076b646bdacdb12c948e19b9f5f69a303a53032c4c79b5bde2de0b586e48acf23bdcae9018afc174fd41d827
+  data.tar.gz: e7ee9cfed8732ebbd60ea3df48a612d3e9405ebedfcc794a09697651d9dd7750cfcd61153befc78432e23b81cc707d1fc4e598084e8a6801656f770a30f3749b

data/app/decorators/tramway/landing/tool_decorator.rb ADDED Viewed

@@ -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 ADDED Viewed

@@ -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/tool.rb ADDED Viewed

@@ -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 ADDED Viewed

@@ -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/application.html.haml CHANGED Viewed

@@ -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
+    = 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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

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

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.2.0.3
+  version: '3.3'
 platform: ruby
 authors:
 - moshinaan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 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 DELETED Viewed

@@ -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