pages_core 3.6.2 → 3.8.2

data/app/assets/stylesheets/pages/admin/components/forms.scss

@@ -62,6 +62,26 @@ form {
     }
   }
 
+  .row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-right: -16px;
+
+    .field {
+      margin-right: 16px;
+      &.text-field {
+        flex-grow: 1;
+        min-width: 300px;
+      }
+    }
+
+    input[type=text],
+    input[type=password] {
+      width: 100%;
+      max-width: none;
+    }
+  }
+
   .date-range-select {
     .date {
       line-height: 34px;

data/app/assets/stylesheets/pages/admin/components/image_editor.scss

@@ -14,6 +14,7 @@
     font-size: 14px;
     color: $c-warn-light;
     text-shadow: 0px 0px 5px rgba(0, 0, 0, 1.0);
+    z-index: 100;
   }
 
   img {

data/app/assets/stylesheets/pages/admin/components/image_grid.scss

@@ -135,10 +135,7 @@ $grid-image-padding: 7px;
   }
 
   .grid {
-    width: 66.67%;
-    @include breakpoint-mobile {
-      width: 100%;
-    }
+    width: 100%;
     .images {
       position: relative;
       display: flex;
@@ -148,7 +145,7 @@ $grid-image-padding: 7px;
         display: flex;
         flex-direction: column;
         justify-content: flex-end;
-        width: 25%;
+        width: 16.66%;
         @include breakpoint-max(1150px) {
           width: 50%;
         }
@@ -159,6 +156,19 @@ $grid-image-padding: 7px;
       }
     }
 
+    .editable-image {
+      padding-bottom: 75%;
+      img {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+        object-position: 50% 50%;
+      }
+    }
+
     .drop-target {
       margin: 10px $grid-image-padding;
       padding-top: 10px;
@@ -168,6 +178,24 @@ $grid-image-padding: 7px;
     }
   }
 
+  &.with-primary-image {
+    .grid {
+      width: 66.67%;
+      @include breakpoint-mobile {
+        width: 100%;
+      }
+    }
+    .images .grid-image {
+      width: 25%;
+      @include breakpoint-max(1150px) {
+        width: 50%;
+      }
+      @include breakpoint-mobile {
+        width: 50%;
+      }
+    }
+  }
+
   .drag-image {
     position: absolute;
     width: 150px;

data/app/assets/stylesheets/pages/admin/components/layout.scss

@@ -17,7 +17,8 @@ html, body {
   display: flex;
   flex-flow: column nowrap;
   height: 100vh;
-  > * {
+  > *,
+  .main-wrapper {
     flex-shrink: 0;
   }
 }

data/app/assets/stylesheets/pages/admin/components/login.scss

@@ -24,3 +24,9 @@ main .login-form {
     }
   }
 }
+
+.login-tab {
+  &.hidden {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pages/admin/components/tabs.scss

@@ -0,0 +1,5 @@
+.content-tab {
+  &.hidden {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pages/admin/components/tag_editor.scss

@@ -12,13 +12,24 @@
     display: block;
     float: left;
     margin: 0 5px 5px 0;
-    padding: 0px 10px;
+    padding: 0px;
     background: $c-background-disabled;
     border-radius: 5px;
     line-height: 26px;
     line-height: 36px;
     min-width: 40px;
     transition: all 200ms ease-out;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    label {
+      margin: 0px;
+      padding: 0px 10px;
+      color: inherit;
+    }
 
     input {
       margin: 2px 3px 0 0;
@@ -30,10 +41,6 @@
     }
 
     &.enabled {
-      //background: #396e97;
-      //border-color: #274b67;
-      //text-shadow: #274b67 1px 1px 1px;
-
       color: #fff;
       background: $c-link;
       background: $c-blue-dark;
@@ -49,8 +56,7 @@
   input.add-tag {
     margin-top: 0px;
     border-radius: 5px;
-    //margin: 0 4px 0 0;
-    //padding: 4px 3px 3px 3px;
+    margin: 0 4px 0 0;
 
     &.example {
       color: $c-text-light;

data/app/assets/stylesheets/pages/admin/controllers/pages.scss

@@ -126,24 +126,32 @@
 }
 
 .edit-page {
-  padding-top: 1px;
   width: auto;
 
+  main div.content {
+    padding-top: 16px;
+  }
+
   .hidden-options {
     display: none;
   }
 
+  .autopublish-notice,
+  .published-date,
   .advanced-options {
-    visibility: none;
+    display: none;
+    &.show {
+      display: block;
+    }
   }
 
-  main & input[type=text],
-  main & textarea {
+  main input[type=text],
+  main textarea {
     width: 100%;
     max-width: 100%;
   }
 
-  main & input.page_title {
+  main input.page_title {
     font-weight: bold;
     font-size: 1.4em;
     color: $c-text;

data/app/assets/stylesheets/pages/admin.scss

@@ -1,4 +1,3 @@
-@import 'jquery-ui';
 @import 'ReactCrop';
 @import 'font-awesome';
 @import 'admin/vars';

data/app/assets/stylesheets/pages/errors.css

@@ -1,5 +1,7 @@
 body {
   background:          #fff;
+  background:          linear-gradient(180deg, rgba(236,236,236,1) 0%, rgba(255,255,255,1) 50%);
+  background-repeat:   no-repeat;
   margin:              0;
   padding:             0;
   border:              0;

data/app/controller_dummies/admin/admin_controller.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Admin
-  class AdminController < PagesCore::AdminController #:nodoc:
+  class AdminController < PagesCore::AdminController # :nodoc:
   end
 end

data/app/controller_dummies/application_controller.rb

@@ -1,4 +1,6 @@
-class ApplicationController < PagesCore::BaseController #:nodoc:
+# frozen_string_literal: true
+
+class ApplicationController < PagesCore::BaseController # :nodoc:
   helper :all
   protect_from_forgery with: :exception
 end

data/app/controller_dummies/attachments_controller.rb

@@ -1,2 +1,4 @@
-class AttachmentsController < PagesCore::AttachmentsController #:nodoc:
+# frozen_string_literal: true
+
+class AttachmentsController < PagesCore::AttachmentsController # :nodoc:
 end

data/app/controller_dummies/frontend_controller.rb

@@ -1,2 +1,4 @@
-class FrontendController < PagesCore::FrontendController #:nodoc:
+# frozen_string_literal: true
+
+class FrontendController < PagesCore::FrontendController # :nodoc:
 end

data/app/controller_dummies/images_controller.rb

@@ -1,2 +1,4 @@
-class ImagesController < PagesCore::ImagesController #:nodoc:
+# frozen_string_literal: true
+
+class ImagesController < PagesCore::ImagesController # :nodoc:
 end

data/app/controller_dummies/page_files_controller.rb

@@ -1,2 +1,4 @@
-class PageFilesController < PagesCore::Frontend::PageFilesController #:nodoc:
+# frozen_string_literal: true
+
+class PageFilesController < PagesCore::Frontend::PageFilesController # :nodoc:
 end

data/app/controller_dummies/pages_controller.rb

@@ -1,2 +1,4 @@
-class PagesController < PagesCore::Frontend::PagesController #:nodoc:
+# frozen_string_literal: true
+
+class PagesController < PagesCore::Frontend::PagesController # :nodoc:
 end

data/app/controller_dummies/sitemaps_controller.rb

@@ -1,2 +1,4 @@
-class SitemapsController < PagesCore::SitemapsController #:nodoc:
+# frozen_string_literal: true
+
+class SitemapsController < PagesCore::SitemapsController # :nodoc:
 end

data/app/controllers/admin/attachments_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class AttachmentsController < Admin::AdminController
     before_action :find_attachment, only: %i[update]
@@ -27,8 +29,8 @@ module Admin
     def attachment_params
       params.require(:attachment).permit(
         :file,
-        localized_attributes.each_with_object({}) do |a, h|
-          h[a] = I18n.available_locales
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
         end
       )
     end
@@ -42,7 +44,7 @@ module Admin
     end
 
     def render_attachment(attachment)
-      render json: attachment, serializer: Admin::AttachmentSerializer
+      render json: Admin::AttachmentResource.new(attachment)
     end
   end
 end

data/app/controllers/admin/categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class CategoriesController < Admin::AdminController
     before_action :find_category, only: %i[show edit update destroy]

data/app/controllers/admin/images_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class ImagesController < Admin::AdminController
     before_action :find_image, only: %i[show edit update destroy]
@@ -12,12 +14,9 @@ module Admin
 
     def create
       @image = Image.create(image_params)
-      if @image.valid?
-        respond_to do |format|
-          format.json do
-            render json: @image, serializer: Admin::ImageSerializer
-          end
-        end
+
+      respond_to do |format|
+        format.json { render_image_json(@image) }
       end
     end
 
@@ -41,8 +40,8 @@ module Admin
         :name, :description, :file,
         :crop_start_x, :crop_start_y, :crop_height, :crop_width, :locale,
         :crop_gravity_x, :crop_gravity_y,
-        localized_attributes.each_with_object({}) do |a, h|
-          h[a] = I18n.available_locales
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
         end
       )
     end
@@ -50,5 +49,14 @@ module Admin
     def find_image
       @image = Image.find(params[:id])
     end
+
+    def render_image_json(image)
+      if image.valid?
+        render json: Admin::ImageResource.new(image)
+      else
+        render json: { status: "error",
+                       error: image.errors.first.full_message }
+      end
+    end
   end
 end

data/app/controllers/admin/invites_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class InvitesController < Admin::AdminController
     before_action :require_authentication, except: %i[accept show]
@@ -45,7 +47,7 @@ module Admin
 
     def destroy
       flash[:notice] = "The invite to #{@invite.email} has been deleted"
-      @invite.destroy
+      PagesCore::DestroyInviteService.call(invite: @invite)
       redirect_to admin_invites_url
     end
 
@@ -58,6 +60,7 @@ module Admin
     def find_and_validate_invite
       @invite = Invite.find_by(id: params[:id])
       return if @invite && secure_compare(@invite.token, params[:token])
+
       flash[:notice] = "This invite is no longer valid."
       redirect_to(login_admin_users_url) && return
     end

data/app/controllers/admin/pages_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Admin
   class PagesController < Admin::AdminController
+    include PagesCore::Admin::PageJsonHelper
     include PagesCore::Admin::NewsPageController
 
     before_action :find_categories
-    before_action :find_page, only: %i[show edit update destroy
-                                       move]
+    before_action :find_page, only: %i[show edit update destroy move]
 
     require_authorization
 
@@ -99,23 +101,9 @@ module Admin
       )
     end
 
-    def page_json(page)
-      { id: page.id,
-        param: page.to_param,
-        parent_page_id: page.parent_page_id,
-        locale: page.locale,
-        status: page.status,
-        news_page: page.news_page,
-        name: page.name,
-        published_at: page.published_at,
-        pinned: page.pinned?,
-        starts_at: page.starts_at,
-        permissions: [(:edit if policy(page).edit?),
-                      (:create if policy(page).edit?)].compact }
-    end
-
     def param_categories
       return [] unless params[:category]
+
       params.permit(category: {})[:category]
             .to_hash
             .map { |id, _| Category.find(id) }
@@ -129,9 +117,9 @@ module Admin
       @categories = Category.order("name")
     end
 
-    def respond_with_page(page)
+    def respond_with_page(page, &block)
       respond_to do |format|
-        format.html { yield }
+        format.html { block.call }
         format.json { render json: page_json(page) }
       end
     end

data/app/controllers/admin/password_resets_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class PasswordResetsController < Admin::AdminController
     before_action :find_password_reset_token, only: %i[show update]
@@ -42,11 +44,12 @@ module Admin
         admin_password_reset_with_token_url(
           password_reset, password_reset.token
         )
-      ).deliver_now
+      ).deliver_later
     end
 
     def find_user_by_email(email)
       return unless email
+
       User.login_name(params[:username])
     end
 
@@ -60,10 +63,10 @@ module Admin
 
     def find_password_reset_token
       @password_reset_token = begin
-                                PasswordResetToken.find(params[:id])
-                              rescue ActiveRecord::RecordNotFound
-                                nil
-                              end
+        PasswordResetToken.find(params[:id])
+      rescue ActiveRecord::RecordNotFound
+        nil
+      end
 
       return if valid_token?(@password_reset_token)
 
@@ -73,6 +76,7 @@ module Admin
 
     def check_for_expired_token
       return unless @password_reset_token.expired?
+
       @password_reset_token.destroy
       flash[:notice] = "Your password reset link has expired"
       redirect_to(login_admin_users_url)

data/app/controllers/admin/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class UsersController < Admin::AdminController
     before_action :require_authentication, except: %i[new create login]
@@ -19,6 +21,7 @@ module Admin
 
     def login
       return unless logged_in?
+
       redirect_to admin_default_url
     end
 
@@ -72,10 +75,11 @@ module Admin
     end
 
     def user_params
-      permitted_params = %i[
-        name email image image_id
-      ]
-      permitted_params += [:activated, role_names: []] if policy(User).manage?
+      permitted_params = %i[name email image image_id]
+      if policy(User).manage?
+        permitted_params += [:activated,
+                             { role_names: [] }]
+      end
       if User.none? || (@user && policy(@user).change_password?)
         permitted_params += %i[password confirm_password]
       end
@@ -84,11 +88,13 @@ module Admin
 
     def user_params_with_roles
       return user_params unless policy(User).manage?
+
       { role_names: [] }.merge(user_params)
     end
 
     def require_no_users
       return unless User.any?
+
       flash[:error] = "Account holder already exists"
       redirect_to(admin_users_url)
     end

data/app/controllers/concerns/pages_core/admin/news_page_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Admin
     module NewsPageController
@@ -6,26 +8,19 @@ module PagesCore
       included do
         before_action :require_news_pages, only: [:news]
         before_action :find_news_pages, only: %i[news new_news]
+        before_action :find_year_and_month, only: %i[news]
       end
 
       def news
         @archive_finder = archive_finder(@news_pages, @locale)
-
-        unless params[:year]
+        unless @year
           redirect_to(news_admin_pages_path(@locale,
                                             (@archive_finder.latest_year ||
                                              Time.zone.now.year)))
           return
         end
-
-        @year = params[:year]&.to_i
-        @month = params[:month]&.to_i
-
-        @pages = (if @month
-                    @archive_finder.by_year_and_month(@year, @month)
-                  else
-                    @archive_finder.by_year(@year)
-                  end).paginate(per_page: 50, page: params[:page])
+        @pages = @archive_finder.by_year_and_maybe_month(@year, @month)
+                                .paginate(per_page: 50, page: params[:page])
       end
 
       def new_news
@@ -48,12 +43,19 @@ module PagesCore
                           .in_locale(@locale)
                           .reorder("parent_page_id ASC, position ASC")
         return if @news_pages.any?
+
         redirect_to(admin_pages_url(@locale))
       end
 
+      def find_year_and_month
+        @year = params[:year]&.to_i
+        @month = params[:month]&.to_i
+      end
+
       # Redirect away if no news pages has been configured
       def require_news_pages
         return if Page.news_pages.any?
+
         redirect_to(admin_pages_url(@locale))
       end
 

data/app/controllers/concerns/pages_core/admin/persistent_params.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module PersistentParams
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :restore_persistent_params
+        after_action :save_persistent_params
+      end
+
+      protected
+
+      # Loads persistent params from user model and merges with session.
+      def restore_persistent_params
+        return unless current_user&.persistent_data?
+
+        session[:persistent_params] ||= {}
+        session[:persistent_params] = current_user.persistent_data.merge(
+          session[:persistent_params]
+        )
+      end
+
+      # Saves persistent params from session to User model if applicable.
+      def save_persistent_params
+        return unless current_user && session[:persistent_params]
+
+        current_user.persistent_data = session[:persistent_params]
+        current_user.save
+      end
+
+      def persistent_params(namespace)
+        session[:persistent_params] ||= {}
+        session[:persistent_params][namespace] ||= {}
+        session[:persistent_params][namespace]
+      end
+
+      def coerce_persistent_param(value)
+        case value
+        when "true"
+          true
+        when "false"
+          false
+        else
+          value
+        end
+      end
+
+      def get_persistent_param(namespace, key, default)
+        if params.key?(key)
+          params[key]
+        elsif persistent_params(namespace).key?(key)
+          persistent_params(namespace)[key]
+        else
+          default
+        end
+      end
+
+      # Get a persistent param
+      def persistent_param(key, default = nil, options = {})
+        key = key.to_s
+        namespace = options[:namespace] || self.class.to_s
+
+        value = coerce_persistent_param(
+          get_persistent_param(namespace, key, default)
+        )
+
+        persistent_params(namespace)[key] = value unless value.nil?
+
+        value
+      end
+    end
+  end
+end