tramway-landing 3.0.3 → 3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e0df59553b9d457afd186bf846f10967c9abff324976369a355961faccef17
-  data.tar.gz: 0074775a10cb3902acf138d28d687e06e24e8565da1e0669718d512f66181228
+  metadata.gz: eb1d9f3f7fd008ccc5b7bf6e10d92157d06a2d43bcfa06d4626eb50376eab1ff
+  data.tar.gz: bce155b9e752abf9ceb692d7cdd8aaf7f03ab62fa99b6ae061f07b7e7e2a076c
 SHA512:
-  metadata.gz: a6e39c5cf78b180deaa0b2f29dff34ad8df89f9ee38cf4cf7f4547291c6c4e09f369e1603de167dd37977a93ff5f5771c22890301407970148f684831258af54
-  data.tar.gz: 02feaf0f5f50d52418eeb29ec35e8e24d700a27c770c3ecd22971353a553f5beb37ffb704554a097c8e4819e909efdc02663b2b9ed856a7f8193bea8a5202ad0
+  metadata.gz: ab36c3b758559543c77678054d6284eabc6b9e6050e864203b12ab2851fe62e3a1d6651091f1210b096859123529b6cb79ccf12a7b790a8efb8a7ac211a314c5
+  data.tar.gz: 1e4c6c583436c421e8548f0e757a194bafe36f225203e8dc8394c4a312c64fc92e6cc6eeb148d370c8481485431ac658ccd1e81a9849805f08d631a7e7796edf

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

@@ -9,15 +9,23 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     def list_attributes
       %i[page_title position view_state block_type]
     end
+    
+    def show_associations
+      [ :forms ]
+    end
 
     delegate :human_view_state_event_name, to: :model_class
   end
 
+  decorate_association :forms
+
   delegate_attributes :position, :title, :background, :anchor, :description, :view_name
 
   def public_path
     if object.published?
-      Tramway::Page::Engine.routes.url_helpers.page_path slug: object.page.slug
+      if object.page.slug.present?
+        Tramway::Page::Engine.routes.url_helpers.page_path slug: object.page.slug
+      end
     else
       Tramway::Page::Engine.routes.url_helpers.preview_path id: object.page.id
     end
@@ -39,10 +47,6 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     "##{object.anchor}"
   end
 
-  def form_url
-    object.values['form_url']
-  end
-
   def view_state_button_color(event)
     case event
     when :publish

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Tramway::Landing::FormDecorator < ::Tramway::Core::ApplicationDecorator
+  delegate_attributes :title, :form_name, :url
+end

data/app/decorators/tramway/landing/navbar/link_decorator.rb

@@ -0,0 +1,9 @@
+class Tramway::Landing::Navbar::LinkDecorator < Tramway::Core::ApplicationDecorator
+  def title
+    object[:title]
+  end
+
+  def link
+    object[:link]
+  end
+end

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

@@ -4,7 +4,7 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
   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
+    :link_object_type, :link_object_id, :button_title, :button_link, :view_name
 
   def initialize(object = nil)
     super(object).tap do
@@ -23,8 +23,7 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
                       description: :ckeditor,
                       button_title: :string,
                       button_link: :string,
-                      view_name: :string,
-                      form_url: :string
+                      view_name: :string
     end
   end
 end

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

@@ -0,0 +1,15 @@
+class Admin::Tramway::Landing::FormForm < Tramway::Core::ApplicationForm
+  association :block
+
+  properties :title, :url, :form_name, :position
+
+  def initialize(object)
+    super(object).tap do
+      form_properties block: :association,
+        title: :string,
+        url: :string,
+        form_name: :default,
+        position: :integer
+    end
+  end
+end

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

@@ -5,6 +5,12 @@ module Tramway
     module ApplicationHelper
       include Tramway::Admin::RussianCasesHelper
       include Tramway::Profiles::LinksHelper if defined?(::Tramway::Profiles)
+
+      def actual_forms(forms)
+        forms = forms.select { |f| f.form_name != 'user_sign_up' } if @signed_in
+        forms = forms.select { |f| f.form_name != 'user_sign_in' } if @signed_in
+        forms
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@
 
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
   belongs_to :page, class_name: 'Tramway::Page::Page'
+  has_many :forms, -> { order(position: :asc) }, class_name: 'Tramway::Landing::Form'
 
   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
@@ -22,7 +23,6 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
     end
   end
 
-  store_accessor :values, :form_url
   store_accessor :button, :button_link
   store_accessor :button, :button_title
 

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

@@ -0,0 +1,5 @@
+class Tramway::Landing::Form < ApplicationRecord
+  belongs_to :block, class_name: 'Tramway::Landing::Block'
+
+  enumerize :form_name, in: (Dir[Rails.root.join('app', 'forms', 'public', '**')].map { |f| f.split('/').last.gsub('_form.rb', '') })
+end

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

@@ -4,15 +4,13 @@
     - if @links&.any?
       = fa_icon :bars
   .collapse.navbar-collapse#navbarSupportedContent
-    - if @links&.any?
+    - left_links = @links.is_a?(Hash) ? @links[:left] : @links
+    - if left_links&.any?
       %ul.navbar-nav.mr-auto
-        - @links.each do |link|
-          - if link.is_a? Hash
-            .nav-item.dropdown
-              %a.nav-link.dropdown-toggle{ id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
-                = t(".#{link.keys.first}")
-              .dropdown-menu.dropdown-primary{ 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'
-          - else
-            = menu_item link.title, link.link
+        - 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/navbar/_link.html.haml

@@ -0,0 +1,9 @@
+- if link.is_a? Hash
+  .nav-item.dropdown
+    %a.nav-link.dropdown-toggle{ id: "dropdown_menu_button_#{link.keys.first}", aria: { expanded: :false, haspopup: :true }, data: { toggle: :dropdown } }
+      = link.keys.first
+    .dropdown-menu.dropdown-primary{ 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'
+- else
+  = menu_item link.title, link.link

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

@@ -14,23 +14,52 @@
             %p.mb-4.d-none.d-md-block
               %strong
                 = @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
-              Sign up successful!
-          - if params[:flash] == 'error'
-            = render 'tramway/landing/templates/alert', alert_type: :danger do
-              There is some errors
-          .card
-            .card-body
-              - raise 'Initialize @header_with_form in a controller with something like that `@header_with_form = UserSignUpForm.new User.new`. `User` is your model which you want to Sign Up' unless defined?(@header_with_form)
-              = simple_form_for @header_with_form, url: block.form_url, method: :post, input_html: { class: 'form-vertical' } do |f|
+        - forms = actual_forms(block.forms)
+        - if forms.any?
+          .col-md-6.col-xl-5.mb-4
+            - if params[:flash] == 'success_user_sign_up'
+              = render 'tramway/landing/templates/alert', alert_type: :success do
+                Sign up successful!
+            - if params[:flash] == 'success_user_sign_in'
+              = render 'tramway/landing/templates/alert', alert_type: :success do
+                Sign In successful!
+            - if params[:flash] == 'error_user_sign_up'
+              = render 'tramway/landing/templates/alert', alert_type: :danger do
+                There is some errors
+            - if params[:flash] == 'error_user_sign_in'
+              = render 'tramway/landing/templates/alert', alert_type: :danger do
+                There is some errors
+            .card
+              .card-body
+                - raise 'Initialize @header_with_form in a controller with something like that `@header_with_form = UserSignUpForm.new User.new`. `User` is your model which you want to Sign Up' unless defined?(@header_with_form)
                 %h3.dark-grey-text.text-center
-                  %strong
-                    = block.title
+                  - forms.each_with_index do |form, index|
+                    - unless index == 0
+                      |
+                    = link_to '#', class: :form_activation_link, id: form.id do
+                      %strong
+                        = form.title
                 %hr
-                = hidden_field_tag :model, 'User'
-                = hidden_field_tag :redirect, request.path
-                - @header_with_form.properties.each do |property|
-                  = render 'tramway/core/shared/input', property: property[0], object: :record, type: property[1], form: f, destination: :landing, record: @header_with_form, value: (params[:record].present? ? params[:record][property[0]] : '')
-                = f.button :submit, @header_with_form.submit_message
+                - forms.each do |form|
+                  - current_form = @header_with_form[form.form_name]
+                  = simple_form_for current_form, url: form.url, method: :post, input_html: { class: "form-vertical form_#{form.id} header_with_form" }, html: { class: "form_#{form.id} header_with_form" } do |f|
+                    = hidden_field_tag :model, @header_with_form[form.form_name].model.class.to_s
+                    = hidden_field_tag :success_redirect, request.path
+                    = hidden_field_tag :error_redirect, request.path
+                    - current_form.properties.each do |property|
+                      = render 'tramway/core/shared/input', property: property[0], object: :user, type: property[1], form: f, destination: :landing, record: current_form, value: (params[:record].present? ? params[:record][property[0]] : '')
+                    = f.button :submit, current_form.submit_message
+:javascript
+  $(document).ready(function() {
+    $("form.header_with_form").each(function(index) {
+      if (index != 0) {
+        $(this).hide();
+      }
+    });
+    $('a.form_activation_link').click(function() {
+      $("form.header_with_form").each(function() {
+        $(this).hide();
+      });
+      $(`form.form_${$(this).first()[0].id}`).show();
+    });
+  });

data/config/locales/ru.models.yml

@@ -19,10 +19,16 @@ ru:
         button_link: Ссылка кнопки (только для Типа блока "Свободный блок с кнопкой")
         view_name: Название вьюхи
         button: Наименование кнопки 
+      tramway/landing/form:
+        title: Название формы
+        form_name: Класс формы
   cases:
     tramway/landing/block:
       plural: Блоки
       genitive: блок
+    tramway/landing/form:
+      plural: Публичные формы
+      genitive: публичную форму
   enumerize:
     tramway/landing/block:
       block_type:

data/lib/tramway/landing/generates/install_generator.rb

@@ -25,6 +25,8 @@ module Tramway::Landing::Generators
         add_view_name_to_tramway_landing_blocks
         add_values_to_tramway_landing_blocks
         add_page_id_to_tramway_landing_blocks
+        create_tramway_landing_forms
+        create_tramway_landing_blocks_forms
       ]
 
       migrations.each do |migration|

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateTramwayLandingBlocksForms < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_landing_blocks_forms do |t|
+      t.integer :block_id
+      t.integer :form_id
+      t.text :state
+
+      t.timestamps
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateTramwayLandingForms < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_landing_forms do |t|
+      t.text :title
+      t.text :form_name
+      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.0.3'
+    VERSION = '3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: '3.1'
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -35,19 +35,23 @@ files:
 - app/decorators/tramway/landing/block_types/cards_decorator.rb
 - app/decorators/tramway/landing/block_types/features_decorator.rb
 - app/decorators/tramway/landing/block_types/page_with_button_decorator.rb
-- app/decorators/tramway/landing/link_decorator.rb
+- app/decorators/tramway/landing/form_decorator.rb
+- app/decorators/tramway/landing/navbar/link_decorator.rb
 - app/decorators/tramway/landing/navbar_decorator.rb
 - app/forms/admin/tramway/landing/block_form.rb
+- app/forms/admin/tramway/landing/form_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/uploaders/tramway/landing/photo_versions.rb
 - 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/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
@@ -88,6 +92,8 @@ files:
 - 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
+- lib/tramway/landing/generates/templates/create_tramway_landing_blocks_forms.rb
+- lib/tramway/landing/generates/templates/create_tramway_landing_forms.rb
 - lib/tramway/landing/version.rb
 homepage: https://github.com/kalashnikovisme/tramway-landing
 licenses:

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

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class Tramway::Landing::LinkDecorator < ::Tramway::Core::ApplicationDecorator
-  def title; end
-
-  def link; end
-end