pages_core 3.7.0 → 3.8.0

data/app/assets/stylesheets/pages/admin/components/image_editor.scss

@@ -14,6 +14,7 @@
     font-size: 14px;
     color: $c-warn-light;
     text-shadow: 0px 0px 5px rgba(0, 0, 0, 1.0);
+    z-index: 100;
   }
 
   img {

data/app/assets/stylesheets/pages/admin/components/image_grid.scss

@@ -135,10 +135,7 @@ $grid-image-padding: 7px;
   }
 
   .grid {
-    width: 66.67%;
-    @include breakpoint-mobile {
-      width: 100%;
-    }
+    width: 100%;
     .images {
       position: relative;
       display: flex;
@@ -148,7 +145,7 @@ $grid-image-padding: 7px;
         display: flex;
         flex-direction: column;
         justify-content: flex-end;
-        width: 25%;
+        width: 16.66%;
         @include breakpoint-max(1150px) {
           width: 50%;
         }
@@ -159,6 +156,19 @@ $grid-image-padding: 7px;
       }
     }
 
+    .editable-image {
+      padding-bottom: 75%;
+      img {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+        object-position: 50% 50%;
+      }
+    }
+
     .drop-target {
       margin: 10px $grid-image-padding;
       padding-top: 10px;
@@ -168,6 +178,24 @@ $grid-image-padding: 7px;
     }
   }
 
+  &.with-primary-image {
+    .grid {
+      width: 66.67%;
+      @include breakpoint-mobile {
+        width: 100%;
+      }
+    }
+    .images .grid-image {
+      width: 25%;
+      @include breakpoint-max(1150px) {
+        width: 50%;
+      }
+      @include breakpoint-mobile {
+        width: 50%;
+      }
+    }
+  }
+
   .drag-image {
     position: absolute;
     width: 150px;

data/app/assets/stylesheets/pages/admin/components/layout.scss

@@ -17,7 +17,8 @@ html, body {
   display: flex;
   flex-flow: column nowrap;
   height: 100vh;
-  > * {
+  > *,
+  .main-wrapper {
     flex-shrink: 0;
   }
 }

data/app/assets/stylesheets/pages/admin/components/login.scss

@@ -24,3 +24,9 @@ main .login-form {
     }
   }
 }
+
+.login-tab {
+  &.hidden {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pages/admin/components/tabs.scss

@@ -0,0 +1,5 @@
+.content-tab {
+  &.hidden {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pages/admin/components/tag_editor.scss

@@ -12,13 +12,24 @@
     display: block;
     float: left;
     margin: 0 5px 5px 0;
-    padding: 0px 10px;
+    padding: 0px;
     background: $c-background-disabled;
     border-radius: 5px;
     line-height: 26px;
     line-height: 36px;
     min-width: 40px;
     transition: all 200ms ease-out;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    label {
+      margin: 0px;
+      padding: 0px 10px;
+      color: inherit;
+    }
 
     input {
       margin: 2px 3px 0 0;
@@ -30,10 +41,6 @@
     }
 
     &.enabled {
-      //background: #396e97;
-      //border-color: #274b67;
-      //text-shadow: #274b67 1px 1px 1px;
-
       color: #fff;
       background: $c-link;
       background: $c-blue-dark;
@@ -49,8 +56,7 @@
   input.add-tag {
     margin-top: 0px;
     border-radius: 5px;
-    //margin: 0 4px 0 0;
-    //padding: 4px 3px 3px 3px;
+    margin: 0 4px 0 0;
 
     &.example {
       color: $c-text-light;

data/app/assets/stylesheets/pages/admin/controllers/pages.scss

@@ -126,24 +126,32 @@
 }
 
 .edit-page {
-  padding-top: 1px;
   width: auto;
 
+  main div.content {
+    padding-top: 16px;
+  }
+
   .hidden-options {
     display: none;
   }
 
+  .autopublish-notice,
+  .published-date,
   .advanced-options {
-    visibility: none;
+    display: none;
+    &.show {
+      display: block;
+    }
   }
 
-  main & input[type=text],
-  main & textarea {
+  main input[type=text],
+  main textarea {
     width: 100%;
     max-width: 100%;
   }
 
-  main & input.page_title {
+  main input.page_title {
     font-weight: bold;
     font-size: 1.4em;
     color: $c-text;

data/app/assets/stylesheets/pages/admin.scss

@@ -1,4 +1,3 @@
-@import 'jquery-ui';
 @import 'ReactCrop';
 @import 'font-awesome';
 @import 'admin/vars';

data/app/controller_dummies/admin/admin_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Admin
-  class AdminController < PagesCore::AdminController #:nodoc:
+  class AdminController < PagesCore::AdminController # :nodoc:
   end
 end

data/app/controller_dummies/application_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ApplicationController < PagesCore::BaseController #:nodoc:
+class ApplicationController < PagesCore::BaseController # :nodoc:
   helper :all
   protect_from_forgery with: :exception
 end

data/app/controller_dummies/attachments_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class AttachmentsController < PagesCore::AttachmentsController #:nodoc:
+class AttachmentsController < PagesCore::AttachmentsController # :nodoc:
 end

data/app/controller_dummies/frontend_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class FrontendController < PagesCore::FrontendController #:nodoc:
+class FrontendController < PagesCore::FrontendController # :nodoc:
 end

data/app/controller_dummies/images_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class ImagesController < PagesCore::ImagesController #:nodoc:
+class ImagesController < PagesCore::ImagesController # :nodoc:
 end

data/app/controller_dummies/page_files_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class PageFilesController < PagesCore::Frontend::PageFilesController #:nodoc:
+class PageFilesController < PagesCore::Frontend::PageFilesController # :nodoc:
 end

data/app/controller_dummies/pages_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class PagesController < PagesCore::Frontend::PagesController #:nodoc:
+class PagesController < PagesCore::Frontend::PagesController # :nodoc:
 end

data/app/controller_dummies/sitemaps_controller.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class SitemapsController < PagesCore::SitemapsController #:nodoc:
+class SitemapsController < PagesCore::SitemapsController # :nodoc:
 end

data/app/controllers/admin/attachments_controller.rb

@@ -44,7 +44,7 @@ module Admin
     end
 
     def render_attachment(attachment)
-      render json: attachment, serializer: Admin::AttachmentSerializer
+      render json: Admin::AttachmentResource.new(attachment)
     end
   end
 end

data/app/controllers/admin/images_controller.rb

@@ -16,13 +16,7 @@ module Admin
       @image = Image.create(image_params)
 
       respond_to do |format|
-        format.json do
-          if @image.valid?
-            render json: @image, serializer: Admin::ImageSerializer
-          else
-            render json: { status: "error", error: @image.errors.first }
-          end
-        end
+        format.json { render_image_json(@image) }
       end
     end
 
@@ -55,5 +49,14 @@ module Admin
     def find_image
       @image = Image.find(params[:id])
     end
+
+    def render_image_json(image)
+      if image.valid?
+        render json: Admin::ImageResource.new(image)
+      else
+        render json: { status: "error",
+                       error: image.errors.first.full_message }
+      end
+    end
   end
 end

data/app/controllers/concerns/pages_core/authentication.rb

@@ -19,17 +19,22 @@ module PagesCore
     end
 
     def authenticate!(user)
-      user.mark_active!
-      @current_user = user
+      reset_session
+      authenticated(user)
     end
 
     def deauthenticate!
       @current_user = nil
-      session[:current_user_id] = nil
+      reset_session
     end
 
     protected
 
+    def authenticated(user)
+      user.mark_active!
+      @current_user = user
+    end
+
     def start_authenticated_session
       if session[:current_user_id]
         user = User.where(id: session[:current_user_id]).first
@@ -37,7 +42,7 @@ module PagesCore
 
       return unless user&.can_login?
 
-      authenticate!(user)
+      authenticated(user)
     end
 
     def finalize_authenticated_session

data/app/controllers/concerns/pages_core/preview_pages_controller.rb

@@ -11,6 +11,7 @@ module PagesCore
     def preview
       redirect_to(page_url(@locale, @page)) && return unless logged_in?
 
+      @preview = true
       @page.attributes = page_params.merge(
         status: 2,
         published_at: Time.zone.now,
@@ -20,6 +21,10 @@ module PagesCore
       render_page
     end
 
+    def preview?
+      @preview || false
+    end
+
     private
 
     def disable_xss_protection

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -27,8 +27,11 @@ module PagesCore
       def show
         respond_to do |format|
           format.html { render_published_page(@page) }
-          format.rss { render_rss(@page.pages.limit(20), title: @page.name) }
-          format.json { render json: @page }
+          format.json { render json: PageResource.new(@page) }
+          format.rss do
+            render_rss(@page.pages.limit(20).includes(:image, :author),
+                       title: @page.name)
+          end
         end
       end
 

data/app/controllers/sessions_controller.rb

@@ -9,7 +9,7 @@ class SessionsController < ::ApplicationController
       redirect_to admin_default_url
     else
       flash[:notice] = "The provided email address and password combination " \
-        "was not valid"
+                       "was not valid"
       redirect_to login_admin_users_url
     end
   end

data/app/formatters/pages_core/link_renderer.rb

@@ -4,13 +4,13 @@ module PagesCore
   class LinkRenderer < WillPaginate::ActionView::LinkRenderer
     def previous_page
       num = @collection.current_page > 1 &&
-            @collection.current_page - 1
+            (@collection.current_page - 1)
       previous_or_next_page(num, "Previous", "previous")
     end
 
     def next_page
       num = @collection.current_page < total_pages &&
-            @collection.current_page + 1
+            (@collection.current_page + 1)
       previous_or_next_page(num, "Next", "next")
     end
   end

data/app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module ApplicationHelper #:nodoc:
+module ApplicationHelper # :nodoc:
   include PagesCore::ApplicationHelper
 end

data/app/helpers/frontend_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module FrontendHelper #:nodoc:
+module FrontendHelper # :nodoc:
   include PagesCore::FrontendHelper
 end

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -20,8 +20,11 @@ module PagesCore
       private
 
       def content_tab_tag(key, content)
-        tag.div(content, class: "content_tab",
-                         id: "content-tab-#{key}")
+        tag.div(content,
+                class: "content-tab",
+                id: "content-tab-#{key}",
+                data: { tab: key,
+                        "main-target" => "tab" })
       end
     end
   end

data/app/helpers/pages_core/admin/image_uploads_helper.rb

@@ -31,7 +31,7 @@ module PagesCore
         return {} unless image
 
         { src: dynamic_image_path(image, size: "#{width * 2}x"),
-          image: ::Admin::ImageSerializer.new(image) }
+          image: ::Admin::ImageResource.new(image).to_hash }
       end
 
       def editable_image_options(image, width: 250, caption: false, locale: nil)
@@ -39,8 +39,7 @@ module PagesCore
           width: width,
           caption: caption,
           locale: locale || I18n.default_locale,
-          locales: PagesCore.config.locales,
-          csrf_token: form_authenticity_token
+          locales: PagesCore.config.locales
         )
       end
     end

data/app/helpers/pages_core/admin/tag_editor_helper.rb

@@ -3,45 +3,15 @@
 module PagesCore
   module Admin
     module TagEditorHelper
-      def tag_editor_for(
-        form_helper, item, field_name = :serialized_tags, options = {}
-      )
-        tags = options[:tags] || Tag.tags_and_suggestions_for(item, limit: 20)
-        tagged = options[:tagged] || item.tags
-        options[:placeholder] ||= "Add tag..."
-        tag.div(class: "tag-editor clearfix") do
-          form_helper.hidden_field(field_name, class: "serialized_tags") +
-            tag_check_boxes(tags, tagged) +
-            add_tag_button(options)
-        end
-      end
-
-      private
-
-      def tag_check_box(tag_instance, tagged)
-        tag.span(class: :tag) do
-          check_box_tag(
-            "tag-#{tag_instance.id}",
-            1,
-            tagged.include?(tag_instance)
-          ) + tag.span(tag_instance.name, class: :name)
-        end
-      end
-
-      def tag_check_boxes(tags, tagged)
-        tag.div(class: :tags) do
-          safe_join(tags.map { |t| tag_check_box(t, tagged) }, "")
-        end
-      end
-
-      def add_tag_button(options = {})
-        tag.div(class: "add-tag-form") do
-          text_field_tag(
-            "add_tag",
-            options[:placeholder],
-            class: "add-tag"
-          ) + tag.button("Add", class: "add-tag-button")
-        end
+      def tag_editor_for(form, object, attribute: :serialized_tags)
+        object ||= form.object
+        react_component(
+          "TagEditor",
+          { enabled: object.tags.map(&:name),
+            tags: Tag.tags_and_suggestions_for(object, limit: 20)
+                     .map(&:name),
+            name: "#{form.object_name}[#{attribute}]" }
+        )
       end
     end
   end

data/app/helpers/pages_core/head_tags_helper.rb

@@ -48,14 +48,8 @@ module PagesCore
     #  google_analytics_tags "UA-12345678-1"
     #
     def google_analytics_tags(account_id)
-      javascript_tag(
-        "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||" \
-          "function(){\n (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new " \
-          "Date();a=s.createElement(o),\nm=s.getElementsByTagName(o)[0];" \
-          "a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n})(window," \
-          "document,'script','//www.google-analytics.com/analytics.js','ga');" \
-          "\n\nga('create', '#{account_id}', 'auto');\nga('send', 'pageview');"
-      )
+      render(partial: "pages_core/google_analytics",
+             locals: { account_id: account_id })
     end
 
     # Outputs a HTML5 doctype and head tags, with document title
@@ -87,13 +81,10 @@ module PagesCore
     #  rss_link_tag "My feed", "feed.rss"
     #
     def rss_link_tag(title, href)
-      tag(
-        :link,
-        rel: "alternate",
-        type: "application/rss+xml",
-        title: title,
-        href: href
-      )
+      tag.link(rel: "alternate",
+               type: "application/rss+xml",
+               title: title,
+               href: href)
     end
 
     # Outputs Typekit tags.
@@ -111,11 +102,11 @@ module PagesCore
 
     def head_tag_contents(block_output)
       [
-        tag(:meta, charset: "utf-8"),
-        tag(:meta, "http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
+        tag.meta(charset: "utf-8"),
+        tag.meta("http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
         tag.title(document_title),
         meta_description_tag, meta_keywords_tag,
-        (tag(:link, rel: "image_src", href: meta_image) if meta_image?),
+        (tag.link(rel: "image_src", href: meta_image) if meta_image?),
         open_graph_tags,
         csrf_meta_tags,
         block_output
@@ -125,13 +116,13 @@ module PagesCore
     def meta_description_tag
       return unless meta_description?
 
-      tag(:meta, name: "description", content: meta_description)
+      tag.meta(name: "description", content: meta_description)
     end
 
     def meta_keywords_tag
       return unless meta_keywords?
 
-      tag(:meta, name: "keywords", content: meta_keywords)
+      tag.meta(name: "keywords", content: meta_keywords)
     end
   end
 end

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -13,7 +13,7 @@ module PagesCore
         properties
           .delete_if { |_, content| content.nil? }
           .map do |name, content|
-          tag(:meta, property: "og:#{name}", content: content)
+          tag.meta(property: "og:#{name}", content: content)
         end,
         "\n"
       )

data/app/javascript/admin-dist.js

@@ -0,0 +1,2 @@
+import startPages from "./index.js";
+startPages();