pages_core 3.6.0 → 3.8.0

data/app/views/admin/pages/_edit_options.html.erb

@@ -1,72 +1,91 @@
-<%= labelled_field(f.select(:status, Page.status_labels.invert),
-                   "Status",
-                   errors: @page.errors[:status]) %>
-<div class="published-date">
-  <%= labelled_field (
+<div class="page-options"
+     data-controller="page-options">
+  <%= labelled_field(f.select(:status,
+                              Page.status_labels.invert,
+                              {},
+                              data: {
+                                "page-options-target": "published",
+                                action: "change->page-options#checkPublishedDate"
+                              }),
+                     "Status",
+                     errors: @page.errors[:status]) %>
+  <div class="published-date"
+       data-page-options-target="publishedDate">
+    <%= labelled_field (
       f.date_select(
         :published_at,
-        start_year: (Time.now.year - 20),
-        end_year: (Time.now.year + 5)
+        { start_year: (Time.now.year - 20),
+          end_year: (Time.now.year + 5),
+          with_css_classes: true },
+        data: { action: "change->page-options#checkAutoPublish" }
       ) +
       '<br />'.html_safe +
-      f.time_select(:published_at)
+      f.time_select(:published_at,
+                    { with_css_classes: true,
+                      ignore_date: true },
+                    data: { action: "change->page-options#checkAutoPublish" })
     ),
-    "Date",
-    errors: @page.errors[:published_at]
-  %>
-  <p class="autopublish-notice">
-    This page will publish later
-  </p>
-</div>
+     "Date",
+     errors: @page.errors[:published_at]
+    %>
+    <p class="autopublish-notice"
+       data-page-options-target="autoPublishNotice">
+      This page will publish later
+    </p>
+  </div>
 
-<%= labelled_field (
+  <%= labelled_field (
     f.select(:user_id, page_authors(@page).map{|a| [a.name, a.id]})
   ),
-  "Author",
-  errors: @page.errors[:user_id]
-%>
-
-<div class="field">
-  <label>
-    Pin to top
-  </label>
-  <%= f.check_box(:pinned) %>
-  Make post featured<br />
-</div>
+   "Author",
+   errors: @page.errors[:user_id]
+  %>
 
-<% if @categories.length > 0 %>
   <div class="field">
-    <label>Categories</label>
-    <% @categories.each do |category| %>
-      <%= check_box_tag("category[#{category.id}]",
-                        "1",
-                        @page.categories.map { |c| c.id }.include?(category.id)) %>
-      <%= category.name %><br />
-    <% end %>
+    <label>
+      Pin to top
+    </label>
+    <%= f.check_box(:pinned) %>
+    Make post featured<br />
   </div>
-<% end %>
 
-<%= labelled_field(f.select(:template, available_templates_for_select),
-                   "Template",
-                   errors: @page.errors[:template]) %>
+  <% if @categories.length > 0 %>
+    <div class="field">
+      <label>Categories</label>
+      <% @categories.each do |category| %>
+        <%= check_box_tag("category[#{category.id}]",
+                          "1",
+                          @page.categories.map { |c| c.id }.include?(category.id)) %>
+        <%= category.name %><br />
+      <% end %>
+    </div>
+  <% end %>
 
-<%= link_to "Advanced options", "#", class: "advanced-toggle" %>
+  <%= labelled_field(f.select(:template, available_templates_for_select),
+                     "Template",
+                     errors: @page.errors[:template]) %>
 
-<div class="advanced-options">
+  <%= link_to("Advanced options",
+              "#",
+              class: "advanced-toggle",
+              data: { action: "click->page-options#toggleAdvancedOptions" }) %>
 
-  <div class="field">
-    <label>Subpages</label>
-    <%= f.check_box(:feed_enabled) %> RSS feed enabled<br />
-    <%= f.check_box(:news_page) %> Show in News<br />
+  <div class="advanced-options"
+       data-page-options-target="advancedOptions">
+    <div class="field">
+      <label>Subpages</label>
+      <%= f.check_box(:feed_enabled) %> RSS feed enabled<br />
+      <%= f.check_box(:news_page) %> Show in News<br />
+    </div>
+    <%= labelled_field f.text_field(:unique_name), "Unique name", errors: @page.errors[:unique_name] %>
+    <%= labelled_field f.text_field(:redirect_to), "Redirect", errors: @page.errors[:redirect_to] %>
   </div>
-  <%= labelled_field f.text_field(:unique_name), "Unique name", errors: @page.errors[:unique_name] %>
-  <%= labelled_field f.text_field(:redirect_to), "Redirect", errors: @page.errors[:redirect_to] %>
-</div>
 
-<% if @page.id? && @page.name? %>
-  <div class="field">
-    <label>Page link</label>
-    <%= link_to(page_path(@page.locale, @page),
-                page_path(@page.locale, @page)) %>
-  </div>
-<% end %>
+  <% if @page.id? && @page.name? %>
+    <div class="field">
+      <label>Page link</label>
+      <%= link_to(page_path(@page.locale, @page),
+                  page_path(@page.locale, @page)) %>
+    </div>
+  <% end %>
+</div>

data/app/views/admin/pages/_form.html.erb

@@ -0,0 +1,19 @@
+<%= content_tab "Content" do %>
+  <%= render partial: "edit_content", locals: { f: f } %>
+<% end %>
+
+<% if @page.template_config.value(:images) || @page.template_config.value(:image) %>
+  <%= content_tab "Images" do %>
+    <%= render partial: "edit_images", locals: { f: f } %>
+  <% end %>
+<% end %>
+
+<% if @page.template_config.value(:files) %>
+  <%= content_tab "Files" do %>
+    <%= render partial: "edit_files", locals: { f: f } %>
+  <% end %>
+<% end %>
+
+<%= content_tab "Metadata" do %>
+  <%= render partial: "edit_metadata", locals: { f: f } %>
+<% end %>

data/app/views/admin/pages/edit.html.erb

@@ -11,71 +11,45 @@
   end
 %>
 
-
-
-<%# #### SIDEBAR ########################################################### %>
-
-<% content_for :sidebar do %>
+<% content_for :main_wrapper do %>
   <%= form_for(@page,
                url: admin_page_url(@locale, @page),
-               html: {class: "edit-page", id: 'page-form-sidebar'},
-               builder: PagesCore::Admin::FormBuilder) do |f| %>
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  <% end %>
-<% end %>
-
-
-
-<%# #### EDIT AREA ######################################################### %>
-
-<%= form_for(@page,
-             url: admin_page_url(@locale, @page),
-             html: {
-               class: "edit-page",
-               id: 'page-form',
-               method: :put,
-               multipart: true
-             },
-             builder: PagesCore::Admin::FormBuilder
-) do |f| %>
-
-  <div class="hidden-options">
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  </div>
-
-  <%# #### CONTENT #### %>
-  <%= content_tab "Content" do %>
-    <%= render partial: 'edit_content', locals: {f: f} %>
-  <% end %>
-
-  <%# #### IMAGES #### %>
-  <% if @page.template_config.value(:images) || @page.template_config.value(:image) %>
-    <%= content_tab "Images" do %>
-      <%= render partial: 'edit_images', locals: {f: f} %>
-    <% end %>
-  <% end %>
-
-
-  <%# #### FILES #### %>
-  <% if @page.template_config.value(:files) %>
-    <%= content_tab "Files" do %>
-      <%= render partial: 'edit_files', locals: {f: f} %>
+               builder: PagesCore::Admin::FormBuilder,
+               html: {
+                 class: "edit-page main-wrapper",
+                 method: :put,
+                 data: {
+                   controller: "edit-page",
+                   "edit-page-target": "form",
+                   "preview-url": preview_page_url(@page.locale, @page)
+                 }
+               }) do |f| %>
+
+    <% content_for :main do %>
+      <div class="content">
+        <%= render(partial: "form", locals: { f: f }) %>
+
+        <div class="buttons">
+          <button type="button"
+                  id="previewButton"
+                  data-action="click->edit-page#preview"
+                  data-url="<%= preview_page_url(@page.locale, @page) %>">
+            Preview
+          </button>
+          <button type="submit">
+            Save
+          </button>
+        </div>
+      </div>
     <% end %>
-  <% end %>
 
+    <main data-controller="main">
+      <%= render(partial: "layouts/admin/page_header") %>
+      <%= yield :main %>
+    </main>
 
-  <%# #### METADATA #### %>
-  <%= content_tab "Metadata" do %>
-    <%= render partial: 'edit_metadata', locals: {f: f} %>
+    <aside class="sidebar" id="page-form-sidebar">
+      <%= render partial: 'edit_options', locals: { f: f } %>
+    </aside>
   <% end %>
-
-  <div class="buttons">
-    <button type="button" id="previewButton" data-url="<%= preview_page_url(@page.locale, @page) %>">
-      Preview
-    </button>
-    <button type="submit">
-      Save
-    </button>
-  </div>
-
 <% end %>

data/app/views/admin/pages/index.html.erb

@@ -14,7 +14,6 @@
   <% cache Page.visible.roots.to_a + [current_user, @locale] do %>
     <%= react_component(
       "PageTree", {
-        csrf_token: form_authenticity_token,
         pages: @pages.map { |p| page_json(p) },
         locale: @locale,
         permissions: [(:create if policy(Page).create?)] }

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

@@ -11,39 +11,39 @@
   @url_options[:parent] = @page.parent if @page.parent
 %>
 
-<% content_for :sidebar do %>
+<% content_for :main_wrapper do %>
   <%= form_for(@page,
                url: admin_pages_url(@locale),
-               html: {class: "edit-page", id: 'page-form-sidebar'}) do |f| %>
-    <%= render partial: 'edit_options', locals: {f: f} %>
+               builder: PagesCore::Admin::FormBuilder,
+               html: {
+                 class: "edit-page main-wrapper",
+                 data: {
+                   controller: "edit-page",
+                   "edit-page-target": "form"
+                 }
+               }) do |f| %>
+
+    <% content_for :main do %>
+      <div class="content">
+        <%= f.hidden_field 'parent_page_id' if @page.parent %>
+
+        <%= render(partial: "form", locals: { f: f }) %>
+
+        <div class="buttons">
+          <button type="submit">
+            Save
+          </button>
+        </div>
+      </div>
+    <% end %>
+
+    <main data-controller="main">
+      <%= render(partial: "layouts/admin/page_header") %>
+      <%= yield :main %>
+    </main>
+
+    <aside class="sidebar" id="page-form-sidebar">
+      <%= render partial: 'edit_options', locals: { f: f } %>
+    </aside>
   <% end %>
 <% end %>
-
-<%= form_for(@page,
-             url: admin_pages_url(@locale),
-             builder: PagesCore::Admin::FormBuilder,
-             html: {
-               class: "edit-page",
-               id: 'page-form',
-               method: :post,
-               multipart: true
-             }
-) do |f| %>
-
-  <div class="hidden-options">
-    <%= render partial: 'edit_options', locals: {f: f} %>
-  </div>
-
-  <%= hidden_field_tag 'locale', @locale %>
-  <%= f.hidden_field 'parent_page_id' if @page.parent %>
-
-  <%# #### CONTENT #### %>
-  <%= content_tab "Content" do %>
-    <%= render partial: 'edit_content', locals: {f: f} %>
-  <% end %>
-
-  <p>
-    <%= submit_tag "Save" %>
-  </p>
-
-<% end %>

data/app/views/admin/pages/news.html.erb

@@ -59,7 +59,7 @@
   </div>
 <% end %>
 
-<% if @pages.any? %>
+<% if @pages.length > 0 %>
   <table class="list news-item-list">
     <tr>
       <th>Name</th>

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

@@ -10,8 +10,12 @@
       <%= check_box_tag("#{model_name_from_record_or_class(f.object).param_key}[role_names][]",
                         role.name,
                         f.object.role?(role.name.to_sym),
+                        id: "role-#{role.name}",
                         class: "role") %>
-      <%= role.description %><br>
+      <label for="role-<%= role.name %>">
+        <%= role.description %>
+      </label>
+      <br>
     <% end %>
   </p>
 <% end %>

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

@@ -11,8 +11,11 @@
   </p>
 <% end %>
 
-<div class="login-form">
-  <div class="login-tab password">
+<div class="login-form"
+     data-controller="login">
+  <div class="login-tab password"
+       data-login-target="tab"
+       data-tab="password">
     <%= form_tag session_path do %>
       <p>
         <label>Email address</label>
@@ -29,13 +32,18 @@
         <li>
           <%= link_to("<b>Help!</b> I forgot my password!".html_safe,
                       login_admin_users_path,
-                      class: 'show-password-reset') %>
+                      data: {
+                        action: "click->login#changeTab",
+                        tab: "password-reset"
+          }) %>
         </li>
       </ul>
     <% end %>
   </div>
 
-  <div class="login-tab password-reset">
+  <div class="login-tab password-reset"
+       data-login-target="tab"
+       data-tab="password-reset">
     <%= form_tag admin_password_resets_path do %>
       <h2>
         Forgot your password?

data/app/views/errors/500.html.erb

@@ -1,24 +1,6 @@
 <%
-  @page_title = "Oh dear..."
+  @page_title = "500 Internal Server Error"
 %>
 <p>
-  Something went terribly wrong. Of course, this shouldn't happen, and
-  we'd really appreciate it if you could click the button below to
-  notify us about the problem.
+  We're experiencing an internal server problem. Please try again later.
 </p>
-<p>
-  Please include your email address if you'd like to hear back from us.
-</p>
-
-<%= form_tag report_errors_path, method: 'post' do %>
-  <%= hidden_field_tag :error_report, @report %>
-  <p>
-    <input name="email" type="text" class="text" value="<%= @email %>"
-           placeholder="Your email (optional)" />
-  </p>
-  <p>
-    <button type="submit" class="clean-gray">
-      Report error
-    </button>
-  </p>
-<% end %>

data/app/views/errors/_generic_help.html.erb

@@ -6,7 +6,7 @@
   <li>Try searching this site using <%= link_to "Google", "http://www.google.com/" %> for the information you want:</li>
 </ul>
 
-<form action="http://www.google.com/search" method="get" onSubmit="googleSearch( this );">
+<form action="https://www.google.com/search" method="get" onSubmit="googleSearch( this );">
   <input name="q" type="hidden" />
   <input name="qinput" type="text" class="text with_button" />
   <button type="submit" class="clean-gray">Search</button>

data/app/views/feeds/pages.rss.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
   xml.channel do
@@ -24,10 +26,9 @@ xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
         xml.pubDate item.published_at.to_formatted_s(:rfc822)
         xml.tag!("dc:creator", item.author.name)
         if item.image
-          image_size = item.image.data.try(&:length)
           xml.enclosure(
             url: dynamic_image_url(item.image, size: "2000x2000"),
-            length: image_size,
+            length: item.image.content_length,
             type: item.image.content_type
           )
         end

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

@@ -24,7 +24,7 @@
   </div>
 </header>
 
-<% if flash[:error] %>
+<% if flash[:error] && false %>
   <div id="flash-error">
     <%= flash[:error] %>
   </div>

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

@@ -0,0 +1,33 @@
+<% if @page_description || @content_tabs %>
+  <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
+    <% if @page_description_links -%>
+      <div class="links">
+        <%= @page_description_links.html_safe %>
+      </div>
+    <% end %>
+    <h3>
+      <%= (@page_description || @page_title).html_safe %>
+    </h3>
+    <% if @content_tabs %>
+      <ul id="content-tabs">
+        <% @content_tabs.map do |t| %>
+          <li id="content-tab-link-<%= t[:key] %>"
+              data-tab="<%= t[:key] %>"
+              data-main-target="link">
+            <% if t[:options][:disabled] == true %>
+              <%= t[:name] %>
+            <% else %>
+              <%= link_to(
+                t[:name],
+                { anchor: "#{t[:key]}" },
+                data: {
+                  action: "click->main#changeTab",
+                  tab: t[:key]
+              }) %>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>

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

@@ -19,14 +19,19 @@
       <%= stylesheet_link_tag "admin" %>
     <% end %>
 
-    <%= javascript_include_tag "pages/admin" %>
-    <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
-      <%= javascript_include_tag "admin" %>
+    <% if File.exist?(Rails.root.join("app/assets/builds/admin.js")) %>
+      <%= javascript_include_tag("admin", defer: true) %>
+    <% else %>
+      <%= javascript_include_tag("pages_core/admin-dist", defer: true) %>
+      <% if Dir.glob(Rails.root.join("app/assets/javascripts/admin.*")).any? %>
+        <%= javascript_include_tag("admin", defer: true) %>
+      <% end %>
     <% end %>
 
     <%= csrf_meta_tag %>
     <meta name="viewport"
           content="width=device-width, initial-scale=1, user-scalable=no">
+    <%= google_analytics_tags "UA-5468672-21" %>
   </head>
 
   <body class="<%= body_classes.join(" ") %>"
@@ -35,49 +40,25 @@
         data-locale="<%= @locale %>">
 
     <div class="wrapper">
-
       <%= render partial: "layouts/admin/header" %>
+      <% if content_for?(:main_wrapper) %>
+        <%= yield :main_wrapper %>
+      <% else %>
+        <div class="main-wrapper">
+          <main data-controller="main">
+            <%= render(partial: "layouts/admin/page_header") %>
+            <%= yield %>
+          </main>
 
-      <div class="main-wrapper">
-        <main>
-          <% if @page_description || @content_tabs %>
-            <div id="page-description"<% if @content_tabs %> class="with_content_tabs"<% end %>>
-              <% if @page_description_links -%>
-                <div class="links">
-                  <%= @page_description_links.html_safe %>
-                </div>
-              <% end %>
-              <h3>
-                <%= (@page_description || @page_title).html_safe %>
-              </h3>
-              <% if @content_tabs %>
-                <ul id="content-tabs">
-                  <% @content_tabs.map do |t| %>
-                    <li id="content-tab-link-<%= t[:key] %>" data-tab-name="<%= t[:key] %>">
-                      <% if t[:options][:disabled] == true %>
-                        <%= t[:name] %>
-                      <% else %>
-                        <%= link_to(t[:name], anchor: "#{t[:key]}") %>
-                      <% end %>
-                    </li>
-                  <% end %>
-                </ul>
-              <% end %>
-            </div>
+          <% if content_for?(:sidebar) %>
+            <aside class="sidebar">
+              <%= content_for(:sidebar) %>
+            </aside>
           <% end %>
-
-          <%= yield %>
-        </main>
-
-        <% if content_for?(:sidebar) %>
-          <aside class="sidebar">
-            <%= content_for(:sidebar) %>
-          </aside>
-        <% end %>
-      </div>
+        </div>
+      <% end %>
     </div>
     <%= react_component "Modal", {} %>
-    <%= react_component "Toast", { notice: flash[:notice] } %>
-    <%= render partial: "layouts/admin/analytics" %>
+    <%= react_component "Toast", { notice: flash[:notice], error: flash[:error] } %>
   </body>
 </html>

data/app/views/pages_core/_google_analytics.html.erb

@@ -0,0 +1,8 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= account_id %>"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '<%= account_id %>', { 'anonymize_ip': true });
+</script>

data/app/views/sitemaps/show.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.instruct!
 xml.urlset xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9" do |urlset|
   @entries.each do |entry|

data/config/routes.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
+  Healthcheck.routes(self)
+
   image_resources :images, path: "dynamic_images/:digest(/:size)"
 
   # Attachment
@@ -83,7 +87,6 @@ Rails.application.routes.draw do
 
         member do
           put "move"
-          delete "delete_meta_image"
         end
 
         get "new/:parent", action: "new"
@@ -98,11 +101,7 @@ Rails.application.routes.draw do
       as: "admin_default")
 
   # Errors
-  resources :errors do
-    collection do
-      post "report"
-    end
-  end
+  resources :errors
 
   # Page path routing
   get ":locale/*path/page/:page" => "pages#show",