tramway-page 1.5.3.3 → 1.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aacf87c1246d2c98fccd4fa5257a6075a3bead31bb0964d1114545a479d552b9
-  data.tar.gz: be153c7cd76b9b6d6e2a1bdd2507828a58ac8aba23d3dff308c7d9fd6a7b54e4
+  metadata.gz: 8235104f968f686a83092e13ffd8dbd2d1915a8b9c9c5c2ba593d80fdcca3e50
+  data.tar.gz: 16b8368fd4d8ac1d36030a19dccf060e5ca0236fd3d72458794b184cb1cb3e79
 SHA512:
-  metadata.gz: 82d3d7f97e3abb061b61e1b54c3f6fd786232688d0c0198ea63f409b177afcbf8d5155ce137098d0199d7deca7012f266fc9cabce7a111442689480691d29eb2
-  data.tar.gz: abf448f0ed1fbc260585813b9557dc4485d4e63f1afb3975b1c4d5e140a31478e96991118382bd676c5df6df17eb3b10f621273623dcc7ebff4b77e0d6dce9eb
+  metadata.gz: 0f0a1de0389159f3d8190ad6e09a2f4fda9da97ad78cbcc4625034fb0d5913baece01d30493e87d34e2aa69c52471a7b0d930f6fa9a946bfa24d873ec505842a
+  data.tar.gz: 71b1f13b592cea0bfbf20018cf8469febe2ff82a3dd8b6bd4105009791055356b36f56eb175b1eaf6882e2fc5eb37b9622249c61a29dfd3aa8c7179706f2637c

data/README.md

@@ -26,3 +26,22 @@ Contribution directions go here.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+
+## Русский
+
+#### 1. Выберите в админке "Страницы"
+![page-1.png](https://github.com/ulmic/tramway-dev/blob/develop/tramway-page/docs/page-1.png)
+
+#### 2. Нажмите на "+" для создания новой Страницы
+![page-2.png](https://github.com/ulmic/tramway-dev/blob/develop/tramway-page/docs/page-2.png)
+
+#### 3. Заполните форму для создания страницы как показано на скриншоте. Название, тип страницы, контент, идентификатор (slug) и представление можете заполнрить самостоятельно. Поля идентификатор (slug) и представление не являются обязательными для заполнения.
+![page-3.png](https://github.com/ulmic/tramway-dev/blob/develop/tramway-page/docs/page-3.png)
+
+#### 4. Проверьте все данные, которые внесли и нажмите "Показать на сайте"
+![page-4.png](https://github.com/ulmic/tramway-dev/blob/develop/tramway-page/docs/page-4.png)
+
+#### 5. Теперь перейдите на страницу, нажав на кнопу "Перейти".
+![page-5.png](https://github.com/ulmic/tramway-dev/blob/develop/tramway-page/docs/page-5.png)
+
+#### 6. Создана пустая страница. Смотрите здесь, [как добавить на страницу Блоки.](https://github.com/ulmic/tramway-dev/tree/develop/tramway-landing#%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9)

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

@@ -10,7 +10,7 @@ class ::Tramway::Page::PagesController < ::Tramway::Page::ApplicationController
         # FIXME: in future
         @header_with_form = block.form_to_render.new(Tramway::Auth.authenticable_models.first.new, page: @page.id)
       end
-      if block.block_type.in? [ :header, :header_with_form ]
+      if block.block_type.in? %i[header header_with_form]
         @links = Tramway::Landing::BlockLinkDecorator.decorate @page.with_navbar_link.active
       end
       ::Tramway::Landing::BlockDecorator.decorate block

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

@@ -9,9 +9,23 @@ class Tramway::Page::PageDecorator < ::Tramway::Core::ApplicationDecorator
     def show_associations
       [:blocks]
     end
+
     delegate :human_view_state_event_name, to: :model_class
   end
 
+  def additional_buttons
+    {
+      show: [
+        { 
+          url: Tramway::Page::Engine.routes.url_helpers.preview_path(id: object.id),
+          method: :get,
+          text: 'Preview',
+          color: :primary
+        }
+      ]
+    }
+  end
+
   delegate_attributes :title, :page_type, :body
 
   decorate_association :blocks, state_machines: [:view_state]

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

@@ -8,16 +8,16 @@ class Tramway::Page::Page < ::Tramway::Core::ApplicationRecord
   scope :landings, -> { where page_type: :landing }
   scope :published, -> { where view_state: :published }
 
-  state_machine :view_state, initial: :unpublished do
-    state :unpublished
+  aasm :view_state, column: :view_state do
+    state :unpublished, initial: true
     state :published
 
     event :publish do
-      transition unpublished: :published
+      transitions from: :unpublished, to: :published
     end
 
     event :hide do
-      transition published: :unpublished
+      transitions from: :published, to: :unpublished
     end
   end
 end

data/app/views/tramway/page/shared/_main_page_view.html.haml

@@ -1,4 +1,8 @@
 - if @page.view.present?
+  :css
+    nav.navbar {
+      display: none;
+    }
   = render "tramway/page/pages/views/#{@page.view}"
 - else
   - content_for :title do

data/config/initializers/tramway.rb

@@ -1,20 +1,3 @@
 # frozen_string_literal: true
 
 ::Tramway::Admin.set_available_models(::Tramway::Page::Page, project: :page)
-::Tramway::Admin.set_additional_buttons(
-  {
-    ::Tramway::Page::Page => {
-      show: [
-        lambda { |record|
-          {
-            url: Tramway::Page::Engine.routes.url_helpers.preview_path(id: record.id),
-            method: :get,
-            text: 'Preview',
-            color: :primary
-          }
-        }
-      ]
-    }
-  },
-  project: :subberz
-)

data/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.5.3.3'
+    VERSION = '1.5.4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.3.3
+  version: 1.5.4.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Description of Tramway::Page.
 email:
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Summary of Tramway::Page.