spina-conferences-primer_theme 0.1.11 → 0.1.16

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

@@ -1,18 +1,18 @@
 - cache [event, event.structure_parts.collect(&:structure_partable)] do
-  .d-flex.flex-column.flex-items-start
+  = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
     - cache partable_for(:name, parent: event) do
       - if event.has_content?(:name)
-        %h3.flex-auto= event.content(:name)
+        = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
     - cache partable_for(:location, :start_time, parent: event) do
-      -# TODO: use 'format: :full' once edit-submission-flash is merged
-      %h4.flex-auto= t(:'.time_and_place', time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :short) : t('.time_tbc'),
-                                          place: event.has_content?(:location) ? event.content(:location) : t('.location_tbc')).try(:html_safe)
+      = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
+        = t(:'.time_and_place_html',
+            time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :ordinal_datetime_with_year) : t('.time_tbc'),
+            place: event.has_content?(:location) ? event.content(:location) : t('.location_tbc'))
     - cache partable_for(:description, parent: event) do
       - if event.has_content?(:description)
-        .mt-1.text-gray-light= event.content(:description).try(:html_safe)
+        = render(Primer::TextComponent.new(mt: 1, color: :gray_light)) { event.content(:description).try(:html_safe) }
     - cache partable_for(:url, parent: event) do
       - if event.has_content?(:url)
-        .mt-2
-          = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url)) do
-            = render Primer::OcticonComponent.new(icon: 'link-external')
-            = t :'.more_info'
+        = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
+          = render Primer::OcticonComponent.new(icon: 'link-external')
+          = t :'.more_info'

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

@@ -1,6 +1,6 @@
 %div{ class: dom_class(events_list), id: dom_id(events_list) }
   = render Primer::SubheadComponent.new(mt: 4) do |component|
-    = component.slot(:heading) { t :'.upcoming' }
+    = component.heading { t :'.upcoming' }
   - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) >= Time.now }.then do |events|
     - if events.any?
       %ul
@@ -9,7 +9,7 @@
     - else
       = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
   = render Primer::SubheadComponent.new(mt: 4) do |component|
-    = component.slot(:heading) { t :'.past' }
+    = component.heading { t :'.past' }
   - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) < Time.now }.then do |events|
     - if events.any?
       %ul

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

@@ -1,15 +1,14 @@
-.py-3.py-lg-6
+= render Primer::BoxComponent.new(py: [3, nil, nil, 6]) do
+  .text-shadow-dark
+    - if latest_conference.present? && latest_conference.finish_date >= Date.today
+      = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) { conference.name }
+      = render(Primer::TextComponent.new(tag: :address, classes: 'f2-light')) { conference.institutions.collect(&:name).to_sentence }
+      = render(Primer::TextComponent.new(tag: :time, classes: 'f2-light')) do
+        = t :'.dates_html', start_date: time_tag(conference.start_date, format: :day_and_month),
+                            finish_date: time_tag(conference.finish_date, format: :day_and_month)
+    - else
+      = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) { Spina::Account.first.name }
   - if latest_conference.present? && latest_conference.finish_date >= Date.today
-    .text-shadow-dark
-      %h1.h000-mktg.lh-condensed-ultra= conference.name
-      %address.f2-light= conference.institutions.collect(&:name).to_sentence
-      %time.f2-light= t(:'.dates_html', start_date: time_tag(conference.start_date, format: :day_and_month),
-                                                        finish_date: time_tag(conference.finish_date, format: :day_and_month))
-      .markdown-body.my-4= content(:text).try(:html_safe)
-    .d-block.mt-4
-      = link_to t('.more_info'), frontend_conference_path(conference), class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3]
-  - else
-    .text-shadow-dark
-      %h1.h000-mktg.lh-condensed-ultra= Spina::Account.first.name
-      .markdown-body.my-4= content(:text).try(:html_safe)
-
+    = link_to t('.more_info'), frontend_conference_path(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) }

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

@@ -1,2 +1,2 @@
-.bg-blue
+= render Primer::BoxComponent.new(bg: :blue) do
   .container-lg.p-responsive.text-white= yield

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

@@ -1,5 +1,5 @@
 = render Primer::SubheadComponent.new do |component|
-  = component.slot(:heading) { t :'.title' }
+  = component.heading { t :'.title' }
 
 - if minutes.present? && minutes.structure_items.any?
   %ul{ class: dom_class(minutes), id: dom_id(minutes) }

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

@@ -1,12 +1,14 @@
 - cache [minutes_entry, minutes_entry.structure_parts.collect(&:structure_partable)] do
-  %li.list-style-none.py-1.d-flex.flex-items-center
+  %li.list-style-none.py-1.d-flex.flex-items-center{ id: dom_id(local_assigns[:minutes_entry]) }
     - cache partable_for(:date, parent: minutes_entry) do
-      .flex-auto= minutes_entry.has_content?(:date) ? t(:'.minutes_html', date: time_tag(minutes_entry.content(:date))) : t(:'.no_date')
+      = render Primer::FlexItemComponent.new(flex_auto: true) do
+        = minutes_entry.has_content?(:date) ? t(:'.minutes_html', date: time_tag(minutes_entry.content(:date))) : t(:'.no_date')
     - cache partable_for(:attachment, parent: minutes_entry) do
       - if minutes_entry.has_content?(:attachment) && minutes_entry.content(:attachment).persisted?
         = render Primer::ButtonComponent.new(tag: :a, ml: 2,
-                                             href: main_app.rails_blob_path(minutes_entry.content(:attachment), disposition: :attachment)) do
+                                             href: main_app.rails_blob_path(minutes_entry.content(:attachment),
+                                                                            disposition: :attachment)) do
           = render Primer::OcticonComponent.new(icon: 'desktop-download')
           = t(:'.download')
       - else
-        .text-small.text-gray= t :'.no_file'
+        = render(Primer::TextComponent.new(color: :gray, font_size: 6)) { t :'.no_file' }

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

@@ -1,10 +1,10 @@
 = render Primer::SubheadComponent.new do |component|
-  = component.slot(:heading) { t :'.title' }
+  = component.heading { t :'.title' }
 
 - if partner_societies.structure_items.any?
   %ul{ class: dom_class(partner_societies), id: dom_id(partner_societies) }
     = render partial: 'partner_society', collection: partner_societies.structure_items.sorted_by_structure,
-             layout: 'list_item',
+             layout: 'list_item', locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:partner_society]) } },
              cached: ->(partner_society) { [partner_society, partner_society.structure_parts.collect(&:structure_partable)] }
 - else
   = render Primer::BlankslateComponent.new(title: t(:'.no_societies'), icon: 'organization')

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

@@ -1,26 +1,28 @@
 - cache [partner_society, partner_society.structure_parts.collect(&:structure_partable)] do
-  .d-flex.flex-column.flex-md-row-reverse.flex-items-start
-    .flex-auto
-      %h3.d-flex.flex-wrap.mb-1
-        - cache partable_for(:name, parent: partner_society) do
-          - if partner_society.has_content? :name
-            .flex-auto= partner_society.content(:name)
-        .BtnGroup.mt-1.mt-sm-0{ aria: { label: t(:'.contact_buttons') } }
-          - cache partable_for(:website, parent: partner_society) do
-            - if partner_society.has_content? :website
-              = render Primer::ButtonComponent.new(tag: :a, href: partner_society.content(:website), group_item: true) do
-                = render Primer::OcticonComponent.new(icon: 'browser')
-                = t(:'.website')
-          - cache partable_for(:email_address, parent: partner_society) do
-            - if partner_society.has_content? :email_address
-              = render Primer::ButtonComponent.new(tag: :a, href: "mailto:#{partner_society.content(:email_address)}", group_item: true) do
-                = render Primer::OcticonComponent.new(icon: 'mail')
-                = t(:'.email')
+  = render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :start) do
+    = render Primer::BaseComponent.new(tag: :div, flex: :auto) do
+      = render Primer::HeadingComponent.new(tag: :h3, mb: 1) do
+        = render Primer::FlexComponent.new(flex_wrap: true, justify_content: :space_between) do
+          - cache partable_for(:name, parent: partner_society) do
+            - if partner_society.has_content? :name
+              = render(Primer::TextComponent.new(tag: :div)) { partner_society.content(:name) }
+          = render Primer::ButtonGroupComponent.new(aria: { label: t(:'.contact_buttons') }) do |component|
+            - cache partable_for(:website, parent: partner_society) do
+              - if partner_society.has_content? :website
+                = component.button(tag: :a, href: partner_society.content(:website)) do
+                  = render Primer::OcticonComponent.new(icon: 'browser')
+                  = t(:'.website')
+            - cache partable_for(:email_address, parent: partner_society) do
+              - if partner_society.has_content? :email_address
+                = component.button(tag: :a, href: "mailto:#{partner_society.content(:email_address)}") do
+                  = render Primer::OcticonComponent.new(icon: 'mail')
+                  = t(:'.email')
       - cache partable_for(:description, parent: partner_society) do
         - if partner_society.has_content? :description
-          .text-gray= render partial: 'text', object: partner_society.content(:description)
+          = render Primer::MarkdownComponent.new(color: :gray) do
+            = partner_society.content(:description).try(:html_safe)
     - cache partable_for(:logo, parent: partner_society) do
-      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted?
+      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted? && partner_society.content(:logo).file.present?
         = image_tag(main_app.url_for(partner_society.content(:logo).file.variant(resize_to_limit: [200, 150])),
                     srcset: srcset(partner_society.content(:logo).file, variant: { resize_to_limit: [200, 150] }), size: nil,
                     alt_description: partner_society.content(:name), draggable: false, class: %w[mt-4 mt-md-0 mr-md-4])

data/config/initializers/primer.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Rails.application.config.primer_view_components.force_functional_colors = false

data/config/initializers/themes/conferences_primer_theme.rb

@@ -81,7 +81,7 @@
   theme.layout_parts = [{
     name: 'current_conference_alert',
     title: 'Alert',
-    partable_type: 'Spina::Line'
+    partable_type: 'Spina::Text'
   }, {
     name: 'github_url',
     title: 'GitHub URL',

data/config/locales/en.rb

@@ -6,6 +6,11 @@
       formats: {
         full: ->(time, _) { "%A, #{time.day.ordinalize} %B %Y" }
       }
+    },
+    time: {
+      formats: {
+        ordinal_datetime_with_year: ->(time, _) { "#{time.day.ordinalize} %b %Y, %R" }
+      }
     }
   }
 }

data/config/locales/en.yml

@@ -43,15 +43,12 @@ en:
     application:
       cookies:
         title: About cookies
-        purpose: We use cookies for security, functionality, and analytics purposes.
-        no_advertising: We do not use Google Analytics Advertising features.
-        used:
-          rails_html: We use the %{cookie} cookie to track sessions.
-          google_analytics_html: Google Analytics sets the %{cookies} cookies for analytics purposes.
       footer:
         copyright: © %{name} %{year}
         find_on_github: Find us on GitHub
+      footer_content:
         cookies: About cookies
+        loading: Loading…
       image_collection:
         previous: Previous
         next: Next
@@ -84,6 +81,7 @@ en:
         no_date: No date specified.
       documents:
         title: Documents
+      document:
         download: Download
         no_file: No file uploaded.
         no_name: No name.
@@ -101,7 +99,7 @@ en:
         past: Past events
         no_events: No events.
       event:
-        time_and_place: "%{place}, %{time}"
+        time_and_place_html: "%{place}, %{time}"
         time_tbc: Time TBC
         location_tbc: Location TBC
         more_info: More information
@@ -115,18 +113,16 @@ en:
             search: Search
             no_matching_conferences: No matching conferences.
           show:
-            dates_html: "%{start_date}–%{finish_date}"
-            submit_by_html: Submit abstracts by %{date}
-            submit_abstract: Submit an abstract
             information: Information
             presentations: Presentations
             events: Events
             subscribe: Subscribe
-            locations: "%{institutions}, %{cities}"
             tabs:
               information: Information
               presentations: Presentations
               events: Events
+            no_tab: No tab.
+            tab_does_not_exist: "The tab '%{tab}' does not exist."
           presentations:
             all_presentation_types: All
             results: Results
@@ -148,6 +144,12 @@ en:
           conference:
             dates_html: "%{start_date}–%{finish_date}"
             locations: "%{institutions}, %{cities}"
+          submission_flash:
+            submit_by_html: Submit abstracts by %{date}
+            submit_abstract: Submit an abstract
+          header:
+            dates_html: "%{start_date}–%{finish_date}"
+            locations: "%{institutions}, %{cities}"
         presentations:
           show:
             room_and_institution: "%{room}, %{institution}"

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
+  def up
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Line').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Text.create(content: layout_part.partable.content).then do |text|
+          layout_part.partable.destroy
+          layout_part.update(partable: text)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Text')
+      end
+    end
+  end
+
+  def down
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Text').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Line.create(content: layout_part.partable.content).then do |line|
+          layout_part.partable.destroy
+          layout_part.update(partable: line)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Line')
+      end
+    end
+  end
+end

data/lib/spina/conferences/primer_theme.rb

@@ -4,9 +4,10 @@ require 'spina'
 require 'spina/conferences/primer_theme/engine'
 require 'spina/conferences/primer_theme/breadcrumbs/builder'
 require 'spina/admin/conferences'
+require 'octicons_helper'
+require 'view_component'
 require 'primer/view_components'
 require 'icalendar'
-require 'octicons_helper'
 
 module Spina
   module Conferences

data/lib/spina/conferences/primer_theme/breadcrumbs/builder.rb

@@ -22,9 +22,9 @@ module Spina
           def render_element(component, element)
             url = compute_path(element)
             if @context.current_page? url
-              component.slot(:item, selected: true, **element.options) { compute_name(element) }
+              component.item(selected: true, **element.options) { compute_name(element) }
             else
-              component.slot(:item, href: compute_path(element), **element.options) { compute_name(element) }
+              component.item(href: compute_path(element), **element.options) { compute_name(element) }
             end
           end
         end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.11'
+      VERSION = '0.1.16'
     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.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.31
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: spina
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -311,9 +311,11 @@ files:
 - app/views/layouts/spina/conferences/primer_theme/application.html.haml
 - app/views/layouts/spina/conferences/primer_theme/conferences.html.haml
 - app/views/layouts/spina/conferences/primer_theme/presentations.html.haml
+- app/views/spina/admin/layout_partables/texts/_form.html.haml
 - app/views/spina/application/_cookies.html.haml
 - app/views/spina/application/_current_conference_alert.html.haml
 - app/views/spina/application/_footer.html.haml
+- app/views/spina/application/_footer_content.html.haml
 - app/views/spina/application/_image_collection.html.haml
 - app/views/spina/application/_list_item.html.haml
 - app/views/spina/application/_logo.html.haml
@@ -326,6 +328,7 @@ files:
 - 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/_information.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml
@@ -335,7 +338,7 @@ files:
 - app/views/spina/conferences/primer_theme/conferences/_presentations.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_sponsor.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_sponsors.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_tab.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
@@ -359,10 +362,12 @@ files:
 - app/views/spina/pages/_partner_societies.html.haml
 - app/views/spina/pages/_partner_society.html.haml
 - config/initializers/assets.rb
+- config/initializers/primer.rb
 - config/initializers/themes/conferences_primer_theme.rb
 - config/locales/en.rb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20210206170704_change_current_conference_alert_to_text.rb
 - lib/spina/conferences/primer_theme.rb
 - lib/spina/conferences/primer_theme/breadcrumbs/builder.rb
 - lib/spina/conferences/primer_theme/engine.rb
@@ -387,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Spina::Admin::Conferences frontend theme.