spina-conferences-primer_theme 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f5a1fe323da1becb53d382218a6582f7c6fadc48ced5b3f2972db2c560010c0
-  data.tar.gz: 49010b4348e16a95963fe877ef3249987f8d95348ceedca6523825b564d2223d
+  metadata.gz: 665965738e060bd5c6c9f90e5452f9cd84f92456a6e04e6de2fe85b594ecc397
+  data.tar.gz: b3a31fb3bb0f867801f9f8fff03265ad9d33ec4cc8bb6acfdbe4b72ec8e8ff8f
 SHA512:
-  metadata.gz: 514c1696a79af56a0fbc9978b1a98cb504bd5ddbfe7e90a4fab6c565306a6c4faa19cc55ece07b920c3f4d45f752cd9637dff531545239e10a80bc6ff165e945
-  data.tar.gz: 24c7b33473536d8e397e61a3eeea5e7077c3b22d0041b788f5f91627040f1b1e348cd1202aa4022d3ffc8203e4614aa78ce0702373471dbb2ed2b3fbeff26e70
+  metadata.gz: 3e149a65b5ef03f743d3d9249a7cbe6e1b463090d10e1af8f833dbf49cebf416cc97e899d5c1340afc12cc67101a2b202a697d719c4a2ef11c35051d8079d03c
+  data.tar.gz: 2fb6e336499d4b36b4cfba6521bd3dace00bc325668a618e97e55e2ac4c79de7f4fac45a3d8baf94ca9291488c5867ff49e2b5e6da77970bde371b1d8e6cd5cc

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

@@ -25,6 +25,8 @@ module Spina
                                                                 presentation_types: [:translations],
                                                                 presentations: [session: [:room], presenters: [:institution]])
                                                       .find(params[:id])
+        rescue ActiveRecord::RecordNotFound
+          send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
         end
 
         def set_tab

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

@@ -9,6 +9,10 @@ module Spina
 
         def show
           add_breadcrumb @presentation.name
+          respond_to do |format|
+            format.html
+            format.ics { head :not_found }
+          end
         end
 
         private
@@ -16,6 +20,8 @@ module Spina
         def set_presentation
           @presentation = Admin::Conferences::Presentation.includes(:presenters, attachments: [attachment_type: [:translations]])
                                                           .find(params[:id])
+        rescue ActiveRecord::RecordNotFound
+          send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
         end
 
         def set_conference

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

@@ -16,11 +16,11 @@ module Spina
         def ancestors
           return [] if current_page.blank?
 
-          render Primer::BreadcrumbComponent.new(mb: 4) do
+          render Primer::BreadcrumbComponent.new(mb: 4) do |component|
             current_page.ancestors.each do |ancestor|
               component.slot(:item, href: 'ancestor.materialized_path') { ancestor.menu_title }
             end
-            component.slot(:item, selected: true) { menu_title }
+            component.slot(:item, selected: true) { current_page.menu_title }
           end
         end
 
@@ -42,15 +42,16 @@ module Spina
           t :'.title', title: current_page.present? ? current_page.seo_title : @title, suffix: current_account.name # rubocop:disable Rails/HelperInstanceVariable
         end
 
-        def partable_for(*parts, parent: current_page)
+        def partable_for(*part_names, parent: current_page)
           association = case parent
                         when Spina::Page then :page_partable
                         when Spina::StructureItem then :structure_partable
                         when Spina::Account then :layout_partable
                         else :partable
                         end
-          part = parent.parts.find_by(name: parts)
-          [part, part.try(association)]
+          parts = parent.parts.where(name: part_names)
+          part_parents = parts.collect { |part| part.try(association) }
+          [*parts, *part_parents]
         end
 
         def calendar(name:, &block)

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

@@ -1,10 +1,9 @@
 .Header.bg-blue.px-3.px-md-4.px-lg-5
-  .Header-item.d-none.d-lg-flex.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
+  .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
   .Header-item.Header-item--full.d-flex.d-lg-none{ aria: { hidden: true } }
-    = link_to render('logo'), root_path, class: %w[Header-link float-left]
-    %details.details-reset.text-right
+    %details.details-reset
       %summary.btn-link.Header-link= octicon 'three-bars', height: 24
-      .d-flex.flex-column.flex-self-stretch.mt-3.text-left
+      .px-3.px-md-4.px-lg-5.bg-blue.Popover.left-0.right-0.mt-3
         = render partial: 'mobile_navigation_item', collection: main_navigation_items, cached: true
         = link_to 'Conferences', frontend_conferences_url, class: %w[d-block py-2 border-top border-white-fade text-white]
   = render partial: 'navigation_item', collection: main_navigation_items, cached: true

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

@@ -1,16 +1,15 @@
-- cache [conference, conference.institutions, conference.institutions.collect(&:logo)] do
-  .d-flex.flex-column.flex-md-row-reverse.flex-justify-start.flex-md-justify-between
-    %ul.list-style-none.d-flex.flex-wrap.flex-md-justify-end.pl-md-2.pb-2.pb-md-0{ class: dom_class(conference.institutions) }
-      = render partial: 'institution', collection: conference.institutions, cached: -> institution { [institution, institution.logo] }
-    .flex-auto
-      %h3.mb-1
-        = link_to conference.name, frontend_conference_path(conference)
-      %ul.text-gray.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
-        %li.mr-sm-3
-          = octicon 'calendar'
-          = t :'.dates_html', start_date: time_tag(conference.start_date, format: :date), finish_date: time_tag(conference.finish_date)
-        - if conference.institutions.any?
-          %li
-            = octicon 'location'
-            %address.d-inline= t :'.locations', institutions: conference.institutions.pluck(:name).to_sentence,
-                                    cities: conference.institutions.pluck(:city).uniq.to_sentence
+.d-flex.flex-column.flex-md-row-reverse.flex-justify-start.flex-md-justify-between
+  %ul.list-style-none.d-flex.flex-wrap.flex-md-justify-end.pl-md-2.pb-2.pb-md-0{ class: dom_class(conference.institutions) }
+    = render partial: 'institution', collection: conference.institutions, cached: -> institution { [institution, institution.logo] }
+  .flex-auto
+    %h3.mb-1
+      = link_to conference.name, frontend_conference_path(conference)
+    %ul.text-gray.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
+      %li.mr-sm-3
+        = octicon 'calendar'
+        = t :'.dates_html', start_date: time_tag(conference.start_date, format: :date), finish_date: time_tag(conference.finish_date)
+      - if conference.institutions.any?
+        %li
+          = octicon 'location'
+          %address.d-inline= t :'.locations', institutions: conference.institutions.pluck(:name).to_sentence,
+                                  cities: conference.institutions.pluck(:city).uniq.to_sentence

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

@@ -1,3 +1 @@
-<% cache conference do %>
 <%= conference.to_event.to_ical -%>
-<% end %>

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

@@ -1,12 +1,11 @@
-- cache event do
-  .d-flex.flex-column.flex-sm-row
-    .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-4
-      %span.f3-light.mb-1
-        = octicon 'clock', class: 'v-align-baseline'
-        = t :'.times_html', start_time: time_tag(event.start_time, format: :short), finish_time: time_tag(event.finish_time, format: :time)
-      .text-gray
-        = octicon 'location'
-        %address.d-inline= event.location
-    .flex-auto
-      %h3.mb-1= event.name
-      .text-gray= event.description.try(:html_safe)
+.d-flex.flex-column.flex-sm-row
+  .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-4
+    %span.f3-light.mb-1
+      = octicon 'clock', class: 'v-align-baseline'
+      = t :'.times_html', start_time: time_tag(event.start_time, format: :short), finish_time: time_tag(event.finish_time, format: :time)
+    .text-gray
+      = octicon 'location'
+      %address.d-inline= event.location
+  .flex-auto
+    %h3.mb-1= event.name
+    .text-gray= event.description.try(:html_safe)

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

@@ -1,3 +1 @@
-<% cache event do %>
 <%= event.to_event.to_ical -%>
-<% end %>

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

@@ -1,6 +1,5 @@
-- cache [institution, institution.logo] do
-  %li
-    - if institution.logo.present?
-      = render partial: 'institution_logo', object: institution.logo, locals: { institution: institution }
-    - else
-      = institution.name
+%li
+  - if institution.logo.present?
+    = render partial: 'institution_logo', object: institution.logo, locals: { institution: institution }
+  - else
+    = institution.name

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

@@ -1,3 +1,4 @@
-- if institution_logo.file.present?
-  = image_tag main_app.url_for(institution_logo.file.variant(resize_to_limit: [300, 60])), srcset: srcset(institution_logo.file,
-              variant: { resize_to_limit: [300, 60] }), alt_description: institution.name, draggable: false, class: 'p-1'
+- cache institution_logo do
+  - if institution_logo.file.present?
+    = image_tag main_app.url_for(institution_logo.file.variant(resize_to_limit: [300, 60])), srcset: srcset(institution_logo.file,
+                variant: { resize_to_limit: [300, 60] }), alt_description: institution.name, draggable: false, class: 'p-1'

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

@@ -1,14 +1,13 @@
-- cache [presentation, presentation.presenters] do
-  .d-flex.flex-column.flex-sm-row
-    .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-3
-      %span.f3-light.mb-1
-        = octicon 'clock', class: 'v-align-baseline'
-        = time_tag presentation.start_datetime, format: :short
-      .text-gray
-        = octicon 'location'
-        %address.d-inline= presentation.session.room_name
-    .flex-auto
-      %h3.mb-1= link_to presentation.title, frontend_conference_presentation_path(conference, presentation)
-      .text-gray
-        = octicon presentation.presenters.many? ? 'people' : 'person'
-        %address.d-inline= presentation.presenters.collect(&:full_name_and_institution).to_sentence
+.d-flex.flex-column.flex-sm-row
+  .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-3
+    %span.f3-light.mb-1
+      = octicon 'clock', class: 'v-align-baseline'
+      = time_tag presentation.start_datetime, format: :short
+    .text-gray
+      = octicon 'location'
+      %address.d-inline= presentation.session.room_name
+  .flex-auto
+    %h3.mb-1= link_to presentation.title, frontend_conference_presentation_path(conference, presentation)
+    .text-gray
+      = octicon presentation.presenters.many? ? 'people' : 'person'
+      %address.d-inline= presentation.presenters.collect(&:full_name_and_institution).to_sentence

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

@@ -1,3 +1 @@
-<% cache presentation do %>
 <%= presentation.to_event.to_ical -%>
-<% end %>

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

@@ -1,6 +1,5 @@
-- cache [presentation_type, @presentation_type] do
-  %li
-    = link_to frontend_conference_url(presentation_type.conference, presentation_type: presentation_type.id, tab: 'presentations'),
-              class: 'filter-item', aria: { current: @presentation_type == presentation_type ? 'page' : nil } do
-      = presentation_type.name.pluralize
-      %span.count{ title: t(:'.results') }= presentation_type.presentations.count
+%li
+  = link_to frontend_conference_url(presentation_type.conference, presentation_type: presentation_type.id, tab: 'presentations'),
+            class: 'filter-item', aria: { current: @presentation_type == presentation_type ? 'page' : nil } do
+    = presentation_type.name.pluralize
+    %span.count{ title: t(:'.results') }= presentation_type.presentations.count

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

@@ -1,9 +1,8 @@
-- cache [sponsor, sponsor.structure_parts.collect(&:structure_partable)] do
-  %li.d-inline-block.m-2.v-align-middle
-    - if sponsor.has_content?(:logo) && sponsor.content(:logo).file.present?
-      = link_to sponsor.content(:website) do
-        = image_tag(main_app.url_for(sponsor.content(:logo).file.variant(resize_to_limit: [200, 60])),
-                    srcset: srcset(sponsor.content(:logo).file, variant: { resize_to_limit: [200, 60] }),
-                    alt_description: sponsor.content(:name), draggable: false)
-    - else
-      = link_to sponsor.content(:name), sponsor.content(:website)
+%li.d-inline-block.m-2.v-align-middle
+  - if sponsor.has_content?(:logo) && sponsor.content(:logo).file.present?
+    = link_to sponsor.content(:website) do
+      = image_tag(main_app.url_for(sponsor.content(:logo).file.variant(resize_to_limit: [200, 60])),
+                  srcset: srcset(sponsor.content(:logo).file, variant: { resize_to_limit: [200, 60] }),
+                  alt_description: sponsor.content(:name), draggable: false)
+  - else
+    = link_to sponsor.content(:name), sponsor.content(:website)

data/app/views/spina/pages/_committee_bio.html.haml

@@ -2,11 +2,12 @@
   .d-flex.flex-column.flex-md-row.flex-items-start
     - cache partable_for(:profile_picture, parent: committee_bio) do
       - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted?
-        = render Primer::AvatarComponent.new(src: src(committee_bio.content(:profile_picture).file, resize_to_fill: [150, 150]),
-                                             srcset: concat_srcset(committee_bio.content(:profile_picture).file,
-                                                                   variant: { resize_to_limit: [150, 150] }),
-                                             draggable: false, alt: committee_bio.content(:name), size: 150, mr: [nil, nil, 3, nil],
-                                             mb: [3, nil, 0, nil])
+        .flex-shrink-0
+          = render Primer::AvatarComponent.new(src: src(committee_bio.content(:profile_picture).file, resize_to_fill: [150, 150]),
+                                               srcset: concat_srcset(committee_bio.content(:profile_picture).file,
+                                                                     variant: { resize_to_limit: [150, 150] }),
+                                               draggable: false, alt: committee_bio.content(:name), size: 150, mr: [nil, nil, 3, nil],
+                                               mb: [3, nil, 0, nil])
     .flex-auto
       .d-flex.flex-column.flex-md-row.mb-1
         - cache partable_for(:name, :role, parent: committee_bio) do

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.4'
+      VERSION = '0.1.9'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler