spina-conferences-primer_theme-fork 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f472da2c641da3e9b2447dcf6d4cc9d10f15a374024eead49056e0ea430a5b
-  data.tar.gz: 5e6d9caf62a78d896a05d61199ddbf4ab39e8c1f71788880a0fdc646d9fc2a3c
+  metadata.gz: e6b6d06ee9207f434033dd3f7e10d6483eee02cf4ff6805173ee5e2cc9c5a3ca
+  data.tar.gz: 82eaa180f742952c42063ff93af5029e8c7d7f9f228a1b0fc988d5626a4229ec
 SHA512:
-  metadata.gz: e053a5dc58adeb0a695d424441a46593c8a0eff9c387a0da1a3485616ac275cde4741ffaaa252d62a0f0d20218bbcac487a46c96fc71093df54a2bae37d9c84e
-  data.tar.gz: 28f300ad55d0f0aa33294dcf3f7d6671e9f0536da82ec42f522439a2745ca947dccc6992164993bded4a5a56e68ac3e5535a4ba31b84e91c8c3679a6bcd3d4f9
+  metadata.gz: e716d4b2ac643c7b2567e35412c38972cc9bac0e0b8b0de7e98855c47fc12e431c254b796a39fd2443e85f0e26c057ef0f1a9b9178a3ea119b53053e706af015
+  data.tar.gz: 6bd91a854364edaab284316bb496ade61b4ecd14a644f4b01e665d13c94b4b0c3dfadbae15d7021ec41aafa5cee4eba163cd0c1e8e6ba1c4aa678c48890f1984

data/app/controllers/spina/conferences/primer_theme/blog/application_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Blog
+        class ApplicationController < ::Spina::ApplicationController
+          include ::Spina::Frontend
+          def cookies_info
+            render partial: 'cookies'
+          end
+
+          protected
+
+          def theme_layout
+            'layouts/spina/conferences/primer_theme/blog/blog'
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spina/conferences/primer_theme/blog/categories_controller.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Blog
+        # Spina::Blog::CategoriesController
+        class CategoriesController < ApplicationController
+          include ::Spina::Frontend
+          
+          before_action :page
+          before_action :category
+          before_action :posts
+          before_action :set_breadcrumb, only: :show
+          before_action :set_metadata
+
+          def show
+            add_breadcrumb t('.category', name: @category.name)
+            render layout: theme_layout
+          end
+
+          private
+
+          def category
+            @category = Spina::Admin::Conferences::Blog::Category.friendly.find params[:id]
+          end
+
+          def posts
+            @posts = @category.posts.available.live.order(published_at: :desc)
+                              .page(params[:page])
+          end
+
+          def page
+            @page = Spina::Page.find_or_create_by name: 'blog' do |page|
+              page.link_url = '/blog'
+              page.deletable = false
+            end
+          end
+
+          def set_breadcrumb
+            add_breadcrumb 'Blog', frontend_blog_root_path
+          end
+
+          def set_metadata
+            @title = @category.name
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spina/conferences/primer_theme/blog/posts_controller.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Spina
+  module Conferences
+    module PrimerTheme
+      module Blog
+        # Spina::Blog::PostsController
+        class PostsController < ApplicationController
+          include ::Spina::Frontend
+
+          before_action :find_posts, only: [:index]
+          before_action :current_spina_user_can_view_page?
+          before_action :set_breadcrumb, only: :show
+
+          decorates_assigned :posts, :post
+
+          def index
+            @posts = @posts.unscope(where: :draft) if current_spina_user&.admin?
+
+            @title = t('.blog')
+
+            respond_to do |format|
+              format.atom
+              format.html { render layout: theme_layout }
+            end
+          end
+
+          def show
+            @post = Spina::Admin::Conferences::Blog::Post.friendly.find params[:id]
+            set_metadata
+            add_breadcrumb @post.title
+            render layout: theme_layout
+          rescue ActiveRecord::RecordNotFound
+            try_redirect
+          end
+
+          def archive
+            @posts = Spina::Admin::Conferences::Blog::Post.live
+                                      .where(published_at: start_date..end_date)
+                                      .order(published_at: :desc)
+                                      .page(params[:page])
+
+            render layout: theme_layout
+          end
+
+          private
+
+          def start_date
+            Time.zone.local(params[:year].to_i, (params[:month] || 1).to_i)
+          end
+
+          def end_date
+            start_date.end_of_year
+          end
+
+          def page
+            @page ||= Spina::Page.find_or_create_by name: 'blog' do |page|
+              page.title = 'Blog'
+              page.link_url = '/blog'
+              page.deletable = false
+            end
+          end
+
+          def find_posts
+            @posts = Spina::Admin::Conferences::Blog::Post.available.live.order(published_at: :desc)
+                                      .page(params[:page])
+          end
+
+          def try_redirect
+            rule = RewriteRule.find_by!(old_path: "/blog/posts/#{params[:id]}")
+            redirect_to rule.new_path, status: :moved_permanently
+          end
+
+          def current_spina_user_can_view_page?
+            raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
+          end
+
+          def set_breadcrumb
+            add_breadcrumb 'Blog', frontend_blog_root_path
+          end
+
+          def set_metadata
+            @title = @post.seo_title.blank? ? @post.title : @post.seo_title
+            @description = @post.description
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spina/conferences/primer_theme/conferences/conferences_controller.rb

@@ -58,7 +58,7 @@ module Spina
           end
 
           def set_breadcrumb
-            add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
+            add_breadcrumb 'Blog', frontend_conferences_path
           end
 
           def set_metadata

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

@@ -4,13 +4,13 @@
       = render Primer::BoxComponent.new(position: :absolute, top: false, left: false, right: false, bottom: false,
                                         style: 'background-color: #057fab; z-index: 0')
       - if content(:carousel).present?
-        %div{data: { controller: :slideshow, slideshow_incrementer: 0, slideshow_advance: true, slideshow_delay: 20000 }}
+        .height-full.d-flex.flex-column.flex-justify-between{data: { controller: :slideshow, slideshow_incrementer: 0, slideshow_advance: true, slideshow_delay: 20000} }
           - content(:carousel).each_with_index do |carousel_item, index|
             = render partial: 'conferences_primer_theme/partials/homepage_item', locals: { item: carousel_item }
-          .position-absolute.top-0.left-0.right-0.bottom-0.container-xl.p-responsive{ style: 'z-index: 2' }
-            - if content(:carousel).many?
-              .d-flex.flex-justify-between.flex-items-center.height-full
-                = render Primer::ButtonComponent.new(data: { action: :'slideshow#previous' }) do
+          - if content(:carousel).many?
+            .container-lg.height-full.d-flex.flex-column-reverse.mb-8{ style: 'z-index: 5' }
+              = render(Primer::ButtonGroupComponent.new) do |component|
+                = component.button(data: { action: :'slideshow#previous' }) do
                   = render Primer::OcticonComponent.new('arrow-left')
-                = render Primer::ButtonComponent.new(data: { action: :'slideshow#next' }) do
+                = component.button(data: { action: :'slideshow#next' }) do
                   = render Primer::OcticonComponent.new('arrow-right')

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

@@ -0,0 +1,5 @@
+- content_for :breadcrumbs do
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
+
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title }

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

@@ -1,4 +1,5 @@
 %nav.d-flex.flex-column.flex-self-stretch
   = render partial: 'mobile_navigation_item', collection: main_navigation_items, as: :navigation_item, cache: -> navigation_item { [navigation_item, navigation_item.children] }
+  .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Blog', frontend_blog_root_path, class: %w[Header-link py-2 py-lg-0]
   .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Journal', frontend_issues_path, 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]

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

@@ -7,5 +7,6 @@
       .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
         = render partial: 'mobile_navigation_items'
     = render partial: 'navigation_item', collection: main_navigation_items, cache: -> navigation_item { [navigation_item, navigation_item.children] }
+    .Header-item.d-none.d-lg-flex= link_to 'Blog', frontend_blog_root_path, class: %w[Header-link]
     .Header-item.d-none.d-lg-flex= link_to 'Journal', frontend_issues_path, class: %w[Header-link]
     .Header-item.d-none.d-lg-flex= link_to 'Conferences', frontend_conferences_path, class: %w[Header-link]

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

@@ -0,0 +1,12 @@
+= render(Primer::HeadingComponent.new) do
+  Blog
+= render(Primer::HeadingComponent.new(tag: :h2)) do
+  = t '.category', name: @category.name
+
+= render(Primer::FlexComponent.new(flex: :auto, direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    - if @posts.any?
+      %ul= render collection: @posts, partial: 'spina/conferences/primer_theme/blog/posts/post', layout: 'list_item', cached: true
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_posts'), icon: 'mortar-board')
+  = render 'spina/conferences/primer_theme/blog/shared/sidebar'

data/app/views/spina/conferences/primer_theme/blog/posts/_post.html.haml

@@ -0,0 +1,10 @@
+-#%li{class: dom_class(post), id: dom_id(post)}
+
+= render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
+  = link_to post.title, frontend_blog_post_path(post)
+= render(Primer::HeadingComponent.new(tag: :h4)) do
+  = time_tag post.published_at, format: :ordinal_datetime_with_year
+= render(Primer::MarkdownComponent.new(color: :text_secondary)) do
+  = post.excerpt.html_safe
+= render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+  = t '.category_html', name: link_to(post.category.name, frontend_blog_category_path(post.category))

data/app/views/spina/conferences/primer_theme/blog/posts/archive.html.haml

@@ -0,0 +1,5 @@
+%h1
+  Blog Archive
+  %small= formatted_date(params[:year], params[:month])
+
+%ul.posts= render @posts

data/app/views/spina/conferences/primer_theme/blog/posts/index.atom.builder

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+atom_feed language: 'en-GB', url: spina.frontend_blog_root_url do |feed|
+  feed.title('Blog')
+  feed.updated(@posts[0].created_at) unless @posts.empty?
+
+  @posts.each do |post|
+    feed.entry(post, published: post.published_at, url: spina.frontend_blog_post_url(post)) do |entry|
+      entry.title(post.title)
+      entry.content(post.content, type: 'html')
+
+      if post.user
+        entry.author do |author|
+          author.name(post.user.name)
+        end
+      end
+    end
+  end
+end

data/app/views/spina/conferences/primer_theme/blog/posts/index.html.haml

@@ -0,0 +1,11 @@
+= render(Primer::HeadingComponent.new) do
+  Blog
+
+= render(Primer::FlexComponent.new(flex: :auto, direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    - if @posts.any?
+      %ul= render collection: @posts, partial: 'post', layout: 'list_item', cached: true
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_posts'), icon: 'mortar-board')
+  = render 'spina/conferences/primer_theme/blog/shared/sidebar'
+

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

@@ -0,0 +1,17 @@
+= render(Primer::HeadingComponent.new) do
+  = @post.title
+
+%ul.list-style-none.d-flex.flex-column.flex-sm-row.my-2
+  = render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
+    = render(Primer::FlexItemComponent.new(mr: 2)) do
+      = render(Primer::OcticonComponent.new('person'))
+    = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
+      = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { @post.user.name }
+
+- if @post.image
+  = image_tag main_app.url_for(@post.image.file)
+
+= render(Primer::FlexComponent.new(flex: :auto, direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::MarkdownComponent.new(tag: :article)) do
+      = @post.content.html_safe

data/app/views/spina/conferences/primer_theme/blog/shared/_sidebar.html.haml

@@ -0,0 +1,10 @@
+= render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 15vw;')) do |sidebar|
+  - sidebar.header do
+    = render(Primer::HeadingComponent.new(tag: :h3)) do
+      = t '.categories'
+  - sidebar.row do
+    = render(Primer::MarkdownComponent.new(tag: :div, font_weight: :bold)) do
+      %ul
+        - Spina::Admin::Conferences::Blog::Category.all.each do |cat|
+          %li= link_to cat.name, frontend_blog_category_path(cat)
+

data/config/initializers/themes/conferences_primer_theme.rb

@@ -288,5 +288,5 @@
     label: 'Footer'
   }]
 
-  theme.plugins = %w[conferences journal]
+  theme.plugins = %w[conferences journal conferences-blog]
 end

data/config/locales/en.yml

@@ -190,6 +190,20 @@ en:
               issue: Issue
               draft: THIS ARTICLE IS A DRAFT
               licence_logo: Licence logo
+        blog:
+          posts:
+            index:
+              blog: Blog
+            post:
+              category_html: "Category: %{name}"
+          categories:
+            show:
+              category: "Category: %{name}"
+          shared:
+            siebar:
+              categories: Categories
+
+
 
   languages:
     en-GB: British English

data/config/routes.rb

@@ -14,4 +14,18 @@ Spina::Engine.routes.draw do
       resources :articles, only: %i[show]
     end
   end
+
+  namespace :frontend, as: 'frontend_blog', path: 'blog', module: 'conferences/primer_theme/blog' do
+    root to: 'posts#index'
+
+    get ':id', to: 'posts#show', as: :post
+
+    # 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 'feed.atom', to: 'posts#index', as: :rss_feed, defaults: { format: :atom }
+    get 'categories/:id', to: 'categories#show', as: :category
+    get 'archive/:year(/:month)', to: 'posts#archive', as: :archive_posts
+  end
 end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.8.0'
+      VERSION = '0.9.2'
     end
   end
 end

data/lib/spina/conferences/primer_theme.rb

@@ -5,6 +5,7 @@ require 'spina/conferences/primer_theme/engine'
 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme-fork
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: spina-admin-conferences
+  name: spina-admin-conferences-fork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -123,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: spina-admin-conferences-blog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +308,9 @@ files:
 - 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
+- app/controllers/spina/conferences/primer_theme/blog/application_controller.rb
+- app/controllers/spina/conferences/primer_theme/blog/categories_controller.rb
+- app/controllers/spina/conferences/primer_theme/blog/posts_controller.rb
 - app/controllers/spina/conferences/primer_theme/conferences/application_controller.rb
 - app/controllers/spina/conferences/primer_theme/conferences/conferences_controller.rb
 - app/controllers/spina/conferences/primer_theme/conferences/presentations_controller.rb
@@ -317,6 +334,7 @@ files:
 - app/views/conferences_primer_theme/partials/_homepage_item.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/blog/blog.html.haml
 - 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
@@ -334,6 +352,13 @@ files:
 - app/views/spina/application/_navigation.html.haml
 - app/views/spina/application/_navigation_item.html.haml
 - app/views/spina/application/_text.html.haml
+- app/views/spina/conferences/primer_theme/blog/categories/show.html.haml
+- app/views/spina/conferences/primer_theme/blog/posts/_post.html.haml
+- app/views/spina/conferences/primer_theme/blog/posts/archive.html.haml
+- app/views/spina/conferences/primer_theme/blog/posts/index.atom.builder
+- app/views/spina/conferences/primer_theme/blog/posts/index.html.haml
+- app/views/spina/conferences/primer_theme/blog/posts/show.html.haml
+- app/views/spina/conferences/primer_theme/blog/shared/_sidebar.html.haml
 - app/views/spina/conferences/primer_theme/conferences/conferences/_conference.html.haml
 - app/views/spina/conferences/primer_theme/conferences/conferences/_event.html.haml
 - app/views/spina/conferences/primer_theme/conferences/conferences/_events.html.haml