tramway-page 1.3.1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352c8fff69216736da625c664efdbd4d47b97065ed4590f2135f33119cb9e853
-  data.tar.gz: af446ae307ed4f30b545463d4f30c4f92cf0db0beeff90a66a00d5a9b8d520f7
+  metadata.gz: a1965d93d821932f6bfd8722be71212d2eecad82f8b7d10a23a35f92f214065c
+  data.tar.gz: 41a9bbe1bb5742dd464239e05a0141db8104844db9dfb912fff715846a73cca9
 SHA512:
-  metadata.gz: 2e2aa019706803074048129cd23ef01892881f08441f9deb6a0c16764a96ceffb5bad98dc0f70be641e567fcf6873471e4834e905a9fac36216e4f1ad5bac0b0
-  data.tar.gz: 559d06baab8cd6fc5e2d4fb63147afc3113cbb1e4105db8f6d603e506363064a4f8573a702f55fa191cf32fd71a294d75883cdb3a8557d38d1cbba3d9417ac6e
+  metadata.gz: 077a64fe57736ce4211b1d862f51efe5aa13be68c51780775f06ee029cdeab71bf8e9452626d4586e15aa8c2671e0764dfe5ba92cd4685e9fa3354dcf3929253
+  data.tar.gz: 84470d8efb6e415e9cc2baf9824206274405786edc36a974d9a1a73fd2f612880e8c7035739c83f65d61c196dde4c5f1e754bbd75854fbe12cb0bfab10250a8b

data/app/controllers/tramway/page/pages_controller.rb

@@ -5,5 +5,6 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
 
   def show
     @page = ::Tramway::Page::Page.find_by slug: params[:slug]
+    @blocks = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.active.where('values @> ?', { page: @page.id.to_s }.to_json)
   end
 end

data/app/decorators/tramway/page/page_decorator.rb

@@ -18,6 +18,6 @@ class Tramway::Page::PageDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def public_path
-    Tramway::Page::Engine.routes.url_helpers.page_path object.slug
+    Tramway::Page::Engine.routes.url_helpers.page_path slug: object.slug
   end
 end

data/app/forms/admin/tramway/page/page_form.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Page::PageForm < ::Tramway::Core::ApplicationForm
-  properties :title, :body, :slug, :view
+  properties :title, :body, :slug, :view, :page_type
 
   def initialize(object)
     super(object).tap do
       form_properties title: :string,
+                      page_type: {
+                        type: :default,
+                        input_options: {
+                          hint: "Body and View fields will be ignored in Landing page type. You will configurate it with Blocks"
+                        }
+                      },
                       body: :ckeditor,
                       slug: :string,
                       view: :string

data/app/models/tramway/page/page.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 class Tramway::Page::Page < ::Tramway::Core::ApplicationRecord
+  enumerize :page_type, in: [ :custom, :landing ], default: :custom
+
+  scope :landings, -> { where page_type: :landing }
 end

data/lib/tramway/page/generators/install_generator.rb

@@ -19,6 +19,7 @@ module Tramway::Page::Generators
       migrations = %i[
         create_tramway_page_pages
         add_view_to_tramway_page_pages
+        add_page_type_to_tramway_page_pages
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/page/generators/templates/add_page_type_to_tramway_page_pages.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPageTypeToTramwayPagePages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_page_pages, :page_type, :text
+  end
+end

data/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.3.1.2'
+    VERSION = '1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.3.1.2
+  version: '1.4'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies: []
 description: Description of Tramway::Page.
 email:
@@ -40,6 +40,7 @@ files:
 - lib/tramway/page.rb
 - lib/tramway/page/engine.rb
 - lib/tramway/page/generators/install_generator.rb
+- lib/tramway/page/generators/templates/add_page_type_to_tramway_page_pages.rb
 - lib/tramway/page/generators/templates/add_view_to_tramway_page_pages.rb
 - lib/tramway/page/generators/templates/create_tramway_page_pages.rb
 - lib/tramway/page/version.rb