tramway-landing 2.2.3.1 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d17d94df671894a4eb82fc19e1f43d5d64125a47fbffefe57d6febc5cb9055
-  data.tar.gz: 4b57c9813612b38be1386e3e0f58495a9048b370fe064134aadcf4df127fbb34
+  metadata.gz: 5c53d44bd00c343f41a392098028bedd928f33a0a9305e50c50d426fa76ba9c3
+  data.tar.gz: 23ab8448186dc62de60f8a2a26762097f8741225bdcdb21cc95d2852288c6705
 SHA512:
-  metadata.gz: a5f14560969a6220ae9e5ea2ea7b02a7655be8aaca7e780a23c3a544242ecf1381e3d7c1dd70ae4cee9be7d13290f11d3328c8ef509d544a3423b469aa07dec1
-  data.tar.gz: 6ae76e329b9a439035486d3f728e4058707df7d10f1bb70f45dfd537940fd2753913ee8d96558d971c530fff9d1b8a73138a4414b512b88876661f3566e70022
+  metadata.gz: cc1a6376e6e9d4bc23d4fbed7810712088be120c9ea452cd56b804b3035110d40d1faefc68c9c1f66b61d3a5eaf71124987ad0afdaf2631be6be9837ea102e7e
+  data.tar.gz: 3ddfcf47ad89f8ee03f9625ecc72ffaaf9fc35a28c80ee7cc2159d2a5b8cb5648bef981c6eac26da773e60af99f917e1c183fbced3a22c0320c615dd9bcc7d57

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

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationForm
+  association :page
+
   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, :page
+    :link_object_type, :link_object_id, :button_title, :button_link, :view_name, :form_url
 
   def initialize(object = nil)
     super(object).tap do
-      form_properties title: :string,
+      form_properties page: :association,
+                      title: :string,
                       background: :file,
                       position: {
                         type: :numeric,
@@ -21,58 +24,7 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
                       button_title: :string,
                       button_link: :string,
                       view_name: :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
-                        }
-                      }
+                      form_url: :string
     end
   end
-
-  def button_title
-    model.button ||= {}
-    model.button['title'] || ''
-  end
-
-  def button_link
-    model.button ||= {}
-    model.button['link'] || ''
-  end
-
-  def button_title=(value)
-    model.button ||= {}
-    model.button[:title] = value
-    model.save
-  end
-
-  def button_link=(value)
-    model.button ||= {}
-    model.button[:link] = value
-    model.save
-  end
-
-  def form_url=(value)
-    model.values ||= {} 
-    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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
+  belongs_to :page, class_name: 'Tramway::Page::Page'
+
   enumerize :block_type, in: %i[header header_with_form footer page cards features contacts link page_with_button just_text view]
   enumerize :navbar_link, in: %i[exist not_exist], default: :not_exist
   enumerize :link_object_type, in: ['Tramway::SportSchool::Document', 'Tramway::Page::Page']
@@ -20,11 +22,12 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
     end
   end
 
-  store_accessor :values, :page
   store_accessor :values, :form_url
+  store_accessor :button, :button_link
+  store_accessor :button, :button_title
 
   scope :on_main_page, -> do
-    active.where(view_state: :published).where("(values -> 'page') IS NULL").order :position 
+    active.joins(:page).where(view_state: :published).where('tramway_page_pages.page_type = ?', :main).order :position 
   end
   scope :with_navbar_link, -> { where navbar_link: :exist }
   scope :header, -> { on_main_page.where(block_type: :header).first }
@@ -41,4 +44,11 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
   def footer?
     block_type.footer?
   end
+
+  def form_to_render
+    case self.form_url
+    when '/auth/sign_up'
+      "#{Tramway::Auth.authenticable_models.first}SignUpForm".constantize
+    end
+  end
 end

data/app/views/tramway/landing/blocks/block_types/_header_with_form.html.haml

@@ -4,14 +4,15 @@
       .row.wow.fadeIn
         .col-md-6.mb-4.white-text.text-center.text-md-left
           %h1.display-4.font-weight-bold
-            = @application.public_name
+            = @page&.title || @application.public_name
           %hr.hr-light
             %p
-              %strong
-                = @application.tagline
+              - unless @page.present?
+                %strong
+                  = @application.tagline
             %p.mb-4.d-none.d-md-block
               %strong
-                = @application.short_description
+                = @page&.body || @application.short_description
         .col-md-6.col-xl-5.mb-4
           - if params[:flash] == 'success'
             = render 'tramway/landing/templates/alert', alert_type: :success do

data/config/locales/en.forms.yml

@@ -4,4 +4,3 @@ 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/generates/install_generator.rb

@@ -24,6 +24,7 @@ module Tramway::Landing::Generators
         add_button_to_tramway_landing_blocks
         add_view_name_to_tramway_landing_blocks
         add_values_to_tramway_landing_blocks
+        add_page_id_to_tramway_landing_blocks
       ]
 
       migrations.each do |migration|

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPageIdToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :page_id, :integer
+  end
+end

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '2.2.3.1'
+    VERSION = '3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 2.2.3.1
+  version: '3.0'
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -84,6 +84,7 @@ files:
 - lib/tramway/landing/generates/templates/add_link_object_id_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_link_object_type_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_navbar_link_to_tramway_landing_blocks.rb
+- lib/tramway/landing/generates/templates/add_page_id_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_values_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/add_view_name_to_tramway_landing_blocks.rb
 - lib/tramway/landing/generates/templates/create_tramway_landing_blocks.rb