pages_core 3.5.1 → 3.6.0

data/app/serializers/admin/attachment_serializer.rb

@@ -0,0 +1,29 @@
+module Admin
+  class AttachmentSerializer < ActiveModel::Serializer
+    include Rails.application.routes.url_helpers
+    include PagesCore::AttachmentsHelper
+
+    attributes :id, :filename, :content_type, :content_hash, :content_length,
+               :name, :description, :created_at, :updated_at, :url
+
+    def name
+      localized_attribute(:name)
+    end
+
+    def description
+      localized_attribute(:description)
+    end
+
+    def url
+      attachment_path(object)
+    end
+
+    private
+
+    def localized_attribute(attr)
+      object.locales.each_with_object({}) do |locale, hash|
+        hash[locale] = object.localize(locale).send(attr)
+      end
+    end
+  end
+end

data/app/serializers/admin/image_serializer.rb

@@ -1,10 +1,57 @@
 module Admin
   class ImageSerializer < ActiveModel::Serializer
-    attributes(
-      :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
-    )
+    include Rails.application.routes.url_helpers
+    include DynamicImage::Helper
+
+    attributes :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
+    attributes :cropped_url, :uncropped_url, :original_url, :thumbnail_url
+
+    def alternative
+      localized_attribute(:alternative)
+    end
+
+    def caption
+      localized_attribute(:caption)
+    end
+
+    def original_url
+      original_dynamic_image_path(object)
+    end
+
+    def thumbnail_url
+      dynamic_image_path(
+        object,
+        size: "500x",
+        upscale: false
+      )
+    end
+
+    def cropped_url
+      dynamic_image_path(
+        object,
+        size: "1200x1200",
+        crop: false,
+        upscale: false
+      )
+    end
+
+    def uncropped_url
+      uncropped_dynamic_image_path(
+        object,
+        size: "2000x2000",
+        upscale: false
+      )
+    end
+
+    private
+
+    def localized_attribute(attr)
+      object.locales.each_with_object({}) do |locale, hash|
+        hash[locale] = object.localize(locale).send(attr)
+      end
+    end
   end
 end

data/app/serializers/admin/page_file_serializer.rb

@@ -0,0 +1,6 @@
+module Admin
+  class PageFileSerializer < ActiveModel::Serializer
+    attributes :id, :page_id, :attachment_id, :position
+    has_one :attachment, serializer: Admin::AttachmentSerializer
+  end
+end

data/app/serializers/admin/page_image_serializer.rb

@@ -1,6 +1,6 @@
 module Admin
   class PageImageSerializer < ActiveModel::Serializer
     attributes :id, :page_id, :image_id, :position, :primary
-    has_one :image
+    has_one :image, serializer: Admin::ImageSerializer
   end
 end

data/app/serializers/page_export_serializer.rb

@@ -0,0 +1,30 @@
+class PageExportSerializer < ActiveModel::Serializer
+  attributes :id, :path, :locale, :author_name, :status
+  attributes(*PagesCore::Templates::TemplateConfiguration.all_blocks)
+  attributes :created_at, :published_at, :pinned, :template, :redirect_to,
+             :starts_at, :ends_at, :all_day
+
+  has_one :image, serializer: PageImageExportSerializer
+  has_many :images, serializer: PageImageExportSerializer
+  has_many :page_files, serializer: PageFileExportSerializer
+
+  def author_name
+    object&.author&.name
+  end
+
+  def path
+    object.full_path || object.to_param
+  end
+
+  def image
+    object.page_images.where(primary: true).try(:first)
+  end
+
+  def images
+    object.page_images
+  end
+
+  def status
+    object.status_label
+  end
+end

data/app/serializers/page_file_export_serializer.rb

@@ -0,0 +1,4 @@
+class PageFileExportSerializer < ActiveModel::Serializer
+  attributes :id, :filename, :name, :description, :content_hash, :content_type,
+             :position, :created_at
+end

data/app/serializers/page_image_export_serializer.rb

@@ -0,0 +1,40 @@
+class PageImageExportSerializer < ActiveModel::Serializer
+  attributes :id, :primary, :content_hash, :content_type, :filename,
+             :alternative, :caption, :created_at
+
+  def id
+    object.image.id
+  end
+
+  def name
+    object.image.name
+  end
+
+  def alternative
+    object.image.alternative
+  end
+
+  def caption
+    object.image.caption
+  end
+
+  def content_hash
+    object.image.content_hash
+  end
+
+  def content_type
+    object.image.content_type
+  end
+
+  def filename
+    object.image.filename
+  end
+
+  def size
+    object.image.crop_size
+  end
+
+  def created_at
+    object.image.created_at
+  end
+end

data/app/serializers/page_image_serializer.rb

@@ -1,5 +1,7 @@
 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/services/pages_core/create_user_service.rb

@@ -0,0 +1,36 @@
+module PagesCore
+  class CreateUserService
+    attr_reader :attributes, :invite
+
+    def initialize(attributes, invite: nil)
+      @attributes = attributes
+      @invite = invite
+    end
+
+    class << self
+      def call(*attrs)
+        new(*attrs).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/invite_service.rb

@@ -0,0 +1,41 @@
+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,6 @@
+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/pages/_edit_content.html.erb

@@ -2,6 +2,13 @@
   <%= 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>

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,95 +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_options.html.erb

@@ -26,15 +26,13 @@
   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">
@@ -61,12 +59,6 @@
     <%= 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>