tramway-event 1.0.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e06fdaa43cfd4ef68dcdb5369e6212412a5fbc68fc95d035f68325eb6cf468ee
-  data.tar.gz: 24c0b650e98e7e3eef37ab86a680c58c27c77f8ba2518a89901d80fb7e6f6758
+  metadata.gz: 384dc18b6aaa234c4d0c80914b1d0226c4d93802afbbab326527ae2bfd3e3131
+  data.tar.gz: 273138747eab3764f22d6430fd3913ca64da20d49ba35d6cf979a466230da084
 SHA512:
-  metadata.gz: af8d9d1da075c48caae42599b8bc260f93d87eabe2a7dea505bbba1bec68545973b3412e674cb4f2c99fa2ab88fe11376a0d060f9ab10821f35f32c91bc0f82a
-  data.tar.gz: cf0e98feebee348ece819498dac34d69fec774459902fe7735e70f60d1ccc6c27bce66a2012b63a0737324e9355ffaa39efa3502036a3c9124e58e910ce29922
+  metadata.gz: 37d17fcadf7e8cfc40fc85927ba681b3d5e9bdbe4baec13c274124371582693f8a73ec3b186204556b3d0e434a40950489d8e4d5365558609eb4441aab75cf80
+  data.tar.gz: 60fb871a9ec3a297ad310957d68416951868ff7c5b43c28b2031091c2d4893d31f0034687bbb128c4710a41f5328e3b90b9ee412aff6789298c4995dff43d08d

data/app/assets/stylesheets/tramway/event/events/show.css.sass

@@ -1,4 +1,5 @@
 @import 'bootstrap'
+@import 'tramway/core/application'
 
 body
   margin: 0

data/app/controllers/tramway/event/events_controller.rb

@@ -6,5 +6,6 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     class_name = "ParticipantExtendedForm#{request.uuid.gsub('-', '')}"
     form_class = ::Tramway::Core::ExtendableForm.new(class_name, *@event.participant_form_fields.inputs_list.map(&:title).map(&:to_sym))
     @participant_form = form_class.new ::Tramway::Event::Participant.new
+    @sections = @event.sections.map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
   end
 end

data/app/decorators/tramway/event/event_decorator.rb

@@ -7,6 +7,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   delegate :title, to: :object
   delegate :participant_form_fields, to: :object
+  delegate :sections, to: :object
 
   def background
     object.photo

data/app/decorators/tramway/event/section_decorator.rb

@@ -0,0 +1,7 @@
+class Tramway::Event::SectionDecorator < ::Tramway::Core::ApplicationDecorator
+  class << self
+    def collections
+      [ :all ]
+    end
+  end
+end

data/app/decorators/tramway/event/section_feature_decorator.rb

@@ -0,0 +1,10 @@
+class ::Tramway::Event::SectionFeatureDecorator < ::Tramway::Core::ApplicationDecorator
+  delegate :icon, to: :object
+  delegate :title, to: :object
+  delegate :description, to: :object
+  alias text description
+
+  def image
+    object.photo.small.url
+  end
+end

data/app/forms/tramway/event/participant_form_field_form.rb

@@ -1,5 +1,6 @@
 class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :field_type, :event, :options, :position
+  properties :title, :description, :field_type, :options, :position
+  association :event
 
   def initialize(object)
     form_object = super object
@@ -12,15 +13,11 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationFor
     form_object
   end
 
-  def event=(value)
-    super ::Tramway::Event::Event.find value
-  end
-
   def options
-    model.options.to_json
+    model.options&.to_json
   end
 
   def options=(value)
-    super JSON.parse value
+    super value == '' ? value : JSON.parse(value)
   end
 end

data/app/forms/tramway/event/section_form.rb

@@ -0,0 +1,14 @@
+class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
+  properties :event, :title, :description, :photo, :icon
+  association :event
+
+  def initialize(object)
+    super(object).tap do
+      form_properties title: :string,
+                      description: :ckeditor,
+                      event: :association,
+                      photo: :file,
+                      icon: :string
+    end       
+  end
+end

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

@@ -3,6 +3,8 @@ require "tramway/collection"
 module Tramway
   module Event
     module ApplicationHelper
+      include ::FontAwesome::Rails::IconHelper
+
       def collection_list_by(name:)
         require name # needed to load class name with collection
         unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)

data/app/models/tramway/event/event.rb

@@ -3,4 +3,5 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   has_many :participants, class_name: 'Tramway::Event::Participant'
   has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
+  has_many :sections, class_name: 'Tramway::Event::Section'
 end

data/app/models/tramway/event/section.rb

@@ -0,0 +1,5 @@
+class Tramway::Event::Section < ::Tramway::Event::ApplicationRecord
+  mount_uploader :photo, PhotoUploader
+
+  belongs_to :event, class_name: 'Tramway::Event::Event'
+end

data/app/views/tramway/event/events/show.html.haml

@@ -29,5 +29,6 @@
         или пишите на email
         = mail_to 'kalashnikov@ulmic.ru'
   = render 'tramway/landing/blocks/templates/full_page', block: @event, buttons: []
+  = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Направления IT Way'18", description: "Вы можете выбрать любое из направлений", anchor: :features), collection: @sections
   .container
     = render 'tramway/event/participants/form'

data/config/initializers/tramway.rb

@@ -1,4 +1,5 @@
 ::Tramway::Admin.set_available_models(::Tramway::Event::Event,
                                       ::Tramway::Event::ParticipantFormField,
                                       ::Tramway::Event::Participant,
+                                      ::Tramway::Event::Section,
                                       project: :event)

data/config/locales/models.yml

@@ -4,6 +4,7 @@ ru:
       tramway/event/event: Мероприятие
       tramway/event/participant: Участник
       tramway/event/participant_form_field: Поле анкеты
+      tramway/event/section: Секция
     attributes:
       tramway/event/event:
         title: Название
@@ -17,6 +18,9 @@ ru:
     tramway/event/participant:
       plural: участники
       genitive: участника
+    tramway/event/section:
+      plural: секции
+      genitive: секцию
     tramway/event/participant_form_field:
       plural: поля анкеты
       genitive: поле анкеты

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

@@ -21,6 +21,8 @@ module Tramway::Event::Generators
       migration_template 'create_tramway_event_participants.rb', 'db/migrate/create_tramway_event_participants.rb'
       migration_template 'add_options_to_tramway_event_participant_form_fields.rb', 'db/migrate/add_options_to_tramway_event_participant_form_fields.rb'
       migration_template 'add_position_to_tramway_event_participant_form_fields.rb', 'db/migrate/add_position_to_tramway_event_participant_form_fields.rb'
+      migration_template 'create_tramway_event_sections.rb', 'db/migrate/create_tramway_event_sections.rb'
+      migration_template 'add_icon_to_tramway_event_sections.rb', 'db/migrate/add_icon_to_tramway_event_sections.rb'
     end
   end
 end

data/lib/tramway/event/generators/templates/add_icon_to_tramway_event_sections.rb

@@ -0,0 +1,5 @@
+class AddIconToTramwayEventSections < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_sections, :icon, :text
+  end
+end

data/lib/tramway/event/generators/templates/create_tramway_event_sections.rb

@@ -0,0 +1,13 @@
+class CreateTramwayEventSections < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_sections do |t|
+      t.integer :event_id
+      t.text :title
+      t.text :description
+      t.text :photo
+      t.text :state, default: :active
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.0.1'
+    VERSION = '1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -31,9 +31,12 @@ files:
 - app/decorators/tramway/event/event_link_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb
 - app/decorators/tramway/event/participant_form_field_decorator.rb
+- app/decorators/tramway/event/section_decorator.rb
+- app/decorators/tramway/event/section_feature_decorator.rb
 - app/forms/tramway/event/event_form.rb
 - app/forms/tramway/event/participant_form.rb
 - app/forms/tramway/event/participant_form_field_form.rb
+- app/forms/tramway/event/section_form.rb
 - app/helpers/tramway/event/application_helper.rb
 - app/jobs/tramway/event/application_job.rb
 - app/mailers/tramway/event/application_mailer.rb
@@ -41,6 +44,7 @@ files:
 - app/models/tramway/event/event.rb
 - app/models/tramway/event/participant.rb
 - app/models/tramway/event/participant_form_field.rb
+- app/models/tramway/event/section.rb
 - app/views/tramway/event/events/show.html.haml
 - app/views/tramway/event/participants/_form.html.haml
 - config/initializers/assets.rb
@@ -52,12 +56,14 @@ files:
 - lib/tramway/event.rb
 - lib/tramway/event/engine.rb
 - lib/tramway/event/generators/install_generator.rb
+- lib/tramway/event/generators/templates/add_icon_to_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/add_options_to_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/add_photo_to_tramway_event_events.rb
 - lib/tramway/event/generators/templates/add_position_to_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/create_tramway_event_events.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participants.rb
+- lib/tramway/event/generators/templates/create_tramway_event_sections.rb
 - lib/tramway/event/version.rb
 homepage: https://github.com/ulmic/tramway-event
 licenses: