spina-conferences-primer_theme-fork 0.9.0 → 1.0.0.rc1

data/app/views/layouts/spina/conferences/primer_theme/application.html.haml

@@ -11,22 +11,17 @@
     %base{ target: '_blank' }
     = csrf_meta_tags
     %title= t(:'.title', title: seo_title, suffix: current_account.name)
-    = render 'spina/shared/google_site_verification'
-    = render 'spina/shared/analytics'
-    = stylesheet_link_tag 'spina/conferences/primer_theme/application', media: 'all', data: { turbolinks_track: true }
-    = javascript_include_tag 'spina/conferences/primer_theme/application', data: { turbolinks_track: true }
-    = javascript_include_tag 'turbo', type: 'module'
-    %script{ type: 'module', src: asset_path('@github/details-dialog-element/dist/index.js') }
-    %script{ type: 'module', src: asset_path('@github/include-fragment-element/dist/index.js') }
-    %script{ type: 'module', src: asset_path('@github/filter-input-element/dist/index.js') }
-    %script{ type: 'module', src: asset_path('@github/details-menu-element/dist/index.js') }
+    = render 'google_site_verification'
+    = render 'analytics'
+    = stylesheet_link_tag 'spina/conferences/primer_theme/application', media: 'all', data: { turbo_track: true }
+    = primer_theme_importmap_tags
     = yield :head
   %body
     - if current_spina_user.present?
-      .admin= render 'spina/shared/admin_bar'
+      .admin= render 'admin_bar'
     %header= render 'navigation'
     - unless local_assigns[:hide_alert]
-      = render 'current_conference_alert'
+      = render 'alert'
     - if content_for? :flash
       .flash-messages= yield :flash
     %main
@@ -35,6 +30,4 @@
         .container-lg.p-responsive.mt-4= yield :breadcrumbs
       = yield :header
       .container-lg.p-responsive.mt-4= yield
-    %footer
-      .container-lg.p-responsive.py-4= render 'footer'
-    = render 'spina/shared/social'
+    %footer.footer.width-full.container-lg.p-responsive= render 'footer'

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

@@ -0,0 +1,7 @@
+- if current_spina_user.present?
+  #admin_bar
+    = render Primer::BoxComponent.new(bg: :accent, p: 3, text_align: :right) do
+      = render Primer::LinkComponent.new(href: spina.admin_root_path, mr: 3, data: { turbo: false }, classes: 'btn') do
+        = t 'spina.edit_website'
+      = render Primer::LinkComponent.new(href: spina.admin_logout_path, classes: 'btn') do
+        = t 'spina.logout'

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

@@ -0,0 +1,4 @@
+- content_for :flash do
+  - cache current_account do
+    - if current_account.has_content? :alert
+      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:alert).html_safe }

data/app/views/spina/application/_analytics.html.erb

@@ -0,0 +1,10 @@
+<script type="text/javascript">
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<%= current_account.google_analytics %>', 'auto');
+  ga('set', 'anonymizeIp', true);
+  ga('send', 'pageview');
+</script>

data/app/views/spina/application/{_footer_content.html.haml → _cookies_footer.html.haml}

@@ -1,4 +1,4 @@
-= render Primer::DetailsComponent.new(overlay: :dark, reset: true, mb: [2, 0, nil, nil], mr: [nil, 2, nil, nil]) do |component|
+= render Primer::DetailsComponent.new(overlay: :dark, reset: true) do |component|
   = component.summary(button_type: :outline, variant: :small, aria: { haspopup: 'dialog' }, type: nil) do
     = render Primer::OcticonComponent.new('info')
     = t :'.cookies'

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

@@ -1,17 +1,25 @@
 - cache [footer_navigation_items, current_account] do
-  = render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :center) do
-    = render Primer::FlexComponent.new(direction: [:column, :row, nil, nil], mb: [4, nil, 0, nil], flex: :auto) do
-      - cache footer_navigation_items do
-        %ul.list-style-none.flex-auto.mb-2.mb-sm-0.mr-sm-2
-          - footer_navigation_items.each do |item|
-            - cache item do
-              %li
-                = render Primer::ButtonComponent.new(tag: :a, href: item.materialized_path, variant: :small) { item.menu_title }
-      = render 'footer_content'
+  = render Primer::BoxComponent.new(position: :relative, display: :flex,
+    flex_wrap: :wrap,
+    direction: [:column_reverse, nil, :row, nil],
+    align_items: :center,
+    justify_content: :space_between,
+    mt: 6, pt: 6, pb: 2, mb: 6,
+    font_size: 6, color: :muted, border: :top, border_color: :muted) do
+    %div
+      = render(Primer::Beta::Text.new(tag: :span, color: :muted, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
+        = t :'.copyright', name: current_account.name, year: Date.today.year
+    - cache footer_navigation_items do
+      %ul.list-style-none.d-flex.flex-wrap.flex-1.flex-justify-center.flex-lg-justify-around.mb-2.mb-lg-0
+        - footer_navigation_items.each do |item|
+          - cache item do
+            %li.mr-3.mr-lg-0
+              = render Primer::LinkComponent.new(href: item.materialized_path) do
+                = item.menu_title
+    = render Primer::BoxComponent.new(display: :flex, mb: [2, nil, 0, nil]) do
+      = render 'cookies_footer'
       - if current_account.has_content? :github_url
         = render Primer::ButtonComponent.new(tag: :a, href: current_account.content(:github_url), button_type: :outline, variant: :small,
-                                             display: :inline_block) do
+                                              display: :inline_block, ml: 2) do
           = render Primer::OcticonComponent.new('mark-github')
           = t :'.find_on_github'
-    = render(Primer::TextComponent.new(tag: :small, color: :text_secondary, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
-      = t :'.copyright', name: current_account.name, year: Date.today.year

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

@@ -0,0 +1 @@
+%meta{ name: 'google-site-verification' , content: current_account.google_site_verification  }

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

@@ -1 +1 @@
-= render(Primer::MarkdownComponent.new) { text.html_safe }
+= render(Primer::Markdown.new) { text.html_safe }

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

@@ -1,4 +1,4 @@
-= render(Primer::HeadingComponent.new) do
+= render(Primer::HeadingComponent.new(tag: :h1)) do
   Blog
 = render(Primer::HeadingComponent.new(tag: :h2)) do
   = t '.category', name: @category.name

data/app/views/spina/conferences/primer_theme/blog/posts/_post.html.haml

@@ -4,7 +4,8 @@
   = link_to post.title, frontend_blog_post_path(post)
 = render(Primer::HeadingComponent.new(tag: :h4)) do
   = time_tag post.published_at, format: :ordinal_datetime_with_year
-= render(Primer::MarkdownComponent.new(color: :text_secondary)) do
-  = post.excerpt.html_safe
-= render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+- if post.excerpt.present?
+  = render(Primer::Markdown.new(color: :muted)) do
+    = post.excerpt.html_safe
+= render(Primer::Beta::Text.new(tag: :div, color: :muted)) do
   = t '.category_html', name: link_to(post.category.name, frontend_blog_category_path(post.category))

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

@@ -1,4 +1,4 @@
-= render(Primer::HeadingComponent.new) do
+= render(Primer::HeadingComponent.new(tag: :h1)) do
   Blog
 
 = render(Primer::FlexComponent.new(flex: :auto, direction: [:column, nil, :row, nil])) do

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

@@ -1,4 +1,4 @@
-= render(Primer::HeadingComponent.new) do
+= render(Primer::HeadingComponent.new(tag: :h1)) do
   = @post.title
 
 %ul.list-style-none.d-flex.flex-column.flex-sm-row.my-2
@@ -6,12 +6,12 @@
     = 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)) { @post.user.name }
+      = render(Primer::Beta::Text.new(tag: :div, font_weight: :bold)) { @post.user.name }
 
 - if @post.image
   = image_tag main_app.url_for(@post.image.file)
 
 = render(Primer::FlexComponent.new(flex: :auto, direction: [:column, nil, :row, nil])) do
   = render(Primer::FlexItemComponent.new(flex_auto: true)) do
-    = render(Primer::MarkdownComponent.new(tag: :article)) do
+    = render(Primer::Markdown.new(tag: :article)) do
       = @post.content.html_safe

data/app/views/spina/conferences/primer_theme/blog/shared/_sidebar.html.haml

@@ -3,7 +3,7 @@
     = render(Primer::HeadingComponent.new(tag: :h3)) do
       = t '.categories'
   - sidebar.row do
-    = render(Primer::MarkdownComponent.new(tag: :div, font_weight: :bold)) do
+    = render(Primer::Markdown.new(tag: :div, font_weight: :bold)) do
       %ul
         - Spina::Admin::Conferences::Blog::Category.all.each do |cat|
           %li= link_to cat.name, frontend_blog_category_path(cat)

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

@@ -1,12 +1,12 @@
 = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil]) do
   = render Primer::FlexItemComponent.new(mr: [nil, nil, 3, nil], mb: [3, nil, 0, nil], col: [nil, nil, 4, 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)
       = t :'.times_html', start_time: time_tag(event.start_time, format: :short), finish_time: time_tag(event.finish_time, format: :time)
-    = 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)) { 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)) do
+    = render(Primer::Beta::Text.new(tag: :div, color: :muted)) do
       = event.description

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

@@ -5,7 +5,7 @@
         .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: 'event_list' }
       - if events.any?
         %ul{ data: { filter: { list: true } } }

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')

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

@@ -16,7 +16,7 @@
           .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/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

@@ -2,5 +2,5 @@
   = 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 }
+    = 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,9 +2,9 @@
   %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 }
@@ -31,7 +31,7 @@
     %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

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

@@ -1,7 +1,7 @@
 - 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
@@ -11,12 +11,12 @@
             = 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(Primer::Beta::Text.new(tag: :div, font_weight: :bold)) { affiliation.name }
+              = render(Primer::Beta::Text.new(tag: :div, color: :muted)) { affiliation.institution.name }
 
       - 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) }
 
     = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 20vw')) do |sidebar|
       - sidebar.body do
@@ -29,28 +29,28 @@
                 = 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)
           - 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::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 +63,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/issues/_article.html.haml

@@ -2,12 +2,12 @@
   = render(Primer::FlexItemComponent.new(flex_auto: true)) 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
+    = 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

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

@@ -8,10 +8,10 @@
                   volume_number: issue.volume.number,
                   issue_number: issue.number), frontend_issue_path(issue)
     - 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
+      = render(Primer::Beta::Text.new(tag: :div, color: :muted, mt: 2)) do
         = issue.content.html(:description)

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

@@ -1,8 +1,8 @@
 = 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 }
+    = render(Primer::HeadingComponent.new(tag: :h1)) { @journal.name }
     - if @journal.has_content? :description
-      = render(Primer::MarkdownComponent.new(my: 4)) { @journal.content.html(:description) }
+      = render(Primer::Markdown.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

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

@@ -1,18 +1,18 @@
 - cache [@issue, @issue.volume, @issue.articles, @issue.content(:cover_img), @issue.content(:description)] do
   - cache [@issue, @issue.volume] do
-    = render(Primer::HeadingComponent.new) 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 }
+      = 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::MarkdownComponent.new(my: 4)) do
+    = render(Primer::Markdown.new(my: 4)) do
       = @issue.content.html(:description)
 
   - if @issue.has_content?(:attachment)

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

@@ -4,7 +4,7 @@
   theme.name = 'conferences_primer_theme'
   theme.title = 'Conferences Primer theme'
 
-  theme.layout_parts = %w[current_conference_alert]
+  theme.layout_parts = %w[alert github_url]
 
   theme.parts = [{
     name: 'text',
@@ -87,7 +87,7 @@
     part_type: 'Spina::Parts::Repeater',
     parts: %w[name start_date finish_date start_time application_deadline location is_archived description url]
   }, {
-    name: 'current_conference_alert',
+    name: 'alert',
     title: 'Alert',
     part_type: 'Spina::Parts::Text'
   }, {
@@ -286,6 +286,8 @@
   }, {
     name: 'footer',
     label: 'Footer'
+  }, {
+    name: 'journal'
   }]
 
   theme.plugins = %w[conferences journal conferences-blog]

data/config/locales/en.yml

@@ -98,7 +98,7 @@ en:
       footer:
         copyright: © %{name} %{year}
         find_on_github: Find us on GitHub
-      footer_content:
+      cookies_footer:
         cookies: About cookies
         loading: Loading…
 
@@ -192,13 +192,16 @@ en:
               licence_logo: Licence logo
         blog:
           posts:
+            index:
+              blog: Blog
+              no_posts: There are no posts.
             post:
               category_html: "Category: %{name}"
           categories:
             show:
               category: "Category: %{name}"
           shared:
-            siebar:
+            sidebar:
               categories: Categories
 
 

data/config/routes.rb

@@ -22,7 +22,7 @@ Spina::Engine.routes.draw do
 
     # Redirects for old sites that used the old blog path
     get 'posts/', to: redirect('/blog'), as: :old_index
-    get 'posts/:id', to: redirect('/blog/%{id}'), as: :old_post
+    get 'posts/:id', to: redirect('/blog/%{id}'), as: :old_post # rubocop:disable Style/FormatStringToken
 
     get 'feed.atom', to: 'posts#index', as: :rss_feed, defaults: { format: :atom }
     get 'categories/:id', to: 'categories#show', as: :category

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
+class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0] # :nodoc:
   def up
     Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Line').each do |layout_part|
       if layout_part.partable.present?