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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94714b6d36ceca47f2ace1a579c81c5ef9ac11fc59c0a24a608a044d01b16862
-  data.tar.gz: c70e3ab6596eb92694c22e11c82349b2aa99f5e45ae17173dece175408a2b029
+  metadata.gz: 8b41121814204870d40e05f0f24a4903d2a90065a6c4e22f0bb9f35fbfc5cc6d
+  data.tar.gz: 407fa16213cc79508555b859dc426de75c632e19d1ddb8ab0f496fafb38132d6
 SHA512:
-  metadata.gz: d711b2fddd3733951d33a78867485dbb50ba2410ad8308c08bfecc5d9ddbeeeb8a8cc3ff19c051f73c555e9f85597abe2e71bc23eabace96ef9691dec0dd6e4b
-  data.tar.gz: a9f6c510143c1db5c547ab992822c1165fa87a158a4a5ea24995947a19f69db10267902edb677b62c4a1213314ba81169f10007b62e02ce430bc3c90d23dedc3
+  metadata.gz: b23678f53c4f7b7009dee49c4bf677067ac366498debf71db357c1013f75fc7aec1a1d328568f0c299ef64521545ebb09c3363841956fee86cdc0589efa5f01a
+  data.tar.gz: 322fa3813cdd79f002781ce44ee5ae5fbb33e745a3e3f44efbfe679a835318c3643e60a540b8f059a029ca3ca02fbaf4cd24dbb20ef927d5cd5641cd6ea73bc0

data/app/assets/javascripts/spina/conferences/primer_theme/controllers/slideshow_controller.js

@@ -56,8 +56,15 @@ export default class SlideshowController extends Controller {
    */
   connect() {
     this.showSlide()
+    this.resetInterval()
+  }
+
+  resetInterval() {
     if (this.data.has('advance')) {
-      setInterval(() => this.next(), this.delay)
+      if (this.intervalId) {
+        clearInterval(this.intervalId)
+      }
+      this.intervalId = setInterval(() => this.next(), this.delay)
     }
   }
 
@@ -74,6 +81,7 @@ export default class SlideshowController extends Controller {
    * @private
    */
   next() {
+    this.resetInterval()
     const incrementer = this.incrementer
     this.incrementer = incrementer === this.slideTargets.length - 1 ? 0 : incrementer + 1
   }
@@ -83,6 +91,7 @@ export default class SlideshowController extends Controller {
    * @private
    */
   previous() {
+    this.resetInterval()
     const incrementer = this.incrementer
     this.incrementer = incrementer === 0 ? this.slideTargets.length - 1 : incrementer - 1
   }

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

@@ -8,6 +8,8 @@ module Spina
         class ApplicationController < ::Spina::ApplicationController
           include ::Spina::Frontend
 
+          before_action :page
+
           def cookies_info
             render partial: 'cookies'
           end
@@ -17,6 +19,14 @@ module Spina
           def theme_layout
             'layouts/spina/conferences/primer_theme/blog/blog'
           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
         end
       end
     end

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

@@ -6,7 +6,6 @@ module Spina
       module Blog
         # Spina::Blog::CategoriesController
         class CategoriesController < ApplicationController
-          before_action :page
           before_action :category
           before_action :posts
           before_action :set_breadcrumb, only: :show
@@ -28,13 +27,6 @@ module Spina
                               .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

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

@@ -7,7 +7,6 @@ module Spina
         # Spina::Blog::PostsController
         class PostsController < ApplicationController
           before_action :find_posts, only: [:index]
-          before_action :current_spina_user_can_view_page?
           before_action :set_breadcrumb, only: :show
 
           decorates_assigned :posts, :post
@@ -51,14 +50,6 @@ module Spina
             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])
@@ -69,10 +60,6 @@ module Spina
             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

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

@@ -6,7 +6,7 @@ module Spina
       module Conferences
         # Base class from which controllers inherit
         class ApplicationController < Spina::ApplicationController
-          before_action :journal_accessible?
+          before_action :page
 
           def cookies_info
             render partial: 'cookies'
@@ -19,13 +19,8 @@ module Spina
               page.title = 'Conferences'
               page.link_url = '/conferences/conferences'
               page.deletable = false
-              page.view_template = 'blank'
             end
           end
-
-          def journal_accessible?
-            raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
-          end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Spina
       module Journal
         # Base class from which controllers related to the journal plugin inherit
         class ApplicationController < Spina::ApplicationController
-          before_action :journal_accessible?
+          before_action :page
 
           private
 
@@ -15,13 +15,8 @@ module Spina
               page.title = 'Journal'
               page.link_url = '/journal/issues'
               page.deletable = false
-              page.view_template = 'blank'
             end
           end
-
-          def journal_accessible?
-            raise ActiveRecord::RecordNotFound unless current_spina_user.present? || page.live?
-          end
         end
       end
     end

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

@@ -1,4 +1,4 @@
-- cache [current_page, journal_navigation_items] do
+- cache [current_page, controller_name, journal_navigation_items] do
   = render Primer::MenuComponent.new(ml: [0, nil, nil, 4], mt: [4, 0, nil, nil], col: [nil, nil, nil, 3]) do |component|
     - component.heading(tag: :h2) do
       = Spina::Admin::Journal::Journal.instance.name

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '1.0.0.rc2'
+      VERSION = '1.0.0.rc3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme-fork
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Justin Malčić
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler