spina-conferences-primer_theme-fork 0.8.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeeecc259280f962b1f0e54454b87884adbbcf02d7bccd976096489e48b7d6a
-  data.tar.gz: 0e9baa272b17486a1888d7103da11c22563c90208b62e625a245d7be90ef94bc
+  metadata.gz: ce68bf02784663a0e354ca369154d20f4599eae01c0910be10c57d6d330afba3
+  data.tar.gz: fe44d6649b68188d82fdd843b0a55d44b32bde8f89752513a152f61fd074ea2f
 SHA512:
-  metadata.gz: 5916e3b6065d2f4c5d4bef963ce35915c6666e99363001de02585536a8b8133860f7899f7bdf9851fa318d7f2aea9597f41e9b072b7cd3ca21c56f1998d38abd
-  data.tar.gz: 8473988d364a83fdba70e3a10d4c476f12df2fbd0b58c666bee88fec6e4686112f9dd67443102b48b4afc3d483ad1d9b89bce43e8f67e687ad8482b5e62414ce
+  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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+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
+            render partial: 'cookies'
+          end
+
+          protected
+
+          def theme_layout
+            'layouts/spina/conferences/primer_theme/blog/blog'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      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
+          before_action :set_metadata
+
+          def show
+            add_breadcrumb t('.category', name: @category.name)
+            render layout: theme_layout
+          end
+
+          private
+
+          def category
+            @category = Spina::Admin::Conferences::Blog::Category.friendly.find params[:id]
+          end
+
+          def posts
+            @posts = @category.posts.available.live.order(published_at: :desc)
+                              .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
+
+          def set_metadata
+            @title = @category.name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      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
+
+          def index
+            @posts = @posts.unscope(where: :draft) if current_spina_user&.admin?
+
+            @title = t('.blog')
+
+            respond_to do |format|
+              format.atom
+              format.html { render layout: theme_layout }
+            end
+          end
+
+          def show
+            @post = Spina::Admin::Conferences::Blog::Post.friendly.find params[:id]
+            set_metadata
+            add_breadcrumb @post.title
+            render layout: theme_layout
+          rescue ActiveRecord::RecordNotFound
+            try_redirect
+          end
+
+          def archive
+            @posts = Spina::Admin::Conferences::Blog::Post.live
+                                                          .where(published_at: start_date..end_date)
+                                                          .order(published_at: :desc)
+                                                          .page(params[:page])
+
+            render layout: theme_layout
+          end
+
+          private
+
+          def start_date
+            Time.zone.local(params[:year].to_i, (params[:month] || 1).to_i)
+          end
+
+          def end_date
+            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])
+          end
+
+          def try_redirect
+            rule = RewriteRule.find_by!(old_path: "/blog/posts/#{params[:id]}")
+            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
+
+          def set_metadata
+            @title = @post.seo_title.presence || @post.title
+            @description = @post.description
+          end
+        end
+      end
+    end
+  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,19 +43,19 @@ 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
@@ -63,7 +64,7 @@ module Spina
 
           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

@@ -8,8 +8,8 @@
           - content(:carousel).each_with_index do |carousel_item, index|
             = 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
-              = render(Primer::ButtonGroupComponent.new) do |component|
+            .container-lg.height-full.d-flex.flex-column-reverse.mb-8{ style: 'z-index: 5' }
+              = 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/layouts/spina/conferences/primer_theme/blog/blog.html.haml

@@ -0,0 +1,5 @@
+- content_for :breadcrumbs do
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
+
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title }