pages_core 3.15.0 → 3.15.2

data/app/assets/builds/pages_core/admin.css

@@ -543,9 +543,9 @@ template {
       margin-left: -7px; } }
 
 /*!
- * Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2023 Fonticons, Inc.
+ * Copyright 2024 Fonticons, Inc.
  */
 
 .fa {
@@ -903,8 +903,8 @@ template {
   transform: scale(-1, -1); }
 
 .fa-rotate-by {
-  transform: rotate(none);
-          transform: rotate(var(--fa-rotate-angle, none)); }
+  transform: rotate(0);
+          transform: rotate(var(--fa-rotate-angle, 0)); }
 
 .fa-stack {
   display: inline-block;
@@ -3210,6 +3210,9 @@ readers do not read off random characters that represent icons */
 .fa-italic::before {
   content: "\f033"; }
 
+.fa-table-cells-column-lock::before {
+  content: "\e678"; }
+
 .fa-church::before {
   content: "\f51d"; }
 
@@ -5382,6 +5385,9 @@ readers do not read off random characters that represent icons */
 .fa-font::before {
   content: "\f031"; }
 
+.fa-table-cells-row-lock::before {
+  content: "\e67a"; }
+
 .fa-rupiah-sign::before {
   content: "\e23d"; }
 
@@ -6411,9 +6417,6 @@ readers do not read off random characters that represent icons */
 .fa-share::before {
   content: "\f064"; }
 
-.fa-arrow-turn-right::before {
-  content: "\f064"; }
-
 .fa-mail-forward::before {
   content: "\f064"; }
 
@@ -6814,9 +6817,9 @@ readers do not read off random characters that represent icons */
   border-width: 0; }
 
 /*!
- * Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2023 Fonticons, Inc.
+ * Copyright 2024 Fonticons, Inc.
  */
 
 :root, :host {
@@ -6827,16 +6830,16 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 900;
   font-display: block;
-  src: url("../fonts/47262711.woff2") format("woff2"), url("../fonts/2a3059ad.ttf") format("truetype"); }
+  src: url("../fonts/7b7db107.woff2") format("woff2"), url("../fonts/6569749d.ttf") format("truetype"); }
 
 .fas,
 .fa-solid {
   font-weight: 900; }
 
 /*!
- * Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2023 Fonticons, Inc.
+ * Copyright 2024 Fonticons, Inc.
  */
 
 :root, :host {
@@ -6848,7 +6851,7 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url("../fonts/500ddeb0.woff2") format("woff2"), url("../fonts/81221036.ttf") format("truetype"); }
+  src: url("../fonts/921961e9.woff2") format("woff2"), url("../fonts/ee32bc60.ttf") format("truetype"); }
 
 .far,
 .fa-regular {
@@ -7521,7 +7524,7 @@ form .field .date-select {
     }
 
 form .field .date-select .time {
-        width: 4rem;
+        width: 5rem;
         min-width: 2rem;
       }
 
@@ -7788,8 +7791,17 @@ form.button-to {
   display: flex;
   flex-wrap: wrap;
   gap: 0.25rem;
+  margin-top: 2rem;
 }
 
+.buttons:first-child {
+    margin-top: 0px;
+  }
+
+.buttons:last-child {
+    margin-bottom: 0px;
+  }
+
 .inline-form {
   display: flex;
 }

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

@@ -0,0 +1,99 @@
+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;
+}
+
+h1:last-child, h2:last-child, h3:last-child, h4:last-child, h5:last-child, h6:last-child, ul:last-child, ol:last-child, p:last-child {
+    margin-bottom: 0rem;
+  }
+
+h1 {
+  font-size: 2rem;
+  margin-top: 2rem;
+}
+
+h1:first-child {
+    margin-top: 0rem;
+  }
+
+a,
+a:visited {
+  color: #1d7195;
+}
+
+a:hover,
+a:focus {
+  color: #15516a;
+}
+
+button,
+a.button {
+  -webkit-appearance: none;
+     -moz-appearance: none;
+          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);
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+button.primary, a.button.primary {
+    background: #111;
+    border-color: #111;
+    color: #fff;
+    box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.2);
+  }
+
+button.primary:hover, a.button.primary:hover {
+      box-shadow: inset 0px 0.75em 0.75em rgba(255, 255, 255, 0.1);
+    }
+
+.buttons,
+table {
+  margin: 1.5rem 0;
+}
+
+.buttons:last-child, table:last-child {
+    margin-bottom: 0px;
+  }
+
+table {
+  border-collapse: collapse;
+  border-top: 1px solid #ddd;
+}
+
+table th,
+  table td {
+    text-align: left;
+    padding: 0.5rem 1rem 0.5rem 0;
+    border-bottom: 1px solid #ddd;
+  }

data/app/assets/stylesheets/pages_core/admin/components/forms.css

@@ -13,7 +13,7 @@ form {
       gap: 4px;
       flex-wrap: wrap;
       .time {
-        width: 4rem;
+        width: 5rem;
         min-width: 2rem;
       }
     }
@@ -259,6 +259,8 @@ form.button-to {
   display: flex;
   flex-wrap: wrap;
   gap: 0.25rem;
+  margin-top: 2rem;
+  @mixin child-margins;
 }
 
 .inline-form {

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/pages_controller.rb

@@ -100,7 +100,7 @@ module Admin
           render json: ::Admin::PageResource.new(
             page,
             params: { user: current_user }
-          )
+          ), status: page.valid? ? :ok : :unprocessable_entity
         end
       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/javascript/components/PageForm.tsx

@@ -82,6 +82,11 @@ export default function PageForm(props: Props) {
     });
   };
 
+  const clearDeletedObjects = () => {
+    filesState.setDeleted([]);
+    imagesState.setDeleted([]);
+  };
+
   const handleSubmit = (evt: React.MouseEvent) => {
     evt.preventDefault();
     let method = postJson;
@@ -105,6 +110,7 @@ export default function PageForm(props: Props) {
         if (response.errors && response.errors.length > 0) {
           errorToast("A validation error prevented the page from being saved.");
         } else {
+          clearDeletedObjects();
           noticeToast("Your changes were saved");
         }
       })

data/app/javascript/components/drag/useDragCollection.ts

@@ -12,10 +12,15 @@ function getPosition<T>(draggable: Drag.Draggable<T>) {
 }
 
 function hideDraggable<T>(
-  draggable: Drag.Draggable<T> | null,
-  callback: () => Drag.Draggable<T>[]
+  draggable: Drag.Item<T> | null,
+  callback: () => Drag.Item<T>[]
 ) {
-  if (draggable && "ref" in draggable && draggable.ref.current) {
+  if (
+    draggable &&
+    draggable !== "Files" &&
+    "ref" in draggable &&
+    draggable.ref.current
+  ) {
     const prevDisplay = draggable.ref.current.style.display;
     draggable.ref.current.style.display = "none";
     const result = callback();

data/app/javascript/components/drag/useDragUploader.ts

@@ -42,7 +42,7 @@ function mousePosition(evt: AnyTouchEvent): Drag.Position {
   if ("touches" in evt && evt.type == "touchmove") {
     x = evt.touches[0].clientX;
     y = evt.touches[0].clientY;
-  } else if (evt instanceof MouseEvent) {
+  } else if ("clientX" in evt && "clientY" in evt) {
     x = evt.clientX;
     y = evt.clientY;
   }

data/app/mailers/admin_mailer.rb

@@ -2,23 +2,19 @@
 
 class AdminMailer < ApplicationMailer
   default from: proc { "\"Pages\" <no-reply@anyone.no>" }
-  layout false
+  layout "pages_core/mailer"
 
   def account_recovery(user, url)
     @user = user
     @url = url
-    mail(
-      to: @user.email,
-      subject: "Recover your account on #{PagesCore.config(:site_name)}"
-    )
+    mail(to: @user.email,
+         subject: "Recover your account on #{PagesCore.config(:site_name)}")
   end
 
   def invite(invite, url)
     @invite = invite
     @url = url
-    mail(
-      to: @invite.email,
-      subject: "#{PagesCore.config(:site_name)} has invited you to Pages"
-    )
+    mail(to: @invite.email,
+         subject: "#{PagesCore.config(:site_name)} has invited you to Pages")
   end
 end

data/app/models/autopublisher.rb

@@ -30,7 +30,7 @@ class Autopublisher
     end
 
     def due_pages
-      queued_pages.where("published_at < ?", (Time.now.utc + 2.minutes))
+      queued_pages.where(published_at: ...(Time.now.utc + 2.minutes))
     end
   end
 end

data/app/models/concerns/pages_core/page_model/attachments.rb

@@ -33,6 +33,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_files_attributes=(attrs)
+        ids = page_files.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       def files
         page_files
       end

data/app/models/concerns/pages_core/page_model/dated_page.rb

@@ -10,7 +10,7 @@ module PagesCore
         before_validation :ensure_ends_at
 
         scope :upcoming, -> { where("ends_at > ?", Time.zone.now) }
-        scope :past, -> { where("ends_at <= ?", Time.zone.now) }
+        scope :past, -> { where(ends_at: ..Time.zone.now) }
         scope :with_dates, -> { where.not(starts_at: nil) }
       end
 
@@ -57,13 +57,13 @@ module PagesCore
       # Finds the page's next sibling by date. Returns nil if there
       # isn't one.
       def next_sibling_by_date
-        siblings_by_date.where("starts_at >= ?", starts_at)&.first
+        siblings_by_date.where(starts_at: starts_at..)&.first
       end
 
       # Finds the page's previous sibling by date. Returns nil if
       # there isn't one.
       def previous_sibling_by_date
-        siblings_by_date.where("starts_at < ?", starts_at)&.last
+        siblings_by_date.where(starts_at: ...starts_at)&.last
       end
 
       def upcoming?

data/app/models/concerns/pages_core/page_model/images.rb

@@ -19,11 +19,11 @@ module PagesCore
 
         after_save :update_primary_image
 
-        accepts_nested_attributes_for :page_images,
-                                      reject_if: proc { |a|
-                                                   a["image_id"].blank?
-                                                 },
-                                      allow_destroy: true
+        accepts_nested_attributes_for(
+          :page_images,
+          reject_if: proc { |a| a["image_id"].blank? },
+          allow_destroy: true
+        )
       end
 
       def image?
@@ -42,6 +42,11 @@ module PagesCore
         super.in_locale(locale)
       end
 
+      def page_images_attributes=(attrs)
+        ids = page_images.map(&:id)
+        super(attrs.reject { |a| a["_destroy"] && ids.exclude?(a["id"]) })
+      end
+
       private
 
       def update_primary_image

data/app/models/concerns/pages_core/taggable.rb

@@ -4,15 +4,12 @@ module PagesCore
   module Taggable
     extend ActiveSupport::Concern
 
-    attr_accessor :new_tags
-
     included do
       has_many :taggings,
                as: :taggable,
                dependent: :destroy,
                inverse_of: :taggable
       has_many :tags, through: :taggings
-      after_save :update_taggings
     end
 
     module ClassMethods
@@ -32,7 +29,7 @@ module PagesCore
     end
 
     def tag_with(*list)
-      @new_tags = Tag.parse(list)
+      self.tags = Tag.parse(list).map { |n| Tag.find_or_initialize_by(name: n) }
     end
 
     def tag_with!(*list)
@@ -48,21 +45,7 @@ module PagesCore
     end
 
     def tag_names
-      @new_tags || tags.by_name.map(&:name)
-    end
-
-    private
-
-    def update_taggings
-      return unless new_tags
-
-      Tag.transaction do
-        taggings.includes(:tag).where.not(tag: { name: new_tags }).destroy_all
-        new_tags.map { |n| Tag.find_or_create_by(name: n) }
-                .each { |t| taggings.create(tag: t) }
-      end
-
-      @new_tags = nil
+      tags.by_name.map(&:name)
     end
   end
 end

data/app/views/admin_mailer/account_recovery.html.erb

@@ -0,0 +1,20 @@
+<h1>
+  Recover your account
+</h1>
+<p>
+  Hi, <%= @user.name %>!
+</p>
+<p>
+  We've received a request to recover your account on
+  <%= PagesCore.config(:site_name) %>.
+</p>
+<p>
+  Please click the following link to continue:<br>
+  <%= link_to(@url, @url) %>
+</p>
+<p>
+  The link will expire in 24 hours.
+</p>
+<p>
+  If you do not want to recover your password, please ignore this email.
+</p>

data/app/views/admin_mailer/invite.html.erb

@@ -0,0 +1,11 @@
+<h1>
+  Welcome!
+</h1>
+<p>
+  <%= @invite.user.name %> has invited you to Pages on
+  <%= PagesCore.config(:site_name) %>.<br>
+  Click the button below to create your account and get started.
+</p>
+<div class="buttons">
+  <%= link_to("Create account", @url, class: "primary button") %>
+</div>

data/app/views/layouts/pages_core/mailer.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <%= stylesheet_link_tag "pages_core/mailer" %>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/lib/pages_core/engine.rb

@@ -29,6 +29,7 @@ module PagesCore
       Rails.application.config.assets.precompile += %w[
         pages_core/admin-dist.js
         pages_core/admin.css
+        pages_core/mailer.css
         pages_core/fonts/*.ttf
         pages_core/fonts/*.woff2
         pages/favicon.gif

data/lib/pages_core.rb

@@ -29,6 +29,7 @@ require "lograge"
 require "nokogiri"
 require "json"
 require "pg_search"
+require "premailer/rails"
 require "progress_bar"
 require "rails_i18n"
 require "RedCloth"