tramway-landing 2.1.0.2 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f3daf91591008a05a391601f2f18fa07e86c758c8cafb84d1699ccd3877c43
-  data.tar.gz: 149d13483c04b34a79ceb5243f17c7ba77de3acd6c552a8ccae058aa259d9c06
+  metadata.gz: 927598e0e4c4c014682f59b806a22588d1f45b446a3775f3dc35f18e3bb53448
+  data.tar.gz: 716e8d4401ef1f828d440ea9cc86efc026dd71b873289015aa12e6e505f25735
 SHA512:
-  metadata.gz: 9f9473a730b0da9169057cbf0347b1588c2caad913816095fbc8d603915cc4ea2190b717cd2797649401b65d5d8fd98d83b3e60a349d965cde954f4cb5e22873
-  data.tar.gz: 0e8d5aa9cb2ca9a3397a7888bc27f4766e5215fc5be2c67132a5310a616841b5b6c6947744914a030fe7ade7c002eb680a8b3eb03e1c9270e5347fb242a1471f
+  metadata.gz: e07c453830803a47b2708ba7df65c6b5d8bc2764a0ed144182cf7924753cecaf32300e6f0131c967db72ff2fe01998f597939ca60091e9dfff9f043ecbd95ac1
+  data.tar.gz: 29acc785378bfdab88365599c4af475440fbb286347cd5ae3fcf31d43ee8a51d25eac2b05bbb6c6334eaf05968d0a3fc3b70d0a12ecaa539099579dbe12f37ae

data/app/assets/stylesheets/tramway/landing/block_types/header_with_form.css.scss

@@ -0,0 +1,40 @@
+html, body, header, .view {
+  height: 100%;
+}
+
+@media (max-width: 740px) {
+  html, body, header, .view {
+    height: 1000px;
+  }
+}
+
+@media (min-width: 800px) and (max-width: 850px) {
+  html, body, header, .view {
+    height: 650px;
+  }
+}
+@media (min-width: 800px) and (max-width: 850px) {
+  .navbar:not(.top-nav-collapse) {
+     background: #1C2331!important;
+  }
+}
+/* Navbar animation */
+.navbar {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.top-nav-collapse {
+  background-color: #1C2331;
+}
+
+/* Adding color to the Navbar on mobile */
+@media only screen and (max-width: 768px) {
+  .navbar {
+    background-color: #1C2331;
+  }
+}
+
+/* Footer color for sake of consistency with Navbar */
+.page-footer {
+  background-color: #1C2331;
+}

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

@@ -27,6 +27,10 @@ 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/forms/admin/tramway/landing/block_form.rb

@@ -2,7 +2,7 @@
 
 class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationForm
   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
+    :link_object_type, :link_object_id, :button_title, :button_link, :view_name, :form_url
 
   def initialize(object = nil)
     super(object).tap do
@@ -20,7 +20,8 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
                       description: :ckeditor,
                       button_title: :string,
                       button_link: :string,
-                      view_name: :string
+                      view_name: :string,
+                      form_url: :string
     end
   end
 
@@ -45,4 +46,10 @@ class Admin::Tramway::Landing::BlockForm < ::Tramway::Core::ExtendedApplicationF
     model.button[:link] = value
     model.save
   end
+
+  def form_url=(value)
+    model.values ||= {} 
+    model.values.merge! form_url: value
+    model.save
+  end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
-  enumerize :block_type, in: %i[header footer page cards features contacts link page_with_button just_text view]
+  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']
 
@@ -28,4 +28,12 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
   def link_object
     link_object_type.constantize.find link_object_id
   end
+
+  def header?
+    block_type.in? [ 'header', 'header_with_form']
+  end
+
+  def footer?
+    block_type.footer?
+  end
 end

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

@@ -0,0 +1,17 @@
+%nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
+  = link_to yield(:application_name), '#', class: 'navbar-brand'
+  %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
+    = fa_icon :bars
+  .collapse.navbar-collapse#navbarSupportedContent
+    - if @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

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

@@ -16,21 +16,24 @@
     = 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'
+    = render 'layouts/tramway/landing/navbar'
     - if @blocks&.any?
-      - headers = @blocks.select { |block| block.model.block_type&.header? }
-      - footers = @blocks.select { |block| block.model.block_type&.footer? }
+      - headers = @blocks.select { |block| block.model.header? }
+      - footers = @blocks.select { |block| block.model.footer? }
       - other_blocks = @blocks - headers - footers
-      - if headers.first.present?
-        = render "tramway/landing/blocks/block_types/header", block: headers.first
-
+      - header_block = headers.first
+      - if header_block.present?
+        = render "tramway/landing/blocks/block_types/#{header_block.model.block_type.underscore}", block: header_block
       %main.mt-5
-        .container
-          - other_blocks.each_with_index do |block, index|
-            = render "tramway/landing/blocks/block_types/#{block.model.block_type}", block: block
-            - if index < other_blocks.count - 1 
-              %hr
-        .container-fluid
-          = yield
+        - if other_blocks.any?
+          .container
+            - other_blocks.each_with_index do |block, index|
+              = render "tramway/landing/blocks/block_types/#{block.model.block_type}", block: block
+              - if index < other_blocks.count - 1 
+                %hr
+        - if block_given?
+          .container-fluid
+            = yield
 
       - footers = @blocks.select { |block| block.model.block_type&.footer? }
       - if footers.first.present?

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

@@ -1,22 +1,4 @@
 = javascript_include_tag 'tramway/landing/smooth-scroll'
-- content_for(:navbar) do
-  %nav.navbar.navbar-expand-lg.navbar-dark.indigo.scrolling-navbar.fixed-top
-    = link_to yield(:application_name), '#', class: 'navbar-brand'
-    %button.navbar-toggler{ type: :button, data: { toggle: :collapse, target: '#navbarSupportedContent' }, aria: { controls: 'navbarSupportedContent', expanded: 'false', label: 'Toggle navigation' } }
-      = fa_icon :bars
-    .collapse.navbar-collapse#navbarSupportedContent
-      - if @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
 = render 'tramway/landing/blocks/templates/full_page', block: OpenStruct.new(title: yield(:application_name), tagline: yield(:application_tagline), background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
 %script
   var scroll = new SmoothScroll('a[href*="#"]');

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

@@ -0,0 +1,33 @@
+.view.full-page-intro{ style: "background-image: url('#{block.background.url}'); background-repeat: no-repeat; background-size: cover;" }
+  .mask.rgba-black-light.d-flex.justify-content-center.align-items-center
+    .container
+      .row.wow.fadeIn
+        .col-md-6.mb-4.white-text.text-center.text-md-left
+          %h1.display-4.font-weight-bold
+            = @application.public_name
+          %hr.hr-light
+            %p
+              %strong
+                = @application.tagline
+            %p.mb-4.d-none.d-md-block
+              %strong
+                = @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
+              = simple_form_for @header_with_form, url: block.form_url, method: :post, input_html: { class: 'form-vertical' } do |f|
+                %h3.dark-grey-text.text-center
+                  %strong
+                    = block.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

data/app/views/tramway/landing/templates/_alert.html.haml

@@ -0,0 +1,14 @@
+.alert{ role: :alert, class: "alert-#{alert_type}" }
+  - if defined? title
+    %h4.alert-heading 
+      = title
+    - if defined? short_description
+      %p
+        = short_description
+    %hr/
+    %p.mb-0
+      = yield
+      = render 'tramway/landing/templates/alerts/close_button'
+  - else
+    = yield
+    = render 'tramway/landing/templates/alerts/close_button'

data/app/views/tramway/landing/templates/alerts/_close_button.html.haml

@@ -0,0 +1,2 @@
+%button.close{ aria: { label: 'Close' }, data: { dismiss: :alert }, type: :button }
+  %span{ aria: { hidden:  :true } } ×

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

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddValuesToTramwayLandingBlocks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_landing_blocks, :values, :jsonb
+  end
+end

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '2.1.0.2'
+    VERSION = '2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 2.1.0.2
+  version: '2.2'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -26,6 +26,7 @@ files:
 - app/assets/javascripts/tramway/landing/footer.js
 - app/assets/javascripts/tramway/landing/smooth-scroll.js
 - app/assets/stylesheets/tramway/landing/application.sass
+- app/assets/stylesheets/tramway/landing/block_types/header_with_form.css.scss
 - app/assets/stylesheets/tramway/landing/collage.css.sass
 - app/assets/stylesheets/tramway/landing/justified.css
 - app/controllers/tramway/landing/application_controller.rb
@@ -44,6 +45,7 @@ files:
 - app/models/tramway/landing/block.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/tramway/landing/blocks/block_types/_cards.html.haml
@@ -51,6 +53,7 @@ files:
 - app/views/tramway/landing/blocks/block_types/_features.html.haml
 - app/views/tramway/landing/blocks/block_types/_footer.html.haml
 - app/views/tramway/landing/blocks/block_types/_header.html.haml
+- app/views/tramway/landing/blocks/block_types/_header_with_form.html.haml
 - app/views/tramway/landing/blocks/block_types/_just_text.html.haml
 - app/views/tramway/landing/blocks/block_types/_link.html.haml
 - app/views/tramway/landing/blocks/block_types/_page.html.haml
@@ -58,10 +61,12 @@ files:
 - app/views/tramway/landing/blocks/block_types/_view.html.haml
 - app/views/tramway/landing/blocks/block_types/contacts/_with_map.html.haml
 - app/views/tramway/landing/blocks/block_types/contacts/_without_map.html.haml
-- app/views/tramway/landing/blocks/templates/_features_list.html.haml
-- app/views/tramway/landing/blocks/templates/_full_page.html.haml
-- app/views/tramway/landing/blocks/templates/_section_with_image_and_text.html.haml
-- app/views/tramway/landing/blocks/templates/_text.html.haml
+- app/views/tramway/landing/templates/_alert.html.haml
+- app/views/tramway/landing/templates/_features_list.html.haml
+- app/views/tramway/landing/templates/_full_page.html.haml
+- app/views/tramway/landing/templates/_section_with_image_and_text.html.haml
+- app/views/tramway/landing/templates/_text.html.haml
+- app/views/tramway/landing/templates/alerts/_close_button.html.haml
 - config/initializers/assets.rb
 - config/initializers/tramway.rb
 - config/locales/en.forms.yml
@@ -79,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_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/version.rb