pages_core 3.14.0 → 3.15.1

data/app/views/admin/sessions/new.html.erb

@@ -12,22 +12,20 @@
 
 <div class="login-form">
   <%= form_tag admin_session_path do %>
-    <p>
+    <div class="field">
       <label>Email address</label>
       <%= text_field_tag(:email, "", autocomplete: "email") %>
-    </p>
-    <p>
+    </div>
+    <div class="field">
       <label>Password</label>
       <%= password_field_tag(:password, "", autocomplete: "current-password") %>
-    </p>
-    <p>
+    </div>
+    <div class="buttons">
       <button type="submit">Sign in</button>
+    </div>
+    <p>
+      <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
+                  new_admin_account_recovery_path) %>
     </p>
-    <ul>
-      <li>
-        <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
-                    new_admin_account_recovery_path) %>
-      </li>
-    </ul>
   <% end %>
 </div>

data/app/views/admin/users/_access_control.html.erb

@@ -4,7 +4,11 @@
   </h2>
   <p>
     <% if f.object.kind_of?(User) && f.object != current_user %>
-      <%= f.check_box :activated %> The user account is activated<br />
+      <%= f.check_box :activated %>
+      <label for="user_activated">
+        The user account is activated
+      </label>
+      <br />
     <% end %>
     <% Role.roles.each do |role| %>
       <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",

data/app/views/admin/users/_list.html.erb

@@ -3,8 +3,9 @@
     <th>Name</th>
     <th>Email</th>
     <th>Can access</th>
+    <th>2FA</th>
     <th>Last seen</th>
-    <th></th>
+    <th colspan="2"></th>
   </tr>
 <% @invites.each do |invite| %>
   <tr class="invite">
@@ -15,13 +16,14 @@
     <td>
       <%= invite.roles.map(&:to_s).sort.to_sentence %>
     </td>
+    <td></td>
     <td>
       <% if invite.sent_at? %>
         Invited
         <%= time_ago_in_words(invite.sent_at) %> ago
       <% end %>
     </td>
-    <td>
+    <td colspan="2">
       <% if current_user.role?(:users) %>
         <%= link_to("View invite",
                     admin_invite_with_token_url(invite, invite.token)) %> /
@@ -36,16 +38,14 @@
 <% end %>
 <% @users.each do |user| -%>
   <tr class="user-<%= user.id %>">
-    <td>
-      <strong><%= link_to user.name, admin_user_url( user ) %></strong>
-      <% if policy(user).edit? %>
-        (<%= link_to "edit", edit_admin_user_url( user ), class: :edit %>)
-      <% end %>
+    <td class="name">
+      <%= link_to user.name, admin_user_url( user ) %>
     </td>
     <td>
       <%= user.email %>
     </td>
     <td><%= user.roles.map(&:to_s).sort.to_sentence %></td>
+    <td><%= user.otp_enabled? ? "Enabled" : "" %></td>
     <td>
       <% if user.online? -%>
         <strong>Online now</strong>
@@ -62,6 +62,11 @@
         notes.join( ", " )
       %>
     </td>
+    <td>
+      <% if policy(user).edit? %>
+        <%= link_to("Edit", edit_admin_user_url(user), class: :edit) %>
+      <% end %>
+    </td>
   </tr>
 <% end -%>
 </table>

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/admin/_header.html.erb

@@ -1,10 +1,8 @@
 <header>
-  <div class="logo">
-    <%= link_to image_tag("pages/admin/icon.svg"), '/admin' %>
-  </div>
   <div class="site-name">
     <h1>
-      <%= link_to "Pages", "/admin" %> <%= PagesCore.config :site_name %>
+      <%= link_to("Pages", "/admin", class: "logo") %>
+      <%= PagesCore.config :site_name %>
     </h1>
   </div>
   <% if logged_in? %>

data/app/views/layouts/admin/_page_header.html.erb

@@ -13,8 +13,7 @@
           role="tablist">
         <% content_tabs.map do |t| %>
           <li id="content-tab-link-<%= t[:key] %>"
-              data-tab="<%= t[:key] %>"
-              data-main-target="link">
+              data-tab="<%= t[:key] %>">
             <% if t[:options][:disabled] == true %>
               <%= t[:name] %>
             <% else %>

data/app/views/layouts/admin.html.erb

@@ -44,7 +44,7 @@
         <%= yield :main_wrapper %>
       <% else %>
         <div class="main-wrapper">
-          <main data-controller="main">
+          <main>
             <%= render(partial: "layouts/admin/page_header") %>
             <%= yield %>
           </main>

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/config/locales/en.yml

@@ -19,10 +19,6 @@ en:
         image: Profile picture
   pages_core:
     account_holder_exists: Account holder already exists
-    categories_controller:
-      created: New category created
-      deleted: Category was deleted
-      updated: Category was updated
     changes_saved: Your changes were saved
     invalid_login: >
       The provided email address and password combination was not valid

data/config/routes.rb

@@ -17,9 +17,7 @@ Rails.application.routes.draw do
     collection do
       get "search"
       post "search"
-    end
-    member do
-      put "preview"
+      post "preview"
     end
     resources :files, controller: "page_files"
   end
@@ -37,6 +35,8 @@ Rails.application.routes.draw do
   resource :sitemap, only: [:show]
 
   namespace :admin do
+    get "users/login" => redirect("/admin/login")
+
     # Invites
     resources :invites do
       member do
@@ -63,16 +63,12 @@ Rails.application.routes.draw do
     resources :users do
       collection do
         get "deactivated"
-        get "login"
       end
       member do
         delete "delete_image"
       end
     end
 
-    # Categories
-    resources :categories
-
     # Authentication
     resource :session, only: %i[create destroy] do
       member { post :verify_otp }

data/db/migrate/20240126160700_add_2fa_fields.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Add2faFields < ActiveRecord::Migration[7.0]
+  class User < ApplicationRecord; end
+
   def change
     change_table :users do |t|
       t.boolean :otp_enabled, null: false, default: false
@@ -14,7 +16,9 @@ class Add2faFields < ActiveRecord::Migration[7.0]
 
     reversible do |dir|
       dir.up do
-        User.find_each { |u| u.update(session_token: SecureRandom.hex(32)) }
+        User.find_each do |u|
+          u.update_columns(session_token: SecureRandom.hex(32))
+        end
         change_column_null :users, :session_token, false
       end
     end

data/db/migrate/20240131140700_change_email_to_citext.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ChangeEmailToCitext < ActiveRecord::Migration[7.0]
+  def up
+    enable_extension "citext"
+    %i[users invites].each do |t|
+      change_column t, :email, :citext
+      add_index t, :email, unique: true, name: "index_#{t}_on_email"
+    end
+  end
+
+  def down
+    %i[users invites].each do |t|
+      change_column t, :email, :string
+      remove_index t, name: "index_#{t}_on_email"
+    end
+  end
+end

data/db/migrate/20240201160700_remove_persistent_data.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemovePersistentData < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :users, :persistent_data, :text
+  end
+end

data/db/migrate/20240508145300_remove_categories.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveCategories < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :page_categories do |t|
+      t.integer :page_id
+      t.integer :category_id
+      t.index :category_id
+      t.index :page_id
+    end
+
+    drop_table :categories do |t|
+      t.string :name
+      t.string :slug
+      t.integer :position
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.index :slug
+    end
+  end
+end

data/lib/pages_core/configuration/base.rb

@@ -18,11 +18,11 @@ module PagesCore
           args.any? ? set(key, *args) : get(key)
         end
 
-        define_method "#{key}=" do |value|
+        define_method :"#{key}=" do |value|
           set(key, value)
         end
 
-        define_method "#{key}?" do
+        define_method :"#{key}?" do
           get(key) ? true : false
         end
       end

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/templates/configuration.rb

@@ -95,7 +95,7 @@ module PagesCore
 
       def valid_template_options
         %i[template image images files text_filter blocks
-           enabled_blocks sub_template tags dates]
+           enabled_blocks sub_template tags dates name]
       end
 
       def configure_block(tpl_name, block_name, title = nil, options = {})

data/lib/pages_core/templates/configuration_proxy.rb

@@ -9,11 +9,11 @@ module PagesCore
       end
 
       def method_missing(method_name, *args, &block)
-        if @parent && block_given?
+        if @parent && block
           @callback.call(@parent, method_name, block)
         elsif @parent
           @callback.call(@parent, method_name, *args)
-        elsif block_given?
+        elsif block
           @callback.call(method_name, block)
         else
           @callback.call(method_name, *args)

data/lib/pages_core/templates/template_configuration.rb

@@ -29,7 +29,7 @@ module PagesCore
 
           (config.get(:default, :blocks).to_a + template_blocks)
             .compact
-            .select { |_, opts| opts[:localized] }.map(&:first)
+            .select { |_, opts| opts[:localized] }.map(&:first).uniq
         end
 
         private
@@ -53,6 +53,10 @@ module PagesCore
         self.class.config
       end
 
+      def name
+        value(:name) || default_name
+      end
+
       def value(*path)
         path = [path, :value].flatten
         value = config.get(*[:default, path].flatten)
@@ -103,6 +107,12 @@ module PagesCore
           size: :small
         }
       end
+
+      def default_name
+        return "[Default]" if template_name == :index
+
+        template_name.to_s.humanize
+      end
     end
 
     class << self

data/lib/pages_core/templates.rb

@@ -10,6 +10,10 @@ require "pages_core/templates/template_configuration"
 module PagesCore
   module Templates
     class << self
+      def all
+        names.map { |n| PagesCore::Templates::TemplateConfiguration.new(n) }
+      end
+
       def names
         @names ||= find_all_templates
       end
@@ -17,10 +21,8 @@ module PagesCore
       private
 
       def template_paths
-        [
-          PagesCore.plugin_root.join("app/views/pages/templates"),
-          Rails.root.join("app/views/pages/templates")
-        ]
+        [PagesCore.plugin_root.join("app/views/pages/templates"),
+         Rails.root.join("app/views/pages/templates")]
       end
 
       def template_files

data/lib/pages_core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module PagesCore
-  unless PagesCore.const_defined?("VERSION")
+  unless PagesCore.const_defined?(:VERSION)
     VERSION = File.read(File.expand_path("../../VERSION", __dir__)).strip
   end
 end

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"

data/lib/rails/generators/pages_core/frontend/templates/javascript/lib/gridOverlay.ts

@@ -1,13 +1,12 @@
 function ready(callback: () => void) {
-  if (document.readyState === "complete" ||
-    (document.readyState !== "loading" && !document.documentElement.doScroll)) {
-      callback();
-    } else {
-      document.addEventListener("DOMContentLoaded", callback);
-    }
+  if (document.readyState !== "loading") {
+    callback();
+  } else {
+    document.addEventListener("DOMContentLoaded", callback);
+  }
 }
 
-function applyGrid () {
+function applyGrid() {
   let showGrid = false;
   const gridOverlay = document.querySelector(".grid-overlay");
 

data/lib/rails/generators/pages_core/frontend/templates/javascript/lib/responsiveEmbeds.ts

@@ -1,14 +1,17 @@
 const selectors = [
-  "iframe[src*=\"bandcamp.com\"]",
-  "iframe[src*=\"player.vimeo.com\"]",
-  "iframe[src*=\"youtube.com\"]",
-  "iframe[src*=\"youtube-nocookie.com\"]",
-  "iframe[src*=\"spotify.com\"]",
-  "iframe[src*=\"kickstarter.com\"][src*=\"video.html\"]"
+  'iframe[src*="bandcamp.com"]',
+  'iframe[src*="player.vimeo.com"]',
+  'iframe[src*="youtube.com"]',
+  'iframe[src*="youtube-nocookie.com"]',
+  'iframe[src*="spotify.com"]',
+  'iframe[src*="kickstarter.com"][src*="video.html"]'
 ];
 
 function readyHandler(fn: () => void) {
-  if (document.readyState === "complete" || document.readyState === "interactive") {
+  if (
+    document.readyState === "complete" ||
+    document.readyState === "interactive"
+  ) {
     setTimeout(fn, 1);
   } else {
     document.addEventListener("DOMContentLoaded", fn);
@@ -19,12 +22,14 @@ function wrapEmbed(embed: HTMLElement): HTMLElement {
   const parent = embed.parentNode as HTMLElement;
 
   // Recycle the existing container if the embed is already responsive.
-  if (parent &&
+  if (
+    parent &&
     parent.tagName === "DIV" &&
     parent.childNodes.length === 1 &&
-    parent.style.position === "relative") {
-      return parent;
-    }
+    parent.style.position === "relative"
+  ) {
+    return parent;
+  }
 
   const wrapper = document.createElement("div");
   if (parent.tagName === "P") {
@@ -51,7 +56,7 @@ function applyEmbed(embed: HTMLElement) {
   wrapper.classList.add("responsive-embed");
   wrapper.style.position = "relative";
   wrapper.style.width = "100%";
-  wrapper.style.paddingTop = 0;
+  wrapper.style.paddingTop = "0";
   wrapper.style.paddingBottom = `${ratio * 100}%`;
 
   embed.style.position = "absolute";

data/lib/rails/generators/pages_core/rspec/rspec_generator.rb

@@ -23,14 +23,12 @@ module PagesCore
       def setup_rspec
         create_file File.join(".rspec"), "--format Fuubar\n--colour\n" \
                                          "--require spec_helper"
-        create_file File.join("spec/controllers/.keep")
         create_file File.join("spec/mailers/preview/.keep")
         create_file File.join("spec/models/.keep")
         create_file File.join("spec/system/.keep")
         template "spec_helper.rb", File.join("spec/spec_helper.rb")
         template "rails_helper.rb", File.join("spec/rails_helper.rb")
         template "factories.rb", File.join("spec/factories.rb")
-        template "mailer_macros.rb", File.join("spec/support/mailer_macros.rb")
         template("page_templates_spec.rb",
                  File.join("spec/system/page_templates_spec.rb"))
       end

data/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb

@@ -6,16 +6,16 @@ ENV["RAILS_ENV"] ||= "test"
 require "simplecov"
 SimpleCov.start "rails" if ARGV.grep(/spec\.rb/).empty?
 
+require "spec_helper"
 require File.expand_path("../config/environment", __dir__)
 
 # Prevent database truncation if the environment is production
 if Rails.env.production?
   abort("The Rails environment is running in production mode!")
 end
-require "spec_helper"
 require "rspec/rails"
-# Add additional requires below this line. Rails is not loaded until this point!
 
+# Add additional requires below this line. Rails is not loaded until this point!
 require "shoulda-matchers"
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -41,7 +41,7 @@ ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Rails.root.join("spec/fixtures")
+  # config.fixture_paths = [Rails.root.join("spec/fixtures")]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -69,7 +69,6 @@ RSpec.configure do |config|
   # config.filter_gems_from_backtrace("gem name")
 
   config.include ActiveJob::TestHelper
-  config.include MailerMacros
 
   # Use FactoryBot shorthand
   config.include FactoryBot::Syntax::Methods