tramway-landing 3.1.1 → 3.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc431043db81f89883889385e03491186d04c04594ffcb06348b8420930f965f
-  data.tar.gz: d19f26f8b33a81658a29d4756fba4dda1bba6e5c2f0d052f9bf6daaa724a4a93
+  metadata.gz: 8cdf40a2a324672c52c438e27d760d6a25a74bf5254b2904d357354bb52ee2bb
+  data.tar.gz: 1afc8e68a3b43c2f50d38a2bc25673e4d055762d6fae81d1f935b30e9fa3fdd3
 SHA512:
-  metadata.gz: 9eba566c78e86f716e68a986971889631674fad452d71f6d0d22a30a3b3de18ccae365b078f93dbd388d15bc8d1a92e18ef6473bfadfa558974b8bd7bee30a31
-  data.tar.gz: 49dcf95b2e98b519f742d6eb68dfc88a99ff5de7337586011bb48a7e51d03081a60e4dbcdca518701828c7c643f2281e24e7cf5521d5361eff6bd9221115fecd
+  metadata.gz: f174636195a5d28be61a438e67021db93e3cab990bf8fe356da21fe62cb83826fbfffc0deea3e02e1bd27780a180027c7e08adaff6842f8308a3807ca3cbc739
+  data.tar.gz: b76eecea6f7c4055c0238032cd0477474796bc1950207d3f3ad16268533258503f0f4b34536c859bad155abc728c7e83eddccdb2d628d2147a98afecd587b019

data/README.md

@@ -49,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)
 
-#### 8. Then create your main page controller `rails g controller web/welcome`
+*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
+```
+
+*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
@@ -75,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
@@ -84,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

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

@@ -13,18 +13,26 @@ module Tramway
       end
 
       def block_title(block)
-        if block.page.page_type.main?
-          content_for?(:application_name) && yield(:application_name).present? ? yield(:application_name) : @application.public_name
+        if block.is_a? Array
+          block.each do |current_block|
+            current_block.page.title
+          end
         else
-          block.page.title
+          if block.page.page_type.main?
+            content_for?(:application_name) && content_for(:application_name).present? ? content_for(:application_name) : @application.public_name
+          end
         end
       end
 
       def block_tagline(block)
-        if block.page.page_type.main?
-          content_for?(:application_tagline) && yield(:application_tagline).present? ? yield(:application_tagline) : @application.tagline
-        else
-          raw block.page.body
+        unless block.is_a? Array
+          if block.page.page_type.main?
+            content_for?(:application_tagline) && content_for(:application_tagline).present? ? content_for(:application_tagline) : @application.tagline
+          else
+            block.each do |_current_block|
+              raw block.page.body
+            end
+          end
         end
       end
     end

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/tramway/landing/blocks/block_types/_footer.html.haml

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

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

@@ -19,16 +19,16 @@
           .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!
+                = t('.sign_up_successful')
             - if params[:flash] == 'success_user_sign_in'
               = render 'tramway/landing/templates/alert', alert_type: :success do
-                Sign In successful!
+                = t('.sign_in_successful')
             - if params[:flash] == 'error_user_sign_up'
               = render 'tramway/landing/templates/alert', alert_type: :danger do
-                There is some errors
+                = t('.there_is_some_errors')
             - if params[:flash] == 'error_user_sign_in'
               = render 'tramway/landing/templates/alert', alert_type: :danger do
-                There is some errors
+                = t('.invalid_email_or_password')
             .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)

data/config/locales/templates.yml

@@ -0,0 +1,9 @@
+ru:
+  tramway:
+    landing:
+      templates:
+        alert:
+          sign_up_successful: Регистрация прошла успешно
+          ign_in_successful: Авторизация прошла успешно
+          there_is_some_errors: Исправьте ошибки
+          ivalid_email_or_password: email или пароль введены неверно

data/lib/tramway/landing/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Landing
-    VERSION = '3.1.1'
+    VERSION = '3.1.1.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-landing
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.1.5
 platform: ruby
 authors:
 - moshinaan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies: []
 description: Landing Engine for your Rails projects
 email:
@@ -77,6 +77,7 @@ files:
 - config/locales/ru.forms.yml
 - config/locales/ru.models.yml
 - config/locales/ru.state_machines.yml
+- config/locales/templates.yml
 - config/routes.rb
 - lib/tasks/tramway/landing_tasks.rake
 - lib/tramway/landing.rb