spina-conferences-primer_theme 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee6ebf471b1278f5dbaa148407d35902b279493695ea85312c622f45300e8be
-  data.tar.gz: 9fdb671ab2618ea7f6cafcd516d8053cad575cc1f3b56fe19c9e86bfe0c3c339
+  metadata.gz: b0f415891da36813f4af78fc54b98daf3e34d1b22853995c7887944757055c05
+  data.tar.gz: 6f8414d707ea3695ef12e342bb514f04fa667a5fa6f427a3679e9c465992527d
 SHA512:
-  metadata.gz: 37ace1c57074d2067673442fbe7baea80e819694999c9180d494336682a63101e7f20d81ea1d28a52ce77eebe9d608dac2ce5a971dc87f2e7b78a8285d277284
-  data.tar.gz: 13deb15dd48fb7b1f046e3fe65d6e95f40ed305f82fff015f7188d7a8ef7a5a2aabbb3b9cadaef6f0949ca68554b5aa2a9d7ebfd5c44e13b936fd47fb4d4c5d9
+  metadata.gz: 62789ffa15b959d63a2a6d7cef661fcc3870d3437ca4e23de0dc55496a597a054bdab0de720ba067b59eeb7685108079717b6c7c335139298f3ddf784b03ddf2
+  data.tar.gz: bcbb08ea4e23752dc6bb8c7d90111701cd0c65ddd1139c549c42fae19b33b75c2391086578a9db9352fa536a4829ac3ddbf675d8b047907251dd3b5e8ee6323e

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -1,6 +1,7 @@
 //= 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 @github/details-dialog-element/dist/index.js
 //= link @github/include-fragment-element/dist/index.js

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Conferences
+        # Base class from which controllers inherit
+        class ApplicationController < Spina::ApplicationController
+          def cookies_info
+            render partial: 'cookies'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      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_metadata
+
+          def index
+            @conferences = Admin::Conferences::Conference.sorted.includes(institutions: [:logo])
+            respond_to do |format|
+              format.html
+              format.ics { render body: @conferences.to_ics }
+            end
+          end
+
+          def show
+            add_breadcrumb @conference.name
+            respond_to do |format|
+              format.html
+              format.ics { render body: @conference.to_ics }
+            end
+          end
+
+          private
+
+          def set_conference
+            @conference = Admin::Conferences::Conference.includes(:events, :institutions,
+                                                                  presentation_types: [:translations],
+                                                                  presentations: [session: [:room], presenters: [:institution]])
+                                                        .find(params[:id])
+            @conference.view_context = view_context
+          rescue ActiveRecord::RecordNotFound
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+
+          def set_tab
+            @tab = params[:tab] || 'information'
+          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
+          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
+          end
+
+          def set_breadcrumb
+            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)) : ''
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Conferences
+        # User-facing controller for presentations, serving both html and ics
+        class PresentationsController < ApplicationController
+          before_action :set_presentation, :set_conference, :set_breadcrumb
+
+          def show
+            add_breadcrumb @presentation.name
+            respond_to do |format|
+              format.html
+              format.ics { head :not_found }
+            end
+          end
+
+          private
+
+          def set_presentation
+            @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
+          end
+
+          def set_conference
+            @conference = Admin::Conferences::Conference.find(params[:conference_id]) if params[:conference_id].present?
+          end
+
+          def set_breadcrumb
+            return if @conference.blank?
+
+            add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
+            add_breadcrumb @conference.name, frontend_conference_path(@conference)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Journal
+        # Base class from which controllers related to the journal plugin inherit
+        class ApplicationController < Spina::ApplicationController
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Journal
+        # User-facing controller for journal articles
+        class ArticlesController < ApplicationController
+          before_action :set_article, :set_issue, :set_journal, :set_breadcrumb, :set_metadata, :require_admin_for_invisible_article
+
+          def show
+            add_breadcrumb @article.title
+          end
+
+          private
+
+          def set_article
+            @article = Admin::Journal::Article.includes(affiliations: [:institution]).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_issue
+            @issue = Admin::Journal::Issue.includes(:volume, :articles).find(params[:issue_id])
+          rescue ActiveRecord::RecordNotFound
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+
+          def set_journal
+            @journal = @issue.volume.journal
+          end
+
+          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)
+          end
+
+          def set_metadata
+            @title = @article.title
+            @description = @article.content(:abstract).try(:to_plain_text)
+          end
+
+          def require_admin_for_invisible_article
+            raise ActiveRecord::RecordNotFound unless current_spina_user.present? || @article.visible?
+          rescue ActiveRecord::RecordNotFound # TODO: proper 404 handler
+            send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Journal
+        # User-facing controller for journal issues
+        class IssuesController < ApplicationController
+          before_action :set_journal
+          before_action :set_issue, :set_breadcrumb, only: :show
+          before_action :set_metadata
+
+          def index
+            # having multiple journals is not currently allowed anyway
+            @issues = Admin::Journal::Issue.sorted_desc
+          end
+
+          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)
+          end
+
+          private
+
+          def set_journal
+            @journal = Admin::Journal::Journal.instance
+          end
+
+          def set_issue
+            @issue = Admin::Journal::Issue.includes(:volume, :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_breadcrumb
+            add_breadcrumb @journal.name, frontend_issues_path
+            add_breadcrumb Admin::Journal::Issue.model_name.human.pluralize, frontend_issues_path
+          end
+
+          def set_metadata
+            @title = @journal.name
+            @description = ActionView::Base.full_sanitizer.sanitize(@journal.content(:description))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -25,10 +25,10 @@ module Spina
 
         def calendar(name:)
           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 { |calendar| yield(calendar) }
+                              .tap(&:publish)
+                              .then(&:to_ical)
         end
       end
     end

data/app/views/layouts/spina/conferences/primer_theme/application.html.haml

@@ -25,7 +25,8 @@
     - if current_spina_user.present?
       .admin= render 'spina/shared/admin_bar'
     %header= render 'navigation'
-    = render 'current_conference_alert'
+    - unless local_assigns[:hide_alert]
+      = render 'current_conference_alert'
     - if content_for? :flash
       .flash-messages= yield :flash
     %main

data/app/views/layouts/spina/conferences/primer_theme/journal/articles.html.haml

@@ -0,0 +1,2 @@
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title, hide_alert: true }

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

@@ -0,0 +1,2 @@
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title, hide_alert: true }

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

@@ -7,4 +7,5 @@
       .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
         = render partial: 'mobile_navigation_items'
     = render partial: 'navigation_item', collection: main_navigation_items, cached: true
+    .Header-item.d-none.d-lg-flex= link_to 'Journal', frontend_issues_path, class: %w[Header-link]
     .Header-item.d-none.d-lg-flex= link_to 'Conferences', frontend_conferences_path, class: %w[Header-link]

data/app/views/spina/conferences/primer_theme/conferences/{_presentations.html.haml → conferences/_presentations.html.haml}

@@ -22,7 +22,7 @@
           %ul{ data: { filter: { list: true } } }
             = render partial: 'presentation', collection: @presentations.sorted.reverse_order, layout: 'list_item',
                      locals: { conference: @conference }, cached: -> presentation { [presentation, presentation.presenters] }
-          = paginate @presentations.sorted, views_prefix: 'spina/conferences/primer_theme'
+          = 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/app/views/spina/conferences/primer_theme/journal/articles/_authorship.html.haml

@@ -0,0 +1,6 @@
+= render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
+  = render(Primer::FlexItemComponent.new(mr: 2)) do
+    = render(Primer::OcticonComponent.new('person'))
+  = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
+    = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { authorship.affiliation.name }
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { authorship.affiliation.institution.name }

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

@@ -0,0 +1,50 @@
+= render(Primer::HeadingComponent.new) { @article.title }
+
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true, mr: [nil, nil, 4, nil])) do
+    %ul.list-style-none.d-flex.flex-column.flex-sm-row.my-2
+      - @article.affiliations.each do |affiliation|
+        = render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
+          = render(Primer::FlexItemComponent.new(mr: 2)) do
+            = render(Primer::OcticonComponent.new('person'))
+          = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
+            = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { affiliation.name }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { affiliation.institution.name }
+
+    - if @article.has_content?(:abstract)
+      = render(Primer::HeadingComponent.new(tag: :h2, mt: 4, font_size: 3)) { t '.abstract' }
+      = render(Primer::MarkdownComponent.new) { @article.content.html(:abstract) }
+
+  = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil])) do |sidebar|
+    - sidebar.body do
+      - if @article.issue.has_content?(:cover_img)
+        = render partial: 'spina/journal/primer_theme/issues/issue_cover', locals: { issue: @article.issue, cover_img: @article.issue.content(:cover_img), size: [200, 400] }
+      = render(Primer::BorderBoxComponent.new) do |component|
+        - if @article.has_content?(:attachment)
+          - component.row do
+            = render(Primer::ButtonComponent.new(tag: :a, href: main_app.url_for(@article.content(:attachment)), download: '', scheme: :primary)) do
+              = render Primer::OcticonComponent.new('download')
+              = t '.download'
+        - component.row do
+          = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.published' }
+          = render(Primer::TextComponent.new) do
+            = time_tag @article.issue.date, format: :long
+        - component.row do
+          = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.issue' }
+          = render(Primer::TextComponent.new) do
+            = link_to t('spina.journal.primer_theme.volume_issue',
+                        volume_number: @article.issue.volume.number,
+                        issue_number: @article.issue.number), frontend_issue_path(@article.issue)
+        - unless @article.doi.blank?
+          = component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.doi' }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = link_to nil, @article.doi
+        - unless @article.url.blank?
+          = component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.url' }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = link_to nil, @article.url
+        - if @article.draft?
+          = component.row do
+            = render(Primer::TextComponent.new(tag: :div, color: :text_danger, font_weight: :bold)) { t '.draft' }

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

@@ -0,0 +1,15 @@
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
+      = link_to article.title, frontend_issue_article_path(article.issue, article)
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = render(Primer::OcticonComponent.new(article.affiliations.many? ? 'people' : 'person'))
+      = render(Primer::BaseComponent.new(tag: :address, display: :inline)) do
+        = article.authorships.sorted_within_article.collect { |authorship| authorship.affiliation.name }.to_sentence
+    - unless article.doi.blank?
+      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+        = link_to nil, article.doi
+    - if article.has_content?(:attachment)
+      = render(Primer::ButtonComponent.new(tag: :a, href: main_app.url_for(article.content(:attachment)), mt: 2, download: '')) do
+        = render Primer::OcticonComponent.new('download')
+        = t '.download'

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

@@ -0,0 +1,17 @@
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  - if issue.content(:cover_img).present?
+    = render(Primer::FlexItemComponent.new(mr: 4)) do
+      = render partial: 'issue_cover', locals: { issue: issue, cover_img: issue.content(:cover_img), size: [150, 300] }
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::HeadingComponent.new(tag: :h2, mb: 1)) do
+      = link_to t('spina.conferences.primer_theme.journal.volume_issue',
+                  volume_number: issue.volume.number,
+                  issue_number: issue.number), frontend_issue_path(issue)
+    - unless issue.title.blank?
+      = render(Primer::HeadingComponent.new(tag: :h3, color: :text_secondary, mb: 1)) do
+        = issue.title
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, font_weight: :bold)) do
+      = time_tag issue.date, format: :long
+    - if issue.has_content?(:description)
+      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 2)) do
+        = issue.content.html(:description)

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

@@ -0,0 +1,6 @@
+- cache cover_img do
+  = image_tag main_app.url_for(cover_img.variant(resize_to_limit: size)),
+              srcset: srcset(cover_img, variant: { resize_to_limit: size }),
+              alt_description: t('spina.conferences.primer_theme.journal.volume_issue', volume_number: issue.volume.number, issue_number: issue.number),
+              draggable: false,
+              class: 'p-1'

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

@@ -0,0 +1,10 @@
+= render(Primer::HeadingComponent.new) { @journal.name }
+
+- if @journal.content(:description).present?
+  = render(Primer::MarkdownComponent.new(mt: 4)) { @journal.content.html(:description) }
+
+%div#journal-issues-list.border-top
+  - if @issues.any?
+    %ul= render partial: 'issue', collection: @issues, layout: 'list_item'
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_issues'), icon: 'mortar-board')

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

@@ -0,0 +1,18 @@
+= render(Primer::HeadingComponent.new) do
+  = t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number)
+
+- unless @issue.title.blank?
+  = render(Primer::HeadingComponent.new(tag: :h2, color: :text_secondary, mb: 2)) { @issue.title }
+
+- if @issue.has_content?(:cover_img)
+  = render partial: 'issue_cover', locals: { issue: @issue, cover_img: @issue.content(:cover_img), size: [300, 600] }
+
+- if @issue.has_content?(:description)
+  = render(Primer::MarkdownComponent.new(my: 4)) do
+    = @issue.content.html(:description)
+
+%div#journal-articles-list.border-top
+  - if @articles.any?
+    %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item'
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')

data/config/initializers/themes/conferences_primer_theme.rb

@@ -162,6 +162,14 @@
     name: 'embed_url',
     title: 'Form embed URL',
     part_type: 'Spina::Parts::Admin::Conferences::Url'
+  }, {
+    name: 'abstract',
+    title: 'Abstract',
+    part_type: 'Spina::Parts::Text'
+  }, {
+    name: 'cover_img',
+    title: 'Cover image',
+    part_type: 'Spina::Parts::Image'
   }]
 
   theme.view_templates = [{
@@ -221,5 +229,5 @@
     label: 'Footer'
   }]
 
-  theme.plugins = ['conferences']
+  theme.plugins = %w[conferences journal]
 end

data/config/locales/en.yml

@@ -99,66 +99,87 @@ en:
     conferences:
       primer_theme:
         conferences:
-          index:
-            subscribe: Subscribe
-            no_conferences: No conferences have been added.
-            search: Search
-            no_matching_conferences: No matching conferences.
-          show:
-            information: Information
-            presentations: Presentations
-            events: Events
-            subscribe: Subscribe
-            tabs:
+          conferences:
+            index:
+              subscribe: Subscribe
+              no_conferences: No conferences have been added.
+              search: Search
+              no_matching_conferences: No matching conferences.
+            show:
               information: Information
               presentations: Presentations
               events: Events
-            no_tab: No tab.
-            tab_does_not_exist: "The tab '%{tab}' does not exist."
-            no_information: No information.
-            conference_navigation: Conference content
+              subscribe: Subscribe
+              tabs:
+                information: Information
+                presentations: Presentations
+                events: Events
+              no_tab: No tab.
+              tab_does_not_exist: "The tab '%{tab}' does not exist."
+              no_information: No information.
+              conference_navigation: Conference content
+            presentations:
+              all_presentation_types: All
+              results: Results
+              search: Search
+              no_matching_presentations: No matching presentations.
+              no_presentations: No presentations.
+            presentation_type:
+              results: Results
+            events:
+              search: Search
+              no_matching_events: No matching events.
+              no_events: No events.
+            event:
+              times_html: "%{start_time}–%{finish_time}"
+            conference:
+              dates_html: "%{start_date}–%{finish_date}"
+              locations: "%{institutions}, %{cities}"
+            submission_flash:
+              submit_by_html: Submit abstracts by %{date}
+              submit_abstract: Submit an abstract
+            header:
+              dates_html: "%{start_date}–%{finish_date}"
+              locations: "%{institutions}, %{cities}"
+              gallery:
+                previous: Previous
+                next: Next
+              sponsors:
+                title: Sponsors
+
           presentations:
-            all_presentation_types: All
-            results: Results
-            search: Search
-            no_matching_presentations: No matching presentations.
-            no_presentations: No presentations.
-          presentation_type:
-            results: Results
-          events:
-            search: Search
-            no_matching_events: No matching events.
-            no_events: No events.
-          event:
-            times_html: "%{start_time}–%{finish_time}"
-          conference:
-            dates_html: "%{start_date}–%{finish_date}"
-            locations: "%{institutions}, %{cities}"
-          submission_flash:
-            submit_by_html: Submit abstracts by %{date}
-            submit_abstract: Submit an abstract
-          header:
-            dates_html: "%{start_date}–%{finish_date}"
-            locations: "%{institutions}, %{cities}"
-            gallery:
-              previous: Previous
-              next: Next
-            sponsors:
-              title: Sponsors
+            show:
+              room_and_institution: "%{room}, %{institution}"
 
-        presentations:
-          show:
-            room_and_institution: "%{room}, %{institution}"
+          kaminari:
+            next_page:
+              next: Next
+              next_page: Next page
+            prev_page:
+              previous: Previous
+              previous_page: Previous page
+            page:
+              page: Page %{number}
 
-        kaminari:
-          next_page:
-            next: Next
-            next_page: Next page
-          prev_page:
-            previous: Previous
-            previous_page: Previous page
-          page:
-            page: Page %{number}
+        journal:
+          volume_issue: "Volume %{volume_number} (Issue %{issue_number})"
+          issues:
+            index:
+              no_issues: This journal has no issues.
+              logo: Journal logo
+            show:
+              no_articles: This issue has no articles.
+            article:
+              download: PDF
+          articles:
+            show:
+              download: PDF
+              doi: DOI
+              url: URL
+              abstract: Abstract
+              published: Published
+              issue: Issue
+              draft: THIS ARTICLE IS A DRAFT
 
   languages:
     en-GB: British English

data/config/routes.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 Spina::Engine.routes.draw do
-  namespace :frontend, path: 'conferences', module: 'conferences/primer_theme' do
+  namespace :frontend, path: 'conferences', module: 'conferences/primer_theme/conferences' do
     resources :conferences, only: %i[index show] do
       resources :presentations, only: [:show]
     end
     resources :presentations, only: [:show]
     get 'cookies-info', controller: 'application'
   end
+
+  namespace :frontend, path: 'journal', module: 'conferences/primer_theme/journal' do
+    resources :issues, only: %i[index show] do
+      resources :articles, only: %i[show]
+    end
+  end
 end

data/lib/spina/conferences/primer_theme.rb

@@ -4,15 +4,14 @@ require 'spina'
 require 'spina/conferences/primer_theme/engine'
 require 'spina/conferences/primer_theme/breadcrumbs/builder'
 require 'spina/admin/conferences'
+require 'spina/admin/journal'
 require 'octicons_helper'
 require 'view_component'
 require 'primer/view_components'
 require 'icalendar'
 
 module Spina
-  module Conferences
-    module PrimerTheme
-      # Your code goes here...
-    end
+  module PrimerTheme
+    # Your code goes here...
   end
 end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.4.2'
+      VERSION = '0.5.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -109,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: spina-admin-journal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.33'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: dotenv-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.33'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.33'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -292,9 +292,12 @@ files:
 - app/assets/stylesheets/spina/conferences/primer_theme/_custom.sass
 - app/assets/stylesheets/spina/conferences/primer_theme/_custom_variables.sass
 - app/assets/stylesheets/spina/conferences/primer_theme/application.sass
-- app/controllers/spina/conferences/primer_theme/application_controller.rb
-- app/controllers/spina/conferences/primer_theme/conferences_controller.rb
-- app/controllers/spina/conferences/primer_theme/presentations_controller.rb
+- app/controllers/spina/conferences/primer_theme/conferences/application_controller.rb
+- app/controllers/spina/conferences/primer_theme/conferences/conferences_controller.rb
+- app/controllers/spina/conferences/primer_theme/conferences/presentations_controller.rb
+- app/controllers/spina/conferences/primer_theme/journal/application_controller.rb
+- app/controllers/spina/conferences/primer_theme/journal/articles_controller.rb
+- app/controllers/spina/conferences/primer_theme/journal/issues_controller.rb
 - app/helpers/spina/conferences/primer_theme/application_helper.rb
 - app/helpers/spina/conferences/primer_theme/asset_helper.rb
 - app/helpers/spina/conferences/primer_theme/navigations_helper.rb
@@ -307,8 +310,10 @@ files:
 - app/views/conferences_primer_theme/pages/show.html.haml
 - app/views/layouts/conferences_primer_theme/application.html.haml
 - app/views/layouts/spina/conferences/primer_theme/application.html.haml
-- app/views/layouts/spina/conferences/primer_theme/conferences.html.haml
-- app/views/layouts/spina/conferences/primer_theme/presentations.html.haml
+- app/views/layouts/spina/conferences/primer_theme/conferences/conferences.html.haml
+- app/views/layouts/spina/conferences/primer_theme/conferences/presentations.html.haml
+- app/views/layouts/spina/conferences/primer_theme/journal/articles.html.haml
+- app/views/layouts/spina/conferences/primer_theme/journal/issues.html.haml
 - app/views/spina/admin/layout_partables/texts/_form.html.haml
 - app/views/spina/application/_cookies.html.haml
 - app/views/spina/application/_current_conference_alert.html.haml
@@ -321,27 +326,34 @@ files:
 - app/views/spina/application/_navigation.html.haml
 - app/views/spina/application/_navigation_item.html.haml
 - app/views/spina/application/_text.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_conference.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_event.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_events.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_header.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_institution.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_presentation.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_presentation_type.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_presentations.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_submission_flash.html.haml
-- app/views/spina/conferences/primer_theme/conferences/index.html.haml
-- app/views/spina/conferences/primer_theme/conferences/show.html.haml
-- app/views/spina/conferences/primer_theme/kaminari/_gap.html.haml
-- app/views/spina/conferences/primer_theme/kaminari/_next_page.html.haml
-- app/views/spina/conferences/primer_theme/kaminari/_page.html.haml
-- app/views/spina/conferences/primer_theme/kaminari/_paginator.html.haml
-- app/views/spina/conferences/primer_theme/kaminari/_prev_page.html.haml
-- app/views/spina/conferences/primer_theme/presentations/_abstract.html.haml
-- app/views/spina/conferences/primer_theme/presentations/_attachment.html.haml
-- app/views/spina/conferences/primer_theme/presentations/_attachments.html.haml
-- app/views/spina/conferences/primer_theme/presentations/show.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_conference.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_event.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_events.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_header.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_institution.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_institution_logo.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_presentation.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_presentation_type.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_presentations.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/_submission_flash.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/index.html.haml
+- app/views/spina/conferences/primer_theme/conferences/conferences/show.html.haml
+- app/views/spina/conferences/primer_theme/conferences/kaminari/_gap.html.haml
+- app/views/spina/conferences/primer_theme/conferences/kaminari/_next_page.html.haml
+- app/views/spina/conferences/primer_theme/conferences/kaminari/_page.html.haml
+- app/views/spina/conferences/primer_theme/conferences/kaminari/_paginator.html.haml
+- app/views/spina/conferences/primer_theme/conferences/kaminari/_prev_page.html.haml
+- app/views/spina/conferences/primer_theme/conferences/presentations/_abstract.html.haml
+- app/views/spina/conferences/primer_theme/conferences/presentations/_attachment.html.haml
+- app/views/spina/conferences/primer_theme/conferences/presentations/_attachments.html.haml
+- app/views/spina/conferences/primer_theme/conferences/presentations/show.html.haml
+- app/views/spina/conferences/primer_theme/journal/articles/_authorship.html.haml
+- app/views/spina/conferences/primer_theme/journal/articles/show.html.haml
+- app/views/spina/conferences/primer_theme/journal/issues/_article.html.haml
+- app/views/spina/conferences/primer_theme/journal/issues/_issue.html.haml
+- app/views/spina/conferences/primer_theme/journal/issues/_issue_cover.html.haml
+- app/views/spina/conferences/primer_theme/journal/issues/index.html.haml
+- app/views/spina/conferences/primer_theme/journal/issues/show.html.haml
 - config/initializers/assets.rb
 - config/initializers/primer.rb
 - config/initializers/themes/conferences_primer_theme.rb

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Conferences
-    module PrimerTheme
-      # Base class from which controllers inherit
-      class ApplicationController < Spina::ApplicationController
-        def cookies_info
-          render partial: 'cookies'
-        end
-      end
-    end
-  end
-end

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

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Conferences
-    module PrimerTheme
-      # 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_metadata
-
-        def index
-          @conferences = Admin::Conferences::Conference.sorted.includes(institutions: [:logo])
-          respond_to do |format|
-            format.html
-            format.ics { render body: @conferences.to_ics }
-          end
-        end
-
-        def show
-          add_breadcrumb @conference.name
-          respond_to do |format|
-            format.html
-            format.ics { render body: @conference.to_ics }
-          end
-        end
-
-        private
-
-        def set_conference
-          @conference = Admin::Conferences::Conference.includes(:events, :institutions,
-                                                                presentation_types: [:translations],
-                                                                presentations: [session: [:room], presenters: [:institution]])
-                                                      .find(params[:id])
-          @conference.view_context = view_context
-        rescue ActiveRecord::RecordNotFound
-          send_file Rails.root.join('public/404.html'), type: 'text/html; charset=utf-8', status: 404
-        end
-
-        def set_tab
-          @tab = params[:tab] || 'information'
-        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
-        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
-        end
-
-        def set_breadcrumb
-          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)) : ''
-        end
-      end
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Spina
-  module Conferences
-    module PrimerTheme
-      # User-facing controller for presentations, serving both html and ics
-      class PresentationsController < ApplicationController
-        before_action :set_presentation, :set_conference, :set_breadcrumb
-
-        def show
-          add_breadcrumb @presentation.name
-          respond_to do |format|
-            format.html
-            format.ics { head :not_found }
-          end
-        end
-
-        private
-
-        def set_presentation
-          @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
-        end
-
-        def set_conference
-          @conference = Admin::Conferences::Conference.find(params[:conference_id]) if params[:conference_id].present?
-        end
-
-        def set_breadcrumb
-          return if @conference.blank?
-
-          add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
-          add_breadcrumb @conference.name, frontend_conference_path(@conference)
-        end
-      end
-    end
-  end
-end