pages_core 3.4.3 → 3.7.0

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

@@ -0,0 +1,21 @@
+@mixin breakpoint-min($width) {
+  @media screen and (min-width: ($width + 1px)) {
+    @content;
+  }
+}
+
+@mixin breakpoint-max($width) {
+  @media screen and (max-width: $width) {
+    @content;
+  }
+}
+
+@mixin breakpoint-min-max($min-width, $max-width) {
+  @media screen and (min-width: ($min-width + 1px)) and (max-width: ($max-width)) {
+    @content;
+  }
+}
+
+@mixin breakpoint-mobile($offset: 0px) {
+  @include breakpoint-max(($breakpoint-mobile + $offset)) { @content; }
+}

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

@@ -0,0 +1,7 @@
+%clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}

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

@@ -0,0 +1,7 @@
+@mixin vertical-gradient($start, $stop) {
+  background: $start;
+  background: -moz-linear-gradient(top,  $start 0%, $stop 100%);
+  background: -webkit-linear-gradient(top,  $start 0%,$stop 100%);
+  background: linear-gradient(to bottom,  $start 0%,$stop 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start', endColorstr='$stop',GradientType=0 );
+}

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

@@ -0,0 +1,30 @@
+$breakpoint-mobile: 900px;
+
+$c-red: #c00007;
+$c-red-invert: #fff0f3;
+$c-green: #19ac1e;
+$c-blue: #1d7195;
+$c-blue-dark: darken($c-blue, 15%);
+
+$c-warn-light: #ffdfa0;
+
+$c-background: #fff;
+$c-background-invert: #000;
+$c-background-disabled: #f8f8f8;
+
+$c-text: #111;
+$c-text-light: #666;
+$c-text-lighter: #999;
+$c-text-invert: #fff;
+
+$c-border: #ddd;
+$c-border-light: #eee;
+
+$c-link: $c-blue;
+$c-link-hover: darken($c-link, 10%);
+$c-create: $c-green;
+$c-create-hover: darken($c-create, 10%);
+$c-delete: $c-red;
+$c-delete-hover: darken($c-delete, 10%);
+
+$c-button: #f6f6f6;

data/app/assets/stylesheets/pages/errors.css

@@ -1,5 +1,7 @@
 body {
   background:          #fff;
+  background:          linear-gradient(180deg, rgba(236,236,236,1) 0%, rgba(255,255,255,1) 50%);
+  background-repeat:   no-repeat;
   margin:              0;
   padding:             0;
   border:              0;

data/app/controller_dummies/admin/admin_controller.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   class AdminController < PagesCore::AdminController #:nodoc:

data/app/controller_dummies/application_controller.rb

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

data/app/controller_dummies/attachments_controller.rb

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

data/app/controller_dummies/frontend_controller.rb

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

data/app/controller_dummies/images_controller.rb

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

data/app/controller_dummies/page_files_controller.rb

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

data/app/controller_dummies/pages_controller.rb

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

data/app/controller_dummies/sitemaps_controller.rb

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

data/app/controllers/admin/attachments_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Admin
+  class AttachmentsController < Admin::AdminController
+    before_action :find_attachment, only: %i[update]
+
+    def create
+      @attachment = Attachment.create(
+        attachment_params.merge(user: current_user)
+      )
+      return unless @attachment.valid?
+
+      respond_to do |format|
+        format.json do
+          render_attachment(@attachment)
+        end
+      end
+    end
+
+    def update
+      @attachment.update(attachment_params)
+      respond_to do |format|
+        format.json { render_attachment(@attachment) }
+      end
+    end
+
+    protected
+
+    def attachment_params
+      params.require(:attachment).permit(
+        :file,
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
+        end
+      )
+    end
+
+    def localized_attributes
+      %i[name description]
+    end
+
+    def find_attachment
+      @attachment = Attachment.find(params[:id])
+    end
+
+    def render_attachment(attachment)
+      render json: attachment, serializer: Admin::AttachmentSerializer
+    end
+  end
+end

data/app/controllers/admin/categories_controller.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   class CategoriesController < Admin::AdminController
-    before_action :find_category, only: [:show, :edit, :update, :destroy]
+    before_action :find_category, only: %i[show edit update destroy]
 
     def index
       @categories = Category.all
@@ -26,8 +26,7 @@ module Admin
       end
     end
 
-    def edit
-    end
+    def edit; end
 
     def update
       if @category.update(category_params)

data/app/controllers/admin/images_controller.rb

@@ -1,43 +1,54 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   class ImagesController < Admin::AdminController
-    before_action :find_image, only: [:show, :edit, :update, :destroy]
+    before_action :find_image, only: %i[show edit update destroy]
 
-    def index
-    end
+    def index; end
 
-    def show
-      respond_to do |format|
-        format.js { render text: @image.to_json, layout: false }
-      end
-    end
+    def show; end
 
-    def new
-    end
+    def new; end
 
-    def edit
-    end
+    def edit; end
 
     def create
+      @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
+      end
     end
 
     def update
       @image.update(image_params)
       respond_to do |format|
-        format.json { render text: @image.to_json, layout: false }
+        format.json { render action: :show }
       end
     end
 
-    def destroy
-    end
+    def destroy; end
 
     protected
 
+    def localized_attributes
+      %i[caption alternative]
+    end
+
     def image_params
       params.require(:image).permit(
-        :name, :alternative, :caption, :description, :file,
-        :crop_start_x, :crop_start_y, :crop_height, :crop_width, :locale
+        :name, :description, :file,
+        :crop_start_x, :crop_start_y, :crop_height, :crop_width, :locale,
+        :crop_gravity_x, :crop_gravity_y,
+        localized_attributes.index_with do |_a|
+          I18n.available_locales
+        end
       )
     end
 

data/app/controllers/admin/invites_controller.rb

@@ -1,22 +1,19 @@
+# frozen_string_literal: true
+
 module Admin
   class InvitesController < Admin::AdminController
-    before_action :require_authentication, except: [:accept, :show]
-    before_action :find_invite, only: [:show, :edit, :update, :destroy, :accept]
-    before_action :require_valid_token,    only: [:show, :accept]
+    before_action :require_authentication, except: %i[accept show]
+    before_action :find_invite, only: %i[destroy]
+    before_action :find_and_validate_invite, only: %i[show accept]
 
-    require_authorization(
-      Invite,
-      proc { @invite },
-      member:     [:show, :edit, :update, :destroy],
-      collection: [:index, :new, :create]
-    )
+    require_authorization
 
     def index
       redirect_to admin_users_url
     end
 
     def accept
-      @user = @invite.create_user(user_params)
+      @user = PagesCore::CreateUserService.call(user_params, invite: @invite)
       if @user.valid?
         authenticate!(@user)
         redirect_to admin_default_url
@@ -37,13 +34,11 @@ module Admin
     end
 
     def create
-      @invite = current_user.invites.create(invite_params)
+      @invite = PagesCore::InviteService.call(invite_params,
+                                              user: current_user,
+                                              host: request.host,
+                                              protocol: request.protocol)
       if @invite.valid?
-        AdminMailer.invite(
-          @invite,
-          admin_invite_with_token_url(@invite, @invite.token)
-        ).deliver_now
-        @invite.update(sent_at: Time.now)
         redirect_to admin_invites_url
       else
         render action: :new
@@ -52,7 +47,7 @@ module Admin
 
     def destroy
       flash[:notice] = "The invite to #{@invite.email} has been deleted"
-      @invite.destroy
+      PagesCore::DestroyInviteService.call(invite: @invite)
       redirect_to admin_invites_url
     end
 
@@ -62,6 +57,14 @@ module Admin
       @invite = Invite.find(params[:id])
     end
 
+    def find_and_validate_invite
+      @invite = Invite.find_by(id: params[:id])
+      return if @invite && secure_compare(@invite.token, params[:token])
+
+      flash[:notice] = "This invite is no longer valid."
+      redirect_to(login_admin_users_url) && return
+    end
+
     def user_params
       params.require(:user).permit(:name, :email, :password, :confirm_password)
     end
@@ -69,11 +72,5 @@ module Admin
     def invite_params
       params.require(:invite).permit(:email, role_names: [])
     end
-
-    def require_valid_token
-      return if @invite && secure_compare(@invite.token, params[:token])
-      flash[:notice] = "Invalid invite token"
-      redirect_to(login_admin_users_url) && return
-    end
   end
 end

data/app/controllers/admin/pages_controller.rb

@@ -1,151 +1,112 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   class PagesController < Admin::AdminController
-    before_action :require_news_pages, only: [:news]
-    before_action :find_page, only: [
-      :show, :edit, :preview, :update, :destroy, :reorder,
-      :delete_meta_image
-    ]
-    before_action :find_categories
-    before_action :find_news_pages, only: [:news, :new_news]
-
-    require_authorization(
-      Page,
-      proc { @page },
-      collection: [:index, :news, :new, :new_news, :create, :reorder_pages]
-    )
+    include PagesCore::Admin::PageJsonHelper
+    include PagesCore::Admin::NewsPageController
 
-    def index
-      @root_pages = Page.roots.in_locale(@locale).visible
-    end
+    before_action :find_categories
+    before_action :find_page, only: %i[show edit update destroy move]
 
-    def news
-      @archive_finder = Page.where(parent_page_id: @news_pages)
-        .visible
-        .order("published_at DESC")
-        .in_locale(@locale)
-        .archive_finder
+    require_authorization
 
-      @year, @month = year_and_month(@archive_finder)
-      @year ||= Time.now.year
-      @month ||= Time.now.month
+    helper_method :page_json
 
-      @pages = @archive_finder.by_year_and_month(@year, @month)
+    def index
+      @pages = Page.admin_list(@locale)
     end
 
-    def reorder_pages
-      pages = params[:ids].map { |id| Page.find(id) }
-      PagesCore::CacheSweeper.once do
-        pages.each_with_index do |page, index|
-          page.update(position: (index + 1))
-        end
-      end
-      render text: "ok" if request.xhr?
+    def deleted
+      @pages = Page.deleted.by_updated_at.in_locale(@locale)
     end
 
     def show
-      edit
-      render action: :edit
+      redirect_to edit_admin_page_url(@locale, @page)
     end
 
     def new
-      @authors = User.activated
-      @page = build_page(@locale)
-      if params[:parent]
-        @page.parent = Page.find(params[:parent])
-      elsif @news_pages
-        @page.parent = @news_pages.first
-      end
-    end
-
-    # TODO: Should be refactored
-    def new_news
-      new
-      render action: :new
+      build_params = params[:page] ? page_params : nil
+      @page = build_page(@locale, build_params)
+      @page.parent = if params[:parent]
+                       Page.find(params[:parent])
+                     elsif @news_pages
+                       @news_pages.first
+                     end
     end
 
     def create
-      @page = build_page(@locale)
-      if @page.update(page_params)
-        @page.update(
-          comments_allowed: @page.template_config.value(:comments_allowed)
-        )
-        @page.categories = param_categories
-        redirect_to edit_admin_page_url(@locale, @page)
+      @page = build_page(@locale, page_params, param_categories)
+      if @page.valid?
+        @page.save
+        respond_with_page(@page) do
+          redirect_to(edit_admin_page_url(@locale, @page))
+        end
       else
         render action: :new
       end
     end
 
-    def edit
-      @authors = User.activated
-      # Make sure the page author is included in the dropdown
-      # even if the account isn't active.
-      if @authors.any? && @page.author
-        @authors = [@page.author] + @authors.reject { |a| a == @page.author }
-      end
-      @new_image ||= Image.new
-    end
+    def edit; end
 
     def update
       if @page.update(page_params)
         @page.categories = param_categories
-        flash[:notice] = "Your changes were saved"
-        flash[:save_performed] = true
-        redirect_to edit_admin_page_url(@locale, @page)
+        respond_with_page(@page) do
+          flash[:notice] = "Your changes were saved"
+          redirect_to edit_admin_page_url(@locale, @page)
+        end
       else
-        edit
         render action: :edit
       end
     end
 
-    def destroy
-      @page = Page.find(params[:id])
-      @page.flag_as_deleted!
-      redirect_to admin_pages_url(@locale)
+    def move
+      parent = params[:parent_id] ? Page.find(params[:parent_id]) : nil
+      @page.update(parent: parent, position: params[:position])
+      respond_with_page(@page) { redirect_to admin_pages_url(@locale) }
     end
 
-    def delete_meta_image
-      @page.meta_image.destroy
-      flash[:notice] = "The image was deleted"
-      redirect_to edit_admin_page_url(@locale, @page, anchor: "metadata")
+    def destroy
+      Page.find(params[:id]).flag_as_deleted!
+      redirect_to admin_pages_url(@locale)
     end
 
     private
 
-    def build_page(locale)
+    def build_page(locale, attributes = nil, categories = nil)
       Page.new.localize(locale).tap do |page|
         page.author = default_author || current_user
+        page.attributes = attributes if attributes
+        page.categories = categories if categories
       end
     end
 
     def default_author
-      return unless PagesCore.config.default_author
-      User.where(email: PagesCore.config.default_author).first
+      User.find_by_email(PagesCore.config.default_author)
     end
 
-    def permitted_page_attributes
-      [
-        :template, :user_id, :status, :content_order,
-        :feed_enabled, :published_at, :redirect_to, :comments_allowed,
-        :image_link, :news_page, :unique_name, :pinned,
-        :parent_page_id, :serialized_tags, :meta_image
-      ]
+    def page_attributes
+      %i[template user_id status feed_enabled published_at redirect_to
+         image_link news_page unique_name pinned parent_page_id serialized_tags
+         meta_image_id starts_at ends_at all_day image_id path_segment
+         meta_title meta_description open_graph_title open_graph_description]
     end
 
     def page_params
       params.require(:page).permit(
-        Page.localized_attributes + permitted_page_attributes
+        PagesCore::Templates::TemplateConfiguration.all_blocks +
+        page_attributes,
+        page_images_attributes: %i[id position image_id primary _destroy],
+        page_files_attributes: %i[id position attachment_id _destroy]
       )
     end
 
     def param_categories
-      if params[:category] && params[:category].length > 0
-        params[:category].map { |k, _| Category.find(k.to_i) }
-      else
-        []
-      end
+      return [] unless params[:category]
+
+      params.permit(category: {})[:category]
+            .to_hash
+            .map { |id, _| Category.find(id) }
     end
 
     def find_page
@@ -156,23 +117,10 @@ module Admin
       @categories = Category.order("name")
     end
 
-    def find_news_pages
-      @news_pages = Page.news_pages.in_locale(@locale)
-      return if @news_pages.any?
-      redirect_to(admin_pages_url(@locale))
-    end
-
-    # Redirect away if no news pages has been configured
-    def require_news_pages
-      return if Page.news_pages.any?
-      redirect_to(admin_pages_url(@locale))
-    end
-
-    def year_and_month(archive_finder)
-      if params[:year] && params[:month]
-        [params[:year], params[:month]].map(&:to_i)
-      else
-        archive_finder.latest_year_and_month
+    def respond_with_page(page, &block)
+      respond_to do |format|
+        format.html { block.call }
+        format.json { render json: page_json(page) }
       end
     end
   end