spina-conferences-primer_theme 0.3.4 → 0.5.1

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

@@ -5,13 +5,13 @@
 
 = turbo_frame_tag 'conference_tabs' do
   = render Primer::UnderlineNavComponent.new(label: t(:'.conference_navigation')) do |component|
-    - component.tab(href: frontend_conference_url(@conference, tab: 'information', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'information', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'information').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.information')
-    - component.tab(href: frontend_conference_url(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'presentations').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.presentations')
-    - component.tab(href: frontend_conference_url(@conference, tab: 'events', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'events', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'events').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.events')
     - component.actions do

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,60 @@
+- cache [@article, @article.authorships, @article.affiliations, @article.content(:abstract), @article.issue, @article.issue.volume, @article.issue.content(:cover_img)] do
+  = 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], style: 'min-width: 20vw')) do |sidebar|
+      - sidebar.body do
+        - if @article.issue.has_content?(:cover_img)
+          = render partial: 'spina/conferences/primer_theme/journal/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.conferences.primer_theme.journal.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
+          - component.row do
+            -# TODO: allow user to select licence
+            = render(Primer::FlexComponent.new(direction: :column)) do
+              = render(Primer::TextComponent.new(mb: 2)) do
+                Copyright #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}
+              %a{ rel: 'licence', href: 'https://creativecommons.org/licenses/by/4.0/' }
+                %img{ alt: 'Creative Commons Attribution 4.0 International Licence', src: '//i.creativecommons.org/l/by/4.0/88x31.png' }
+            = render(Primer::TextComponent.new(mt: 1)) { t '.cc_by_licence_html' }
+
+          - 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: :h3, 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: :h4, 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,30 @@
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexComponent.new(direction: :column, flex: :auto)) do
+    = render(Primer::HeadingComponent.new) { @journal.name }
+    - if @journal.has_content? :description
+      = render(Primer::MarkdownComponent.new(my: 4)) { @journal.content.html(:description) }
+  = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 15vw;')) do |sidebar|
+    - if @journal.has_content? :logo
+      - sidebar.header(bg: :primary) do
+        = render(Primer::FlexItemComponent.new(mb: 4)) do
+          - cache @journal.content(:logo) do
+            = image_tag main_app.url_for(@journal.content(:logo).variant(resize_to_limit: [300, 150])),
+                        srcset: srcset(@journal.content(:logo), variant: { resize_to_limit: [300, 150] }),
+                        alt_description: t('.logo'),
+                        draggable: false,
+                        class: 'p-1'
+    - unless @latest_issue.nil?
+      - sidebar.row do
+        = render(Primer::HeadingComponent.new(tag: :h2, font_size: 3)) do
+          = link_to t('.latest_issue', volume_number: @latest_issue.volume.number, issue_number: @latest_issue.number), frontend_issue_path(@latest_issue)
+    - if @latest_issue.has_content?(:cover_img)
+      - sidebar.row do
+        = link_to(frontend_issue_path(@latest_issue)) do
+          = render partial: 'issue_cover', locals: { issue: @latest_issue, cover_img: @latest_issue.content(:cover_img), size: [150, 300] }
+
+#journal-issues-list
+  = render(Primer::HeadingComponent.new(tag: :h2, mt: 3)) { t '.all_issues' }
+  - 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')

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

@@ -0,0 +1,27 @@
+- cache [@issue, @issue.volume, @issue.articles, @issue.content(:cover_img), @issue.content(:description)] do
+  - cache [@issue, @issue.volume] do
+    = 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)
+
+  - if @issue.has_content?(:attachment)
+    = render(Primer::ButtonComponent.new(tag: :a, scheme: :primary, href: main_app.url_for(@issue.content(:attachment)), my: 2, download: '')) do
+      = render Primer::OcticonComponent.new('download')
+      = t '.download'
+
+  %div#journal-articles-list.border-top
+    - 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')

data/config/initializers/themes/conferences_primer_theme.rb

@@ -158,6 +158,18 @@
     name: 'url',
     title: 'Link',
     part_type: 'Spina::Parts::Admin::Conferences::Url'
+  }, {
+    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 = [{
@@ -184,6 +196,11 @@
     title: 'Events',
     description: 'Contains details of past and upcoming events',
     parts: %w[text events_list]
+  }, {
+    name: 'embedded_form',
+    title: 'Embedded form',
+    description: 'Contains an embedded form',
+    parts: %w[text embed_url]
   }, {
     name: 'show',
     title: 'Blank',
@@ -212,5 +229,5 @@
     label: 'Footer'
   }]
 
-  theme.plugins = ['conferences']
+  theme.plugins = %w[conferences journal]
 end

data/config/locales/en.yml

@@ -99,66 +99,91 @@ 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
+              all_issues: All Issues
+              latest_issue: "Latest Issue (Vol. %{volume_number} Issue %{issue_number})"
+            show:
+              no_articles: This issue has no articles.
+              download: Full Issue PDF
+            article:
+              download: PDF
+          articles:
+            show:
+              download: PDF
+              doi: DOI
+              url: URL
+              abstract: Abstract
+              published: Published
+              issue: Issue
+              draft: THIS ARTICLE IS A DRAFT
+              cc_by_licence_html: This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
 
   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.3.4'
+      VERSION = '0.5.1'
     end
   end
 end