spina-conferences-primer_theme 0.2.4 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d47fcfce152343cb9baa7ec78661b6c65d4e3704cbd706c61b176c8eaa645f
-  data.tar.gz: 6278037a4f3ebc25de33fc412b5fa42702f3a5839447472b7bec85a149f22520
+  metadata.gz: de1627c42a5f26df5aab40b2cf5e9abfcbf8c37656be2905da0dea069132e32c
+  data.tar.gz: 0baa91ffa622518f16eba5f681192ff8b38467632f7d028a66a039a3d85a1140
 SHA512:
-  metadata.gz: d4a6d4b275de914475fd02a4a6a91e26c5ef5a3aa87cc2d030d472dfd1e51b9763e54071bdb787319f0efc656cd12c822f416dec2ec940d643e57acc38043db9
-  data.tar.gz: '099156869d9fbe3e677eb5a4e8f48e8dc75be819f1c65c6bd39256d2563f9c29f36e54350875a574374cc7ce8579d9d213a83c6d8276239833b30d6bab7b47ae'
+  metadata.gz: 7b38daf67fde96dc831215ede91223f3641888ad9643f043839dea38385ba29ba03e50876a728a1bd44a8e96e81f63352728b0845ad6f91a1965aacfcc3bf653
+  data.tar.gz: 34bb8c7f7255f46f0f267da339ab3861e469bf35021fe39b9ebc523efc67ac00a6273acb656aa5c40573cb67c97923941cae9c196b403c00eed08c3c2d8733ca

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

@@ -5,6 +5,28 @@
 @import "@primer/octicons"
 @import spina/conferences/primer_theme/custom_variables
 
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-normal
+  src: local("Inter"), local("Inter-Regular"), asset-url("@primer/css/fonts/Inter-Regular.woff") format("woff")
+  font-display: swap
+
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-semibold
+  src: local("Inter Medium"), local("Inter-Medium"), asset-url("@primer/css/fonts/Inter-Medium.woff") format("woff")
+  font-display: swap
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-bold
+  src: local("Inter Bold"), local("Inter-Bold"), asset-url("@primer/css/fonts/Inter-Bold.woff") format("woff")
+  font-display: swap
+
 .admin
   @import "spina/admin_editing"
   #admin_bar

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

@@ -27,5 +27,8 @@
           - 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]
+          - else
+            = link_to t('.more_info'), Spina::Page.find_by(name: 'about').materialized_path,
+                      class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3 mt-4]
           %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.try(:to_plain_text), title: @presentation.name,
                    seo_title: @presentation.name }

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
+      = 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/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/initializers/themes/conferences_primer_theme.rb

@@ -75,7 +75,7 @@
     name: 'committee_bios',
     title: 'Committee bios',
     part_type: 'Spina::Parts::Repeater',
-    parts: %w[name role bio profile_picture]
+    parts: %w[name institution role bio profile_picture]
   }, {
     name: 'sponsors',
     title: 'Sponsors',

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.2.4'
+      VERSION = '0.3.4'
     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.4
+  version: 0.3.4
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.35
+        version: 0.0.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.35
+        version: 0.0.37
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -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 %>