spina-conferences-primer_theme-fork 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b6d06ee9207f434033dd3f7e10d6483eee02cf4ff6805173ee5e2cc9c5a3ca
-  data.tar.gz: 82eaa180f742952c42063ff93af5029e8c7d7f9f228a1b0fc988d5626a4229ec
+  metadata.gz: ce68bf02784663a0e354ca369154d20f4599eae01c0910be10c57d6d330afba3
+  data.tar.gz: fe44d6649b68188d82fdd843b0a55d44b32bde8f89752513a152f61fd074ea2f
 SHA512:
-  metadata.gz: e716d4b2ac643c7b2567e35412c38972cc9bac0e0b8b0de7e98855c47fc12e431c254b796a39fd2443e85f0e26c057ef0f1a9b9178a3ea119b53053e706af015
-  data.tar.gz: 6bd91a854364edaab284316bb496ade61b4ecd14a644f4b01e665d13c94b4b0c3dfadbae15d7021ec41aafa5cee4eba163cd0c1e8e6ba1c4aa678c48890f1984
+  metadata.gz: 193634c447d2d784f51be6787991e3754d178bc78998de0a4c0dfd4171eeb5ad669fc1a13e7ac02fd2d288a254611213d6b72949360d547855c63e59707fca93
+  data.tar.gz: d337742e09e81dab12073e1a49a844e3d66612769e5bd7d9cb152beccfba1f3f629909bdc39ce8871fadfbd440e044c1ea2a9399e65e31e64b8965af0d15d7df

data/README.md

@@ -1,10 +1,16 @@
-# PrimerTheme
-A plugin for `Spina` that provides a frontend for `Spina::Admin::Conferences` using components from `Primer::ViewComponents`.
+# PrimerTheme: frontend for Spina
 
-This fork provides an updated version of the plugin, as the main repo is currently stale.
+![Rails tests](https://github.com/louis-vs/spina-conferences-primer_theme-fork/workflows/Verify/badge.svg?branch=master&event=push)
+[![codecov](https://codecov.io/gh/louis-vs/spina-conferences-primer_theme-fork/branch/master/graph/badge.svg?token=9TZ9QGGLAH)](https://codecov.io/gh/louis-vs/spina-conferences-primer_theme-fork)
+[![CodeFactor](https://www.codefactor.io/repository/github/louis-vs/spina-conferences-primer_theme-fork/badge)](https://www.codefactor.io/repository/github/louis-vs/spina-conferences-primer_theme-fork)
+[![Inline docs](http://inch-ci.org/github/louis-vs/spina-conferences-primer_theme-fork.svg?branch=master)](http://inch-ci.org/github/louis-vs/spina-conferences-primer_theme-fork)
+
+A plugin for `Spina` that provides a frontend for `Spina::Admin::Conferences`, `Spina::Admin::Journal`, and `Spina::Admin::Conferences::Blog` using components from `Primer::ViewComponents`.
+
+This fork provides an updated version of the plugin, as the main repo is currently badly outdated.
 
 ## Usage
-See the README for `Spina::Admin::Conferences`. Also make sure to ensure compilation of the assets for this gem by adding the following line to your
+See the READMEs for the conference plugin, the journal plugin, and the bog plugin, respectively, for more information on what kind of content this frontend allows you to create and how to do so within the admin interface. Also make sure to ensure compilation of the assets for this gem by adding the following line to your
 `manifest.js` file.
 
 ```js

data/Rakefile

@@ -33,4 +33,10 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts = %w[-W:no-deprecated]
 end
 
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new do |t|
+  t.options << '--parallel' if ENV['CI']
+end
+
 task default: :test

data/app/controllers/spina/conferences/primer_theme/blog/application_controller.rb

@@ -4,6 +4,7 @@ module Spina
   module Conferences
     module PrimerTheme
       module Blog
+        # Base class from which controllers related to the blog plugin inherit
         class ApplicationController < ::Spina::ApplicationController
           include ::Spina::Frontend
           def cookies_info

data/app/controllers/spina/conferences/primer_theme/blog/categories_controller.rb

@@ -7,7 +7,7 @@ module Spina
         # Spina::Blog::CategoriesController
         class CategoriesController < ApplicationController
           include ::Spina::Frontend
-          
+
           before_action :page
           before_action :category
           before_action :posts

data/app/controllers/spina/conferences/primer_theme/blog/posts_controller.rb

@@ -36,9 +36,9 @@ module Spina
 
           def archive
             @posts = Spina::Admin::Conferences::Blog::Post.live
-                                      .where(published_at: start_date..end_date)
-                                      .order(published_at: :desc)
-                                      .page(params[:page])
+                                                          .where(published_at: start_date..end_date)
+                                                          .order(published_at: :desc)
+                                                          .page(params[:page])
 
             render layout: theme_layout
           end
@@ -63,7 +63,7 @@ module Spina
 
           def find_posts
             @posts = Spina::Admin::Conferences::Blog::Post.available.live.order(published_at: :desc)
-                                      .page(params[:page])
+                                                          .page(params[:page])
           end
 
           def try_redirect
@@ -80,7 +80,7 @@ module Spina
           end
 
           def set_metadata
-            @title = @post.seo_title.blank? ? @post.title : @post.seo_title
+            @title = @post.seo_title.presence || @post.title
             @description = @post.description
           end
         end

data/app/controllers/spina/conferences/primer_theme/conferences/conferences_controller.rb

@@ -6,7 +6,8 @@ module Spina
       module Conferences
         # User-facing controller for conferences, serving both html and ics
         class ConferencesController < ApplicationController
-          before_action :set_conference, :set_tab, :set_presentation_type, :set_presentations, :set_breadcrumb, only: :show
+          before_action :set_conference, :set_tab, :set_presentation_type, :set_presentations, :set_breadcrumb,
+                        only: :show
           before_action :set_metadata
 
           def index
@@ -30,7 +31,7 @@ module Spina
           def set_conference
             @conference = Admin::Conferences::Conference.includes(:events, :institutions,
                                                                   presentation_types: [:translations],
-                                                                  presentations: [session: [:room], presenters: [:institution]])
+                                                                  presentations: [session: [:room], presenters: [:institution]]) # rubocop:disable Layout/LineLength
                                                         .find(params[:id])
             @conference.view_context = view_context
           rescue ActiveRecord::RecordNotFound
@@ -42,28 +43,28 @@ module Spina
           end
 
           def set_presentation_type
-            if params[:presentation_type].present?
-              @presentation_type = @conference.presentation_types
-                                              .includes(presentations: [session: [:room], presenters: [:institution]])
-                                              .find(params[:presentation_type])
-            end
+            return if params[:presentation_type].blank?
+
+            @presentation_type = @conference.presentation_types
+                                            .includes(presentations: [session: [:room], presenters: [:institution]])
+                                            .find(params[:presentation_type])
           end
 
           def set_presentations
             @presentations = if @presentation_type.present?
-                              @presentation_type.presentations.page(params[:page]).per(15)
-                            else
-                              @conference.presentations.page(params[:page]).per(15)
-                            end
+                               @presentation_type.presentations.page(params[:page]).per(15)
+                             else
+                               @conference.presentations.page(params[:page]).per(15)
+                             end
           end
 
           def set_breadcrumb
-            add_breadcrumb 'Blog', frontend_conferences_path
+            add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
           end
 
           def set_metadata
             @title = @conference.present? ? @conference.name : Admin::Conferences::Conference.model_name.human(count: 0)
-            @description = @conference.present? && @conference.has_content?(:text) ? helpers.strip_tags(@conference.content(:text)) : ''
+            @description = @conference.present? && @conference.has_content?(:text) ? helpers.strip_tags(@conference.content(:text)) : '' # rubocop:disable Layout/LineLength
           end
         end
       end

data/app/controllers/spina/conferences/primer_theme/conferences/presentations_controller.rb

@@ -19,7 +19,8 @@ module Spina
           private
 
           def set_presentation
-            @presentation = Admin::Conferences::Presentation.includes(:presenters, attachments: [attachment_type: [:translations]])
+            @presentation = Admin::Conferences::Presentation.includes(:presenters,
+                                                                      attachments: [attachment_type: [:translations]])
                                                             .find(params[:id])
           rescue ActiveRecord::RecordNotFound
             send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404

data/app/controllers/spina/conferences/primer_theme/journal/articles_controller.rb

@@ -6,7 +6,8 @@ module Spina
       module Journal
         # User-facing controller for journal articles
         class ArticlesController < ApplicationController
-          before_action :set_article, :set_issue, :set_journal, :set_licence, :set_breadcrumb, :set_metadata, :require_admin_for_invisible_article
+          before_action :set_article, :set_issue, :set_journal, :set_licence, :set_breadcrumb, :set_metadata,
+                        :require_admin_for_invisible_article
 
           def show
             respond_to do |format|
@@ -48,8 +49,9 @@ module Spina
 
             add_breadcrumb @journal.name, frontend_issues_path
             add_breadcrumb Admin::Journal::Issue.model_name.human.pluralize, frontend_issues_path
-            add_breadcrumb t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number),
-                          frontend_issue_path(@issue.id)
+            add_breadcrumb t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number,
+                                                                                    issue_number: @issue.number),
+                           frontend_issue_path(@issue.id)
           end
 
           def set_metadata

data/app/controllers/spina/conferences/primer_theme/journal/issues_controller.rb

@@ -22,7 +22,8 @@ module Spina
 
           def show
             @articles = current_spina_user.present? ? @issue.articles : @issue.articles.visible
-            add_breadcrumb t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number)
+            add_breadcrumb t('spina.conferences.primer_theme.journal.volume_issue',
+                             volume_number: @issue.volume.number, issue_number: @issue.number)
           end
 
           private

data/app/helpers/spina/conferences/primer_theme/application_helper.rb

@@ -9,34 +9,34 @@ module Spina
 
         # Because the upper bound is exclusive a conference is current the day after it ends
         def current_conference
-          Spina::Admin::Conferences::Conference.order(dates: :asc).find_by('upper(dates) >= ?', Date.today)
+          Spina::Admin::Conferences::Conference.order(dates: :asc).find_by('upper(dates) >= ?', Time.zone.today)
         end
 
         def ancestors
           return [] if current_page.blank?
 
-          render Primer::BreadcrumbComponent.new(mb: 4) do |component|
+          render Primer::Beta::Breadcrumbs.new(mb: 4) do |component|
             current_page.ancestors.each do |ancestor|
               component.item(href: ancestor.materialized_path) { ancestor.menu_title }
             end
-            component.item(selected: true) { current_page.menu_title }
+            component.item(href: current_page.materialized_path) { current_page.menu_title }
           end
         end
 
-        def calendar(name:)
+        def calendar(name:, &block)
           Icalendar::Calendar.new
-                              .tap { |calendar| calendar.x_wr_calname = name }
-                              .tap { |calendar| yield(calendar) }
-                              .tap(&:publish)
-                              .then(&:to_ical)
+                             .tap { |calendar| calendar.x_wr_calname = name }
+                             .tap(&block)
+                             .tap(&:publish)
+                             .then(&:to_ical)
         end
 
         def generate_datetime(date, time)
-          Time.new(date.year,
-                   date.month,
-                   date.day,
-                   time.hour,
-                   time.min)
+          Time.zone.local(date.year,
+                          date.month,
+                          date.day,
+                          time.hour,
+                          time.min)
         end
       end
     end

data/app/helpers/spina/conferences/primer_theme/asset_helper.rb

@@ -27,7 +27,9 @@ module Spina
         DEFAULT_FACTORS = [1, 2, 3, 4].freeze
 
         def variants_for(image, variant_options:, factors:)
-          factors.inject({}) { |srcset, factor| srcset.update(variant_url(image, variant_options, factor) => "#{factor}x") }
+          factors.inject({}) do |srcset, factor|
+            srcset.update(variant_url(image, variant_options, factor) => "#{factor}x")
+          end
         end
 
         def variant_url(image, variant_options, factor)
@@ -39,7 +41,13 @@ module Spina
         end
 
         def resize_dimensions_for_key(key, factor, dimensions)
-          METHODS_TO_RESIZE.include?(key) ? dimensions.collect { |dimension| resize_dimension(dimension, factor) } : dimensions
+          if METHODS_TO_RESIZE.include?(key)
+            dimensions.collect do |dimension|
+              resize_dimension(dimension, factor)
+            end
+          else
+            dimensions
+          end
         end
 
         def resize_dimension(dimension = 0, factor = 0)

data/app/helpers/spina/conferences/primer_theme/navigations_helper.rb

@@ -16,7 +16,9 @@ module Spina
         private
 
         def live_navigation_items(name)
-          ::Spina::NavigationItem.joins(:navigation).where(spina_navigations: { name: name }).roots.regular_pages.in_menu.live.sorted
+          ::Spina::NavigationItem.joins(:navigation)
+                                 .where(spina_navigations: { name: name })
+                                 .roots.regular_pages.in_menu.live.sorted
         end
       end
     end

data/app/models/spina/parts/conferences/primer_theme/checkbox.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 module Spina
   module Parts
     module Conferences
       module PrimerTheme
+        # A simplistic checkbox part, e.g. to indicate whether an item should
+        # show or not.
         class Checkbox < Spina::Parts::Base
           # Booleans don't work nicely with Spina page parts, so we have this mess
-          CHECKED_VALUE = "1"
-          UNCHECKED_VALUE = "0"
+          CHECKED_VALUE = '1'
+          UNCHECKED_VALUE = '0'
 
           attr_json :content, :string, default: UNCHECKED_VALUE
         end

data/app/models/spina/parts/conferences/primer_theme.rb

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
 module Spina
-  module Parts::Conferences::PrimerTheme
-    def self.table_name_prefix
-      'spina_parts_conferences_primer_theme_'
+  module Parts
+    module Conferences
+      module PrimerTheme # rubocop:disable Style/Documentation
+        def self.table_name_prefix
+          'spina_parts_conferences_primer_theme_'
+        end
+      end
     end
   end
 end

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

@@ -1,12 +1,12 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
   - if content(:contact).present?
     = render Primer::SubheadComponent.new(mt: 4) do |component|
       = component.heading { t :'.contact.title' }
-    = render(Primer::MarkdownComponent.new) { content.html(:contact) }
+    = render(Primer::Markdown.new) { content.html(:contact) }
 
   .clearfix.gutter
     = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
@@ -41,7 +41,7 @@
                   = render Primer::OcticonComponent.new('desktop-download')
                   = t(:'.minutes.download')
               - else
-                = render(Primer::TextComponent.new(color: :text_secondary, font_size: 6)) { t :'.minutes.no_file' }
+                = render(Primer::Beta::Text.new(color: :muted, font_size: 6)) { t :'.minutes.no_file' }
       - else
         = render Primer::BlankslateComponent.new(title: t(:'.minutes.no_minutes'), icon: 'file')
 
@@ -52,13 +52,13 @@
         %ul
           - repeater :documents do |document|
             %li.list-style-none.py-1.d-flex.flex-items-center
-              = render(Primer::TextComponent.new(tag: :div, flex: :auto)) { document.content(:name).presence ||  t(:'.documents.no_name') }
+              = 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: document.content.attachment_url(:attachment), download: '') do
                   = render Primer::OcticonComponent.new('desktop-download')
                   = t :'.documents.download'
               - else
-                = render(Primer::TextComponent.new(tag: :div, font_size: 6, color: :text_secondary)) { t :'.documents.no_file' }
+                = render(Primer::Beta::Text.new(tag: :div, font_size: 6, color: :muted)) { t :'.documents.no_file' }
 
   = render Primer::SubheadComponent.new(mt: 4) do |component|
     = component.heading { t :'.partner_societies.title' }
@@ -71,8 +71,8 @@
               = render Primer::HeadingComponent.new(tag: :h3, mb: 1) do
                 = render Primer::FlexComponent.new(flex_wrap: true, justify_content: :space_between) do
                   - if partner_society.content(:name).present?
-                    = render(Primer::TextComponent.new(tag: :div)) { partner_society.content(:name) }
-                  = render Primer::ButtonGroupComponent.new(aria: { label: t(:'.partner_societies.contact_buttons') }) do |component|
+                    = render(Primer::Beta::Text.new(tag: :div)) { partner_society.content(:name) }
+                  = render Primer::ButtonGroup.new(aria: { label: t(:'.partner_societies.contact_buttons') }) do |component|
                     - if partner_society.content(:website).present?
                       = component.button(tag: :a, href: partner_society.content(:website)) do
                         = render Primer::OcticonComponent.new('browser')
@@ -82,7 +82,7 @@
                         = render Primer::OcticonComponent.new('mail')
                         = t(:'.partner_societies.email')
               - if partner_society.content(:description).present?
-                = render Primer::MarkdownComponent.new(color: :text_secondary) do
+                = render Primer::Markdown.new(color: :muted) do
                   = partner_society.content(:description).try(:html_safe)
             - if partner_society.content(:logo).present?
               = partner_society.content.image_tag(:logo, { resize_to_limit: [200, 150] }, size: nil, draggable: false,

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

@@ -1,8 +1,8 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
 
   - if content(:committee_bios).present?
     %ul.mt-4
@@ -10,11 +10,12 @@
         %li.list-style-none.py-4.border-bottom
           = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
             - if committee_bio.content(:profile_picture).present?
-              = render Primer::AvatarComponent.new(src: committee_bio.content.image_url(:profile_picture, resize_to_fill: [150, 150]),
-                                                   srcset: srcset_string(committee_bio.content(:profile_picture),
-                                                                         variant: { resize_to_fill: [150, 150] }),
-                                                   draggable: false, alt: committee_bio.content(:profile_picture).alt, size: 150,
-                                                   mr: [nil, nil, 3, nil], mb: [3, nil, 0, nil], flex_shrink: 0)
+              -# TODO: create helper to replace this, because Primer::Beta::Avatar limits size to 80 sadly
+              %img.avatar.circle.mr-md-3.mb-3.mb-md-0.flex-shrink-0{src: committee_bio.content.image_url(:profile_picture, resize_to_fill: [150, 150]),
+                                                                    srcset: srcset_string(committee_bio.content(:profile_picture),
+                                                                                          variant: { resize_to_fill: [150, 150] }),
+                                                                    draggable: false,
+                                                                    alt: committee_bio.content(:profile_picture).alt}
             = render Primer::FlexItemComponent.new(flex_auto: true) do
               = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], mb: 1) do
                 = render Primer::BoxComponent.new do
@@ -26,7 +27,7 @@
                         = committee_bio.content(:name)
                   - if committee_bio.content(:institution).present?
                     = render(Primer::HeadingComponent.new(tag: :h4)) { committee_bio.content(:institution) }
-                = render Primer::ButtonGroupComponent.new(mt: [1, nil, 0, nil], ml: [nil, nil, 1, nil],
+                = render Primer::ButtonGroup.new(mt: [1, nil, 0, nil], ml: [nil, nil, 1, nil],
                                                           aria: { label: t(:'.contact_buttons') }) do |component|
                   - if committee_bio.content(:twitter_profile).present?
                     = component.button(tag: :a, href: committee_bio.content(:twitter_profile)) do
@@ -37,6 +38,6 @@
                       = render Primer::OcticonComponent.new('link-external')
                       = t(:'.facebook')
               - if committee_bio.content(:bio).present?
-                = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { committee_bio.content.html(:bio) }
+                = render(Primer::Beta::Text.new(tag: :div, color: :muted)) { committee_bio.content.html(:bio) }
   - else
     = render Primer::BlankslateComponent.new(title: t(:'.no_bios'), icon: 'file')

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

@@ -1,8 +1,8 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
 
   - if content(:embed_url).present?
     = render Primer::BoxComponent.new(mt: 4, col: 12) do

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

@@ -1,8 +1,8 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
 
   - if content(:events_list).present?
     = render Primer::SubheadComponent.new(mt: 4) do |component|

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

@@ -9,7 +9,7 @@
             = render partial: 'conferences_primer_theme/partials/homepage_item', locals: { item: carousel_item }
           - if content(:carousel).many?
             .container-lg.height-full.d-flex.flex-column-reverse.mb-8{ style: 'z-index: 5' }
-              = render(Primer::ButtonGroupComponent.new) do |component|
+              = render(Primer::ButtonGroup.new) do |component|
                 = component.button(data: { action: :'slideshow#previous' }) do
                   = render Primer::OcticonComponent.new('arrow-left')
                 = component.button(data: { action: :'slideshow#next' }) do

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

@@ -1,5 +1,5 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }

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

@@ -1,8 +1,8 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
   
   - if content(:periodical_issues).present?
     %ul.mt-4
@@ -26,7 +26,7 @@
                     = render Primer::HeadingComponent.new(tag: :h4) do
                       = time_tag issue.content(:date), format: :long_ordinal
               - if issue.content(:description).present?
-                = render Primer::MarkdownComponent.new(tag: :div, color: :text_secondary) do
+                = render Primer::Markdown.new(tag: :div, color: :muted) do
                   = issue.content.html(:description)
               = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
                 - if issue.content(:url).present?

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

@@ -1,2 +1,2 @@
 - cache current_page do
-  = render(Primer::HeadingComponent.new) { current_page.title }
+  = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }

data/app/views/conferences_primer_theme/partials/_event.html.haml

@@ -21,7 +21,7 @@
     = render Primer::HeadingComponent.new(tag: :h5, flex: :auto) do
       = event.content(:location).presence
     - if event.content(:description).present?
-      = render(Primer::MarkdownComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
+      = render(Primer::Markdown.new(mt: 1, color: :muted)) { event.content.html(:description) }
     - if event.content(:url).present?
       = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
         = render Primer::OcticonComponent.new('link-external')

data/app/views/conferences_primer_theme/partials/_homepage_item.html.haml

@@ -13,7 +13,7 @@
         = render(Primer::HeadingComponent.new(tag: :h1, classes: 'h000-mktg lh-condensed-ultra')) do
           = item.content(:title)
       %div{ style: 'text-shadow: 0 1px 1px rgba(var(--color-scale-black), 0.25), 0 1px 25px rgba(var(--color-scale-black), 0.75);' }
-        = render(Primer::MarkdownComponent.new(my: 4)) do
+        = render(Primer::Markdown.new(my: 4)) do
           = item.content(:description).html_safe
       - if item.content(:url).present?
         = link_to t('.more_info'), item.content(:url),

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

@@ -13,5 +13,5 @@
                                              display: :inline_block) 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
+    = render(Primer::Beta::Text.new(tag: :small, color: :muted, 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/_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,7 @@
   = 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
+= render(Primer::Markdown.new(color: :muted)) do
   = post.excerpt.html_safe
-= render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+= 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,8 +1,8 @@
 = 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) }
   - if @conference.content(:submission_url).present?
     - component.action do
       = render Primer::ButtonComponent.new(tag: :a, href: @conference.content.html(:submission_url), button_type: :primary,

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) }
         - 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/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/mime_types.rb

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

data/config/locales/en.yml

@@ -194,13 +194,14 @@ en:
           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?

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

@@ -8,23 +8,10 @@ module Spina
         # Custom builder using Primer breadcrumbs.
         class Builder < BreadcrumbsOnRails::Breadcrumbs::Builder
           def render
-            @context.render ::Primer::BreadcrumbComponent.new(mb: 4) do |component|
-              @context.safe_join(render_elements(component, @elements), "\n")
-            end
-          end
-
-          private
-
-          def render_elements(component, elements)
-            elements.collect { |element| render_element(component, element) }
-          end
-
-          def render_element(component, element)
-            url = compute_path(element)
-            if @context.current_page? url
-              component.item(selected: true, **element.options) { compute_name(element) }
-            else
-              component.item(href: compute_path(element), **element.options) { compute_name(element) }
+            @context.render ::Primer::Beta::Breadcrumbs.new(mb: 4) do |component|
+              @elements.each do |element|
+                component.item(href: compute_path(element), **element.options) { compute_name(element) }
+              end
             end
           end
         end

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

@@ -3,8 +3,8 @@
 module Spina
   module Conferences
     module PrimerTheme
+      # Registers the frontend controller and page parts with Spina.
       class Engine < ::Rails::Engine
-
         config.after_initialize do
           Spina::Part.register(Spina::Parts::Conferences::PrimerTheme::Checkbox)
         end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.9.2'
+      VERSION = '0.10.0'
     end
   end
 end

data/lib/spina/conferences/primer_theme.rb

@@ -6,13 +6,12 @@ require 'spina/conferences/primer_theme/breadcrumbs/builder'
 require 'spina/admin/conferences'
 require 'spina/admin/journal'
 require 'spina/admin/conferences/blog'
-require 'octicons_helper'
 require 'view_component'
 require 'primer/view_components'
 require 'icalendar'
 
 module Spina
+  # A Primer-based frontend theme for Spina.
   module PrimerTheme
-    # Your code goes here...
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme-fork
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.37
+        version: 0.0.66
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.37
+        version: 0.0.66
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -96,47 +96,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: spina-admin-conferences-fork
+  name: spina-admin-conferences-blog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: spina-admin-journal
+  name: spina-admin-conferences-fork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: spina-admin-conferences-blog
+  name: spina-admin-journal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -283,14 +283,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 description: Frontend for Spina::Admin::Conferences plugin, based on Primer.
 email:
 - j.malcic@me.com
@@ -405,7 +405,8 @@ files:
 homepage: 
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: