tramway-landing 3.1.0.3 → 3.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e057ffc355c0688fc9eed906e96e4479fd276ed229372c430afd4960ecabff4
-  data.tar.gz: e2135286163352dcbab10451068eb28de9b7cb044f429168780cf67d6c9c6d15
+  metadata.gz: cc9815cf619ada642aa9d5f68b7c322f74ae2541c18ff105c8b100b7a603b65b
+  data.tar.gz: 809f5a0d8f1bd62dbe6c7a092c4f988f32f875784a8ba85a08f08ad16b967bce
 SHA512:
-  metadata.gz: a93dec15630c0559c25c1ccc62e9eb28a76915d96fea7d017a9a03fcee6f7f87e12f8c74f2479cb0bb996674b7a545054a815f6014235e216d40b4a7e2e7f730
-  data.tar.gz: 36e3c179532960a8be63abd40cb524f782cd516343cd58d4a7298527441ee62b9b252e9251db7887708521679da33a3f9f86ff51f6078c3cca21de95c796e756
+  metadata.gz: 7acfeb6e279f8f11708287c50fbef4ec82a9f6e38217d88de00f47db94dccb083245c992f8bb42560c5f2c096da3d973c5878aadadbca0ec61d40e48cebb97ba
+  data.tar.gz: 853f6e6a4eaf19d77a9128d7185d2e502d41df33bb5558f21995e40bc0d8897434741feb8a3b6d9b6eb32f072b0711af8f39d986022251182390e4fdae70796c

data/README.md

@@ -1,3 +1,5 @@
+## English
+
 # Tramway::Landing
 It uses [Material Design Bootstrap](https://mdbootstrap.com/) by default
 
@@ -47,12 +49,45 @@ Tramway::Admin.set_available_models ::Tramway::Landing::Block, project: #{projec
 Tramway::Admin.navbar_structure ::Tramway::Landing::Block
 ```
 
-#### 4. Run server `rails s`
-#### 5. Open `localhost:3000/admin`
-#### 6. Click on `Blocks`, add new block with type `Header`
-#### 7. Click `Show` in the block menu
+#### 4. Add `PhotoVersions` to middleware (will be removed soon)
+
+*lib/middleware/tramway/landing_middleware.rb*
+```ruby
+module Tramway
+  class LandingMiddleware
+    def initialize(app)
+      @app = app
+    end
+    
+    def call(env)
+      PhotoUploader.include Tramway::Landing::PhotoVersions
+      
+      @app.call(env)
+    end
+  end
+end
+```
 
-#### 8. Then create your main page controller `rails g controller web/welcome`
+*confing/initializers/application.rb*
+```ruby
+...
+require_relative '../lib/middleware/tramway/landing_middleware'
+...
+
+module YourApplication
+  class Application < Rails::Application
+    config.middleware.use = ::Tramway::LandingMiddleware
+  end
+end
+```
+
+
+#### 5. Run server `rails s`
+#### 6. Open `localhost:3000/admin`
+#### 7. Click on `Blocks`, add new block with type `Header`
+#### 8. Click `Show` in the block menu
+
+#### 9. Then create your main page controller `rails g controller web/welcome`
 
 *app/controllers/web/welcome_controller.rb*
 ```ruby
@@ -73,7 +108,7 @@ class Web::WelcomeController < ApplicationController
 end
 ```
 
-#### 9. Add new controller to the routes
+#### 10. Add new controller to the routes
 
 *config/routes.rb*
 ```ruby
@@ -82,7 +117,7 @@ root to: 'web/welcome#index'
 # ...
 ```
 
-#### 10. Add view for the new landing
+#### 11. Add view for the new landing
 
 *app/views/web/welcome/index.html.haml*
 ```haml
@@ -202,3 +237,19 @@ Contribution directions go here.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## Русский
+
+Инструкцию по созданию блоков, Вы можете посмотреть здесь
+
+* [Начальный (Header)](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/header/main.md#%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9)
+* Начальный блок с формой (Header)
+* [Подвал (Footer)](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/footer/main.md#%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9)
+* [Свободный блок (картинка+текст)](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/block_with_text_and_image/main.md)
+* [Свободный блок с кнопкой (картинка + текст + кнопка)](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/block_with_text_image_and_button/main.md)
+* [Карточки (выводит опредеделенный набор карточек)-программируется](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/cards/main.md)
+* [Список возможностей-программируется](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/features/main.md)
+* [Блок с контактами](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/contacts/main.md#%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9)
+* Представление
+* [Просто текст](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/docs/just_text/main.md)
+* Ссылка на объект

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

@@ -9,23 +9,22 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
     def list_attributes
       %i[page_title position view_state block_type]
     end
-    
+
     def show_associations
-      [ :forms ]
+      [:forms]
     end
 
     delegate :human_view_state_event_name, to: :model_class
   end
 
   decorate_association :forms
+  decorate_association :page
 
   delegate_attributes :position, :title, :background, :anchor, :description, :view_name
 
   def public_path
     if object.published?
-      if object.page.slug.present?
-        Tramway::Page::Engine.routes.url_helpers.page_path slug: object.page.slug
-      end
+      Tramway::Page::Engine.routes.url_helpers.page_path slug: object.page.slug if object.page.slug.present?
     else
       Tramway::Page::Engine.routes.url_helpers.preview_path id: object.page.id
     end
@@ -57,9 +56,9 @@ class Tramway::Landing::BlockDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def button
-    if object.button.present? && object.button['title'].present? && object.button['link'].present?
-      content_tag :a, href: object.button['link'], target: '_blank', class: 'btn btn-primary' do
-        object.button['title']
+    if object.button.present? && object.button['button_title'].present? && object.button['button_link'].present?
+      content_tag :a, href: object.button['button_link'], target: '_blank', class: 'btn btn-primary' do
+        object.button['button_title']
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Landing::Navbar::LinkDecorator < Tramway::Core::ApplicationDecorator
   def title
     object[:title]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::Tramway::Landing::FormForm < Tramway::Core::ApplicationForm
   association :block
 
@@ -6,10 +8,10 @@ class Admin::Tramway::Landing::FormForm < Tramway::Core::ApplicationForm
   def initialize(object)
     super(object).tap do
       form_properties block: :association,
-        title: :string,
-        url: :string,
-        form_name: :default,
-        position: :integer
+                      title: :string,
+                      url: :string,
+                      form_name: :default,
+                      position: :integer
     end
   end
 end

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

@@ -7,10 +7,26 @@ module Tramway
       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 = forms.reject { |f| f.form_name == 'user_sign_up' } if @signed_in
+        forms = forms.reject { |f| f.form_name == 'user_sign_in' } if @signed_in
         forms
       end
+
+      def block_title(block)
+        if block.page.page_type.main?
+          content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+        else
+          block.page.title
+        end
+      end
+
+      def block_tagline(block)
+        if block.page.page_type.main?
+          content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
+        else
+          raw block.page.body
+        end
+      end
     end
   end
 end

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

@@ -8,7 +8,7 @@ class Tramway::Landing::Block < ::Tramway::Landing::ApplicationRecord
   enumerize :navbar_link, in: %i[exist not_exist], default: :not_exist
   enumerize :link_object_type, in: ['Tramway::SportSchool::Document', 'Tramway::Page::Page']
 
-  mount_uploader :background, PhotoUploader
+  uploader :background, :photo, extensions: %i[jpg jpeg gif png]
 
   state_machine :view_state, initial: :published do
     state :published

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Landing::Form < ApplicationRecord
   belongs_to :block, class_name: 'Tramway::Landing::Block'
 

data/app/uploaders/tramway/landing/photo_versions.rb

@@ -17,5 +17,3 @@ module Tramway::Landing::PhotoVersions
     end
   end
 end
-
-PhotoUploader.include Tramway::Landing::PhotoVersions

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

@@ -14,7 +14,7 @@
       = favicon_link_tag @application.favicon
     - ::Tramway::Landing.head_content.each do |content|
       - self.instance_exec &content
-  %body
+  %body{ class: @application.name }
     = 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/tramway/landing/blocks/block_types/_footer.html.haml

@@ -4,9 +4,9 @@
     .row
       .col-md-6
         %h5.title
-          = @application.title
+          = block_title(block)
         %p
-          = @application.tagline
+          = block_tagline(block)
         .logo_collage.effect-parent
           = yield :footer_logos
       .col-md-6

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

@@ -1,4 +1,4 @@
 = javascript_include_tag 'tramway/landing/smooth-scroll'
-= render 'tramway/landing/templates/full_page', block: OpenStruct.new(title: yield(:application_name).present? ? yield(:application_name) : @application.public_name, tagline: yield(:application_tagline).present? ? yield(:application_tagline) : @application.tagline, background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
+= render 'tramway/landing/templates/full_page', block: OpenStruct.new(title: block_title(block), tagline: block_tagline(block), background: block.background), buttons: @links&.select { |link| !link.is_a? Hash }
 %script
   var scroll = new SmoothScroll('a[href*="#"]');

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

@@ -2,7 +2,7 @@
   #intro.view.hm-black-strong{ style: "background-image: url('#{block.background.url}')" }
     .container-fluid.full-bg-img.d-flex.align-items-center.justify-content-center
       .row.d-flex.justify-content-center
-        .col-md-10.text-center
+        .col-md-12.text-center
           %h2.display-3.font-bold.white-text.mb-2
             = block.title
           %hr.hr-light

data/config/locales/ru.models.yml

@@ -18,7 +18,11 @@ ru:
         button_title: Наименование кнопки (только для Типа блока "Свободный блок с кнопкой")
         button_link: Ссылка кнопки (только для Типа блока "Свободный блок с кнопкой")
         view_name: Название вьюхи
-        button: Наименование кнопки 
+        button: Наименование кнопки
+        page: Страница 
+        form_url: Ссылка на форму (используется только для блока "Начальный блок с формой"
+        page_id: Страница
+        values: Значение
       tramway/landing/form:
         title: Название формы
         form_name: Класс формы
@@ -33,6 +37,7 @@ ru:
     tramway/landing/block:
       block_type:
         header: Начальный (Header)
+        header_with_form: Начальный блок с формой (Header)
         footer: Подвал (Footer)
         page: Свободный блок (картинка + текст)
         page_with_button: Свободный блок с кнопкой (картинка + текст + кнопка)
@@ -47,3 +52,6 @@ ru:
       navbar_link:
         exist: Присутствует
         not_exist: Отсутствует
+  errors:
+    messages:
+      extension_whitelist_error: неверный формата, расширение файла должно быть jpg, jpeg, gif или png.

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.0.3'
+    VERSION = '3.1.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.0.3
+  version: 3.1.1.1
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email: