spina-conferences-primer_theme-fork 1.0.0.rc1 → 1.0.0.rc5

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

@@ -1,30 +1,36 @@
-= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
-  = render(Primer::FlexComponent.new(direction: :column, flex: :auto)) do
-    = render(Primer::HeadingComponent.new(tag: :h1)) { @journal.name }
-    - if @journal.has_content? :description
-      = render(Primer::Markdown.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] }
+= render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+  = render(Primer::BoxComponent.new(display: :flex, direction: :column, col: [nil, nil, nil, 9])) do
+    = render(Primer::BoxComponent.new) do
+      = render(Primer::HeadingComponent.new(tag: :h1)) { @journal.name }
+      - if @journal.has_content? :description
+        = render(Primer::Markdown.new(my: 4)) { @journal.content.html(:description).to_s }
+    = render Primer::BoxComponent.new(my: 4, col: [12, nil, 6, nil], float: [nil, nil, :left, nil]) do
+      - if @journal.has_content?(:documents) && @journal.content(:documents)&.any?
+        = render Primer::SubheadComponent.new do |component|
+          = component.heading { t :'.documents.title' }
+        %ul
+          - @journal.content(:documents).each do |document|
+            %li.list-style-none.py-1.d-flex.flex-items-center
+              = render(Primer::Beta::Text.new(tag: :div, flex: :auto)) { document.content(:name).presence ||  t(:'.documents.no_name') }
+              - if document.content(:attachment).present?
+                = render Primer::ButtonComponent.new(tag: :a, ml: 2, href: main_app.url_for(document.content(:attachment)), download: '') do
+                  = render Primer::OcticonComponent.new('desktop-download')
+                  = t :'.documents.download'
+              - else
+                = render(Primer::Beta::Text.new(tag: :div, font_size: 6, color: :muted)) { t :'.documents.no_file' }
+
+  = render 'journal_navigation'
 
 #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')
+    = 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
+    = render(Primer::Beta::Text.new(font_weight: :bold)) do
+      = t '.issn', issn: @journal.content(:issn)

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

@@ -1,27 +1,39 @@
 - cache [@issue, @issue.volume, @issue.articles, @issue.content(:cover_img), @issue.content(:description)] do
-  - cache [@issue, @issue.volume] do
-    = render(Primer::HeadingComponent.new(tag: :h1)) do
-      = t('spina.conferences.primer_theme.journal.volume_issue',
-          volume_number: @issue.volume.number,
-          issue_number: @issue.number)
+  = render(Primer::BoxComponent.new(display: :flex, direction: [:column, nil, nil, :row])) do
+    = render(Primer::BoxComponent.new(mr: [nil, nil, nil, 4], col: [nil, nil, nil, 8])) do
+      - cache [@issue, @issue.volume] do
+        = render(Primer::HeadingComponent.new(tag: :h1)) 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: :muted, mb: 2)) { @issue.title }
+        - unless @issue.title.blank?
+          = render(Primer::HeadingComponent.new(tag: :h2, color: :muted, 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::Markdown.new(my: 4)) do
+          = @issue.content.html(:description).to_s
 
-  - if @issue.has_content?(:description)
-    = render(Primer::Markdown.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::Beta::Blankslate.new do |blankslate|
+            - blankslate.visual_icon(icon: 'mortar-board')
+            - blankslate.heading(tag: :h3).with_content(t(:'.no_articles'))
 
-  %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')
+    = render(Primer::BorderBoxComponent.new(ml: [nil, nil, nil, 4], col: [nil, nil, nil, 4])) do |sidebar|
+      - sidebar.body do
+        - if @issue.has_content?(:cover_img)
+          = render partial: 'spina/conferences/primer_theme/journal/issues/issue_cover', locals: { issue: @issue, cover_img: @issue.content(:cover_img), size: [300, 600] }
+        = render(Primer::BorderBoxComponent.new) do |component|
+          - component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :muted)) { t '.published' }
+            = render(Primer::Beta::Text.new) do
+              = time_tag @issue.date, format: :long
+          - if @issue.has_content?(:attachment)
+            - component.row do
+              = 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'

data/config/initializers/primer.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Rails.application.config.primer_view_components.silence_deprecations = true
+Rails.application.config.primer_view_components.silence_deprecations = false

data/config/initializers/themes/conferences_primer_theme.rb

@@ -235,6 +235,11 @@
     title: 'Information',
     description: 'Contains general information',
     parts: %w[text]
+  }, {
+    name: 'journal_information',
+    title: 'Information (Journal)',
+    description: 'An information page specifically for the journal section',
+    parts: %w[text]
   }, {
     name: 'committee',
     title: 'Committee',
@@ -286,8 +291,13 @@
   }, {
     name: 'footer',
     label: 'Footer'
-  }, {
-    name: 'journal'
+  }]
+
+  theme.resources = [{
+    name: 'journal',
+    label: 'Journal',
+    slug: 'journal',
+    view_template: 'journal_information'
   }]
 
   theme.plugins = %w[conferences journal conferences-blog]

data/config/locales/en.yml

@@ -1,34 +1,3 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t(:'hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# The following keys must be escaped otherwise they will not be retrieved by
-# the default I18n backend:
-#
-# true, false, on, off, yes, no
-#
-# Instead, surround them with single quotes.
-#
-# en:
-#   'true': 'foo'
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
 en:
   layouts:
     spina:
@@ -101,6 +70,9 @@ en:
       cookies_footer:
         cookies: About cookies
         loading: Loading…
+      journal_navigation:
+        issues: View issues
+        authors: View authors
 
     conferences:
       primer_theme:
@@ -175,6 +147,12 @@ en:
               logo: Journal logo
               all_issues: All Issues
               latest_issue: "Latest Issue (Vol. %{volume_number} Issue %{issue_number})"
+              issn: "ISSN: %{issn}"
+              documents:
+                title: Useful documents
+                download: Download
+                no_file: No file uploaded.
+                no_name: No name.
             show:
               no_articles: This issue has no articles.
               download: Full Issue PDF
@@ -185,11 +163,22 @@ en:
               download: PDF
               doi: DOI
               url: URL
+              permalink: Permalink
               abstract: Abstract
               published: Published
               issue: Issue
               draft: THIS ARTICLE IS A DRAFT
               licence_logo: Licence logo
+          authors:
+            index:
+              authors: Authors
+              no_authors: This journal has no authors.
+            show:
+              authors: Authors
+              articles: Articles
+              aka: "Also known as:"
+              name_institution: "%{name} (%{institution})"
+
         blog:
           posts:
             index:

data/config/routes.rb

@@ -10,9 +10,13 @@ Spina::Engine.routes.draw do
   end
 
   namespace :frontend, path: 'journal', module: 'conferences/primer_theme/journal' do
-    resources :issues, only: %i[index show] do
-      resources :articles, only: %i[show]
+    resources :issues, only: :index
+    resources :volumes, only: [], param: :number do
+      resources :issues, only: :show, param: :number do
+        resources :articles, only: %i[show], param: :number
+      end
     end
+    resources :authors, only: %i[index show]
   end
 
   namespace :frontend, as: 'frontend_blog', path: 'blog', module: 'conferences/primer_theme/blog' do

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

@@ -9,13 +9,13 @@ module Spina
           app.config.importmap.cache_sweepers << Engine.root.join('app/assets/javascripts')
         end
 
-        config.after_initialize do
-          Spina::Part.register(Spina::Parts::Conferences::PrimerTheme::Checkbox)
-        end
-
         config.to_prepare do
           ::Spina::PagesController.helper 'spina/conferences/primer_theme/application'
         end
+
+        config.after_initialize do
+          Spina::Part.register(Spina::Parts::Conferences::PrimerTheme::Checkbox)
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '1.0.0.rc1'
+      VERSION = '1.0.0.rc5'
     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.rc1
+  version: 1.0.0.rc5
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.66
+        version: 0.0.67
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.66
+        version: 0.0.67
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc2
+        version: 3.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc2
+        version: 3.0.0.rc3
 - !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
@@ -333,6 +333,7 @@ files:
 - 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/authors_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
@@ -345,6 +346,7 @@ files:
 - app/views/conferences_primer_theme/pages/events.html.haml
 - app/views/conferences_primer_theme/pages/homepage.html.haml
 - app/views/conferences_primer_theme/pages/information.html.haml
+- app/views/conferences_primer_theme/pages/journal_information.html.haml
 - app/views/conferences_primer_theme/pages/periodical.html.haml
 - app/views/conferences_primer_theme/pages/show.html.haml
 - app/views/conferences_primer_theme/partials/_event.html.haml
@@ -355,6 +357,7 @@ files:
 - 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/authors.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/admin/parts/conferences/primer_theme/checkboxes/_form.html.haml
@@ -365,6 +368,7 @@ files:
 - app/views/spina/application/_cookies_footer.html.haml
 - app/views/spina/application/_footer.html.haml
 - app/views/spina/application/_google_site_verification.html.haml
+- app/views/spina/application/_journal_navigation.html.haml
 - app/views/spina/application/_list_item.html.haml
 - app/views/spina/application/_logo.html.haml
 - app/views/spina/application/_mobile_navigation_item.html.haml
@@ -403,6 +407,9 @@ files:
 - app/views/spina/conferences/primer_theme/journal/articles/_authorship.html.haml
 - app/views/spina/conferences/primer_theme/journal/articles/_metadata.html.haml
 - app/views/spina/conferences/primer_theme/journal/articles/show.html.haml
+- app/views/spina/conferences/primer_theme/journal/authors/_author.html.haml
+- app/views/spina/conferences/primer_theme/journal/authors/index.html.haml
+- app/views/spina/conferences/primer_theme/journal/authors/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