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

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

@@ -4,8 +4,12 @@ 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
+
+          before_action :page
+
           def cookies_info
             render partial: 'cookies'
           end
@@ -15,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
@@ -36,9 +33,9 @@ module Spina
 
           def archive
             @posts = Spina::Admin::Conferences::Blog::Post.live
-                                      .where(published_at: start_date..end_date)
-                                      .order(published_at: :desc)
-                                      .page(params[:page])
+                                                          .where(published_at: start_date..end_date)
+                                                          .order(published_at: :desc)
+                                                          .page(params[:page])
 
             render layout: theme_layout
           end
@@ -53,17 +50,9 @@ 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])
+                                                          .page(params[:page])
           end
 
           def try_redirect
@@ -71,16 +60,12 @@ 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
 
           def set_metadata
-            @title = @post.seo_title.blank? ? @post.title : @post.seo_title
+            @title = @post.seo_title.presence || @post.title
             @description = @post.description
           end
         end

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

@@ -6,9 +6,21 @@ 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
+            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,28 +43,28 @@ module Spina
           end
 
           def set_presentation_type
-            if params[:presentation_type].present?
-              @presentation_type = @conference.presentation_types
-                                              .includes(presentations: [session: [:room], presenters: [:institution]])
-                                              .find(params[:presentation_type])
-            end
+            return if params[:presentation_type].blank?
+
+            @presentation_type = @conference.presentation_types
+                                            .includes(presentations: [session: [:room], presenters: [:institution]])
+                                            .find(params[:presentation_type])
           end
 
           def set_presentations
             @presentations = if @presentation_type.present?
-                              @presentation_type.presentations.page(params[:page]).per(15)
-                            else
-                              @conference.presentations.page(params[:page]).per(15)
-                            end
+                               @presentation_type.presentations.page(params[:page]).per(15)
+                             else
+                               @conference.presentations.page(params[:page]).per(15)
+                             end
           end
 
           def set_breadcrumb
-            add_breadcrumb 'Blog', frontend_conferences_path
+            add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
           end
 
           def set_metadata
             @title = @conference.present? ? @conference.name : Admin::Conferences::Conference.model_name.human(count: 0)
-            @description = @conference.present? && @conference.has_content?(:text) ? helpers.strip_tags(@conference.content(:text)) : ''
+            @description = @conference.present? && @conference.has_content?(:text) ? helpers.strip_tags(@conference.content(:text)) : '' # rubocop:disable Layout/LineLength
           end
         end
       end

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

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

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

@@ -6,6 +6,17 @@ 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
+            end
+          end
         end
       end
     end

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_volume, :set_issue, :set_article, :set_journal, :set_licence,
+                        :set_breadcrumb, :set_metadata, :require_admin_for_invisible_article
 
           def show
             respond_to do |format|
@@ -24,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
@@ -46,10 +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 t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number),
-                          frontend_issue_path(@issue.id)
+            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_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,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
@@ -32,14 +33,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

@@ -9,34 +9,53 @@ 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
+        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
+        end
+
+        def ancestors # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
           return [] if current_page.blank?
 
-          render Primer::BreadcrumbComponent.new(mb: 4) do |component|
+          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
-            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
+
+        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

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

@@ -13,10 +13,20 @@ module Spina
           @footer_navigation_items ||= live_navigation_items('footer')
         end
 
+        def journal_navigation_items
+          @journal_navigation_items ||= live_resource_navigation_items('journal')
+        end
+
         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
+
+        def live_resource_navigation_items(name)
+          ::Spina::Resource.find_by(name: name)&.pages&.roots&.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