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

data/config/initializers/themes/conferences_primer_theme.rb

@@ -4,7 +4,7 @@
   theme.name = 'conferences_primer_theme'
   theme.title = 'Conferences Primer theme'
 
-  theme.layout_parts = %w[current_conference_alert]
+  theme.layout_parts = %w[alert github_url]
 
   theme.parts = [{
     name: 'text',
@@ -87,7 +87,7 @@
     part_type: 'Spina::Parts::Repeater',
     parts: %w[name start_date finish_date start_time application_deadline location is_archived description url]
   }, {
-    name: 'current_conference_alert',
+    name: 'alert',
     title: 'Alert',
     part_type: 'Spina::Parts::Text'
   }, {
@@ -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',
@@ -288,5 +293,12 @@
     label: 'Footer'
   }]
 
+  theme.resources = [{
+    name: 'journal',
+    label: 'Journal',
+    slug: 'journal',
+    view_template: 'journal_information'
+  }]
+
   theme.plugins = %w[conferences journal conferences-blog]
 end

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:
@@ -98,9 +67,12 @@ en:
       footer:
         copyright: © %{name} %{year}
         find_on_github: Find us on GitHub
-      footer_content:
+      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,22 +163,34 @@ 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:
               blog: Blog
+              no_posts: There are no posts.
             post:
               category_html: "Category: %{name}"
           categories:
             show:
               category: "Category: %{name}"
           shared:
-            siebar:
+            sidebar:
               categories: Categories
 
 

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
@@ -22,7 +26,7 @@ Spina::Engine.routes.draw do
 
     # Redirects for old sites that used the old blog path
     get 'posts/', to: redirect('/blog'), as: :old_index
-    get 'posts/:id', to: redirect('/blog/%{id}'), as: :old_post
+    get 'posts/:id', to: redirect('/blog/%{id}'), as: :old_post # rubocop:disable Style/FormatStringToken
 
     get 'feed.atom', to: 'posts#index', as: :rss_feed, defaults: { format: :atom }
     get 'categories/:id', to: 'categories#show', as: :category

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
+class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0] # :nodoc:
   def up
     Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Line').each do |layout_part|
       if layout_part.partable.present?

data/lib/spina/conferences/primer_theme/breadcrumbs/builder.rb

@@ -8,23 +8,10 @@ module Spina
         # Custom builder using Primer breadcrumbs.
         class Builder < BreadcrumbsOnRails::Breadcrumbs::Builder
           def render
-            @context.render ::Primer::BreadcrumbComponent.new(mb: 4) do |component|
-              @context.safe_join(render_elements(component, @elements), "\n")
-            end
-          end
-
-          private
-
-          def render_elements(component, elements)
-            elements.collect { |element| render_element(component, element) }
-          end
-
-          def render_element(component, element)
-            url = compute_path(element)
-            if @context.current_page? url
-              component.item(selected: true, **element.options) { compute_name(element) }
-            else
-              component.item(href: compute_path(element), **element.options) { compute_name(element) }
+            @context.render ::Primer::Beta::Breadcrumbs.new(mb: 4) do |component|
+              @elements.each do |element|
+                component.item(href: compute_path(element), **element.options) { compute_name(element) }
+              end
             end
           end
         end

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

@@ -3,15 +3,19 @@
 module Spina
   module Conferences
     module PrimerTheme
+      # Registers the frontend controller and page parts with Spina.
       class Engine < ::Rails::Engine
-
-        config.after_initialize do
-          Spina::Part.register(Spina::Parts::Conferences::PrimerTheme::Checkbox)
+        initializer 'spina.conferences.primer_theme.importmap', before: 'importmap' do |app|
+          app.config.importmap.cache_sweepers << Engine.root.join('app/assets/javascripts')
         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 = '0.9.2'
+      VERSION = '1.0.0.rc3'
     end
   end
 end

data/lib/spina/conferences/primer_theme.rb

@@ -6,13 +6,20 @@ require 'spina/conferences/primer_theme/breadcrumbs/builder'
 require 'spina/admin/conferences'
 require 'spina/admin/journal'
 require 'spina/admin/conferences/blog'
-require 'octicons_helper'
 require 'view_component'
 require 'primer/view_components'
 require 'icalendar'
+require 'cssbundling-rails'
 
 module Spina
-  module PrimerTheme
-    # Your code goes here...
+  module Conferences
+    # A Primer-based frontend theme for Spina.
+    module PrimerTheme
+      include ActiveSupport::Configurable
+
+      config_accessor :importmap
+
+      self.importmap = Importmap::Map.new
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme-fork
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: cssbundling-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -59,84 +73,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.37
+        version: 0.0.67
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.37
+        version: 0.0.67
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: spina
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: spina-admin-conferences-fork
+  name: spina-admin-conferences-blog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: spina-admin-journal
+  name: spina-admin-conferences-fork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 3.0.0.rc2
 - !ruby/object:Gem::Dependency
-  name: spina-admin-conferences-blog
+  name: spina-admin-journal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 1.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -283,14 +297,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 description: Frontend for Spina::Admin::Conferences plugin, based on Primer.
 email:
 - j.malcic@me.com
@@ -302,9 +316,12 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/builds/spina/conferences/primer_theme/application.css
 - app/assets/config/spina_conferences_primer_theme_manifest.js
 - app/assets/javascripts/spina/conferences/primer_theme/application.js
-- app/assets/javascripts/spina/conferences/primer_theme/controllers/slideshow_controller.es6
+- app/assets/javascripts/spina/conferences/primer_theme/controllers/application.js
+- app/assets/javascripts/spina/conferences/primer_theme/controllers/index.js
+- app/assets/javascripts/spina/conferences/primer_theme/controllers/slideshow_controller.js
 - 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
@@ -316,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
@@ -328,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
@@ -338,13 +357,18 @@ 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
+- app/views/spina/application/_admin_bar.html.haml
+- app/views/spina/application/_alert.html.haml
+- app/views/spina/application/_analytics.html.erb
 - app/views/spina/application/_cookies.html.haml
-- app/views/spina/application/_current_conference_alert.html.haml
+- app/views/spina/application/_cookies_footer.html.haml
 - app/views/spina/application/_footer.html.haml
-- app/views/spina/application/_footer_content.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
@@ -383,12 +407,16 @@ 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
 - 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/importmap.rb
 - config/initializers/mime_types.rb
 - config/initializers/primer.rb
 - config/initializers/themes/conferences_primer_theme.rb
@@ -405,7 +433,8 @@ files:
 homepage: 
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -417,9 +446,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 

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

@@ -1,4 +0,0 @@
-- content_for :flash do
-  - cache current_account do
-    - if current_account.has_content? :current_conference_alert
-      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert).html_safe }