tramway-page 1.5.3.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c0a90c2649ccaf5926473179e912f386e20251a0ef8f9f3fab8fa61235b80a
-  data.tar.gz: bbdf97520c3d10ebe07a14f92f96d172cf9cee1977e1ad824bb2d1559968ff51
+  metadata.gz: aebc50c638d7d8369af0f9508672f61fb72111b2383824c06768030668529352
+  data.tar.gz: 4423eb7153bfa694537dd1f9dfddc34e5243b0274f0ab666228aa75e68fa8eb2
 SHA512:
-  metadata.gz: 6cba87a2205e172f23f9aa0c227cf0beeafe9790130c3697248048066f8b334ccc207d5a8aec8010013ee0b7fdb64bce8ab23544035302c34c9ad8bb68803593
-  data.tar.gz: b452c345e91605a2c81ff22e81331e257609c03ea142890c7d55f9ee9855cced8470c30696a9df4f82a2cc7394808ea41fa70e721a891b0fea068cc7a7206bff
+  metadata.gz: ad27d46d8779ad5fc1884214918bef7132158c54400fafe7f4bd76a0f449d6957f88e2d75fbeae518106bccd600dd1393ccb7d18e26be84a57899794e58a7f83
+  data.tar.gz: 13845a0085eefbd7846b34dd58d2daf37297d4f894687e279f7f1f30a10ad91401a64ddf58fa7a4c732e3d44dfebc7e86121af03709610b0d25e6dc2864b7aea

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/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/lib/tramway/page/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Page
-    VERSION = '1.5.3.2'
+    VERSION = '1.5.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-page
 version: !ruby/object:Gem::Version
-  version: 1.5.3.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2021-03-08 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.