pages_core 3.4.3 → 3.7.0

data/app/serializers/page_image_serializer.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 class PageImageSerializer < ActiveModel::Serializer
+  include Rails.application.routes.url_helpers
   include DynamicImage::Helper
+
   attributes :id, :image_id, :primary, :filename
   attributes :alternative, :caption, :created_at, :url
 

data/app/serializers/page_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PageSerializer < ActiveModel::Serializer
   attributes :id, :param, :parent_page_id, :locale
   attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)

data/app/services/pages_core/create_user_service.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class CreateUserService
+    attr_reader :attributes, :invite
+
+    def initialize(attributes, invite: nil)
+      @attributes = attributes
+      @invite = invite
+    end
+
+    class << self
+      def call(attrs, invite: nil)
+        new(attrs, invite: invite).call
+      end
+    end
+
+    def call
+      User.transaction do
+        user = User.create(attributes.merge(invite_attributes))
+        if user.valid?
+          PagesCore::PubSub.publish(:create_user, user: user, invite: invite)
+          invite&.destroy
+        end
+        user
+      end
+    end
+
+    private
+
+    def invite_attributes
+      return {} unless invite
+
+      { role_names: invite.role_names,
+        creator: invite.user,
+        activated: true }
+    end
+  end
+end

data/app/services/pages_core/destroy_invite_service.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class DestroyInviteService
+    attr_reader :invite
+
+    def initialize(invite:)
+      @invite = invite
+    end
+
+    class << self
+      def call(*attrs)
+        new(*attrs).call
+      end
+    end
+
+    def call
+      Invite.transaction do
+        invite.destroy
+        PagesCore::PubSub.publish(:destroy_invite, invite: invite)
+        invite
+      end
+    end
+  end
+end

data/app/services/pages_core/invite_service.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class InviteService
+    include Rails.application.routes.url_helpers
+
+    attr_reader :attributes, :user, :host, :protocol
+
+    def initialize(attributes, user:, host:, protocol: "http")
+      @attributes = attributes
+      @user = user
+      @host = host
+      @protocol = protocol
+    end
+
+    class << self
+      def call(*attrs)
+        new(*attrs).call
+      end
+    end
+
+    def call
+      Invite.transaction do
+        invite = user.invites.create(attributes)
+        if invite.valid?
+          deliver_invite(invite)
+          invite.update(sent_at: Time.now.utc)
+        end
+        invite
+      end
+    end
+
+    private
+
+    def deliver_invite(invite)
+      AdminMailer.invite(
+        invite,
+        admin_invite_with_token_url(invite, invite.token,
+                                    host: host, protocol: protocol)
+      ).deliver_later
+    end
+  end
+end

data/app/views/admin/images/show.json.jbuilder

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+json.extract!(
+  @image, :id, :filename, :content_type, :content_hash,
+  :content_length, :colorspace, :real_width, :real_height, :crop_width,
+  :crop_height, :crop_start_x, :crop_start_y, :crop_gravity_x,
+  :crop_gravity_y, :alternative, :caption, :created_at, :updated_at
+)

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

@@ -9,7 +9,8 @@
 
 <%= form_for [:admin, @invite], builder: PagesCore::FormBuilder do |f| %>
   <%= f.labelled_text_field :email %>
-  <%= render partial: "admin/users/access_control", locals: { user: @user, f: f } %>
+  <%= render(partial: "admin/users/access_control",
+             locals: { user: @user, f: f }) %>
   <button type="submit">
     Send invite
   </button>

data/app/views/admin/invites/show.html.erb

@@ -9,17 +9,16 @@
   </p>
 </div>
 
-<%= form_for @user, url: accept_admin_invite_path(@invite, token: @invite.token), builder: PagesCore::FormBuilder do |f| %>
-
+<%= form_for(@user,
+             url: accept_admin_invite_path(@invite, token: @invite.token),
+             builder: PagesCore::FormBuilder) do |f| %>
   <%= f.labelled_text_field :name %>
   <%= f.labelled_text_field :email %>
   <%= f.labelled_password_field :password %>
   <%= f.labelled_password_field :confirm_password %>
-
   <p>
     <button type="submit">
       Sign up
     </button>
   </p>
-
 <% end %>

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

@@ -2,9 +2,18 @@
   <%= page_block_field(f, block_name, block_options) %>
 <% end %>
 
+<% if @page.template_config.value(:dates) %>
+  <%= react_component("PageDates",
+                      { starts_at: @page.starts_at,
+                        ends_at: @page.ends_at,
+                        all_day: @page.all_day }) %>
+<% end %>
+
 <% if !@page.new_record? && @page.template_config.value(:tags) %>
   <div class="field">
-    <label>Tags</label>
-    <%= tag_editor_for f, @page %>
+    <label>
+      Tags
+    </label>
+    <%= tag_editor_for(f, @page) %>
   </div>
 <% end %>

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

@@ -0,0 +1,8 @@
+<%= react_component("PageFiles",
+                    locale: @locale,
+                    locales: PagesCore.config.locales,
+                    csrf_token: form_authenticity_token,
+                    records: ActiveModel::Serializer::CollectionSerializer.new(
+                      @page.files,
+                      serializer: Admin::PageFileSerializer
+                    )) %>

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

@@ -1,84 +1,8 @@
-  <div class="page_images">
-
-    <div class="editor">
-      <div class="controls">
-        <div class="nav">
-          <%= link_to "Close",    '#', class: :close %>
-        </div>
-        <h4>Image Editor</h4>
-        <%= fields_for PageImage.new do |pi| %>
-          <%= pi.fields_for :image_attributes, Image.new do |i| %>
-            <%= i.hidden_field :id, class: 'image_id' %>
-            <fieldset>
-              <label>
-                Alternative text
-              </label>
-              <%= i.text_field(:alternative,
-                               class: 'alternative',
-                               placeholder: 'Alternative text') %>
-            </fieldset>
-            <fieldset class="caption-fieldset">
-              <label>
-                Caption
-              </label>
-              <%= i.text_field(:caption,
-                               class: 'caption',
-                               placeholder: 'Write your caption/byline') %>
-            </fieldset>
-            <%= text_field_tag 'embed', '', class: 'embed' %>
-            <%= pi.check_box :primary %><label>Primary</label>
-            <%= i.hidden_field :crop_start_x, class: 'crop_start_x' %>
-            <%= i.hidden_field :crop_start_y, class: 'crop_start_y' %>
-            <%= i.hidden_field :crop_width, class: 'crop_width' %>
-            <%= i.hidden_field :crop_height, class: 'crop_height' %>
-          <% end %>
-
-          <button class="save">
-            Save
-          </button>
-
-          <%= link_to "Delete image", '#', class: :delete %>
-        <% end %>
-      </div>
-      <div class="edit-image-container">
-        <%= link_to "", '#', class: :previous %>
-        <%= link_to "",     '#', class: :next %>
-        <div class="edit-image">
-        </div>
-      </div>
-    </div>
-
-    <div class="uploadButton">
-      <p>
-        <button type="button" class="upload-images-button">
-          Upload images
-        </button>
-      </p>
-    </div>
-
-    <div class="no_images">
-      <p>No images have been uploaded.</p>
-    </div>
-
-    <div class="primary_container">
-      <% if @page.image? && (page_image = @page.page_images.select{|pi| pi.primary?}.first) %>
-        <a class="image primary"
-           data-page-image-id="<%= page_image.id %>"
-           data-uncropped-url="<%= uncropped_dynamic_image_path(page_image.image, size: '2000x2000') %>"
-           href="<%= dynamic_image_url page_image.image, size: '2000x2000' %>">
-          <%= dynamic_image_tag(page_image.image, size: '380x380', crop: true, upscale: true) %>
-        </a>
-      <% end %>
-    </div>
-    <div class="images clearfix">
-      <% @page.page_images.reject{|pi| pi.primary?}.each do |i| %>
-        <a class="image"
-           data-page-image-id="<%= i.id %>"
-           data-uncropped-url="<%= uncropped_dynamic_image_path(i.image, size: '2000x2000') %>"
-           href="<%= dynamic_image_url i.image, size: '2000x2000' %>">
-          <%= dynamic_image_tag(i.image, size: '240x240', crop: true, upscale: true) %>
-        </a>
-      <% end %>
-    </div>
-
-  </div>
+<%= react_component("PageImages",
+                    locale: @locale,
+                    locales: PagesCore.config.locales,
+                    csrf_token: form_authenticity_token,
+                    records: ActiveModel::Serializer::CollectionSerializer.new(
+                      @page.page_images,
+                      serializer: Admin::PageImageSerializer
+                    )) %>

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

@@ -1,3 +1,25 @@
+<div class="field">
+  <% if f.object.pathable? %>
+    <%= labelled_field(f.text_field(:path_segment),
+                       "Path segment",
+                       description: "Only alpanumeric characters and dashes " \
+                         "are allowed.") %>
+  <% else %>
+    <div class="field">
+      <label>Path segment</label>
+      <p class="description">
+        Unable to add a path segment,
+        please add one to
+        <%= link_to("this page's parent",
+                    edit_admin_page_path(f.object.parent,
+                                         locale: f.object.locale,
+                                         anchor: "metadata")) %>
+        first.
+      </p>
+    </div>
+  <% end %>
+</div>
+
 <div class="field">
   <%= f.label_for :meta_image, "Image" %>
   <p class="description">
@@ -5,18 +27,7 @@
     Will fall back to the primary image if absent.
     Recommended size is at least 1200x630.
   </p>
-  <% if @page.meta_image %>
-    <p>
-      <%= dynamic_image_tag @page.meta_image, size: "250x" %>
-      <br>
-      <%= link_to("Delete image",
-                  delete_meta_image_admin_page_path(@locale, @page),
-                  method: "delete",
-                  class: "delete",
-                  data: { confirm: "Are you sure?" }) %>
-    </p>
-  <% end %>
-  <%= f.file_field :meta_image %>
+  <%= f.image_uploader :meta_image %>
 </div>
 
 <% @page.template_config.metadata_blocks do |block_name, block_options| %>

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

@@ -1,7 +1,7 @@
-<%= labelled_field f.select(:status, Page.status_labels.invert), "Status",
-  errors: @page.errors[:status]
-%>
-<div class="published_date">
+<%= labelled_field(f.select(:status, Page.status_labels.invert),
+                   "Status",
+                   errors: @page.errors[:status]) %>
+<div class="published-date">
   <%= labelled_field (
       f.date_select(
         :published_at,
@@ -14,52 +14,51 @@
     "Date",
     errors: @page.errors[:published_at]
   %>
-  <p class="autopublish_notice">This page will publish later</p>
+  <p class="autopublish-notice">
+    This page will publish later
+  </p>
 </div>
 
 <%= labelled_field (
-    f.select(:user_id, @authors.map{|a| [a.name, a.id]})
+    f.select(:user_id, page_authors(@page).map{|a| [a.name, a.id]})
   ),
   "Author",
   errors: @page.errors[:user_id]
 %>
 
-<% if @page.parent && @page.parent.news_page? %>
-  <div class="field">
-    <label>Pin to top</label>
-    <%= f.check_box(:pinned) %> Make post featured<br />
-  </div>
-<% end %>
+<div class="field">
+  <label>
+    Pin to top
+  </label>
+  <%= f.check_box(:pinned) %>
+  Make post featured<br />
+</div>
 
 <% 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) ? true : false) %>
+      <%= check_box_tag("category[#{category.id}]",
+                        "1",
+                        @page.categories.map { |c| c.id }.include?(category.id)) %>
       <%= category.name %><br />
     <% end %>
   </div>
 <% end %>
 
-<%= labelled_field f.select( :template, available_templates_for_select ), "Template", errors: @page.errors[:template] %>
-
+<%= labelled_field(f.select(:template, available_templates_for_select),
+                   "Template",
+                   errors: @page.errors[:template]) %>
 
-<%= link_to "Advanced options", "#", class: "advanced_toggle" %>
+<%= link_to "Advanced options", "#", class: "advanced-toggle" %>
 
-<div class="advanced_options">
+<div class="advanced-options">
 
   <div class="field">
     <label>Subpages</label>
-    Sort <%= f.select(:content_order, [ ['manually','position'], ['with the newest first','published_at DESC'] ] ) %><br />
     <%= f.check_box(:feed_enabled) %> RSS feed enabled<br />
     <%= f.check_box(:news_page) %> Show in News<br />
   </div>
-  <% if @page.template_config.value(:comments) %>
-    <p class="field">
-      <label>Comments</label>
-      <%= f.check_box(:comments_allowed) %> Enabled<br />
-    </p>
-  <% end %>
   <%= 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>
@@ -67,6 +66,7 @@
 <% if @page.id? && @page.name? %>
   <div class="field">
     <label>Page link</label>
-    <%= page_link @page %>
+    <%= link_to(page_path(@page.locale, @page),
+                page_path(@page.locale, @page)) %>
   </div>
 <% end %>

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

@@ -0,0 +1,50 @@
+<%
+  author ||= false
+  date ||= false
+  section ||= false
+%>
+<tr class="<%= [page.status_label.downcase,((page.autopublish?) ? 'autopublish' : nil), ((page.pinned?) ? 'pinned' : nil)].join(' ') %>">
+  <td class="name">
+    <%= link_to_if(policy(page).edit?,
+                   page_name(page),
+                   edit_admin_page_url(@locale, page),
+                   class: 'name_link') %>
+    <% if page.autopublish? %>
+      <br />
+      <small>
+        This page will be published
+        <strong><%= publish_time(page.published_at) %></strong>
+      </small>
+    <% end %>
+  </td>
+  <% if date %>
+    <td class="date">
+      <%= page_date_range(page) %>
+    </td>
+  <% end %>
+  <td>
+    <% if page.published? %>
+      <% if page.published_at.year == Time.zone.now.year %>
+        <%= l(page.published_at, format: :pages_date) %>
+      <% else %>
+        <%= l(page.published_at, format: :pages_full) %>
+      <% end %>
+    <% else %>
+      <% if page.status_label == 'Published' %>
+        <em>Not published</em>
+      <% else %>
+        <em><%= page.status_label %></em>
+      <% end %>
+    <% end %>
+  </td>
+  <% if author %>
+    <td>
+      <%= link_to(page.author.name, admin_user_path(page.author)) %>
+    </td>
+  <% end %>
+  <% if section %>
+    <td>
+      <%= news_section_name(page.parent, @news_pages) %>
+    </td>
+  <% end %>
+</tr>