spina-conferences-primer_theme 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5db3e3aed2f1b2f312c664bfd6e9de742890e29b0dff5fc3245c071f4c88bc
-  data.tar.gz: dee4c28ccc657664dba6746b1d6c5e31db5239a3e8e5a9c52e3f91a18aef3560
+  metadata.gz: b0f415891da36813f4af78fc54b98daf3e34d1b22853995c7887944757055c05
+  data.tar.gz: 6f8414d707ea3695ef12e342bb514f04fa667a5fa6f427a3679e9c465992527d
 SHA512:
-  metadata.gz: 06c17c49c6d8c9946d275492b1c6d190f127ec7b126cd2df3b946cc5e39d003c1ceb6d8a5b939139db94d296bfcc206cea8565b2a36ac4bfd552a364690b1aee
-  data.tar.gz: 27e5f2fbadb9d634c368c6b3d876062ed96a162f63271397064fbea3f894ef97394550d6bd5fcf23a4f27433d721a2bcb4b049e164e402f8b0c9d84748fa6c02
+  metadata.gz: 62789ffa15b959d63a2a6d7cef661fcc3870d3437ca4e23de0dc55496a597a054bdab0de720ba067b59eeb7685108079717b6c7c335139298f3ddf784b03ddf2
+  data.tar.gz: bcbb08ea4e23752dc6bb8c7d90111701cd0c65ddd1139c549c42fae19b33b75c2391086578a9db9352fa536a4829ac3ddbf675d8b047907251dd3b5e8ee6323e

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -1,8 +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_directory ../../../node_modules/@primer/css/fonts .woff
+//= link spina_admin_journal_manifest.js
 
 //= link @github/details-dialog-element/dist/index.js
 //= link @github/include-fragment-element/dist/index.js

data/app/assets/stylesheets/spina/conferences/primer_theme/application.sass

@@ -5,6 +5,28 @@
 @import "@primer/octicons"
 @import spina/conferences/primer_theme/custom_variables
 
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-normal
+  src: local("Inter"), local("Inter-Regular"), asset-url("@primer/css/fonts/Inter-Regular.woff") format("woff")
+  font-display: swap
+
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-semibold
+  src: local("Inter Medium"), local("Inter-Medium"), asset-url("@primer/css/fonts/Inter-Medium.woff") format("woff")
+  font-display: swap
+
+@font-face
+  font-family: Inter
+  font-style: normal
+  font-weight: $font-weight-bold
+  src: local("Inter Bold"), local("Inter-Bold"), asset-url("@primer/css/fonts/Inter-Bold.woff") format("woff")
+  font-display: swap
+
 .admin
   @import "spina/admin_editing"
   #admin_bar
@@ -15,3 +37,8 @@
 
 address
   font-style: normal
+
+#form_frame
+  border: none
+  width: 100%
+  height: 70vh

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/conferences_primer_theme/pages/embedded_form.html.haml

@@ -0,0 +1,9 @@
+- 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(:embed_url).present?
+    = render Primer::BoxComponent.new(mt: 4, col: 12) do
+      %iframe#form_frame{ src: content(:embed_url), allowfullscreen: true }

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

@@ -27,5 +27,8 @@
           - if current_conference.present? && current_conference.finish_date >= Date.today
             = link_to t('.more_info'), frontend_conference_path(current_conference),
                       class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3 mt-4]
+          - else
+            = link_to t('.more_info'), Spina::Page.find_by(name: 'about').materialized_path,
+                      class: %w[btn-mktg btn-large-mktg btn-primary-mktg f3 mt-4]
           %div{ style: 'text-shadow: 0 1px 1px rgba(var(--color-scale-black), 0.25), 0 1px 25px rgba(var(--color-scale-black), 0.75);' }
             = render(Primer::MarkdownComponent.new(my: 4)) { content(:text).try(:html_safe) }

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/_footer.html.haml

@@ -1,15 +1,17 @@
-= render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :center) do
-  = render Primer::FlexComponent.new(direction: [:column, :row, nil, nil], mb: [4, nil, 0, nil], flex: :auto) do
-    %ul.list-style-none.flex-auto.mb-2.mb-sm-0.mr-sm-2
-      - footer_navigation_items.each do |item|
-        - cache item do
-          %li
-            = render Primer::ButtonComponent.new(tag: :a, href: item.materialized_path, variant: :small) { item.menu_title }
-    = render 'footer_content'
-    - if current_account.has_content? :github_url
-      = render Primer::ButtonComponent.new(tag: :a, href: current_account.content(:github_url), button_type: :outline, variant: :small,
-                                           display: :inline_block) do
-        = render Primer::OcticonComponent.new('mark-github')
-        = t :'.find_on_github'
-  = render(Primer::TextComponent.new(tag: :small, color: :text_secondary, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
-    = t :'.copyright', name: Spina::Account.first.name, year: Date.today.year
+- cache [footer_navigation_items, current_account] do
+  = render Primer::FlexComponent.new(direction: [:column, nil, :row_reverse, nil], align_items: :center) do
+    = render Primer::FlexComponent.new(direction: [:column, :row, nil, nil], mb: [4, nil, 0, nil], flex: :auto) do
+      - cache footer_navigation_items do
+        %ul.list-style-none.flex-auto.mb-2.mb-sm-0.mr-sm-2
+          - footer_navigation_items.each do |item|
+            - cache item do
+              %li
+                = render Primer::ButtonComponent.new(tag: :a, href: item.materialized_path, variant: :small) { item.menu_title }
+      = render 'footer_content'
+      - if current_account.has_content? :github_url
+        = render Primer::ButtonComponent.new(tag: :a, href: current_account.content(:github_url), button_type: :outline, variant: :small,
+                                             display: :inline_block) do
+          = render Primer::OcticonComponent.new('mark-github')
+          = t :'.find_on_github'
+    = render(Primer::TextComponent.new(tag: :small, color: :text_secondary, mr: [nil, 2, nil, nil], font_size: 6, flex_grow: 0)) do
+      = t :'.copyright', name: current_account.name, year: Date.today.year

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

@@ -1,12 +1,13 @@
-.Header-item.mr-0.border-top.border-white-fade-15.flex-column.flex-items-stretch
-  - if navigation_item.has_children?
-    %details.details-reset
-      %summary.Header-link.py-2
-        = navigation_item.menu_title
-        = render Primer::OcticonComponent.new('chevron-down')
-      %ul.list-style-none
-        - navigation_item.children.each do |child|
-          %li= link_to child.menu_title, child.materialized_path, class: %w[d-block py-2 pl-3 border-top border-white-fade color-text-white]
-  - elsif navigation_item.is_root?
-    = link_to navigation_item.menu_title, navigation_item.materialized_path,
-              class: %w[Header-link py-2]
+- cache navigation_item do
+  .Header-item.mr-0.border-top.border-white-fade-15.flex-column.flex-items-stretch
+    - if navigation_item.has_children?
+      %details.details-reset
+        %summary.Header-link.py-2
+          = navigation_item.menu_title
+          = render Primer::OcticonComponent.new('chevron-down')
+        %ul.list-style-none
+          - navigation_item.children.each do |child|
+            %li= link_to child.menu_title, child.materialized_path, class: %w[d-block py-2 pl-3 border-top border-white-fade color-text-white]
+    - elsif navigation_item.is_root?
+      = link_to navigation_item.menu_title, navigation_item.materialized_path,
+                class: %w[Header-link py-2]

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

@@ -1,3 +1,3 @@
 %nav.d-flex.flex-column.flex-self-stretch
   = render partial: 'mobile_navigation_item', collection: main_navigation_items, cached: true, as: :navigation_item
-  .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Conferences', frontend_conferences_url, class: %w[Header-link py-2 py-lg-0]
+  .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Conferences', frontend_conferences_path, class: %w[Header-link py-2 py-lg-0]