spina-conferences-primer_theme 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936083c4293cbc611194be98f61919d3ebafb7fba30657fe953a03b0168b95ef
-  data.tar.gz: c278c8c41ec3a012cc6a4e5c6b66c233459b0e3fe3e4a11841f2f2f72e916f1b
+  metadata.gz: 0a9af98852b5d516ce1dae3c7ebfd570ac23300b7a5037b0e1968686a3b7d318
+  data.tar.gz: e8d9d34229bb3fe09261aedbf8d1fec41e905df4e6fb1d11ea932f377ffa2827
 SHA512:
-  metadata.gz: f3bb1a5ffa62d39071a3afc7d871781e4be937a73e6e860dfed3bd09bd1c63fe776aa705b09b7b83adeeca5bc6865470571ccc9826550891465054ca454e9114
-  data.tar.gz: 10a589d62195e08be32b6300842f92ff39dea79ec27d18015c1e2d9bc0bf41f06ef67256c8ab5015d80be0be8de91b1530522a4d931d90296e47c33199fec72f
+  metadata.gz: 5bcb8c8d1527b954ab2dd6a4bf3e9869b29d2dbec26e541abadd4a8a2a42638337ed5ff07b45f943b77688f2173b8c6e71e5dc59d27d63960458cd24b59e01b6
+  data.tar.gz: 32493b5f6c0e48b4dd3dcd5b381e0886365fc322ac8aacd5d1043490dec3cd541124ac565176ec7bb9ac86231ad6b3904bea7e09b91b38a926d03ca181fed42d

data/app/controllers/spina/conferences/primer_theme/conferences_controller.rb

@@ -10,12 +10,18 @@ module Spina
 
         def index
           @conferences = Admin::Conferences::Conference.sorted.includes(institutions: [:logo])
-          respond_to :html, :ics
+          respond_to do |format|
+            format.html
+            format.ics { render body: @conferences.to_ics }
+          end
         end
 
         def show
           add_breadcrumb @conference.name
-          respond_to :html, :ics
+          respond_to do |format|
+            format.html
+            format.ics { render body: @conference.to_ics }
+          end
         end
 
         private

data/app/helpers/spina/conferences/primer_theme/application_helper.rb

@@ -23,11 +23,12 @@ module Spina
           end
         end
 
-        def calendar(name:, &block)
-          # noinspection SpellCheckingInspection
-          block ||= proc { '' }
-          Icalendar::Calendar.new.tap { |calendar| calendar.x_wr_calname = name }
-                             .then(&:to_ical).then { |calendar| calendar.insert(calendar.index('END:VCALENDAR'), capture(&block)) }
+        def calendar(name:)
+          Icalendar::Calendar.new
+                             .tap { |calendar| calendar.x_wr_calname = name }
+                             .tap { |calendar| yield(calendar) }
+                             .tap(&:publish)
+                             .then(&:to_ical)
         end
       end
     end

data/app/views/layouts/spina/conferences/primer_theme/presentations.html.haml

@@ -2,5 +2,5 @@
   = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
 = render template: 'layouts/spina/conferences/primer_theme/application',
-         locals: { author: current_account.name, description: strip_tags(@presentation.abstract), title: @presentation.name,
+         locals: { author: current_account.name, description: @presentation.abstract.try(:to_plain_text), title: @presentation.name,
                    seo_title: @presentation.name }

data/app/views/spina/application/_footer_content.html.haml

@@ -1,5 +1,5 @@
 = render Primer::DetailsComponent.new(overlay: :dark, reset: true, mb: [2, 0, nil, nil], mr: [nil, 2, nil, nil]) do |component|
-  = component.summary(button_type: :outline, variant: :small, aria: { haspopup: 'dialog' }) do
+  = component.summary(button_type: :outline, variant: :small, aria: { haspopup: 'dialog' }, type: nil) do
     = render Primer::OcticonComponent.new('info')
     = t :'.cookies'
   = component.body(tag: :'details-dialog') do

data/app/views/spina/application/_mobile_navigation_item.html.haml

@@ -6,7 +6,7 @@
         = render Primer::OcticonComponent.new('chevron-down')
       %ul.list-style-none
         - navigation_item.children.each do |child|
-          %li= link_to child.menu_title, child.materialized_path, class: %w[d-block py-2 pl-3 border-top border-white-fade text-white]
+          %li= link_to child.menu_title, child.materialized_path, class: %w[d-block py-2 pl-3 border-top border-white-fade color-text-white]
   - elsif navigation_item.is_root?
     = link_to navigation_item.menu_title, navigation_item.materialized_path,
               class: %w[Header-link py-2]

data/app/views/spina/application/_navigation.html.haml

@@ -1,9 +1,8 @@
 .Header.px-3.px-md-4.px-lg-5.flex-wrap.flex-lg-nowrap
   .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
   %details.details-reset.d-lg-none{ style: 'display: contents' }
-    %summary.Header-item
-      %button.Header-link.btn-link{ type: 'button' }
-        = render Primer::OcticonComponent.new('three-bars', height: 24)
+    %summary.Header-item.Header-link.btn-link{ type: 'button' }
+      = render Primer::OcticonComponent.new('three-bars', height: 24)
     .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
       = render partial: 'mobile_navigation_items'
   = render partial: 'navigation_item', collection: main_navigation_items, cached: true

data/app/views/spina/application/_navigation_item.html.haml

@@ -1,11 +1,11 @@
 .Header-item.position-relative.d-none.d-lg-flex
-  - if navigation_item.has_children?
+  - if navigation_item.has_children? && navigation_item.children.regular_pages.in_menu.live.sorted.any?
     %details.details-reset.details-overlay
       %summary.Header-link{ role: 'button', aria: { haspopup: 'menu' } }
         = navigation_item.menu_title
         = render Primer::OcticonComponent.new('chevron-down')
       %ul.dropdown-menu.dropdown-menu-sw
-        - navigation_item.children.each do |child|
+        - navigation_item.children.regular_pages.in_menu.live.sorted.each do |child|
           %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
   - elsif navigation_item.is_root?
     = link_to navigation_item.menu_title, navigation_item.materialized_path, class: %w[Header-link]

data/app/views/spina/conferences/primer_theme/conferences/_event.html.haml

@@ -8,4 +8,5 @@
       = render(Primer::BaseComponent.new(tag: :address, display: :inline)) { event.location }
   = render Primer::FlexItemComponent.new(flex_auto: true, col: [nil, nil, 8, nil]) do
     = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) { event.name }
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { event.description.try(:html_safe) }
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = event.description

data/app/views/spina/conferences/primer_theme/conferences/_header.html.haml

@@ -30,11 +30,12 @@
               = render(Primer::LinkComponent.new(href: sponsor.content(:website) || '')) { sponsor.content(:name) }
 
   - if @conference.content(:gallery).present?
-    .mb-4.position-relative{ data: { controller: :slideshow, slideshow: { incrementer: 0, advance: true } } }
+    = render Primer::FlexComponent.new(flex_direction: :column, justify_content: :center, align_items: :center, mb: 4, position: :relative,
+                                       data: { controller: :slideshow, slideshow_incrementer: 0, slideshow_advance: true }) do
       - @conference.content(:gallery).each_with_index do |image, index|
         = @conference.content.image_tag(image, { resize_to_fill: [1680, 600] }, draggable: false, data: { 'slideshow-target': 'slide' },
                                         srcset: srcset(image, variant: { resize_to_fill: [1680, 600] }), hidden: index != 0,
-                                        class: %w[d-block mx-auto])
+                                        class: %w[width-fit])
       .position-absolute.top-0.left-0.right-0.bottom-0.container-lg.p-responsive
         - if @conference.content(:gallery).many?
           .d-none.d-sm-flex.flex-justify-between.flex-items-center.height-full

data/app/views/spina/conferences/primer_theme/presentations/_abstract.html.haml

@@ -1 +1,2 @@
-= render(Primer::MarkdownComponent.new(my: 4)) { abstract.html_safe }
+= render(Primer::MarkdownComponent.new(my: 4)) do
+  = abstract

data/lib/spina/conferences/primer_theme/version.rb

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.2.2'
+      VERSION = '0.3.2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -321,22 +321,17 @@ files:
 - app/views/spina/application/_navigation_item.html.haml
 - app/views/spina/application/_text.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_conference.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_conference.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_event.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_event.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_events.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_header.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentation.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_presentation_type.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentations.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_submission_flash.html.haml
 - app/views/spina/conferences/primer_theme/conferences/index.html.haml
-- app/views/spina/conferences/primer_theme/conferences/index.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/show.html.haml
-- app/views/spina/conferences/primer_theme/conferences/show.ics.erb
 - app/views/spina/conferences/primer_theme/kaminari/_gap.html.haml
 - app/views/spina/conferences/primer_theme/kaminari/_next_page.html.haml
 - app/views/spina/conferences/primer_theme/kaminari/_page.html.haml

data/app/views/spina/conferences/primer_theme/conferences/_conference.ics.erb

@@ -1 +0,0 @@
-<%= conference.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/_event.ics.erb

@@ -1 +0,0 @@
-<%= event.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb

@@ -1 +0,0 @@
-<%= presentation.to_event.to_ical -%>

data/app/views/spina/conferences/primer_theme/conferences/index.ics.erb

@@ -1,3 +0,0 @@
-<%= calendar name: current_account.name do -%>
-<%= render partial: 'conference', collection: @conferences, cached: true -%>
-<% end %>

data/app/views/spina/conferences/primer_theme/conferences/show.ics.erb

@@ -1,5 +0,0 @@
-<%= calendar name: @conference.name do -%>
-<%= render partial: 'conference', object: @conference, cached: true -%>
-<%= render partial: 'presentation', collection: @conference.presentations, cached: true -%>
-<%= render partial: 'event', collection: @conference.events, cached: true -%>
-<% end %>