spina-conferences-primer_theme 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665965738e060bd5c6c9f90e5452f9cd84f92456a6e04e6de2fe85b594ecc397
-  data.tar.gz: b3a31fb3bb0f867801f9f8fff03265ad9d33ec4cc8bb6acfdbe4b72ec8e8ff8f
+  metadata.gz: 9944a8a75899d111879d10a63f4bfb35980d75169f3ebb41b410eec6eae3a2b9
+  data.tar.gz: 860e7c50cb148b3f51230f32beb0598065c4cc82a3eb8eabb0e329e4fc08ee73
 SHA512:
-  metadata.gz: 3e149a65b5ef03f743d3d9249a7cbe6e1b463090d10e1af8f833dbf49cebf416cc97e899d5c1340afc12cc67101a2b202a697d719c4a2ef11c35051d8079d03c
-  data.tar.gz: 2fb6e336499d4b36b4cfba6521bd3dace00bc325668a618e97e55e2ac4c79de7f4fac45a3d8baf94ca9291488c5867ff49e2b5e6da77970bde371b1d8e6cd5cc
+  metadata.gz: 677fb690c14b5adea6013fc3b7ba650d3143492b562a132cda9dade57ef0383e5feed5fc568924f3f6defb88c6cd71aa378edfc54ca5e63a4d4c6a69c215300f
+  data.tar.gz: 263a34a87512b24300dab2cfc39459538910fb801709e427a695813626ada9f4e47873e98b1650e739a69dfb70b292037f3cd30d875f4b46c83714533ebb4710

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -6,3 +6,4 @@
 //= link @github/include-fragment-element/dist/index.js
 //= link @github/tab-container-element/dist/index.js
 //= link @github/filter-input-element/dist/index.js
+//= link @github/details-menu-element/dist/index.js

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

@@ -18,7 +18,7 @@ module Spina
 
           render Primer::BreadcrumbComponent.new(mb: 4) do |component|
             current_page.ancestors.each do |ancestor|
-              component.slot(:item, href: 'ancestor.materialized_path') { ancestor.menu_title }
+              component.slot(:item, href: ancestor.materialized_path) { ancestor.menu_title }
             end
             component.slot(:item, selected: true) { current_page.menu_title }
           end

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

@@ -13,6 +13,9 @@
     - cache [partable_for(:minutes), content(:minutes)&.structure_items,
              content(:minutes)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
       .mt-4.col-12.col-md-6.float-md-left= render partial: 'minutes', object: content(:minutes)
+    - cache [partable_for(:documents), content(:documents)&.structure_items,
+             content(:documents)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
+      .mt-4.col-12.col-md-12.float-md-left= render partial: 'documents', object: content(:documents)
   - cache [partable_for(:partner_societies), content(:partner_societies)&.structure_items,
            content(:partner_societies)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
     - if has_content?(:partner_societies) && content(:partner_societies).structure_items.any?

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

@@ -0,0 +1,12 @@
+- cache current_page do
+  %h1= current_page.title
+
+  - cache partable_for(:text) do
+    - if has_content? :text
+      .mt-4= render partial: 'text', object: content(:text)
+  - cache [partable_for(:events_list), content(:events_list)&.structure_items, 
+           content(:events_list)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
+    - if has_content?(:events_list) && content(:events_list).structure_items.any?
+      .mt-2= render partial: 'events_list', object: content(:events_list)
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')

data/app/views/layouts/spina/conferences/primer_theme/application.html.haml

@@ -19,6 +19,7 @@
     %script{ type: 'module', src: asset_path('@github/include-fragment-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/tab-container-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/filter-input-element/dist/index.js') }
+    %script{ type: 'module', src: asset_path('@github/details-menu-element/dist/index.js') }
     = yield :head
   %body
     .admin= render 'spina/shared/admin_bar'

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

@@ -1,2 +1,11 @@
-= link_to mobile_navigation_item.menu_title, mobile_navigation_item.materialized_path,
-          class: %w[d-block py-2 border-top border-white-fade text-white]
+- if mobile_navigation_item.has_children?
+  %details.details-reset
+    %summary.btn-link.d-block.py-2.border-top.border-white-fade.text-white
+      = mobile_navigation_item.menu_title
+      = render Primer::OcticonComponent.new(icon: 'chevron-down')
+    %ul.list-style-none
+      - mobile_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 text-white]
+- elsif mobile_navigation_item.is_root?
+  = link_to mobile_navigation_item.menu_title, mobile_navigation_item.materialized_path,
+            class: %w[d-block py-2 border-top border-white-fade text-white]

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

@@ -1 +1,12 @@
-.Header-item.d-none.d-lg-flex= link_to navigation_item.menu_title, navigation_item.materialized_path, class: 'Header-link'
+- if navigation_item.has_children?
+  .Header-item.d-none.d-lg-flex
+    %details.dropdown.details-reset.details-overlay
+      %summary.Header-link
+        = navigation_item.menu_title
+        %span.dropdown-caret
+      %details-menu.dropdown-menu.dropdown-menu-se.mt-3{ role: 'menu' }
+        - navigation_item.children.each do |child|
+          %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
+- elsif navigation_item.has_parent?
+  .Header-item.d-none.d-lg-flex
+    = link_to navigation_item.menu_title, navigation_item.materialized_path, class: 'Header-link'

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

@@ -5,11 +5,11 @@
         - cache partable_for(:submission_url, parent: @conference) do
           - if @conference.content(:submission_url).present?
             = link_to t(:'.submit_abstract'), @conference.content(:submission_url),
-                      class: %i[btn btn-sm flash-action d-none d-sm-inline-block]
+                      class: %i[btn btn-primary flash-action]
         - cache partable_for(:submission_date, parent: @conference) do
           %p
             = octicon('clock')
-            = t :'.submit_by_html', date: time_tag(@conference.content(:submission_date), format: :short)
+            = t :'.submit_by_html', date: time_tag(@conference.content(:submission_date), format: :full)
         - cache partable_for(:submission_text, parent: @conference) do
           - if @conference.content(:submission_text).present?
             %p= @conference.content(:submission_text).html_safe

data/app/views/spina/pages/_committee_bio.html.haml

@@ -10,11 +10,14 @@
                                                mb: [3, nil, 0, nil])
     .flex-auto
       .d-flex.flex-column.flex-md-row.mb-1
-        - cache partable_for(:name, :role, parent: committee_bio) do
-          - if committee_bio.has_content?(:name) && committee_bio.has_content?(:role)
-            %h3.flex-auto= t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
-          - elsif committee_bio.has_content?(:name)
-            %h3.flex-auto= committee_bio.content(:name)
+        - cache partable_for(:name, :role, :institution, parent: committee_bio) do
+          .flex-column
+            - if committee_bio.has_content?(:name) && committee_bio.has_content?(:role)
+              %h3.flex-auto= t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
+            - elsif committee_bio.has_content?(:name)
+              %h3.flex-auto= committee_bio.content(:name)
+            - if committee_bio.has_content?(:institution)
+              %h4.flex-auto= committee_bio.content(:institution)
         .BtnGroup.mt-1.mt-md-0.ml-md-1{ aria: { label: t(:'.contact_buttons') } }
           - cache partable_for(:twitter_profile, parent: committee_bio) do
             - if committee_bio.has_content?(:twitter_profile)

data/app/views/spina/pages/_document.html.haml

@@ -0,0 +1,15 @@
+- cache [document, document.structure_parts.collect(&:structure_partable)] do
+  %li.list-style-none.py-1.d-flex.flex-items-center
+    - cache partable_for(:name, parent: document) do
+      - if(document.has_content?(:name))
+        %h3.flex-auto= document.content(:name)
+      - else
+        %h3.flex-auto= t :'.no_name'
+    - cache partable_for(:attachment, parent: document) do
+      - if document.has_content?(:attachment) && document.content(:attachment).persisted?
+        = render Primer::ButtonComponent.new(tag: :a, ml: 2,
+                                             href: main_app.rails_blob_path(document.content(:attachment), disposition: :attachment)) do
+          = render Primer::OcticonComponent.new(icon: 'desktop-download')
+          = t(:'.download')
+      - else
+        .text-small.text-gray= t :'.no_file'

data/app/views/spina/pages/_documents.html.haml

@@ -0,0 +1,7 @@
+- if documents.present? && documents.structure_items.any?
+  = render Primer::SubheadComponent.new do |component|
+    = component.slot(:heading) { t :'.title' }
+
+  %ul{ class: dom_class(documents), id: dom_id(documents) }
+    = render partial: 'document', collection: documents.structure_items.sorted_by_structure,
+            cached: ->(document) { [document, document.structure_parts.collect(&:structure_partable)] }

data/app/views/spina/pages/_event.html.haml

@@ -0,0 +1,18 @@
+- cache [event, event.structure_parts.collect(&:structure_partable)] do
+  .d-flex.flex-column.flex-items-start
+    - cache partable_for(:name, parent: event) do
+      - if event.has_content?(:name)
+        %h3.flex-auto= event.content(:name)
+    - cache partable_for(:location, :start_time, parent: event) do
+      -# TODO: use 'format: :full' once edit-submission-flash is merged
+      %h4.flex-auto= t(:'.time_and_place', time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :short) : t('.time_tbc'),
+                                          place: event.has_content?(:location) ? event.content(:location) : t('.location_tbc')).try(:html_safe)
+    - cache partable_for(:description, parent: event) do
+      - if event.has_content?(:description)
+        .mt-1.text-gray-light= event.content(:description).try(:html_safe)
+    - cache partable_for(:url, parent: event) do
+      - if event.has_content?(:url)
+        .mt-2
+          = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url)) do
+            = render Primer::OcticonComponent.new(icon: 'link-external')
+            = t :'.more_info'

data/app/views/spina/pages/_events_list.html.haml

@@ -0,0 +1,19 @@
+%div{ class: dom_class(events_list), id: dom_id(events_list) }
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
+    = component.slot(:heading) { t :'.upcoming' }
+  - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) >= Time.now }.then do |events|
+    - if events.any?
+      %ul
+        = render partial: 'event', layout: 'list_item', cached: ->(event) { [event, event.structure_parts.collect(&:structure_partable)] },
+                 collection: events
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
+    = component.slot(:heading) { t :'.past' }
+  - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) < Time.now }.then do |events|
+    - if events.any?
+      %ul
+        = render partial: 'event', layout: 'list_item', cached: ->(event) { [event, event.structure_parts.collect(&:structure_partable)] },
+                 collection: events
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')

data/config/initializers/themes/conferences_primer_theme.rb

@@ -36,6 +36,10 @@
     name: 'minutes',
     title: 'Minutes',
     partable_type: 'Spina::Structure'
+  }, {
+    name: 'documents',
+    title: 'Documents',
+    partable_type: 'Spina::Structure'
   }, {
     name: 'contact',
     title: 'Contact',
@@ -68,6 +72,10 @@
     name: 'sponsors',
     title: 'Sponsors',
     partable_type: 'Spina::Structure'
+  }, {
+    name: 'events_list',
+    title: 'Events',
+    partable_type: 'Spina::Structure'
   }]
 
   theme.layout_parts = [{
@@ -114,6 +122,17 @@
       title: 'Attachment',
       partable_type: 'Spina::Attachment'
     }]
+  }, {
+    name: 'documents',
+    structure_parts: [{
+      name: 'name',
+      title: 'Name',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'attachment',
+      title: 'Attachment',
+      partable_type: 'Spina::Attachment'
+    }]
   }, {
     name: 'socials',
     structure_parts: [{
@@ -158,6 +177,10 @@
       name: 'name',
       title: 'Name',
       partable_type: 'Spina::Line'
+    }, {
+      name: 'institution',
+      title: 'Institution',
+      partable_type: 'Spina::Line'
     }, {
       name: 'role',
       title: 'Role',
@@ -194,6 +217,30 @@
       title: 'Website',
       partable_type: 'Spina::Admin::Conferences::UrlPart'
     }]
+  }, {
+    name: 'events_list',
+    title: 'Events',
+    structure_parts: [{
+      name: 'name',
+      title: 'Name',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'start_time',
+      title: 'Time',
+      partable_type: 'Spina::Admin::Conferences::TimePart'
+    }, {
+      name: 'location',
+      title: 'Location',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'description',
+      title: 'Description',
+      partable_type: 'Spina::Text'
+    }, {
+      name: 'url',
+      title: 'Link',
+      partable_type: 'Spina::Admin::Conferences::UrlPart'
+    }]
   }]
 
   theme.view_templates = [{
@@ -214,7 +261,12 @@
     name: 'about',
     title: 'About',
     description: 'Contains information about the society',
-    page_parts: %w[text constitution minutes partner_societies contact]
+    page_parts: %w[text constitution minutes documents partner_societies contact]
+  }, {
+    name: 'events',
+    title: 'Events',
+    description: 'Contains details of past and upcoming events',
+    page_parts: %w[text events_list]
   }, {
     name: 'show',
     title: 'Blank',

data/config/locales/en.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+{
+  en: {
+    date: {
+      formats: {
+        full: ->(time, _) { "%A, #{time.day.ordinalize} %B %Y" }
+      }
+    }
+  }
+}

data/config/locales/en.yml

@@ -82,6 +82,11 @@ en:
         download: Download
         no_file: No file uploaded.
         no_date: No date specified.
+      documents:
+        title: Documents
+        download: Download
+        no_file: No file uploaded.
+        no_name: No name.
       partner_societies:
         title: Partner societies
         no_societies: No societies added.
@@ -89,6 +94,17 @@ en:
         website: Website
         email: Email
         contact_buttons: Contact buttons
+      events:
+        no_events: No events.
+      events_list:
+        upcoming: Upcoming events
+        past: Past events
+        no_events: No events.
+      event:
+        time_and_place: "%{place}, %{time}"
+        time_tbc: Time TBC
+        location_tbc: Location TBC
+        more_info: More information
 
     conferences:
       primer_theme:

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.9'
+      VERSION = '0.1.10'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -303,6 +303,7 @@ files:
 - app/helpers/spina/conferences/primer_theme/navigations_helper.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/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/show.html.haml
@@ -347,6 +348,10 @@ files:
 - app/views/spina/pages/_committee_bios.html.haml
 - app/views/spina/pages/_constitution.html.haml
 - app/views/spina/pages/_contact.html.haml
+- app/views/spina/pages/_document.html.haml
+- app/views/spina/pages/_documents.html.haml
+- app/views/spina/pages/_event.html.haml
+- app/views/spina/pages/_events_list.html.haml
 - app/views/spina/pages/_homepage_content.html.haml
 - app/views/spina/pages/_jumbotron.html.haml
 - app/views/spina/pages/_minutes.html.haml
@@ -355,6 +360,7 @@ files:
 - app/views/spina/pages/_partner_society.html.haml
 - config/initializers/assets.rb
 - config/initializers/themes/conferences_primer_theme.rb
+- config/locales/en.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/spina/conferences/primer_theme.rb