spina-conferences-primer_theme 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62666bdc7b0e62a032379e36423bcaa40f42abb02b6760b386ee8cfd168ed0d5
-  data.tar.gz: 11fcc65db823cdbfdc02b908e3d8d9a57ee963d8c8ed13e6a2be30bf124c13be
+  metadata.gz: 3f9332dab27a0db7ba980280a95c67f5277362a85b5786bd552a4ff9337b5a6f
+  data.tar.gz: 6cb511d37aecdd415ffc56576562d92a65c4d4c848e4e60dfba8eb94449dd2c9
 SHA512:
-  metadata.gz: e6c1f15ab5688680a43e5fe876928fa1b5dc9e7345468fca565aa13245e84ee8529f620d322edd2dce1b169921a0d313da8b07a0f1a07b09c99394f30e83717c
-  data.tar.gz: 05aec9a6d349c73c01bfeff02a677339564b2d36720b79e34663facdfb602a845d877395992b2e8bb83560faaf63c3d3e7bb90e9d59d3f3c1e2b5710c925d6dd
+  metadata.gz: e3fa1e8800cf378145d9a136919fa22c780231717f9af981eb73e7c741176158cab2e0975b719f94535a70fff986bf80aa83f71c37f64c0ca828528e0dbb6983
+  data.tar.gz: 1ed5d9d97805e85b5a9580b7b26ebdf65c7406ba3756bbf59b9631810f5e5ceac5091c5b601a5e486ba0f6629a530a706a53fd352746113fea758700dcfa0812

data/app/assets/stylesheets/spina/conferences/primer_theme/application.sass

@@ -3,6 +3,7 @@
 @import spina/conferences/primer_theme/custom
 @import "@primer/css"
 @import "@primer/octicons"
+@import spina/conferences/primer_theme/custom_variables
 
 .admin
   @import "spina/admin_editing"

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
@@ -44,9 +50,9 @@ module Spina
 
         def set_presentations
           @presentations = if @presentation_type.present?
-                             @presentation_type.presentations.page(params[:page])
+                             @presentation_type.presentations.page(params[:page]).per(15)
                            else
-                             @conference.presentations.page(params[:page])
+                             @conference.presentations.page(params[:page]).per(15)
                            end
         end
 

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/conferences_primer_theme/pages/about.html.haml

@@ -60,7 +60,7 @@
               - else
                 = render(Primer::TextComponent.new(tag: :div, font_size: 6, color: :text_secondary)) { t :'.documents.no_file' }
 
-  = render Primer::SubheadComponent.new do |component|
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
     = component.heading { t :'.partner_societies.title' }
   - if content(:partner_societies).present?
     %ul

data/app/views/conferences_primer_theme/pages/homepage.html.haml

@@ -2,7 +2,7 @@
   - cache [current_page, current_conference] do
     = render Primer::BoxComponent.new(position: :relative, style: 'height: 639px') do
       = render Primer::BoxComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false,
-                                        style: 'background-color: var(--color-bg-backdrop)')
+                                        style: 'background-color: var(--color-scale-blue-9)')
       - if content(:gallery).present?
         = render Primer::FlexComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false, style: 'z-index: 1',
                                            flex_direction: :column, justify_content: :center, align_items: :center,
@@ -12,9 +12,9 @@
                                 srcset: srcset(image, variant: { resize_to_limit: [1680, 1680] }),
                                 style: 'object-fit: cover; max-width: max-content; max-height: max-content',
                                 data: { slideshow_target: 'slide' }, class: %w[width-full height-full])
-      .container-lg.p-responsive.position-relative.text-white.height-full{ style: 'z-index: 2' }
+      .container-lg.p-responsive.position-relative.color-text-white.height-full{ style: 'z-index: 2' }
         = render Primer::BoxComponent.new(py: [3, nil, nil, 6]) do
-          .text-shadow-dark
+          %div{ style: 'text-shadow: 0 1px 1px #01040940, 0 1px 25px #010409bf;' }
             - if current_conference.present?
               = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) { current_conference.name }
               = render Primer::TextComponent.new(tag: :address, classes: 'f2-light') do
@@ -27,4 +27,5 @@
           - if current_conference.present? && current_conference.finish_date >= Date.today
             = link_to t('.more_info'), frontend_conference_path(current_conference),
                       class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3 mt-4]
-          .text-shadow-dark= render(Primer::MarkdownComponent.new(my: 4)) { content(:text).try(:html_safe) }
+          %div{ style: 'text-shadow: 0 1px 1px rgba(var(--color-scale-black), 0.25), 0 1px 25px rgba(var(--color-scale-black), 0.75);' }
+            = render(Primer::MarkdownComponent.new(my: 4)) { content(:text).try(:html_safe) }

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.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

@@ -0,0 +1,12 @@
+.Header-item.mr-0.border-top.border-white-fade-15.flex-column.flex-items-stretch
+  - if navigation_item.has_children?
+    %details.details-reset
+      %summary.Header-link.py-2
+        = navigation_item.menu_title
+        = 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 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/_mobile_navigation_items.html.haml

@@ -0,0 +1,3 @@
+%nav.d-flex.flex-column.flex-self-stretch
+  = render partial: 'mobile_navigation_item', collection: main_navigation_items, cached: true, as: :navigation_item
+  .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Conferences', frontend_conferences_url, class: %w[Header-link py-2 py-lg-0]

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

@@ -5,6 +5,6 @@
       %button.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: 'navigation_items'
-  .Header-item.Header-item--full.flex-row.width-full.d-none.d-lg-flex
-    = render partial: 'navigation_items'
+      = render partial: 'mobile_navigation_items'
+  = render partial: 'navigation_item', collection: main_navigation_items, cached: true
+  .Header-item.d-none.d-lg-flex= link_to 'Conferences', frontend_conferences_url, class: %w[Header-link]

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

@@ -1,11 +1,11 @@
-- if navigation_item.has_children?
-  %details.details-reset
-    %summary.btn-link.d-block.py-2.border-top.border-white-fade.text-white
-      = navigation_item.menu_title
-      = 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]
-- elsif navigation_item.is_root?
-  = link_to navigation_item.menu_title, navigation_item.materialized_path,
-            class: %w[Header-link mt-lg-n3 mb-lg-n3 py-2 py-lg-3 mr-0 mr-lg-3 border-top border-lg-top-0 border-white-fade-15]
+.Header-item.position-relative.d-none.d-lg-flex
+  - if navigation_item.has_children?
+    %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|
+          %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/conferences/show.html.haml

@@ -4,12 +4,12 @@
 - content_for(:header) { render 'header' }
 
 = turbo_frame_tag 'conference_tabs' do
-  = render Primer::UnderlineNavComponent.new(label: t(:'.conference_navigationcle')) do |component|
+  = render Primer::UnderlineNavComponent.new(label: t(:'.conference_navigation')) do |component|
     - component.tab(href: frontend_conference_url(@conference, tab: 'information', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'information').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.information')
     - component.tab(href: frontend_conference_url(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
-                    saria: { selected: (@tab == 'presentations').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
+                    aria: { selected: (@tab == 'presentations').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.presentations')
     - component.tab(href: frontend_conference_url(@conference, tab: 'events', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'events').to_s }, classes: 'UnderlineNav-item', role: 'tab') do

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/config/locales/en.yml

@@ -150,6 +150,16 @@ en:
           show:
             room_and_institution: "%{room}, %{institution}"
 
+        kaminari:
+          next_page:
+            next: Next
+            next_page: Next page
+          prev_page:
+            previous: Previous
+            previous_page: Previous page
+          page:
+            page: Page %{number}
+
   languages:
     en-GB: British English
 

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.2.0'
+      VERSION = '0.3.0'
     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.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-18 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
@@ -290,6 +290,7 @@ files:
 - app/assets/javascripts/spina/conferences/primer_theme/application.js
 - app/assets/javascripts/spina/conferences/primer_theme/controllers/slideshow_controller.es6
 - app/assets/stylesheets/spina/conferences/primer_theme/_custom.sass
+- app/assets/stylesheets/spina/conferences/primer_theme/_custom_variables.sass
 - app/assets/stylesheets/spina/conferences/primer_theme/application.sass
 - app/controllers/spina/conferences/primer_theme/application_controller.rb
 - app/controllers/spina/conferences/primer_theme/conferences_controller.rb
@@ -314,27 +315,23 @@ files:
 - app/views/spina/application/_footer_content.html.haml
 - app/views/spina/application/_list_item.html.haml
 - app/views/spina/application/_logo.html.haml
+- app/views/spina/application/_mobile_navigation_item.html.haml
+- app/views/spina/application/_mobile_navigation_items.html.haml
 - app/views/spina/application/_navigation.html.haml
 - app/views/spina/application/_navigation_item.html.haml
-- app/views/spina/application/_navigation_items.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/application/_navigation_items.html.haml

@@ -1,3 +0,0 @@
-%nav.d-flex.flex-column.flex-lg-row.flex-self-stretch.flex-lg-self-auto
-  = render partial: 'navigation_item', collection: main_navigation_items, cached: true
-  = link_to 'Conferences', frontend_conferences_url, class: %w[Header-link mt-lg-n3 mb-lg-n3 py-2 py-lg-3 mr-0 mr-lg-3 border-top border-lg-top-0 border-white-fade-15]

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 %>