spina-conferences-primer_theme-fork 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7408f5151a38a7c1334a6b029208fbc71068f4e5ab56da51181bbb9046bfc9b
-  data.tar.gz: 68a5875a9cb07dfd4636863d39e676ce5a0de4fb883df2009db9f0c53cb6111d
+  metadata.gz: 1adba13c5232efe37824da591809831d3dd78ed86ad7e992dc2d62ba0d6988e1
+  data.tar.gz: e14fc95fa28bbb0e3fc6c8824c5ae98b066f4555f2b67318446264e1a88690dc
 SHA512:
-  metadata.gz: f9f1c1aa64f2d604448d43f02947da0b44ca5d6bf31579ac2d841a97ed6842b61cba62a833a5ecc9c459053462eeb1e54646f9d9dc68298129a70947e50567a4
-  data.tar.gz: 735717cd619d7dc47aed28c78022a42ab56b00e06ed42bd3b6e3d23b755e67ab39d9073d06b37fac69d6b9ce81a0f7dd2547b6ab2585182a4fa5731bebdb8740
+  metadata.gz: de54af339ed49a2f380ebb45a22b112983414e82a5c0cc30dc5775df883de449473568eac267aa94df340108adf26746d37e54bd5b39970bfd6aef7fee7b3be1
+  data.tar.gz: 71639bc4bdf2b4521acd7764c99e1c20f4b520362a2628a14705e43842f9e179c70b3d472a185992d701986891d718dd1f7a1063c8ac642f88244cacfadc9ffd

data/README.md

@@ -1,6 +1,8 @@
 # PrimerTheme
 A plugin for `Spina` that provides a frontend for `Spina::Admin::Conferences` using components from `Primer::ViewComponents`.
 
+This fork provides an updated version of the plugin, as the main repo is currently stale.
+
 ## Usage
 See the README for `Spina::Admin::Conferences`. Also make sure to ensure compilation of the assets for this gem by adding the following line to your
 `manifest.js` file.
@@ -13,7 +15,7 @@ See the README for `Spina::Admin::Conferences`. Also make sure to ensure compila
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'spina-conferences-primer_theme'
+gem 'spina-conferences-primer_theme-fork', require: 'spina/conferences/primer_theme'
 ```
 
 And then execute:
@@ -23,7 +25,7 @@ $ bundle
 
 Or install it yourself as:
 ```bash
-$ gem install spina-conferences-primer_theme
+$ gem install spina-conferences-primer_theme-fork
 ```
 
 ## Contributing

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

@@ -30,6 +30,14 @@ module Spina
                               .tap(&:publish)
                               .then(&:to_ical)
         end
+
+        def generate_datetime(date, time)
+          Time.new(date.year,
+                   date.month,
+                   date.day,
+                   time.hour,
+                   time.min)
+        end
       end
     end
   end

data/app/models/spina/parts/conferences/primer_theme/checkbox.rb

@@ -0,0 +1,15 @@
+module Spina
+  module Parts
+    module Conferences
+      module PrimerTheme
+        class Checkbox < Spina::Parts::Base
+          # Booleans don't work nicely with Spina page parts, so we have this mess
+          CHECKED_VALUE = "1"
+          UNCHECKED_VALUE = "0"
+
+          attr_json :content, :string, default: UNCHECKED_VALUE
+        end
+      end
+    end
+  end
+end

data/app/models/spina/parts/conferences/primer_theme.rb

@@ -0,0 +1,7 @@
+module Spina
+  module Parts::Conferences::PrimerTheme
+    def self.table_name_prefix
+      'spina_parts_conferences_primer_theme_'
+    end
+  end
+end

data/app/views/conferences_primer_theme/pages/events.html.haml

@@ -6,53 +6,37 @@
 
   - if content(:events_list).present?
     = render Primer::SubheadComponent.new(mt: 4) do |component|
-      = component.heading { t :'.upcoming' }
-    - content(:events_list).filter { |event| event.content(:start_time).blank? || event.content(:start_time) >= Time.now }.then do |events|
+      = component.heading do
+        - if content(:current_section_title).present?
+          = content(:current_section_title)
+        - else
+          = t :'.upcoming'
+
+    - content(:events_list).filter do |event| 
+      - (event.content(:start_date).blank? || event.content(:start_date) >= Date.today) && event.content(:is_archived) != Spina::Parts::Conferences::PrimerTheme::Checkbox::CHECKED_VALUE
+    - end.then do |events|
       - if events.any?
         %ul
           - repeater(events) do |event|
-            %li.list-style-none.py-4.border-bottom
-              = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
-                - if event.content(:name).present?
-                  = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
-                = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
-                  - if event.content(:start_time).present?
-                    = t(:'.time_and_place_html',
-                        time: time_tag(event.content(:start_time), format: :ordinal_datetime_with_year),
-                        place: event.content(:location).presence || t('.location_tbc'))
-                  - else
-                    = t(:'.time_and_place_html', time: t('.time_tbc'), place: event.content(:location).presence || t('.location_tbc'))
-                - if event.content(:description).present?
-                  = render(Primer::TextComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
-                - if event.content(:url).present?
-                  = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
-                    = render Primer::OcticonComponent.new('link-external')
-                    = t :'.more_info'
+            = render 'conferences_primer_theme/partials/event', event: event
       - else
         = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+
+
     = render Primer::SubheadComponent.new(mt: 4) do |component|
-      = component.heading { t :'.past' }
-    - content(:events_list).filter { |event| event.content(:start_time).present? && event.content(:start_time) < Time.now }.then do |events|
+      = component.heading do
+        - if content(:past_section_title).present?
+          = content(:past_section_title)
+        - else
+          = t :'.past'
+
+    - content(:events_list).filter do |event|
+      - (event.has_content?(:is_archived) && event.content(:is_archived) == Spina::Parts::Conferences::PrimerTheme::Checkbox::CHECKED_VALUE) || (event.content(:start_date).present? && event.content(:start_date) < Date.today)
+    - end.then do |events|
       - if events.any?
         %ul
           - repeater(events) do |event|
-            %li.list-style-none.py-4.border-bottom
-              = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
-                - if event.content(:name).present?
-                  = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
-                = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
-                  - if event.content(:start_time).present?
-                    = t(:'.time_and_place_html',
-                        time: time_tag(event.content(:start_time), format: :ordinal_datetime_with_year),
-                        place: event.content(:location).presence || t('.location_tbc'))
-                  - else
-                    = t(:'.time_and_place_html', time: t('.time_tbc'), place: event.content(:location).presence || t('.location_tbc'))
-                - if event.content(:description).present?
-                  = render(Primer::TextComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
-                - if event.content(:url).present?
-                  = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
-                    = render Primer::OcticonComponent.new('link-external')
-                    = t :'.more_info'
+            = render 'conferences_primer_theme/partials/event', event: event
       - else
         = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
   - else

data/app/views/conferences_primer_theme/pages/periodical.html.haml

@@ -0,0 +1,39 @@
+- cache current_page do
+  = render(Primer::HeadingComponent.new) { current_page.title }
+
+  - if content(:text).present?
+    = render(Primer::MarkdownComponent.new(mt: 4)) { content.html(:text) }
+  
+  - if content(:periodical_issues).present?
+    %ul.mt-4
+      - repeater(:periodical_issues) do |issue|
+        %li.list-style-none.py-4.border-bottom
+          = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
+            - if issue.content(:cover_img).present?
+              = render Primer::FlexItemComponent.new(mr: [nil, nil, 3, nil], mb: [3, nil, 0, nil], flex_shrink: 0) do
+                = render Primer::LinkComponent.new(href: issue.content(:url)) do
+                  = image_tag(issue.content.image_url(:cover_img, resize_to_limit: [300, 300]),
+                              srcset: srcset_string(issue.content(:cover_img),
+                                                    variant: { resize_to_limit: [300, 300] }),
+                              alt: issue.content(:cover_img).alt)
+            = render Primer::FlexItemComponent.new(flex_auto: true) do
+              = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], mb: 1) do
+                = render Primer::BoxComponent.new do
+                  - if issue.content(:name).present?
+                    = render Primer::HeadingComponent.new(tag: :h2) do
+                      = issue.content(:name)
+                  - if issue.content(:date).present?
+                    = render Primer::HeadingComponent.new(tag: :h4) do
+                      = time_tag issue.content(:date), format: :long_ordinal
+              - if issue.content(:description).present?
+                = render Primer::TextComponent.new(tag: :div, color: :text_secondary) do
+                  = issue.content.html(:description)
+              = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
+                - if issue.content(:url).present?
+                  = render Primer::ButtonComponent.new(scheme: :primary, tag: :a, href: issue.content(:url), mt: 2, mr: 2) do
+                    = render Primer::OcticonComponent.new('link-external')
+                    = t '.more_info'
+                - if issue.content(:attachment).present?
+                  = render Primer::ButtonComponent.new(tag: :a, mt: 2, href: issue.content.attachment_url(:attachment), download: '') do
+                    = render Primer::OcticonComponent.new('desktop-download')
+                    = t '.download'

data/app/views/conferences_primer_theme/partials/_event.html.haml

@@ -0,0 +1,30 @@
+%li.list-style-none.py-4.border-bottom
+  = render Primer::FlexComponent.new(direction: :column, align_items: :start) do
+    - if event.content(:name).present?
+      = render(Primer::HeadingComponent.new(tag: :h3, flex: :auto)) { event.content(:name) }
+    = render Primer::HeadingComponent.new(tag: :h4, flex: :auto) do
+      - if event.content(:start_date).present?
+        - if event.content(:finish_date).present?
+          - if event.content(:start_time).present?
+            = t('.dates_html',
+                start_date: time_tag(generate_datetime(event.content(:start_date), event.content(:start_time)), format: :ordinal_datetime_with_year),
+                finish_date: time_tag(event.content(:finish_date), format: :long_ordinal))
+          - else
+            = t('.dates_html',
+                start_date: time_tag(event.content(:start_date), format: :long_ordinal),
+                finish_date: time_tag(event.content(:finish_date), format: :long_ordinal))
+        - else
+          - if event.content(:start_time).present?
+            = time_tag(generate_datetime(event.content(:start_date), event.content(:start_time)), format: :ordinal_datetime_with_year)
+          - else
+            = time_tag(event.content(:start_date), format: :long_ordinal)
+      - else
+        = t '.time_tbc'
+    = render Primer::HeadingComponent.new(tag: :h5, flex: :auto) do
+      = event.content(:location).presence || t('.location_tbc')
+    - if event.content(:description).present?
+      = render(Primer::TextComponent.new(mt: 1, color: :text_secondary)) { event.content.html(:description) }
+    - if event.content(:url).present?
+      = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url), mt: 2) do
+        = render Primer::OcticonComponent.new('link-external')
+        = t '.more_info'

data/app/views/spina/admin/parts/conferences/primer_theme/checkboxes/_form.html.haml

@@ -0,0 +1,2 @@
+.page-form-label= f.object.title
+.page-form-control= f.check_box :content, checked_value: Spina::Parts::Conferences::PrimerTheme::Checkbox::CHECKED_VALUE, unchecked_value: Spina::Parts::Conferences::PrimerTheme::Checkbox::UNCHECKED_VALUE

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

@@ -9,8 +9,10 @@
     %meta{ name: 'DC.Format', scheme: 'IMT', content: 'application/pdf' }
   %meta{ name: 'DC.Identifier', content: @article.id }
   %meta{ name: 'DC.Identifier.URI', content: frontend_issue_article_url(@issue.id, @article.id) }
+  - if @article.has_content? :page_range
+    %meta{ name: 'DC.Identifier.pageNumber', content: "#{@article.content(:page_range).first_page}-#{@article.content(:page_range).last_page}" }
   %meta{ name: 'DC.Language', scheme: 'ISO639-1', content: 'en' }
-  %meta{ name: 'DC.Rights', content: "Copyright #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}"  }
+  %meta{ name: 'DC.Rights', content: "Copyright © #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}"  }
   - if @licence && @licence.has_content?(:url) && !@licence.content(:url).blank?
     %meta{ name: 'DC.Rights', content: @licence.content(:url) }
   %meta{ name: 'DC.Source', content: @journal.name }
@@ -32,5 +34,8 @@
   %meta{ name: 'citation_date', content: @issue.date.to_s(:iso8601).gsub('-', '/') }
   %meta{ name: 'citation_volume', content: @issue.volume.number }
   %meta{ name: 'citation_issue', content: @issue.number }
+  - if @article.has_content? :page_range
+    %meta{ name: 'citation_firstpage', content: @article.content(:page_range).first_page }
+    %meta{ name: 'citation_lastpage', content: @article.content(:page_range).last_page }
   %meta{ name: 'citation_abstract_html_url', content: frontend_issue_article_url(@issue.id, @article.id) }
   %meta{ name: 'citation_pdf_url', content: frontend_issue_article_url(@issue.id, @article.id) + '.pdf' }

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

@@ -51,7 +51,7 @@
           - component.row do
             = 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}
+                Copyright © #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}
               - unless @licence.nil?
                 - cache [@licence, @licence.content(:logo), @licence.content(:url)] do
                   %a{ rel: 'licence', href: @licence.content(:url) }

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

@@ -1,6 +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),
+              alt: t('spina.conferences.primer_theme.journal.volume_issue', volume_number: issue.volume.number, issue_number: issue.number),
               draggable: false,
               class: 'p-1'

data/config/initializers/themes/conferences_primer_theme.rb

@@ -85,7 +85,7 @@
     name: 'events_list',
     title: 'Events',
     part_type: 'Spina::Parts::Repeater',
-    parts: %w[name start_time location description url]
+    parts: %w[name start_date finish_date start_time application_deadline location is_archived description url]
   }, {
     name: 'current_conference_alert',
     title: 'Alert',
@@ -118,6 +118,18 @@
     name: 'date',
     title: 'Date',
     part_type: 'Spina::Parts::Admin::Conferences::Date'
+  }, {
+    name: 'start_date',
+    title: 'Start Date',
+    part_type: 'Spina::Parts::Admin::Conferences::Date'
+  }, {
+    name: 'finish_date',
+    title: 'Finish Date',
+    part_type: 'Spina::Parts::Admin::Conferences::Date'
+  }, {
+    name: 'application_deadline',
+    title: 'Application Deadline',
+    part_type: 'Spina::Parts::Admin::Conferences::Date'
   }, {
     name: 'attachment',
     title: 'Attachment',
@@ -174,6 +186,31 @@
     name: 'journal_abbreviation',
     title: 'Journal Abbreviation',
     part_type: 'Spina::Parts::Line'
+  }, {
+    name: 'issn',
+    title: 'ISSN',
+    part_type: 'Spina::Parts::Line'
+  }, {
+    name: 'page_range',
+    title: 'Page Range',
+    part_type: 'Spina::Parts::Admin::Journal::PageRange'
+  }, {
+    name: 'is_archived',
+    title: 'Archived?',
+    part_type: 'Spina::Parts::Conferences::PrimerTheme::Checkbox'
+  }, {
+    name: 'current_section_title',
+    title: 'Title for \'Current\' section',
+    part_type: 'Spina::Parts::Line'
+  }, {
+    name: 'past_section_title',
+    title: 'Title for \'Archive\' section',
+    part_type: 'Spina::Parts::Line'
+  }, {
+    name: 'periodical_issues',
+    title: 'Periodical Issues',
+    part_type: 'Spina::Parts::Repeater',
+    parts: %w[name date description cover_img attachment url]
   }]
 
   theme.view_templates = [{
@@ -199,7 +236,12 @@
     name: 'events',
     title: 'Events',
     description: 'Contains details of past and upcoming events',
-    parts: %w[text events_list]
+    parts: %w[text current_section_title past_section_title events_list]
+  }, {
+    name: 'periodical',
+    title: 'Periodical',
+    description: 'Can be used to store archives of things like newsletters and magazine issues',
+    parts: %w[text periodical_issues]
   }, {
     name: 'embedded_form',
     title: 'Embedded form',

data/config/locales/en.rb

@@ -4,12 +4,13 @@
   en: {
     date: {
       formats: {
-        full: ->(time, _) { "%A, #{time.day.ordinalize} %B %Y" }
+        full: ->(date, _) { "%A, #{date.day.ordinalize} %B %Y" },
+        long_ordinal: ->(date, _) { "#{date.day.ordinalize} %B %Y" }
       }
     },
     time: {
       formats: {
-        ordinal_datetime_with_year: ->(time, _) { "#{time.day.ordinalize} %b %Y, %R" }
+        ordinal_datetime_with_year: ->(time, _) { "#{time.day.ordinalize} %B %Y, %R" }
       }
     }
   }

data/config/locales/en.yml

@@ -72,16 +72,22 @@ en:
         name_and_role: "%{name}, %{role}"
         contact_buttons: Contact buttons
       events:
-        no_events: No events.
+        no_events: No listings.
         upcoming: Upcoming events
         past: Past events
-        time_and_place_html: "%{place}, %{time}"
-        time_tbc: Time TBC
-        location_tbc: Location TBC
-        more_info: More information
+      periodical:
+        more_info: View online
+        download: Download PDF
       homepage:
         more_info: More info
         dates_html: "%{start_date}–%{finish_date}"
+    partials:
+      event:
+        dates_html: "%{start_date} – %{finish_date}"
+        time_tbc: Time TBC
+        location_tbc: Location TBC
+        more_info: More information
+
 
   spina:
     show: Show

data/db/migrate/20210907142118_create_spina_parts_conferences_primer_theme_checkboxes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class CreateSpinaPartsConferencesPrimerThemeCheckboxes < ActiveRecord::Migration[6.1] # :nodoc:
+  def change
+    create_table :spina_parts_conferences_primer_theme_checkboxes, &:timestamps
+  end
+end

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

@@ -4,6 +4,11 @@ module Spina
   module Conferences
     module PrimerTheme
       class Engine < ::Rails::Engine
+
+        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

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.6.1'
+      VERSION = '0.7.0'
     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.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -303,13 +303,17 @@ files:
 - 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
+- app/models/spina/parts/conferences/primer_theme.rb
+- app/models/spina/parts/conferences/primer_theme/checkbox.rb
 - app/views/conferences_primer_theme/pages/about.html.haml
 - app/views/conferences_primer_theme/pages/committee.html.haml
 - app/views/conferences_primer_theme/pages/embedded_form.html.haml
 - 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/periodical.html.haml
 - app/views/conferences_primer_theme/pages/show.html.haml
+- app/views/conferences_primer_theme/partials/_event.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/conferences.html.haml
@@ -317,6 +321,7 @@ files:
 - 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/admin/parts/conferences/primer_theme/checkboxes/_form.html.haml
 - app/views/spina/application/_cookies.html.haml
 - app/views/spina/application/_current_conference_alert.html.haml
 - app/views/spina/application/_footer.html.haml
@@ -365,6 +370,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20210206170704_change_current_conference_alert_to_text.rb
+- db/migrate/20210907142118_create_spina_parts_conferences_primer_theme_checkboxes.rb
 - lib/spina/conferences/primer_theme.rb
 - lib/spina/conferences/primer_theme/breadcrumbs/builder.rb
 - lib/spina/conferences/primer_theme/engine.rb
@@ -389,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Spina::Admin::Conferences frontend theme.