pages_core 3.14.0 → 3.15.1

data/app/assets/stylesheets/pages_core/admin/global/typography.css

@@ -0,0 +1,109 @@
+@define-mixin child-margins {
+  &:first-child {
+    margin-top: 0px;
+  }
+  &:last-child {
+    margin-bottom: 0px;
+  }
+}
+
+:root {
+  --bold-weight: 600;
+
+  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
+    Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
+  --font-sans: "Inter", var(--font-os-sans);
+
+  --font-heading-2: 600 1.4rem/1.2 var(--font-sans);
+  --font-heading-3: 600 1.2rem/1.4 var(--font-sans);
+
+  --font-large: 400 1.2rem/1.4 var(--font-sans);
+  --font-normal: 400 1rem/1.5 var(--font-sans);
+  --font-small: 400 0.875rem/1.33 var(--font-sans);
+}
+
+html {
+  font-size: 1rem;
+}
+
+body {
+  font: var(--font-normal);
+}
+
+b,
+strong {
+  font-weight: var(--bold-weight);
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  margin: 1.25rem 0;
+  @mixin child-margins;
+}
+
+h2 {
+  font: var(--font-heading-2);
+  margin-top: 3rem;
+  letter-spacing: -0.04rem;
+  @mixin child-margins;
+  form &:first-of-type {
+    margin-top: 0px;
+  }
+}
+
+h3,
+.sidebar h2 {
+  font: var(--font-heading-3);
+  margin-top: 2rem;
+  letter-spacing: -0.02rem;
+  @mixin child-margins;
+}
+
+table,
+small,
+.page-description,
+header,
+.sidebar,
+.pagination {
+  font: var(--font-small);
+}
+
+.page-tree {
+  .date,
+  .status-label,
+  .collapsed-label,
+  button {
+    font: var(--font-small);
+  }
+}
+
+.login-form,
+form .field {
+  label {
+    font-weight: var(--bold-weight);
+  }
+  label,
+  .description {
+    font: var(--font-small);
+  }
+}
+
+input,
+textarea {
+  font: var(--font-normal);
+}
+
+button,
+select {
+  font: var(--font-small);
+}
+
+input[type="text"].large,
+input[type="password"].large {
+  font: var(--font-large);
+}

data/app/assets/stylesheets/pages_core/admin/vars.css

@@ -2,9 +2,6 @@
 @custom-media --narrow screen and (max-width: 1150px);
 
 :root {
-  --font-os-sans: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
-    Roboto, Ubuntu, "Helvetica Neue", Oxygen, Cantarell, sans-serif;
-
   --red: #c00007;
   --red-transparent: #c0000740;
   --red-hover: #8d0005;
@@ -21,6 +18,7 @@
   --background-invert-color: #000;
   --background-disabled-color: #f8f8f8;
   --background-warning-color: #ffdfa0;
+  --background-highlight-color: #e7f3f9;
   --text-color: #111;
   --text-light-color: #666;
   --text-lighter-color: #999;

data/app/assets/stylesheets/pages_core/{admin.postcss.css → admin.css}

@@ -5,5 +5,6 @@
 @import "@fortawesome/fontawesome-free/css/regular";
 
 @import "admin/vars";
+@import-glob "admin/global/*.css";
 @import-glob "admin/components/*.css";
 @import-glob "admin/controllers/*.css";

data/app/assets/stylesheets/pages_core/mailer.css

@@ -0,0 +1,90 @@
+body,
+input,
+textarea,
+a.button,
+a.button:visited,
+button {
+  font-family: -apple-system, BlinkMacSystemFont, Calibri, sans-serif;
+  color: #111;
+}
+
+body {
+  font-size: 1rem;
+  padding: 2rem;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ul,
+ol,
+p {
+  max-width: 80ch;
+  margin: 0 0 1rem 0;
+  &:last-child {
+    margin-bottom: 0rem;
+  }
+}
+
+h1 {
+  font-size: 2rem;
+  margin-top: 2rem;
+  &:first-child {
+    margin-top: 0rem;
+  }
+}
+
+a,
+a:visited {
+  color: #1d7195;
+}
+a:hover,
+a:focus {
+  color: #15516a;
+}
+
+button,
+a.button {
+  appearance: none;
+  cursor: inherit;
+  font-size: 1rem;
+  line-height: 1.5;
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  padding: 0.5em 0.75em;
+  background: #e8e8e8;
+  box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.25);
+  text-decoration: none;
+
+  &.primary {
+    background: #111;
+    border-color: #111;
+    color: #fff;
+    box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.2);
+    &:hover {
+      box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.1);
+    }
+  }
+}
+
+.buttons,
+table {
+  margin: 1.5rem 0;
+  &:last-child {
+    margin-bottom: 0px;
+  }
+}
+
+table {
+  border-collapse: collapse;
+  border-top: 1px solid #ddd;
+  th,
+  td {
+    text-align: left;
+    padding: 0.5rem 1rem 0.5rem 0;
+    border-bottom: 1px solid #ddd;
+  }
+}

data/app/controllers/admin/account_recoveries_controller.rb

@@ -11,7 +11,7 @@ module Admin
     def new; end
 
     def create
-      @user = User.find_by_email(params[:email])
+      @user = User.find_by(email: params[:email])
       if @user
         deliver_account_recovery(@user)
         flash[:notice] = t("pages_core.account_recovery.sent")
@@ -47,7 +47,7 @@ module Admin
 
     def find_by_token
       @token = params[:token]
-      @user = User.find(message_verifier.verify(@token)[:id])
+      @user = User.find(message_verifier.verify(@token).symbolize_keys[:id])
       return if @user
 
       fail_recovery(t("pages_core.account_recovery.invalid_request"))

data/app/controllers/admin/pages_controller.rb

@@ -2,9 +2,8 @@
 
 module Admin
   class PagesController < Admin::AdminController
-    include PagesCore::Admin::PageJsonHelper
+    include PagesCore::PageParameters
 
-    before_action :find_categories
     before_action :find_page, only: %i[show edit update destroy move]
 
     require_authorization
@@ -39,26 +38,26 @@ module Admin
     def edit; end
 
     def create
-      @page = build_page(content_locale, page_params,
-                         param_categories).tap(&:save)
-      if @page.valid?
-        respond_with_page(@page) do
+      @page = build_page(content_locale, page_params).tap(&:save)
+
+      respond_with_page(@page) do
+        if @page.valid?
           redirect_to(edit_admin_page_url(content_locale, @page))
+        else
+          render action: :new
         end
-      else
-        render action: :new
       end
     end
 
     def update
-      if @page.update(page_params)
-        @page.categories = param_categories
-        respond_with_page(@page) do
+      @page.update(page_params)
+      respond_with_page(@page) do
+        if @page.valid?
           flash[:notice] = t("pages_core.changes_saved")
           redirect_to edit_admin_page_url(content_locale, @page)
+        else
+          render action: :edit
         end
-      else
-        render action: :edit
       end
     end
 
@@ -75,53 +74,34 @@ module Admin
 
     private
 
-    def build_page(locale, attributes = nil, categories = nil)
+    def build_page(locale, attributes = nil)
       Page.new.localize(locale).tap do |page|
         page.author = default_author || current_user
         page.attributes = attributes if attributes
-        page.categories = categories if categories
       end
     end
 
     def default_author
-      User.find_by_email(PagesCore.config.default_author)
-    end
-
-    def page_attributes
-      %i[template user_id status feed_enabled published_at redirect_to
-         image_link news_page unique_name pinned parent_page_id serialized_tags
-         meta_image_id starts_at ends_at all_day image_id path_segment
-         meta_title meta_description open_graph_title open_graph_description]
+      User.find_by(email: PagesCore.config.default_author)
     end
 
     def page_params
-      params.require(:page).permit(
-        PagesCore::Templates::TemplateConfiguration.all_blocks +
-        page_attributes,
-        page_images_attributes: %i[id position image_id primary _destroy],
-        page_files_attributes: %i[id position attachment_id _destroy]
-      )
-    end
-
-    def param_categories
-      return [] unless params[:category]
-
-      params.permit(category: {})[:category].to_hash
-            .map { |id, _| Category.find(id) }
+      params.require(:page).permit(page_content_attributes)
     end
 
     def find_page
       @page = Page.find(params[:id]).localize(content_locale)
     end
 
-    def find_categories
-      @categories = Category.order("name")
-    end
-
     def respond_with_page(page, &block)
       respond_to do |format|
-        format.html { block.call }
-        format.json { render json: page_json(page) }
+        format.html(&block)
+        format.json do
+          render json: ::Admin::PageResource.new(
+            page,
+            params: { user: current_user }
+          ), status: page.valid? ? :ok : :unprocessable_entity
+        end
       end
     end
   end

data/app/controllers/concerns/pages_core/error_reporting.rb

@@ -11,7 +11,7 @@ module PagesCore
     protected
 
     def configure_sentry_scope
-      return if Rails.env.test? || !Object.const_defined?("Sentry")
+      return if Rails.env.test? || !Object.const_defined?(:Sentry)
 
       Sentry.set_context("params", params.to_unsafe_h)
       Sentry.set_tags(locale: params[:locale] || I18n.default_locale.to_s)

data/app/controllers/concerns/pages_core/page_parameters.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module PageParameters
+    extend ActiveSupport::Concern
+
+    def page_attachment_attributes
+      { page_images_attributes: %i[id position image_id primary _destroy],
+        page_files_attributes: %i[id position attachment_id _destroy] }
+    end
+
+    def page_content_attributes
+      locales = PagesCore.config.locales&.keys || [I18n.default_locale]
+      [page_static_attributes,
+       PagesCore::Templates::TemplateConfiguration.all_blocks,
+       :path_segment,
+       (PagesCore::Templates::TemplateConfiguration
+                  .localized_blocks + %i[path_segment])
+         .index_with { locales },
+       page_attachment_attributes]
+    end
+
+    def page_static_attributes
+      %i[template user_id status feed_enabled published_at redirect_to
+         news_page unique_name pinned parent_page_id serialized_tags
+         meta_image_id starts_at ends_at all_day]
+    end
+  end
+end

data/app/controllers/concerns/pages_core/policies_helper.rb

@@ -35,7 +35,7 @@ module PagesCore
     end
 
     def verify_policy(record)
-      return true if policy(record).public_send("#{action_name}?")
+      return true if policy(record).public_send(:"#{action_name}?")
 
       raise PagesCore::NotAuthorized
     end

data/app/controllers/concerns/pages_core/preview_pages_controller.rb

@@ -3,11 +3,27 @@
 module PagesCore
   module PreviewPagesController
     extend ActiveSupport::Concern
+    include PagesCore::PageParameters
+
+    included do
+      before_action :disable_xss_protection, only: %i[preview]
+    end
 
     def preview?
       @preview || false
     end
 
+    def preview
+      render_error 403 unless logged_in?
+
+      @preview = true
+      @page = Page.find_by(id: params[:page_id]) || Page.new
+      @page.readonly!
+      @page.assign_attributes(preview_page_params)
+
+      render_page
+    end
+
     private
 
     def disable_xss_protection
@@ -17,31 +33,15 @@ module PagesCore
       response.headers["X-XSS-Protection"] = "0"
     end
 
-    def permitted_page_attributes
-      %i[template user_id status feed_enabled published_at
-         redirect_to image_link news_page
-         unique_name pinned parent_page_id]
-    end
-
-    def page_params
-      params.require(:page).permit(
-        Page.localized_attributes + permitted_page_attributes
-      )
-    end
-
-    def preview_page(page)
-      redirect_to(page_url(content_locale, page)) && return unless logged_in?
-
-      disable_xss_protection
-
-      @preview = true
-      page.attributes = page_params.merge(
+    def preview_page_params
+      ActionController::Parameters.new(
+        JSON.parse(params.require(:preview_page))
+      ).permit(:id, page_content_attributes).merge(
         status: 2,
         published_at: Time.zone.now,
         locale: content_locale,
         redirect_to: nil
       )
-      render_page
     end
   end
 end

data/app/controllers/pages_core/admin_controller.rb

@@ -4,8 +4,6 @@
 # authorization and other common code for the Admin set of controllers.
 module PagesCore
   class AdminController < ::ApplicationController
-    include PagesCore::Admin::PersistentParams
-
     protect_from_forgery with: :exception
 
     before_action :set_i18n_locale

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -12,8 +12,8 @@ module PagesCore
 
       before_action :load_root_pages
       before_action :find_page_by_path, only: [:show]
-      before_action :find_page, only: %i[show preview]
-      before_action :require_page, only: %i[show preview]
+      before_action :find_page, only: %i[show]
+      before_action :require_page, only: %i[show]
       before_action :canonicalize_url, only: [:show]
       static_cache :index, :show
 
@@ -27,10 +27,6 @@ module PagesCore
         end
       end
 
-      def preview
-        preview_page(@page)
-      end
-
       def show
         respond_to do |format|
           format.html { render_published_page(@page) }

data/app/formatters/pages_core/html_formatter.rb

@@ -38,8 +38,7 @@ module PagesCore
     def find_attachments(str)
       str.match(attachment_expression)[1]
          .split(",")
-         .map { |id| find_attachment(id) }
-         .compact
+         .filter_map { |id| find_attachment(id) }
     end
 
     def find_file(id)
@@ -51,8 +50,7 @@ module PagesCore
     def find_files(str)
       str.match(file_expression)[1]
          .split(",")
-         .map { |id| find_file(id) }
-         .compact
+         .filter_map { |id| find_file(id) }
     end
 
     def fix_markup(str)

data/app/helpers/admin/menu_helper.rb

@@ -5,12 +5,13 @@ module Admin
     include PagesCore::LocalesHelper
 
     def header_tabs(group)
+      return unless menu_items_for(group).any?
+
       tag.ul(class: group.to_s) do
         safe_join(menu_items_for(group).map do |item|
           tag.li do
             path = instance_eval(&item.path)
-            link_to(item.label,
-                    path,
+            link_to(item.label, path,
                     class: (current_menu_item?(item) ? "current" : ""))
           end
         end)
@@ -24,9 +25,9 @@ module Admin
         .select { |_, routing| routing[:controller] == params[:controller] }
     end
 
-    def find_menu_candidate(&block)
+    def find_menu_candidate(&)
       menu_item_candidates
-        .select { |item, routing| block.call(item, routing) }
+        .select(&)
         .try(&:first)
         .try(&:first)
     end

data/app/helpers/admin/pages_helper.rb

@@ -2,8 +2,6 @@
 
 module Admin
   module PagesHelper
-    include PagesCore::Admin::PageBlocksHelper
-
     def autopublish_notice(page)
       return unless page.autopublish?
 
@@ -13,22 +11,8 @@ module Admin
       end
     end
 
-    def available_templates_for_select
-      PagesCore::Templates.names.collect do |template|
-        if template == "index"
-          ["[Default]", "index"]
-        else
-          [template.humanize, template]
-        end
-      end
-    end
-
-    def file_embed_code(file)
-      "[file:#{file.id}]"
-    end
-
     def news_section_name(page, news_pages)
-      if news_pages.select { |p| p.name == page.name }.length > 1
+      if news_pages.count { |p| p.name == page.name } > 1
         page_name(page, include_parents: true)
       else
         page_name(page)
@@ -83,10 +67,6 @@ module Admin
 
     private
 
-    def nested_array?(array)
-      array.present? && array.first.is_a?(Array)
-    end
-
     def page_name_with_fallback(page)
       if page.name?
         page.name.to_s

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -7,7 +7,6 @@ module PagesCore
       include PagesCore::Admin::DateRangeHelper
       include PagesCore::Admin::ImageUploadsHelper
       include PagesCore::Admin::LocalesHelper
-      include PagesCore::Admin::PageJsonHelper
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
@@ -18,12 +17,12 @@ module PagesCore
                                       value: content))
       end
 
-      def locale_links(&block)
+      def locale_links
         return unless PagesCore.config.localizations?
 
         safe_join(
           PagesCore.config.locales.map do |locale, name|
-            link_to(name, block.call(locale),
+            link_to(name, yield(locale),
                     class: ("current" if locale == params[:locale].to_sym))
           end
         )

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -31,8 +31,7 @@ module PagesCore
                 class: "content-tab",
                 id: "content-tab-#{key}",
                 role: "tabpanel",
-                data: { tab: key,
-                        "main-target" => "tab" })
+                data: { tab: key })
       end
     end
   end

data/app/helpers/pages_core/admin/labelled_field_helper.rb

@@ -53,7 +53,7 @@ module PagesCore
 
       def labelled_field_label(label, options = {})
         tag.label do
-          safe_join([label, labelled_field_errors(options[:errors])])
+          safe_join([label, labelled_field_errors(options[:errors])], " ")
         end
       end
 

data/app/helpers/pages_core/attachments_helper.rb

@@ -17,7 +17,7 @@ module PagesCore
       page_file = args.detect { |a| a.is_a?(PageFile) }
       return attachment_path(page_file.attachment) if page_file
 
-      super(*args)
+      super
     end
 
     private

data/app/helpers/pages_core/frontend_helper.rb

@@ -10,6 +10,6 @@ module PagesCore
       @root_page ||= root_pages.first
     end
 
-    attr_reader :search_query, :search_category_id
+    attr_reader :search_query
   end
 end