spina-conferences-primer_theme-fork 0.10.0 → 1.0.0.rc4

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -1,9 +1,12 @@
-//= link_directory ../stylesheets/spina/conferences/primer_theme .css
-//= link_directory ../javascripts/spina/conferences/primer_theme .js
-//= link spina_admin_conferences_manifest.js
-//= link spina_admin_journal_manifest.js
+//= link spina/conferences/primer_theme/application.css
+
+//= link_directory ../javascripts/spina/conferences/primer_theme/controllers .js
+//= link spina/conferences/primer_theme/application.js
 
 //= link @github/details-dialog-element/dist/index.js
 //= link @github/include-fragment-element/dist/index.js
 //= link @github/filter-input-element/dist/index.js
 //= link @github/details-menu-element/dist/index.js
+
+//= link spina_admin_conferences_manifest.js
+//= link spina_admin_journal_manifest.js

data/app/assets/javascripts/spina/conferences/primer_theme/application.js

@@ -1,7 +1,6 @@
-//= require stimulus
-//= require_directory ./controllers
-
-// eslint-disable-next-line no-undef
-const application = Stimulus.Application.start()
-// eslint-disable-next-line no-undef
-application.register('slideshow', SlideshowController)
+import '@hotwired/turbo-rails'
+import '@github/details-dialog-element'
+import '@github/include-fragment-element'
+import '@github/filter-input-element'
+import '@github/details-menu-element'
+import 'controllers'

data/app/assets/javascripts/spina/conferences/primer_theme/controllers/application.js

@@ -0,0 +1,10 @@
+import { Application } from '@hotwired/stimulus'
+
+const application = Application.start()
+
+// Configure Stimulus
+application.warnings = true
+application.debug = false
+window.Stimulus = application
+
+export { application }

data/app/assets/javascripts/spina/conferences/primer_theme/controllers/index.js

@@ -0,0 +1,5 @@
+import { application } from 'controllers/application'
+
+// Eager load all Stimulus controllers
+import { eagerLoadControllersFrom } from '@hotwired/stimulus-loading'
+eagerLoadControllersFrom('controllers', application)

data/app/assets/javascripts/spina/conferences/primer_theme/controllers/{slideshow_controller.es6 → slideshow_controller.js}

@@ -1,5 +1,6 @@
-// eslint-disable-next-line no-unused-vars,no-undef
-class SlideshowController extends Stimulus.Controller {
+import { Controller } from '@hotwired/stimulus'
+
+export default class SlideshowController extends Controller {
   static get targets() {
     return [
       /**
@@ -35,7 +36,7 @@ class SlideshowController extends Stimulus.Controller {
    * @return {Number} The value for the delay.
    */
   get delay() {
-    return this.data.has('delay') 
+    return this.data.has('delay')
       ? Number.parseInt(this.data.get('delay'))
       : 10000
   }
@@ -55,8 +56,15 @@ class SlideshowController extends Stimulus.Controller {
    */
   connect() {
     this.showSlide()
+    this.resetInterval()
+  }
+
+  resetInterval() {
     if (this.data.has('advance')) {
-      setInterval(() => this.next(), this.delay)
+      if (this.intervalId) {
+        clearInterval(this.intervalId)
+      }
+      this.intervalId = setInterval(() => this.next(), this.delay)
     }
   }
 
@@ -73,6 +81,7 @@ class SlideshowController extends Stimulus.Controller {
    * @private
    */
   next() {
+    this.resetInterval()
     const incrementer = this.incrementer
     this.incrementer = incrementer === this.slideTargets.length - 1 ? 0 : incrementer + 1
   }
@@ -82,6 +91,7 @@ class SlideshowController extends Stimulus.Controller {
    * @private
    */
   previous() {
+    this.resetInterval()
     const incrementer = this.incrementer
     this.incrementer = incrementer === 0 ? this.slideTargets.length - 1 : incrementer - 1
   }

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

@@ -28,7 +28,7 @@
   font-display: swap
 
 .admin
-  @import "spina/admin_editing"
+  //@import "spina/admin_editing"
   #admin_bar
     font-family: 'Metropolis', sans-serif
 

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

@@ -7,6 +7,9 @@ module Spina
         # Base class from which controllers related to the blog plugin inherit
         class ApplicationController < ::Spina::ApplicationController
           include ::Spina::Frontend
+
+          before_action :page
+
           def cookies_info
             render partial: 'cookies'
           end
@@ -16,6 +19,14 @@ module Spina
           def theme_layout
             'layouts/spina/conferences/primer_theme/blog/blog'
           end
+
+          def page
+            @page = Spina::Page.find_or_create_by name: 'blog' do |page|
+              page.title = 'Blog'
+              page.link_url = '/blog'
+              page.deletable = false
+            end
+          end
         end
       end
     end

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

@@ -6,9 +6,6 @@ module Spina
       module Blog
         # Spina::Blog::CategoriesController
         class CategoriesController < ApplicationController
-          include ::Spina::Frontend
-
-          before_action :page
           before_action :category
           before_action :posts
           before_action :set_breadcrumb, only: :show
@@ -30,13 +27,6 @@ module Spina
                               .page(params[:page])
           end
 
-          def page
-            @page = Spina::Page.find_or_create_by name: 'blog' do |page|
-              page.link_url = '/blog'
-              page.deletable = false
-            end
-          end
-
           def set_breadcrumb
             add_breadcrumb 'Blog', frontend_blog_root_path
           end

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

@@ -6,10 +6,7 @@ module Spina
       module Blog
         # Spina::Blog::PostsController
         class PostsController < ApplicationController
-          include ::Spina::Frontend
-
           before_action :find_posts, only: [:index]
-          before_action :current_spina_user_can_view_page?
           before_action :set_breadcrumb, only: :show
 
           decorates_assigned :posts, :post
@@ -53,14 +50,6 @@ module Spina
             start_date.end_of_year
           end
 
-          def page
-            @page ||= Spina::Page.find_or_create_by name: 'blog' do |page|
-              page.title = 'Blog'
-              page.link_url = '/blog'
-              page.deletable = false
-            end
-          end
-
           def find_posts
             @posts = Spina::Admin::Conferences::Blog::Post.available.live.order(published_at: :desc)
                                                           .page(params[:page])
@@ -71,10 +60,6 @@ module Spina
             redirect_to rule.new_path, status: :moved_permanently
           end
 
-          def current_spina_user_can_view_page?
-            raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
-          end
-
           def set_breadcrumb
             add_breadcrumb 'Blog', frontend_blog_root_path
           end

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

@@ -6,9 +6,22 @@ module Spina
       module Conferences
         # Base class from which controllers inherit
         class ApplicationController < Spina::ApplicationController
+          before_action :page
+
           def cookies_info
             render partial: 'cookies'
           end
+
+          private
+
+          def page
+            @page ||= Spina::Page.find_or_create_by name: 'conferences' do |page|
+              page.title = 'Conferences'
+              page.link_url = '/conferences/conferences'
+              page.deletable = false
+              page.active = true
+            end
+          end
         end
       end
     end

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

@@ -6,6 +6,18 @@ module Spina
       module Journal
         # Base class from which controllers related to the journal plugin inherit
         class ApplicationController < Spina::ApplicationController
+          before_action :page
+
+          private
+
+          def page
+            @page ||= Spina::Page.find_or_create_by name: 'journal' do |page|
+              page.title = 'Journal'
+              page.link_url = '/journal/issues'
+              page.deletable = false
+              page.active = true
+            end
+          end
         end
       end
     end

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

@@ -6,8 +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_volume, :set_issue, :set_article, :set_journal, :set_licence,
+                        :set_breadcrumb, :set_metadata, :require_admin_for_invisible_article
 
           def show
             respond_to do |format|
@@ -25,13 +25,19 @@ module Spina
           private
 
           def set_article
-            @article = Admin::Journal::Article.includes(affiliations: [:institution]).find(params[:id])
+            @article = @issue.articles.includes(affiliations: [:institution]).find_by!(number: params[:number])
           rescue ActiveRecord::RecordNotFound
             send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
           end
 
           def set_issue
-            @issue = Admin::Journal::Issue.includes(:volume, :articles).find(params[:issue_id])
+            @issue = @volume.issues.includes(:volume, :articles).find_by!(number: params[:issue_number])
+          rescue ActiveRecord::RecordNotFound
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+
+          def set_volume
+            @volume = Admin::Journal::Volume.includes(:issues).find_by!(number: params[:volume_number])
           rescue ActiveRecord::RecordNotFound
             send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
           end
@@ -47,11 +53,11 @@ module Spina
           def set_breadcrumb
             return if @issue.blank?
 
-            add_breadcrumb @journal.name, frontend_issues_path
-            add_breadcrumb Admin::Journal::Issue.model_name.human.pluralize, frontend_issues_path
+            add_breadcrumb helpers.journal_abbreviation_or_name(@journal), 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)
+                           frontend_volume_issue_path(@issue.volume.number, @issue.number)
           end
 
           def set_metadata

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Journal
+        # User-facing controller for authors
+        class AuthorsController < ApplicationController
+          before_action :set_journal, :set_breadcrumb
+          before_action :set_author, only: :show
+          before_action :set_metadata
+
+          def index
+            @authors = Admin::Journal::Author.all.sort do |a, b|
+              a.primary_affiliation.name <=> b.primary_affiliation.name
+            end
+          end
+
+          def show
+            add_breadcrumb @author.primary_affiliation.name
+          end
+
+          private
+
+          def set_journal
+            @journal = Admin::Journal::Journal.instance
+          end
+
+          def set_author
+            @author = Admin::Journal::Author.includes(:affiliations, :articles).find(params[:id])
+          rescue ActiveRecord::RecordNotFound
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+
+          def set_metadata
+            @title = @journal.name
+            @description = ActionView::Base.full_sanitizer.sanitize(@journal.content(:description))
+          end
+
+          def set_breadcrumb
+            add_breadcrumb helpers.journal_abbreviation_or_name(@journal), frontend_issues_path
+            add_breadcrumb Admin::Journal::Author.model_name.human(count: :many), frontend_authors_path
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Spina
         # User-facing controller for journal issues
         class IssuesController < ApplicationController
           before_action :set_journal
-          before_action :set_issue, :set_breadcrumb, only: :show
+          before_action :set_volume, :set_issue, only: :show
           before_action :set_metadata
 
           def index
@@ -22,6 +22,7 @@ module Spina
 
           def show
             @articles = current_spina_user.present? ? @issue.articles : @issue.articles.visible
+            add_breadcrumb helpers.journal_abbreviation_or_name(@journal), frontend_issues_path
             add_breadcrumb t('spina.conferences.primer_theme.journal.volume_issue',
                              volume_number: @issue.volume.number, issue_number: @issue.number)
           end
@@ -33,14 +34,20 @@ module Spina
           end
 
           def set_issue
-            @issue = Admin::Journal::Issue.includes(:volume, :articles).find(params[:id])
+            @issue = @volume.issues.includes(:volume, :articles).find_by!(number: params[:number])
+          rescue ActiveRecord::RecordNotFound
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+
+          def set_volume
+            @volume = Admin::Journal::Volume.includes(:issues).find_by!(number: params[:volume_number])
           rescue ActiveRecord::RecordNotFound
             send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
           end
 
           def set_breadcrumb
-            add_breadcrumb @journal.name, frontend_issues_path
-            add_breadcrumb Admin::Journal::Issue.model_name.human.pluralize, frontend_issues_path
+            add_breadcrumb helpers.journal_abbreviation_or_name(@journal), frontend_issues_path
+            # add_breadcrumb Admin::Journal::Issue.model_name.human.pluralize, frontend_issues_path
           end
 
           def set_metadata

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

@@ -12,10 +12,19 @@ module Spina
           Spina::Admin::Conferences::Conference.order(dates: :asc).find_by('upper(dates) >= ?', Time.zone.today)
         end
 
-        def ancestors
+        def journal_abbreviation_or_name(journal)
+          journal.content(:journal_abbreviation).nil? || journal.content(:journal_abbreviation).blank? ? journal.name : journal.content(:journal_abbreviation) # rubocop:disable Layout/LineLength
+        end
+
+        def ancestors # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           return [] if current_page.blank?
 
           render Primer::Beta::Breadcrumbs.new(mb: 4) do |component|
+            if current_page.resource&.name = 'journal'
+              component.item(href: frontend_issues_path) do
+                journal_abbreviation_or_name(Spina::Admin::Journal::Journal.instance)
+              end
+            end
             current_page.ancestors.each do |ancestor|
               component.item(href: ancestor.materialized_path) { ancestor.menu_title }
             end
@@ -38,6 +47,16 @@ module Spina
                           time.hour,
                           time.min)
         end
+
+        def primer_theme_importmap_tags(entry_point = 'application', shim: true)
+          safe_join [
+            javascript_inline_importmap_tag(Spina::Conferences::PrimerTheme.config.importmap.to_json(resolver: self)),
+            javascript_importmap_module_preload_tags(Spina::Conferences::PrimerTheme.config.importmap),
+            (javascript_importmap_shim_nonce_configuration_tag if shim),
+            (javascript_importmap_shim_tag if shim),
+            javascript_import_module_tag(entry_point)
+          ], "\n"
+        end
       end
     end
   end

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

@@ -13,6 +13,15 @@ module Spina
           @footer_navigation_items ||= live_navigation_items('footer')
         end
 
+        def journal_navigation_items
+          @journal_navigation_items ||= live_resource_navigation_items('journal')
+        end
+
+        # Use this for caching, since pages are not touched when navigation position is updated.
+        def all_navigation_items
+          @all_navigation_items ||= ::Spina::NavigationItem.all
+        end
+
         private
 
         def live_navigation_items(name)
@@ -20,6 +29,10 @@ module Spina
                                  .where(spina_navigations: { name: name })
                                  .roots.regular_pages.in_menu.live.sorted
         end
+
+        def live_resource_navigation_items(name)
+          ::Spina::Resource.find_by(name: name)&.pages&.roots&.in_menu&.live&.sorted || []
+        end
       end
     end
   end

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

@@ -2,26 +2,28 @@
   = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text).to_s }
   - if content(:contact).present?
     = render Primer::SubheadComponent.new(mt: 4) do |component|
       = component.heading { t :'.contact.title' }
-    = render(Primer::Markdown.new) { content.html(:contact) }
+    = render(Primer::Markdown.new) { content.html(:contact).to_s }
 
   .clearfix.gutter
     = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
       = render Primer::SubheadComponent.new do |component|
         = component.heading { t :'.constitution.title' }
       - if content(:constitution).present?
-        = render Primer::FlexComponent.new(align_items: :center, py: 1) do
-          = render Primer::FlexItemComponent.new(flex_auto: true, pr: 1) do
+        = render Primer::BoxComponent.new(display: :flex, align_items: :center, py: 1) do
+          = render Primer::BoxComponent.new(flex: :auto, pr: 1) do
             = t :'.constitution.uploaded',
                 date: l(Spina::Attachment.find(content(:constitution).attachment_id).created_at.to_date, format: :long)
           = render Primer::ButtonComponent.new(tag: :a, href: content.attachment_url(:constitution), ml: 2, download: '') do
             = render Primer::OcticonComponent.new('desktop-download')
             = t :'.constitution.download'
       - else
-        = render Primer::BlankslateComponent.new(title: t(:'.constitution.no_constitution'), icon: 'law')
+        = render Primer::Beta::Blankslate.new do |blankslate|
+          - blankslate.visual_icon(icon: 'law')
+          - blankslate.heading(tag: :h3).with_content(t(:'.constitution.no_constitution'))
 
     = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
       = render Primer::SubheadComponent.new do |component|
@@ -30,7 +32,7 @@
         %ul
           - repeater :minutes do |minutes_entry|
             %li.list-style-none.py-1.d-flex.flex-items-center
-              = render Primer::FlexItemComponent.new(flex_auto: true) do
+              = render Primer::BoxComponent.new(flex: :auto) do
                 - if minutes_entry.content(:date).present?
                   = t(:'.minutes.minutes_for_html', date: time_tag(minutes_entry.content(:date)))
                 - else
@@ -43,7 +45,9 @@
               - else
                 = 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')
+        = render Primer::Beta::Blankslate.new do |blankslate|
+          - blankslate.visual_icon(icon: 'file')
+          - blankslate.heading(tag: :h3).with_content(t(:'.minutes.no_minutes'))
 
     = render Primer::BoxComponent.new(mt: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
       - if content(:documents).present?
@@ -66,10 +70,10 @@
     %ul
       - repeater :partner_societies do |partner_society|
         %li.list-style-none.py-4.border-bottom
-          = render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :start) do
+          = render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row_reverse, nil], align_items: :flex_start) do
             = render Primer::BaseComponent.new(tag: :div, flex: :auto) do
               = render Primer::HeadingComponent.new(tag: :h3, mb: 1) do
-                = render Primer::FlexComponent.new(flex_wrap: true, justify_content: :space_between) do
+                = render Primer::BoxComponent.new(display: :flex, flex_wrap: :wrap, justify_content: :space_between) do
                   - if partner_society.content(:name).present?
                     = render(Primer::Beta::Text.new(tag: :div)) { partner_society.content(:name) }
                   = render Primer::ButtonGroup.new(aria: { label: t(:'.partner_societies.contact_buttons') }) do |component|
@@ -89,4 +93,6 @@
                                                   srcset: srcset(partner_society.content(:logo), variant: { resize_to_limit: [200, 150] }),
                                                   class: %w[mt-4 mt-md-0 mr-md-4])
   - else
-    = render Primer::BlankslateComponent.new(title: t(:'.partner_societies.no_societies'), icon: 'organization')
+    = render Primer::Beta::Blankslate.new do |blankslate|
+      - blankslate.visual_icon(icon: 'organization')
+      - blankslate.heading(tag: :h3).with_content(t(:'.partner_societies.no_societies'))

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

@@ -2,13 +2,13 @@
   = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text).to_s }
 
   - if content(:committee_bios).present?
     %ul.mt-4
       - repeater(:committee_bios) do |committee_bio|
         %li.list-style-none.py-4.border-bottom
-          = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
+          = render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil], align_items: :flex_start) do
             - if committee_bio.content(:profile_picture).present?
               -# 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]),
@@ -16,8 +16,8 @@
                                                                                           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(flex: :auto) do
+              = render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, :row, nil], mb: 1) do
                 = render Primer::BoxComponent.new do
                   - if committee_bio.content(:name).present?
                     = render(Primer::HeadingComponent.new(tag: :h3)) do
@@ -38,6 +38,8 @@
                       = render Primer::OcticonComponent.new('link-external')
                       = t(:'.facebook')
               - if committee_bio.content(:bio).present?
-                = render(Primer::Beta::Text.new(tag: :div, color: :muted)) { committee_bio.content.html(:bio) }
+                = render(Primer::Beta::Text.new(tag: :div, color: :muted)) { committee_bio.content.html(:bio).to_s }
   - else
-    = render Primer::BlankslateComponent.new(title: t(:'.no_bios'), icon: 'file')
+    = render Primer::Beta::Blankslate.new do |blankslate|
+      - blankslate.visual_icon(icon: 'file')
+      - blankslate.heading(tag: :h3).with_content(t(:'.no_bios'))

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

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

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

@@ -2,7 +2,7 @@
   = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
 
   - if content(:text).present?
-    = render(Primer::Markdown.new(mt: 4)) { content.html(:text) }
+    = render(Primer::Markdown.new(mt: 4)) { content.html(:text).to_s }
 
   - if content(:events_list).present?
     = render Primer::SubheadComponent.new(mt: 4) do |component|
@@ -12,7 +12,7 @@
         - else
           = t :'.upcoming'
 
-    - content(:events_list).filter do |event| 
+    - content(:events_list).filter do |event|
       - (event.content(:start_date).blank? || event.content(:start_date) >= Date.today) && event.content(:is_archived) != Spina::Parts::Conferences::PrimerTheme::Checkbox::CHECKED_VALUE
     - end.then do |events|
       - if events.any?
@@ -20,7 +20,9 @@
           - repeater(events) do |event|
             = render 'conferences_primer_theme/partials/event', event: event
       - else
-        = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+        = render Primer::Beta::Blankslate.new do |blankslate|
+          - blankslate.visual_icon(icon: 'calendar')
+          - blankslate.heading(tag: :h3).with_content(t(:'.no_events'))
 
 
     = render Primer::SubheadComponent.new(mt: 4) do |component|
@@ -38,6 +40,10 @@
           - repeater(events) do |event|
             = render 'conferences_primer_theme/partials/event', event: event
       - else
-        = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+        = render Primer::Beta::Blankslate.new do |blankslate|
+          - blankslate.visual_icon(icon: 'calendar')
+          - blankslate.heading(tag: :h3).with_content(t(:'.no_events'))
   - else
-    = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+    = render Primer::Beta::Blankslate.new do |blankslate|
+      - blankslate.visual_icon(icon: 'calendar')
+      - blankslate.heading(tag: :h3).with_content(t(:'.no_events'))

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

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

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

@@ -0,0 +1,10 @@
+- cache [current_page, journal_navigation_items] do
+  = render Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row]) do
+    - cache current_page do
+      = render Primer::BoxComponent.new(col: [nil, nil, nil, 9]) do
+        = render(Primer::HeadingComponent.new(tag: :h1)) { current_page.title }
+
+        - if content(:text).present?
+          = render(Primer::Markdown.new(mt: 4)) { content.html(:text).to_s }
+
+    = render 'journal_navigation'