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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b41121814204870d40e05f0f24a4903d2a90065a6c4e22f0bb9f35fbfc5cc6d
-  data.tar.gz: 407fa16213cc79508555b859dc426de75c632e19d1ddb8ab0f496fafb38132d6
+  metadata.gz: 368c56ce1c8e46990e158e126482ccfdb4cb642155137de454e392f069122253
+  data.tar.gz: 65f336153d9d62c27b31583b6279a38ce22dc0bd6c0d1483623b7c01a78fcad6
 SHA512:
-  metadata.gz: b23678f53c4f7b7009dee49c4bf677067ac366498debf71db357c1013f75fc7aec1a1d328568f0c299ef64521545ebb09c3363841956fee86cdc0589efa5f01a
-  data.tar.gz: 322fa3813cdd79f002781ce44ee5ae5fbb33e745a3e3f44efbfe679a835318c3643e60a540b8f059a029ca3ca02fbaf4cd24dbb20ef927d5cd5641cd6ea73bc0
+  metadata.gz: f520220033ab6a8f5513fbfab3da718d56cecddeb12c2530bec85c555dad46a2699433b3e5ecfb07790cc85a4a404a53f7031a05c61ba55e30a5be5fde911cf7
+  data.tar.gz: 52cb679bd54df86e7f71519da986cf87d1a7fc37c37bb8804aa8d6aa88c076b0ce65a459f5736683daddd3a278217457bc52cf6d5dc2d7819fc07270a0eb23c2

data/README.md

@@ -1,24 +1,39 @@
-# PrimerTheme: frontend for Spina
+# PrimerTheme for Spina
+
+PrimerTheme is a theme for Spina that uses [GitHub's Primer design system](https://primer.style/). It provides frontends for Spina pages, as well as for the following Spina plugins:
+
+- [Conferences](https://github.com/louis-vs/spina-admin-conferences-fork/)
+- [Journal](https://github.com/louis-vs/spina-admin-journal)
+- [Blog (fork)](https://github.com/louis-vs/spina-admin-conferences-blog)
+
+All of these plugins will be automatically installed with PrimerTheme, but you can use any selection of them that you wish. PrimerTheme provides you with an easy-to-setup Spina theme with a wide array of options, extending the core Spina setup.
+
+PrimerTheme was originally designed for the Undergraduate Linguistics Association of Britain's website, which you can [view here](https://www.ulab.org.uk/) if you want to see the theme in action.
+
+**NB:** Please use this fork, rather than the original. This fork provides a stable, updated release, whilst the old repo is no longer maintained.
 
 ![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`.
+## Features
 
-This fork provides an updated version of the plugin, as the main repo is currently badly outdated.
+The plugin's main goal is to provide frontends for Spina core and the three plugins listed above, using Primer. It also provides a number of useful page templates for use with Spina.
 
 ## Usage
-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
-//= link spina_conferences_primer_theme_manifest.js
-```
+See the READMEs for the conference plugin, the journal plugin, and the blog 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.
+
+You can customise Primer by overriding the `_custom.sass` and `_custom_variables.sass` files. See the [ULAB Website](https://github.com/ulab-committee/ulab-website) repo for an example.
 
 ## Installation
-Add this line to your application's Gemfile:
+
+Make sure you have a working installation of Ruby on Rails 7. You can find a setup guide [here](https://guides.rubyonrails.org/getting_started.html).
+
+You then need to install Spina, following the guide [on the Spina website](https://spinacms.com/docs).
+
+To install the plugin, add this line to your application's Gemfile:
 
 ```ruby
 gem 'spina-conferences-primer_theme-fork', require: 'spina/conferences/primer_theme'
@@ -29,19 +44,46 @@ And then execute:
 $ bundle
 ```
 
-Or install it yourself as:
+You will also need to configure Yarn. Add this repo as a dependency, so that your `package.json` resembles the following:
+
+```json
+{
+  "name": "website_name",
+  "private": true,
+  "dependencies": {
+    "spina-conferences-primer-theme-fork": "louis-vs/spina-conferences-primer_theme-fork"
+  }
+}
+```
+
+You will then need to install and run the migrations from all of the plugins that come bundled with PrimerTheme:
+
 ```bash
-$ gem install spina-conferences-primer_theme-fork
+$ bin/rails spina_admin_journal:install:migrations
+$ bin/rails spina_admin_conferences:install:migrations
+$ bin/rails spina_admin_conferences_blog:install:migrations
+$ bin/rails spina_conferences_primer_theme:install:migrations
+$ bin/rails db:migrate
+```
+
+Also make sure to ensure compilation of the assets for this gem by adding the following line to your `manifest.js` file.
+
+```js
+//= link spina_conferences_primer_theme_manifest.js
 ```
 
-The first thing you will probably want to do is add three pages using the 'blank' template, and add
-forwarding URLs as follows:
-* Conferences to `/conferences/conferences`
-* Journal to `/journal/issues`
-* Blog to `/blog`
+Finally, start the server with:
+
+```bash
+$ bin/rails s
+```
+
+If you want to customise Primer, you will need to add `_custom.sass` and/or `_custom_variables.sass` into `app/assets/stylesheets/spina/conferences/primer_theme`. You will also need to override the CSS build rake task so that it finds your new files - an example of this can be found in the ULAB website [here](https://github.com/ulab-committee/ulab-website/blob/master/lib/tasks/ulab_website_tasks.rake).
 
 ## Contributing
-Contributions welcome, open an issue first please.
+
+Bug reports and feature requests are welcome in the [Issues](https://github.com/louis-vs/spina-conferences-primer_theme-fork/issues) section. Translations are also very welcome!
 
 ## License
+
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/builds/spina/conferences/primer_theme/application.css

@@ -25962,3 +25962,11 @@ address {
   width: 100%;
   height: 70vh;
 }
+
+img {
+  background-color: white !important;
+}
+
+.breadcrumb-item {
+  white-space: normal !important;
+}

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

@@ -42,3 +42,9 @@ address
   border: none
   width: 100%
   height: 70vh
+
+img
+  background-color: white !important
+
+.breadcrumb-item
+  white-space: normal !important

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

@@ -19,6 +19,7 @@ module Spina
               page.title = 'Conferences'
               page.link_url = '/conferences/conferences'
               page.deletable = false
+              page.active = true
             end
           end
         end

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

@@ -15,6 +15,7 @@ module Spina
               page.title = 'Journal'
               page.link_url = '/journal/issues'
               page.deletable = false
+              page.active = true
             end
           end
         end

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

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

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

@@ -13,7 +13,7 @@ module Spina
         end
 
         def journal_abbreviation_or_name(journal)
-          journal.content(:journal_abbreviation) && journal.content(:journal_abbreviation).empty? ? journal.name : journal.content(:journal_abbreviation) # rubocop:disable Layout/LineLength
+          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

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

@@ -17,6 +17,11 @@ module Spina
           @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)

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

@@ -21,7 +21,9 @@
             = 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|
@@ -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?
@@ -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

@@ -40,4 +40,6 @@
               - if committee_bio.content(:bio).present?
                 = 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/events.html.haml

@@ -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/homepage.html.haml

@@ -6,7 +6,7 @@
       - if content(:carousel).present?
         .height-full.d-flex.flex-column.flex-justify-between{data: { controller: :slideshow, slideshow_incrementer: 0, slideshow_advance: true, slideshow_delay: 20000} }
           - content(:carousel).each_with_index do |carousel_item, index|
-            = render partial: 'conferences_primer_theme/partials/homepage_item', locals: { item: carousel_item }
+            = render partial: 'conferences_primer_theme/partials/homepage_item', locals: { item: carousel_item, index: index }
           - if content(:carousel).many?
             .container-lg.height-full.d-flex.flex-column-reverse.mb-8{ style: 'z-index: 5' }
               = render(Primer::ButtonGroup.new) do |component|

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

@@ -1,4 +1,4 @@
-%div{ data: { slideshow_target: 'slide' } }
+%div{ data: { slideshow_target: 'slide' }, hidden: (index != 0) }
   - if item.content(:background_image).present?
     = render Primer::BoxComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false, style: 'z-index: 1') do
       = image_tag(main_app.url_for(item.content(:background_image).variant(resize_to_limit: [1680, 1680])),
@@ -9,11 +9,11 @@
                   class: %w[width-full height-full])
   .container-lg.p-responsive.position-relative.color-text-white.height-full{ style: 'z-index: 3'}
     = render Primer::BoxComponent.new(py: [3, nil, nil, 6]) do
-      %div{ style: 'text-shadow: 0 1px 1px #01040940, 0 1px 25px #010409bf;' }
+      %div{ style: 'color: var(--color-scale-white); text-shadow: 0 1px 1px #01040940, 0 1px 25px #010409bf;' }
         = 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::Markdown.new(my: 4)) do
+      %div{ style: 'color: var(--color-scale-white); text-shadow: 0 1px 1px #010409bf, 0 1px 25px #010409bf;' }
+        = render(Primer::Markdown.new(my: 4, font_size: 3)) do
           = item.content.html(:description).to_s
       - if item.content(:url).present?
         = link_to t('.more_info'), item.content(:url),

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

@@ -1,7 +1,8 @@
-= render Primer::BorderBoxComponent.new(classes: 'Box--overlay') do |component|
-  - component.header do
-    = button_tag(data: { 'close-dialog': true }, aria: { label: t(:'spina.close') }, type: 'button',
-                 class: %w[Box-btn-octicon btn-octicon float-right]) do
-      = render Primer::OcticonComponent.new('x')
-    .Box-title= t(:'.title')
-  = component.body { }
+- cache do
+  = render Primer::BorderBoxComponent.new(classes: 'Box--overlay') do |component|
+    - component.header do
+      = button_tag(data: { 'close-dialog': true }, aria: { label: t(:'spina.close') }, type: 'button',
+                  class: %w[Box-btn-octicon btn-octicon float-right]) do
+        = render Primer::OcticonComponent.new('x')
+      .Box-title= t(:'.title')
+    = component.body { }

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

@@ -1,13 +1,15 @@
-= render Primer::DetailsComponent.new(overlay: :dark, reset: true) do |component|
-  = component.summary(button_type: :outline, variant: :small, aria: { haspopup: 'dialog' }, type: nil) do
-    = render Primer::OcticonComponent.new('info')
-    = t :'.cookies'
-  = component.body(tag: :'details-dialog') do
-    %include-fragment{ src: frontend_cookies_info_path, loading: :lazy }
-      = render Primer::BorderBoxComponent.new(classes: 'Box--overlay') do |box_component|
-        = box_component.body do
-          = button_tag(data: { 'close-dialog': true }, aria: { label: t(:'spina.close') }, type: 'button',
-                       class: %w[Box-btn-octicon btn-octicon m-0 position-absolute right-0 top-0]) do
-            = render Primer::OcticonComponent.new('x')
-          = render Primer::BlankslateComponent.new(title: t('.loading')) do |blankslate_component|
-            = blankslate_component.spinner(size: :large)
+- cache frontend_cookies_info_path do
+  = render Primer::DetailsComponent.new(overlay: :dark, reset: true) do |component|
+    = component.summary(button_type: :outline, variant: :small, aria: { haspopup: 'dialog' }, type: nil) do
+      = render Primer::OcticonComponent.new('info')
+      = t :'.cookies'
+    = component.body(tag: :'details-dialog') do
+      %include-fragment{ src: frontend_cookies_info_path, loading: :lazy }
+        = render Primer::BorderBoxComponent.new(classes: 'Box--overlay') do |box_component|
+          = box_component.body do
+            = button_tag(data: { 'close-dialog': true }, aria: { label: t(:'spina.close') }, type: 'button',
+                        class: %w[Box-btn-octicon btn-octicon m-0 position-absolute right-0 top-0]) do
+              = render Primer::OcticonComponent.new('x')
+            = render Primer::Beta::Blankslate.new(title: t('.loading')) do |blankslate_component|
+              = blankslate_component.visual_spinner(size: :large)
+              = blankslate_component.heading(tag: :h3).with_content(t('.loading'))

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

@@ -1,4 +1,4 @@
-- cache [footer_navigation_items, current_account] do
+- cache [all_navigation_items, current_account] do
   = render Primer::BoxComponent.new(position: :relative, display: :flex,
     flex_wrap: :wrap,
     direction: [:column_reverse, nil, :row, nil],
@@ -9,7 +9,7 @@
     %div
       = render(Primer::Beta::Text.new(tag: :span, color: :muted, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
         = t :'.copyright', name: current_account.name, year: Date.today.year
-    - cache footer_navigation_items do
+    - cache all_navigation_items do
       %ul.list-style-none.d-flex.flex-wrap.flex-1.flex-justify-center.flex-lg-justify-around.mb-2.mb-lg-0
         - footer_navigation_items.each do |item|
           - cache item do

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

@@ -1,4 +1,4 @@
-- cache main_navigation_items do
+- cache all_navigation_items do
   .Header.px-3.px-md-4.px-lg-5.flex-wrap.flex-lg-nowrap
     .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
     %details.details-reset.d-lg-none{ style: 'display: contents' }

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

@@ -8,5 +8,7 @@
     - if @posts.any?
       %ul= render collection: @posts, partial: 'spina/conferences/primer_theme/blog/posts/post', layout: 'list_item', cached: true
     - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_posts'), icon: 'mortar-board')
+      = render Primer::Beta::Blankslate.new do |blankslate|
+        - blankslate.visual_icon(icon: 'mortar-board')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_posts'))
   = render 'spina/conferences/primer_theme/blog/shared/sidebar'

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

@@ -6,6 +6,8 @@
     - if @posts.any?
       %ul= render collection: @posts, partial: 'post', layout: 'list_item', cached: true
     - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_posts'), icon: 'mortar-board')
+      = render Primer::Beta::Blankslate.new do |blankslate|
+        - blankslate.visual_icon(icon: 'mortar-board')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_posts'))
   = render 'spina/conferences/primer_theme/blog/shared/sidebar'
 

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

@@ -11,6 +11,9 @@
         %ul{ data: { filter: { list: true } } }
           = render partial: 'event', collection: events.sorted, layout: 'list_item', cached: true
       - else
-        = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
-      = render Primer::BlankslateComponent.new(title: t(:'.no_matching_events'), icon: 'calendar', hidden: true,
-                                               data: { 'filter-empty-state': true })
+        = render Primer::Beta::Blankslate.new do |blankslate|
+          - blankslate.visual_icon(icon: 'calendar')
+          - blankslate.heading(tag: :h3).with_content(t(:'.no_events'))
+      = render Primer::Beta::Blankslate.new(data: { 'filter-empty-state': true }, hidden: true) do |blankslate|
+        - blankslate.visual_icon(icon: 'calendar')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_matching_events'))

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

@@ -24,6 +24,9 @@
                      locals: { conference: @conference }, cached: -> presentation { [presentation, presentation.presenters] }
           = paginate @presentations.sorted, views_prefix: 'spina/conferences/primer_theme/conferences'
         - else
-          = render Primer::BlankslateComponent.new(title: t(:'.no_presentations'), icon: 'mortar-board')
-        = render Primer::BlankslateComponent.new(title: t(:'.no_matching_presentations'), icon: 'mortar-board', hidden: true,
-                                                 data: { 'filter-empty-state': true })
+          = render Primer::Beta::Blankslate.new do |blankslate|
+            - blankslate.visual_icon(icon: 'mortar-board')
+            - blankslate.heading(tag: :h3).with_content(t(:'.no_presentations'))
+        = render Primer::Beta::Blankslate.new(data: { 'filter-empty-state': true }, hidden: true) do |blankslate|
+          - blankslate.visual_icon(icon: 'mortar-board')
+          - blankslate.heading(tag: :h3).with_content(t(:'.no_matching_presentations'))

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

@@ -18,6 +18,9 @@
       = render partial: 'conference', collection: @conferences, layout: 'list_item',
                cached: -> conference { [conference, conference.institutions, conference.institutions.collect(&:logo)] }
   - else
-    = render Primer::BlankslateComponent.new(title: t(:'.no_conferences'), icon: 'mortar-board')
-  = render Primer::BlankslateComponent.new(title: t(:'.no_matching_conferences'), icon: 'mortar-board', hidden: true,
-                                           data: { 'filter-empty-state': true })
+    = render Primer::Beta::Blankslate.new do |blankslate|
+      - blankslate.visual_icon(icon: 'mortar-board')
+      - blankslate.heading(tag: :h3).with_content(t(:'.no_conferences'))
+  = render Primer::Beta::Blankslate.new(data: { 'filter-empty-state': true }, hidden: true) do |blankslate|
+    - blankslate.visual_icon(icon: 'mortar-board')
+    - blankslate.heading(tag: :h3).with_content(t(:'.no_matching_conferences'))

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

@@ -3,7 +3,7 @@
 
 - content_for(:header) { render 'header' }
 
-= turbo_frame_tag 'conference_tabs' do
+= turbo_frame_tag 'conference_tabs', target: '_top' do
   = 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),
                     selected: (@tab == 'information'), id: 'information') do
@@ -22,10 +22,36 @@
   - case @tab
     - when 'information'
       - cache [@conference, @tab] do
+        = render Primer::BoxComponent.new(mt: 4,
+                                          col: [12, nil, 5, nil],
+                                          float: [nil, nil, :right, nil],
+                                          border: true,
+                                          border_radius: 3,
+                                          p: 3) do
+          - if @conference.content(:documents).present?
+            = render Primer::SubheadComponent.new do |component|
+              = component.heading { t :'.documents.title' }
+            %ul
+              - repeater @conference.content(:documents) do |document|
+                %li.list-style-none.py-1.d-flex.flex-items-center
+                  = render Primer::BoxComponent.new(flex: :auto) do
+                    - if document.content(:name).present?
+                      = document.content(:name)
+                    - else
+                      = 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::Beta::Text.new(color: :muted, font_size: 6)) { t :'.documents.no_file' }
         - if @conference.content(:text).present?
           = render(Primer::Markdown.new(my: 4)) { @conference.content.html(:text).to_s }
         - else
-          = render Primer::BlankslateComponent.new(title: t(:'.no_information'), icon: 'info', my: 4)
+          = render Primer::Beta::Blankslate.new(my: 4) do |blankslate|
+            - blankslate.visual_icon(icon: 'info')
+            - blankslate.heading(tag: :h3).with_content(t(:'.no_information'))
     - when 'presentations'
       - cache [@conference.presentations, @presentation_type, @presentations, @presentations.collect(&:presenters), @tab] do
         = render partial: 'presentations'
@@ -33,5 +59,7 @@
       - cache [@conference.events, @tab] do
         = render partial: 'events', locals: { events: @conference.events }
     - else
-      = render Primer::BlankslateComponent.new(title: t('.no_tab'), description: t('.tab_does_not_exist', tab: @tab), icon: 'x-circle',
-                                               my: 4)
+      = render Primer::Beta::Blankslate.new(my: 4) do |blankslate|
+        - blankslate.visual_icon(icon: 'x-circle')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_tab'))
+        - blankslate.description { t('.tab_does_not_exist', tab: @tab) }

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

@@ -6,5 +6,7 @@
     - if @authors.any?
       %ul= render partial: 'author', collection: @authors, layout: 'list_item', cached: true
     - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_authors'), icon: 'mortar-board')
+      = render Primer::Beta::Blankslate.new do |blankslate|
+        - blankslate.visual_icon(icon: 'mortar-board')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_authors'))
   = render 'journal_navigation'

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

@@ -15,6 +15,8 @@
     - if @author.articles.any?
       %ul= render partial: 'spina/conferences/primer_theme/journal/issues/article', collection: @author.articles.sorted_asc, layout: 'list_item', cached: true
     - else
-      = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')
+      = render Primer::Beta::Blankslate.new do |blankslate|
+        - blankslate.visual_icon(icon: 'mortar-board')
+        - blankslate.heading(tag: :h3).with_content(t(:'.no_articles'))
 
   = render 'journal_navigation'

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

@@ -26,7 +26,9 @@
   - if @issues.any?
     %ul= render partial: 'issue', collection: @issues, layout: 'list_item', cached: true
   - else
-    = render Primer::BlankslateComponent.new(title: t(:'.no_issues'), icon: 'mortar-board')
+    = render Primer::Beta::Blankslate.new do |blankslate|
+      - blankslate.visual_icon(icon: 'mortar-board')
+      - blankslate.heading(tag: :h3).with_content(t(:'.no_issues'))
 
 - if @journal.has_content?(:issn) && !@journal.content(:issn).empty?
   = render(Primer::BoxComponent.new(mt: 4)) do

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

@@ -19,7 +19,9 @@
         - if @articles.any?
           %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item', cached: true
         - else
-          = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')
+          = render Primer::Beta::Blankslate.new do |blankslate|
+            - blankslate.visual_icon(icon: 'mortar-board')
+            - blankslate.heading(tag: :h3).with_content(t(:'.no_articles'))
 
     = render(Primer::BorderBoxComponent.new(ml: [nil, nil, nil, 4], col: [nil, nil, nil, 4])) do |sidebar|
       - sidebar.body do

data/config/locales/en.yml

@@ -96,6 +96,11 @@ en:
               tab_does_not_exist: "The tab '%{tab}' does not exist."
               no_information: No information.
               conference_navigation: Conference content
+              documents:
+                title: Downloads
+                download: Download
+                no_file: No file uploaded.
+                no_name: Untitled
             presentations:
               all_presentation_types: All
               results: Results

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '1.0.0.rc3'
+      VERSION = '1.0.0.rc6'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme-fork
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: spina-admin-journal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement