spina-conferences-primer_theme-fork 0.9.2 → 1.0.0.rc3

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

@@ -1,6 +1,6 @@
 - cache [@conference, @conference.institutions] do
   .container-lg.p-responsive.mb-4
-    = render(Primer::HeadingComponent.new( mb: [1, nil, 2, nil])) { @conference.name }
+    = render(Primer::HeadingComponent.new(tag: :h1, mb: [1, nil, 2, nil])) { @conference.name }
     %ul.text-secondary.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
       %li.mr-sm-3.mb-1
         = render Primer::OcticonComponent.new('calendar')
@@ -19,9 +19,9 @@
     - if @conference.content(:sponsors).present?
       = render Primer::SubheadComponent.new(spacious: true) do |component|
         = component.heading(tag: :h2) { t :'.sponsors.title' }
-      = render Primer::FlexComponent.new(flex_wrap: true, ml: -2, mr: -2, mt: -2, mb: -2) do
+      = render Primer::BoxComponent.new(display: :flex, flex_wrap: :wrap, ml: -2, mr: -2, mt: -2, mb: -2) do
         - repeater @conference.content(:sponsors) do |sponsor|
-          = render Primer::FlexItemComponent.new(m: 2, vertical_align: :middle) do
+          = render Primer::BoxComponent.new(m: 2, vertical_align: :middle) do
             - if sponsor.content(:logo).present?
               = link_to sponsor.content(:website) do
                 = sponsor.content.image_tag(:logo, { resize_to_limit: [200, 60] }, draggable: false,
@@ -30,7 +30,7 @@
               = render(Primer::LinkComponent.new(href: sponsor.content(:website) || '')) { sponsor.content(:name) }
 
   - if @conference.content(:gallery).present?
-    = render Primer::FlexComponent.new(flex_direction: :column, justify_content: :center, align_items: :center, mb: 4, position: :relative,
+    = render Primer::BoxComponent.new(display: :flex, 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' },

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

@@ -1,15 +1,15 @@
-= render Primer::FlexComponent.new(direction: [:column, nil, :row, nil]) do
+= render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil]) do
   = render Primer::BaseComponent.new(tag: :div, flex_shrink: 0, mr: [nil, nil, 3, nil], mb: [3, nil, 0, nil], col: [nil, nil, 3, nil]) do
-    = render Primer::TextComponent.new(tag: :div, font_size: 3, font_weight: :light, mb: 1) do
+    = render Primer::Beta::Text.new(tag: :div, font_size: 3, font_weight: :light, mb: 1) do
       = render Primer::OcticonComponent.new('clock', vertical_align: :baseline)
       = time_tag presentation.start_datetime, format: :short
-    = render Primer::TextComponent.new(tag: :div, color: :text_secondary) do
+    = render Primer::Beta::Text.new(tag: :div, color: :muted) do
       = render Primer::OcticonComponent.new('location')
       = render(Primer::BaseComponent.new(tag: :address, display: :inline)) { presentation.session.room_name }
   = render Primer::BaseComponent.new(tag: :div, flex: :auto) do
     = render Primer::HeadingComponent.new(tag: :h3, mb: 1) do
       = render(Primer::LinkComponent.new(href: frontend_conference_presentation_path(conference, presentation), data: { turbo_frame: '_top' })) { presentation.title }
-    = render Primer::TextComponent.new(tag: :div, color: :text_secondary) do
+    = render Primer::Beta::Text.new(tag: :div, color: :muted) do
       = render Primer::OcticonComponent.new(presentation.presenters.many? ? 'people' : 'person')
       = render Primer::BaseComponent.new(tag: :address, display: :inline) do
         = presentation.presenters.collect(&:full_name_and_institution).to_sentence

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

@@ -1,6 +1,6 @@
 - cache [@conference.presentations, @presentation_type, @presentations, @presentations.collect(&:presenters), @tab] do
-  = render Primer::FlexComponent.new(direction: [:column, nil, nil, :row], my: 4) do
-    = render Primer::FlexItemComponent.new(pr: [nil, nil, nil, 4], mb: [4, nil, nil, 0], col: [12, nil, nil, 3]) do
+  = render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row], my: 4) do
+    = render Primer::BoxComponent.new(pr: [nil, nil, nil, 4], mb: [4, nil, nil, 0], col: [12, nil, nil, 3]) do
       %ul.filter-list
         - cache [@conference.presentations, @presentation_type] do
           %li
@@ -10,13 +10,13 @@
               %span.count{ title: t(:'.results') }= @conference.presentations.count
         = render partial: 'presentation_type', collection: @conference.presentation_types.sorted,
                  cached: -> presentation_type { [presentation_type, @presentation_type] }
-    = render Primer::FlexItemComponent.new(col: [12, nil, nil, 9]) do
+    = render Primer::BoxComponent.new(col: [12, nil, nil, 9]) do
       - if @presentations.any?
         %filter-input{ aria: { owns: 'presentation_list' } }
           .subnav.subnav-flush
             .subnav-search.float-left.ml-0
               = search_field_tag 'search', nil, class: %w[form-control subnav-search-input], aria: { label: t(:'.search') }
-              = octicon 'search', class: 'subnav-search-icon'
+              = render Primer::OcticonComponent.new('search', class: 'subnav-search-icon')
       %div{ id: 'presentation_list' }
         - if @presentations.any?
           %ul{ data: { filter: { list: true } } }

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

@@ -1,10 +1,10 @@
 = render Primer::FlashComponent.new(variant: :warning, full: true, icon: 'clock') do |component|
-  = render Primer::TextComponent.new(tag: :div, display: :inline) do
+  = render Primer::Beta::Text.new(tag: :div, display: :inline) do
     = t :'.submit_by_html', date: time_tag(@conference.content(:submission_date), format: :full)
   - if @conference.content(:submission_text).present?
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, display: :inline)) { @conference.content.html(:submission_text) }
+    = render(Primer::Beta::Text.new(tag: :div, color: :muted, display: :inline)) { @conference.content.html(:submission_text).to_s }
   - if @conference.content(:submission_url).present?
     - component.action do
-      = render Primer::ButtonComponent.new(tag: :a, href: @conference.content.html(:submission_url), button_type: :primary,
+      = render Primer::ButtonComponent.new(tag: :a, href: @conference.content.html(:submission_url).to_s, button_type: :primary,
                                            variant: :small) do
         = t :'.submit_abstract'

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

@@ -1,12 +1,12 @@
-= render Primer::FlexComponent.new(direction: [:column_reverse, nil, :row, nil]) do
-  = render Primer::FlexItemComponent.new(flex_auto: true, mb: [4, nil, 0, nil]) do
+= render Primer::BoxComponent.new(display: :flex, direction: [:column_reverse, nil, :row, nil]) do
+  = render Primer::BoxComponent.new(flex: :auto, mb: [4, nil, 0, nil]) do
     %filter-input{ aria: { owns: 'conference_list' } }
       - if @conferences.any?
         .subnav.subnav-flush
           .subnav-search.float-left.ml-0
             = search_field_tag 'search', nil, class: %w[form-control subnav-search-input], aria: { label: t(:'.search') }
             = render Primer::OcticonComponent.new('search', classes: 'subnav-search-icon')
-  = render Primer::FlexItemComponent.new(mb: [4, nil, 0, nil]) do
+  = render Primer::BoxComponent.new(mb: [4, nil, 0, nil]) do
     = render Primer::ButtonComponent.new(tag: :a, href: frontend_conferences_url(protocol: :webcal, format: :ics), button_type: :primary,
                                          ml: [0, nil, 6, nil]) do
       = render Primer::OcticonComponent.new('calendar')

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

@@ -4,15 +4,15 @@
 - content_for(:header) { render 'header' }
 
 = turbo_frame_tag 'conference_tabs' do
-  = render Primer::UnderlineNavComponent.new(label: t(:'.conference_navigation')) do |component|
+  = render Primer::Alpha::UnderlineNav.new(tag: :div, label: t(:'.conference_navigation')) do |component|
     - component.tab(href: frontend_conference_path(@conference, tab: 'information', presentation_type: @presentation_type&.id),
-                    aria: { selected: (@tab == 'information').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
+                    selected: (@tab == 'information'), id: 'information') do
       = t(:'.tabs.information')
     - component.tab(href: frontend_conference_path(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
-                    aria: { selected: (@tab == 'presentations').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
+                    selected: (@tab == 'presentations'), id: 'presentations') do
       = t(:'.tabs.presentations')
     - component.tab(href: frontend_conference_path(@conference, tab: 'events', presentation_type: @presentation_type&.id),
-                    aria: { selected: (@tab == 'events').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
+                    selected: (@tab == 'events'), id: 'events') do
       = t(:'.tabs.events')
     - component.actions do
       = render Primer::ButtonComponent.new(tag: :a, href: frontend_conference_url(@conference, protocol: :webcal, format: :ics),
@@ -23,7 +23,7 @@
     - when 'information'
       - cache [@conference, @tab] do
         - if @conference.content(:text).present?
-          = render(Primer::MarkdownComponent.new(my: 4)) { @conference.content.html(:text) }
+          = render(Primer::Markdown.new(my: 4)) { @conference.content.html(:text).to_s }
         - else
           = render Primer::BlankslateComponent.new(title: t(:'.no_information'), icon: 'info', my: 4)
     - when 'presentations'

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

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

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

@@ -1,5 +1,5 @@
 - cache [attachments, attachments.collect(&:attachment)] do
   - if attachments.any?
-    = render Primer::ButtonGroupComponent.new(mt: 1) do |component|
+    = render Primer::ButtonGroup.new(mt: 1) do |component|
       = render partial: 'attachment', collection: attachments, cached: -> attachment { [attachment, attachment.attachment] },
                locals: { component: component }

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

@@ -1,17 +1,17 @@
 - cache [@presentation, @presentation.presenters, @presentation.attachments.collect(&:attachment)] do
   - cache [@presentation, @presentation.presenters] do
-    = render(Primer::HeadingComponent.new(mb: [1, nil, 2, nil])) { @presentation.title }
+    = render(Primer::HeadingComponent.new(tag: :h1, mb: [1, nil, 2, nil])) { @presentation.title }
     %ul.text-secondary-dark.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
       %li.mr-sm-3.mb-1
         = render Primer::OcticonComponent.new(@presentation.presenters.many? ? 'people' : 'person')
-        = render Primer::TextComponent.new(tag: :address, display: :inline) do
+        = render Primer::Beta::Text.new(tag: :address, display: :inline) do
           = @presentation.presenters.collect(&:full_name_and_institution).to_sentence
       %li.mr-sm-3.mb-1
         = render Primer::OcticonComponent.new('clock')
         = time_tag @presentation.start_datetime, format: :short
       %li.mb-1
         = render Primer::OcticonComponent.new('location')
-        = render Primer::TextComponent.new(tag: :address, display: :inline) do
+        = render Primer::Beta::Text.new(tag: :address, display: :inline) do
           = t :'.room_and_institution', room: @presentation.session.room_name, institution: @presentation.room.institution.name
 
   = render partial: 'attachments', object: @presentation.attachments

data/app/views/spina/conferences/primer_theme/journal/articles/_authorship.html.haml

@@ -1,6 +1,8 @@
-= render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
-  = render(Primer::FlexItemComponent.new(mr: 2)) do
-    = render(Primer::OcticonComponent.new('person'))
-  = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
-    = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { authorship.affiliation.name }
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { authorship.affiliation.institution.name }
+%li
+  = link_to frontend_author_path(authorship.affiliation.author) do
+    = render(Primer::BoxComponent.new(display: :flex, tag: :li, mr: 4, align_items: :center)) do
+      = render(Primer::BoxComponent.new(mr: 2)) do
+        = render(Primer::OcticonComponent.new('person'))
+      = render(Primer::BoxComponent.new(display: :flex, tag: :address, direction: :column)) do
+        = render(Primer::Beta::Text.new(tag: :div, font_weight: :bold)) { authorship.affiliation.name }
+        = render(Primer::Beta::Text.new(tag: :div, color: :muted)) { authorship.affiliation.institution.name }

data/app/views/spina/conferences/primer_theme/journal/articles/_metadata.html.haml

@@ -2,13 +2,13 @@
   %link{ rel: 'schema.DC', href: 'http://purl.org/dc/elements/1.1/' }
   - @article.authorships.sorted_within_article.each do |authorship|
     %meta{ name: 'DC.Creator.PersonalName', content: authorship.affiliation.name }
-  %meta{ name: 'DC.Date.created', scheme: 'ISO8601', content: @issue.date.to_s(:iso8601) }
-  %meta{ name: 'DC.Date.issued', scheme: 'ISO8601', content: @issue.date.to_s(:iso8601) }
-  %meta{ name: 'DC.Date.modified', scheme: 'ISO8601', content: @issue.date.to_s(:iso8601) }
+  %meta{ name: 'DC.Date.created', scheme: 'ISO8601', content: @issue.date.to_formatted_s(:iso8601) }
+  %meta{ name: 'DC.Date.issued', scheme: 'ISO8601', content: @issue.date.to_formatted_s(:iso8601) }
+  %meta{ name: 'DC.Date.modified', scheme: 'ISO8601', content: @issue.date.to_formatted_s(:iso8601) }
   - if @article.has_content? :attachment
     %meta{ name: 'DC.Format', scheme: 'IMT', content: 'application/pdf' }
   %meta{ name: 'DC.Identifier', content: @article.id }
-  %meta{ name: 'DC.Identifier.URI', content: frontend_issue_article_url(@issue.id, @article.id) }
+  %meta{ name: 'DC.Identifier.URI', content: frontend_volume_issue_article_url(@volume.number, @issue.number, @article.number) }
   - if @article.has_content? :page_range
     %meta{ name: 'DC.Identifier.pageNumber', content: "#{@article.content(:page_range).first_page}-#{@article.content(:page_range).last_page}" }
   %meta{ name: 'DC.Language', scheme: 'ISO639-1', content: 'en' }
@@ -31,11 +31,11 @@
     %meta{ name: 'citation_author', content: authorship.affiliation.name }
     %meta{ name: 'citation_author_institution', content: authorship.affiliation.institution.name }
   %meta{ name: 'citation_language', content: 'en' }
-  %meta{ name: 'citation_date', content: @issue.date.to_s(:iso8601).gsub('-', '/') }
+  %meta{ name: 'citation_date', content: @issue.date.to_formatted_s(:iso8601).gsub('-', '/') }
   %meta{ name: 'citation_volume', content: @issue.volume.number }
   %meta{ name: 'citation_issue', content: @issue.number }
   - if @article.has_content? :page_range
     %meta{ name: 'citation_firstpage', content: @article.content(:page_range).first_page }
     %meta{ name: 'citation_lastpage', content: @article.content(:page_range).last_page }
-  %meta{ name: 'citation_abstract_html_url', content: frontend_issue_article_url(@issue.id, @article.id) }
-  %meta{ name: 'citation_pdf_url', content: frontend_issue_article_url(@issue.id, @article.id) + '.pdf' }
+  %meta{ name: 'citation_abstract_html_url', content: frontend_volume_issue_article_url(@volume.number, @issue.number, @article.number) }
+  %meta{ name: 'citation_pdf_url', content: frontend_volume_issue_article_url(@volume.number, @issue.number, @article.number) + '.pdf' }

data/app/views/spina/conferences/primer_theme/journal/articles/show.html.haml

@@ -1,56 +1,54 @@
 - cache [@article, @article.authorships, @article.affiliations, @article.content(:abstract), @article.issue, @article.issue.volume, @article.issue.content(:cover_img)] do
   = render partial: 'metadata'
 
-  = render(Primer::HeadingComponent.new) { @article.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { @article.title }
 
-  = render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
-    = render(Primer::FlexItemComponent.new(flex_auto: true, mr: [nil, nil, 4, nil])) do
+  = render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+    = render(Primer::BoxComponent.new(flex: :auto, mr: [nil, nil, nil, 4], col: [nil, nil, nil, 8])) do
       %ul.list-style-none.d-flex.flex-column.flex-sm-row.my-2
-        - @article.affiliations.each do |affiliation|
-          = render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
-            = render(Primer::FlexItemComponent.new(mr: 2)) do
-              = render(Primer::OcticonComponent.new('person'))
-            = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
-              = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { affiliation.name }
-              = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { affiliation.institution.name }
+        = render partial: 'authorship', collection: @article.authorships.sorted_within_article
 
       - if @article.has_content?(:abstract)
         = render(Primer::HeadingComponent.new(tag: :h2, mt: 4, font_size: 3)) { t '.abstract' }
-        = render(Primer::MarkdownComponent.new) { @article.content.html(:abstract) }
+        = render(Primer::Markdown.new) { @article.content.html(:abstract).to_s }
 
-    = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 20vw')) do |sidebar|
+    = render(Primer::BorderBoxComponent.new(ml: [nil, nil, nil, 4], col: [nil, nil, nil, 4])) do |sidebar|
       - sidebar.body do
         - if @article.issue.has_content?(:cover_img)
           = render partial: 'spina/conferences/primer_theme/journal/issues/issue_cover', locals: { issue: @article.issue, cover_img: @article.issue.content(:cover_img), size: [200, 400] }
         = render(Primer::BorderBoxComponent.new) do |component|
           - if @article.has_content?(:attachment)
             - component.row do
-              = render(Primer::ButtonComponent.new(tag: :a, href: frontend_issue_article_path(@issue, @article, format: :pdf), download: '', scheme: :primary)) do
+              = render(Primer::ButtonComponent.new(tag: :a, href: frontend_volume_issue_article_path(@issue.volume.number, @issue.number, @article.number, format: :pdf), download: '', scheme: :primary)) do
                 = render Primer::OcticonComponent.new('download')
                 = t '.download'
           - component.row do
-            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.published' }
-            = render(Primer::TextComponent.new) do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.published' }
+            = render(Primer::Beta::Text.new) do
               = time_tag @article.issue.date, format: :long
           - component.row do
-            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.issue' }
-            = render(Primer::TextComponent.new) do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.issue' }
+            = render(Primer::Beta::Text.new) do
               = link_to t('spina.conferences.primer_theme.journal.volume_issue',
                           volume_number: @article.issue.volume.number,
-                          issue_number: @article.issue.number), frontend_issue_path(@article.issue)
+                          issue_number: @article.issue.number), frontend_volume_issue_path(@article.issue.volume.number, @article.issue.number)
           - unless @article.doi.blank?
             - component.row do
-              = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.doi' }
-              = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.doi' }
+              = render(Primer::Beta::Text.new(tag: :div, color: :muted, mt: 1)) do
                 = link_to nil, @article.doi
           - unless @article.url.blank?
             - component.row do
-              = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.url' }
-              = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.url' }
+              = render(Primer::Beta::Text.new(tag: :div, color: :muted, mt: 1)) do
                 = link_to nil, @article.url
           - component.row do
-            = render(Primer::FlexComponent.new(direction: :column)) do
-              = render(Primer::TextComponent.new(mb: 2)) do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.permalink' }
+            = render(Primer::Beta::Text.new(tag: :div, color: :muted, mt: 1)) do
+              = link_to nil, frontend_volume_issue_article_url(@volume.number, @issue.number, @article.number)
+          - component.row do
+            = render(Primer::BoxComponent.new(display: :flex, direction: :column)) do
+              = render(Primer::Beta::Text.new(mb: 2)) do
                 Copyright © #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}
               - unless @licence.nil?
                 - cache [@licence, @licence.content(:logo), @licence.content(:url)] do
@@ -63,8 +61,8 @@
                                   class: 'py-1'
             - unless @licence.nil?
               - cache [@licence, @licence.content(:text)] do
-                = @licence.has_content?(:text) && render(Primer::TextComponent.new(mt: 1)) { @licence.content(:text) }
+                = @licence.has_content?(:text) && render(Primer::Beta::Text.new(mt: 1)) { @licence.content(:text) }
 
           - if @article.draft?
             - component.row do
-              = render(Primer::TextComponent.new(tag: :div, color: :text_danger, font_weight: :bold)) { t '.draft' }
+              = render(Primer::Beta::Text.new(tag: :div, color: :danger, font_weight: :bold)) { t '.draft' }

data/app/views/spina/conferences/primer_theme/journal/authors/_author.html.haml

@@ -0,0 +1,9 @@
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil], align_items: [:flex_start, nil, nil, :center])) do
+  = render(Primer::BoxComponent.new(mr: 2)) do
+    = render(Primer::OcticonComponent.new('person'))
+  = render(Primer::BoxComponent.new(flex: :auto)) do
+    = link_to frontend_author_path(author) do
+      = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
+        = author.primary_affiliation.name
+      = render(Primer::HeadingComponent.new(tag: :h4, color: :muted, mb: 1)) do
+        = author.primary_affiliation.institution.name

data/app/views/spina/conferences/primer_theme/journal/authors/index.html.haml

@@ -0,0 +1,10 @@
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+  = render(Primer::BoxComponent.new(col: [nil, nil, nil, 9])) do
+    = render(Primer::HeadingComponent.new(tag: :h1)) do
+      = @journal.name
+    = render(Primer::HeadingComponent.new(tag: :h2, mt: 3)) { t '.authors' }
+    - if @authors.any?
+      %ul= render partial: 'author', collection: @authors, layout: 'list_item', cached: true
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_authors'), icon: 'mortar-board')
+  = render 'journal_navigation'

data/app/views/spina/conferences/primer_theme/journal/authors/show.html.haml

@@ -0,0 +1,20 @@
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+  = render(Primer::BoxComponent.new(col: [nil, nil, nil, 9])) do
+    = render(Primer::HeadingComponent.new(tag: :h1)) do
+      = @journal.name
+    = render(Primer::HeadingComponent.new(tag: :h2, mt: 2)) do
+      = t '.name_institution', name: @author.primary_affiliation.name, institution: @author.primary_affiliation.institution.name
+    - if @author.affiliations.count > 1
+      = render(Primer::BoxComponent.new) do
+        = render(Primer::Beta::Text.new) do
+          = t '.aka'
+          = @author.affiliations.not_primary.map { |affiliation| t('.name_institution', name: affiliation.name, institution: affiliation.institution.name) }.join(', ')
+
+    = render(Primer::HeadingComponent.new(tag: :h3, mt: 3)) { t '.articles' }
+
+    - if @author.articles.any?
+      %ul= render partial: 'spina/conferences/primer_theme/journal/issues/article', collection: @author.articles.sorted_asc, layout: 'list_item', cached: true
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')
+
+  = render 'journal_navigation'

data/app/views/spina/conferences/primer_theme/journal/issues/_article.html.haml

@@ -1,15 +1,15 @@
-= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
-  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil])) do
+  = render(Primer::BoxComponent.new(flex: :auto)) do
     = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
-      = link_to article.title, frontend_issue_article_path(article.issue, article)
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = link_to article.title, frontend_volume_issue_article_path(article.issue.volume.number, article.issue.number, article.number)
+    = render(Primer::Beta::Text.new(tag: :div, color: :muted)) do
       = render(Primer::OcticonComponent.new(article.affiliations.many? ? 'people' : 'person'))
       = render(Primer::BaseComponent.new(tag: :address, display: :inline)) do
         = article.authorships.sorted_within_article.collect { |authorship| authorship.affiliation.name }.to_sentence
     - unless article.doi.blank?
-      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = render(Primer::Beta::Text.new(tag: :div, color: :muted)) do
         = link_to nil, article.doi
     - if article.has_content?(:attachment)
-      = render(Primer::ButtonComponent.new(tag: :a, href: frontend_issue_article_path(article.issue, article, format: :pdf), mt: 2, download: '')) do
+      = render(Primer::ButtonComponent.new(tag: :a, href: frontend_volume_issue_article_path(article.issue.volume.number, article.issue.number, article.number, format: :pdf), mt: 2, download: '')) do
         = render Primer::OcticonComponent.new('download')
         = t '.download'

data/app/views/spina/conferences/primer_theme/journal/issues/_issue.html.haml

@@ -1,17 +1,18 @@
-= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil])) do
   - if issue.content(:cover_img).present?
-    = render(Primer::FlexItemComponent.new(mr: 4)) do
-      = render partial: 'issue_cover', locals: { issue: issue, cover_img: issue.content(:cover_img), size: [150, 300] }
-  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::BoxComponent.new(mr: 4)) do
+      = link_to frontend_volume_issue_path(issue.volume.number, issue.number) do
+        = render partial: 'issue_cover', locals: { issue: issue, cover_img: issue.content(:cover_img), size: [150, 300] }
+  = render(Primer::BoxComponent.new(flex: :auto)) do
     = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
       = link_to t('spina.conferences.primer_theme.journal.volume_issue',
                   volume_number: issue.volume.number,
-                  issue_number: issue.number), frontend_issue_path(issue)
+                  issue_number: issue.number), frontend_volume_issue_path(issue.volume.number, issue.number)
     - unless issue.title.blank?
-      = render(Primer::HeadingComponent.new(tag: :h4, color: :text_secondary, mb: 1)) do
+      = render(Primer::HeadingComponent.new(tag: :h4, color: :muted, mb: 1)) do
         = issue.title
-    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, font_weight: :bold)) do
+    = render(Primer::Beta::Text.new(tag: :div, color: :muted, font_weight: :bold)) do
       = time_tag issue.date, format: :long
     - if issue.has_content?(:description)
-      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 2)) do
-        = issue.content.html(:description)
+      = render(Primer::Beta::Text.new(tag: :div, color: :muted, mt: 2)) do
+        = issue.content.html(:description).to_s

data/app/views/spina/conferences/primer_theme/journal/issues/index.html.haml

@@ -1,26 +1,25 @@
-= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
-  = render(Primer::FlexComponent.new(direction: :column, flex: :auto)) do
-    = render(Primer::HeadingComponent.new) { @journal.name }
-    - if @journal.has_content? :description
-      = render(Primer::MarkdownComponent.new(my: 4)) { @journal.content.html(:description) }
-  = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 15vw;')) do |sidebar|
-    - if @journal.has_content? :logo
-      - sidebar.header(bg: :primary) do
-        = render(Primer::FlexItemComponent.new(mb: 4)) do
-          - cache @journal.content(:logo) do
-            = image_tag main_app.url_for(@journal.content(:logo).variant(resize_to_limit: [300, 150])),
-                        srcset: srcset(@journal.content(:logo), variant: { resize_to_limit: [300, 150] }),
-                        alt_description: t('.logo'),
-                        draggable: false,
-                        class: 'p-1'
-    - unless @latest_issue.nil?
-      - sidebar.row do
-        = render(Primer::HeadingComponent.new(tag: :h2, font_size: 3)) do
-          = link_to t('.latest_issue', volume_number: @latest_issue.volume.number, issue_number: @latest_issue.number), frontend_issue_path(@latest_issue)
-      - if @latest_issue.has_content?(:cover_img)
-        - sidebar.row do
-          = link_to(frontend_issue_path(@latest_issue)) do
-            = render partial: 'issue_cover', locals: { issue: @latest_issue, cover_img: @latest_issue.content(:cover_img), size: [150, 300] }
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+  = render(Primer::BoxComponent.new(display: :flex, direction: :column, col: [nil, nil, nil, 9])) do
+    = render(Primer::BoxComponent.new) do
+      = render(Primer::HeadingComponent.new(tag: :h1)) { @journal.name }
+      - if @journal.has_content? :description
+        = render(Primer::Markdown.new(my: 4)) { @journal.content.html(:description).to_s }
+    = render Primer::BoxComponent.new(my: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
+      - if @journal.has_content?(:documents) && @journal.content(:documents)&.any?
+        = render Primer::SubheadComponent.new do |component|
+          = component.heading { t :'.documents.title' }
+        %ul
+          - @journal.content(:documents).each do |document|
+            %li.list-style-none.py-1.d-flex.flex-items-center
+              = render(Primer::Beta::Text.new(tag: :div, flex: :auto)) { document.content(:name).presence ||  t(:'.documents.no_name') }
+              - if document.content(:attachment).present?
+                = render Primer::ButtonComponent.new(tag: :a, ml: 2, href: main_app.url_for(document.content(:attachment)), download: '') do
+                  = render Primer::OcticonComponent.new('desktop-download')
+                  = t :'.documents.download'
+              - else
+                = render(Primer::Beta::Text.new(tag: :div, font_size: 6, color: :muted)) { t :'.documents.no_file' }
+
+  = render 'journal_navigation'
 
 #journal-issues-list
   = render(Primer::HeadingComponent.new(tag: :h2, mt: 3)) { t '.all_issues' }
@@ -28,3 +27,8 @@
     %ul= render partial: 'issue', collection: @issues, layout: 'list_item', cached: true
   - else
     = render Primer::BlankslateComponent.new(title: t(:'.no_issues'), icon: 'mortar-board')
+
+- if @journal.has_content?(:issn) && !@journal.content(:issn).empty?
+  = render(Primer::BoxComponent.new(mt: 4)) do
+    = render(Primer::Beta::Text.new(font_weight: :bold)) do
+      = t '.issn', issn: @journal.content(:issn)

data/app/views/spina/conferences/primer_theme/journal/issues/show.html.haml

@@ -1,27 +1,37 @@
 - cache [@issue, @issue.volume, @issue.articles, @issue.content(:cover_img), @issue.content(:description)] do
-  - cache [@issue, @issue.volume] do
-    = render(Primer::HeadingComponent.new) do
-      = t('spina.conferences.primer_theme.journal.volume_issue',
-          volume_number: @issue.volume.number,
-          issue_number: @issue.number)
+  = render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+    = render(Primer::BoxComponent.new(mr: [nil, nil, nil, 4], col: [nil, nil, nil, 8])) do
+      - cache [@issue, @issue.volume] do
+        = render(Primer::HeadingComponent.new(tag: :h1)) do
+          = t('spina.conferences.primer_theme.journal.volume_issue',
+              volume_number: @issue.volume.number,
+              issue_number: @issue.number)
 
-    - unless @issue.title.blank?
-      = render(Primer::HeadingComponent.new(tag: :h2, color: :text_secondary, mb: 2)) { @issue.title }
+        - unless @issue.title.blank?
+          = render(Primer::HeadingComponent.new(tag: :h2, color: :muted, mb: 2)) { @issue.title }
 
-  - if @issue.has_content?(:cover_img)
-    = render partial: 'issue_cover', locals: { issue: @issue, cover_img: @issue.content(:cover_img), size: [300, 600] }
+      - if @issue.has_content?(:description)
+        = render(Primer::Markdown.new(my: 4)) do
+          = @issue.content.html(:description).to_s
 
-  - if @issue.has_content?(:description)
-    = render(Primer::MarkdownComponent.new(my: 4)) do
-      = @issue.content.html(:description)
 
-  - if @issue.has_content?(:attachment)
-    = render(Primer::ButtonComponent.new(tag: :a, scheme: :primary, href: main_app.url_for(@issue.content(:attachment)), my: 2, download: '')) do
-      = render Primer::OcticonComponent.new('download')
-      = t '.download'
+      %div#journal-articles-list.border-top
+        - if @articles.any?
+          %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item', cached: true
+        - else
+          = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')
 
-  %div#journal-articles-list.border-top
-    - if @articles.any?
-      %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item', cached: true
-    - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')
+    = render(Primer::BorderBoxComponent.new(ml: [nil, nil, nil, 4], col: [nil, nil, nil, 4])) do |sidebar|
+      - sidebar.body do
+        - if @issue.has_content?(:cover_img)
+          = render partial: 'spina/conferences/primer_theme/journal/issues/issue_cover', locals: { issue: @issue, cover_img: @issue.content(:cover_img), size: [300, 600] }
+        = render(Primer::BorderBoxComponent.new) do |component|
+          - component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.published' }
+            = render(Primer::Beta::Text.new) do
+              = time_tag @issue.date, format: :long
+          - if @issue.has_content?(:attachment)
+            - component.row do
+              = render(Primer::ButtonComponent.new(tag: :a, scheme: :primary, href: main_app.url_for(@issue.content(:attachment)), my: 2, download: '')) do
+                = render Primer::OcticonComponent.new('download')
+                = t '.download'

data/config/initializers/importmap.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+Spina::Conferences::PrimerTheme.config.importmap.draw do
+  # Stimulus & Turbo, as included with spina
+  pin '@hotwired/stimulus', to: 'stimulus.js'
+  pin '@hotwired/stimulus-loading', to: 'stimulus-loading.js'
+  pin '@hotwired/turbo-rails', to: 'turbo.js'
+
+  # GitHub Primer
+  pin '@github/details-dialog-element', to: '@github/details-dialog-element/dist/index.js'
+  pin '@github/include-fragment-element', to: '@github/include-fragment-element/dist/index.js'
+  pin '@github/filter-input-element', to: '@github/filter-input-element/dist/index.js'
+  pin '@github/details-menu-element', to: '@github/details-menu-element/dist/index.js'
+
+  # Frontend entrypoint
+  pin 'application', to: 'spina/conferences/primer_theme/application.js'
+
+  pin_all_from Spina::Conferences::PrimerTheme::Engine.root.join('app/assets/javascripts/spina/conferences/primer_theme/controllers'), # rubocop:disable Layout/LineLength
+               under: 'controllers',
+               to: 'spina/conferences/primer_theme/controllers'
+end

data/config/initializers/mime_types.rb

@@ -1 +1,3 @@
-Mime::Type.register "application/pdf", :pdf
+# frozen_string_literal: true
+
+Mime::Type.register 'application/pdf', :pdf

data/config/initializers/primer.rb

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