sibu 0.2.5 → 0.2.6

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -2,6 +2,7 @@
 //= require jquery_ujs
 //= require sibu/common
 //= require ../quill/quill
+//= require ../cropper/cropper
 //= require_self
 
 var Inline = Quill.import('blots/inline');
@@ -77,3 +78,27 @@ function initQuillEditor(container) {
 
     return quill;
 }
+
+
+function initCropper(imgId) {
+    var wrapper = $(".sibu_crop").first();
+    var srcImg = $("#content_panel").find(".sb-editing img[data-id='" + imgId + "']").first();
+    var srcContainer = srcImg.parent();
+    var ratio = parseFloat(srcContainer.css("width")) / parseFloat(wrapper.css("width"));
+    wrapper.css("height", (parseFloat(srcContainer.css("height")) / ratio) + "px");
+    var cropper = new Cropper(wrapper.find("img")[0], {
+        crop: function(event) {
+            var data = event.detail;
+            var cropper = this.cropper;
+            var imageData = cropper.getImageData();
+            var previewWidth = parseFloat(srcContainer.css("width"));
+            var imageScaledRatio = data.width / previewWidth;
+            var width = imageData.naturalWidth / imageScaledRatio + 'px';
+            var height = imageData.naturalHeight / imageScaledRatio + 'px';
+            var marginLeft = -data.x / imageScaledRatio + 'px';
+            var marginTop = -data.y / imageScaledRatio + 'px';
+
+            $("#element_style").val("width: " + width + "; height: " + height + "; margin-left: " + marginLeft + "; margin-top: " + marginTop +"; max-width: none; max-height: none;");
+        }
+    });
+}

data/app/assets/stylesheets/cropper/cropper.css

@@ -0,0 +1,305 @@
+/*!
+ * Cropper.js v1.3.3
+ * https://github.com/fengyuanchen/cropperjs
+ *
+ * Copyright (c) 2015-2018 Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2018-03-18T03:19:07.619Z
+ */
+
+.cropper-container {
+    direction: ltr;
+    font-size: 0;
+    line-height: 0;
+    position: relative;
+    -ms-touch-action: none;
+    touch-action: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.cropper-container img {/*Avoid margin top issue (Occur only when margin-top <= -height)
+ */
+    display: block;
+    height: 100%;
+    image-orientation: 0deg;
+    max-height: none !important;
+    max-width: none !important;
+    min-height: 0 !important;
+    min-width: 0 !important;
+    width: 100%;
+}
+
+.cropper-wrap-box,
+.cropper-canvas,
+.cropper-drag-box,
+.cropper-crop-box,
+.cropper-modal {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+
+.cropper-wrap-box,
+.cropper-canvas {
+    overflow: hidden;
+}
+
+.cropper-drag-box {
+    background-color: #fff;
+    opacity: 0;
+}
+
+.cropper-modal {
+    background-color: #000;
+    opacity: .5;
+}
+
+.cropper-view-box {
+    display: block;
+    height: 100%;
+    outline-color: rgba(51, 153, 255, 0.75);
+    outline: 1px solid #39f;
+    overflow: hidden;
+    width: 100%;
+}
+
+.cropper-dashed {
+    border: 0 dashed #eee;
+    display: block;
+    opacity: .5;
+    position: absolute;
+}
+
+.cropper-dashed.dashed-h {
+    border-bottom-width: 1px;
+    border-top-width: 1px;
+    height: 33.33333%;
+    left: 0;
+    top: 33.33333%;
+    width: 100%;
+}
+
+.cropper-dashed.dashed-v {
+    border-left-width: 1px;
+    border-right-width: 1px;
+    height: 100%;
+    left: 33.33333%;
+    top: 0;
+    width: 33.33333%;
+}
+
+.cropper-center {
+    display: block;
+    height: 0;
+    left: 50%;
+    opacity: .75;
+    position: absolute;
+    top: 50%;
+    width: 0;
+}
+
+.cropper-center:before,
+.cropper-center:after {
+    background-color: #eee;
+    content: ' ';
+    display: block;
+    position: absolute;
+}
+
+.cropper-center:before {
+    height: 1px;
+    left: -3px;
+    top: 0;
+    width: 7px;
+}
+
+.cropper-center:after {
+    height: 7px;
+    left: 0;
+    top: -3px;
+    width: 1px;
+}
+
+.cropper-face,
+.cropper-line,
+.cropper-point {
+    display: block;
+    height: 100%;
+    opacity: .1;
+    position: absolute;
+    width: 100%;
+}
+
+.cropper-face {
+    background-color: #fff;
+    left: 0;
+    top: 0;
+}
+
+.cropper-line {
+    background-color: #39f;
+}
+
+.cropper-line.line-e {
+    cursor: ew-resize;
+    right: -3px;
+    top: 0;
+    width: 5px;
+}
+
+.cropper-line.line-n {
+    cursor: ns-resize;
+    height: 5px;
+    left: 0;
+    top: -3px;
+}
+
+.cropper-line.line-w {
+    cursor: ew-resize;
+    left: -3px;
+    top: 0;
+    width: 5px;
+}
+
+.cropper-line.line-s {
+    bottom: -3px;
+    cursor: ns-resize;
+    height: 5px;
+    left: 0;
+}
+
+.cropper-point {
+    background-color: #39f;
+    height: 5px;
+    opacity: .75;
+    width: 5px;
+}
+
+.cropper-point.point-e {
+    cursor: ew-resize;
+    margin-top: -3px;
+    right: -3px;
+    top: 50%;
+}
+
+.cropper-point.point-n {
+    cursor: ns-resize;
+    left: 50%;
+    margin-left: -3px;
+    top: -3px;
+}
+
+.cropper-point.point-w {
+    cursor: ew-resize;
+    left: -3px;
+    margin-top: -3px;
+    top: 50%;
+}
+
+.cropper-point.point-s {
+    bottom: -3px;
+    cursor: s-resize;
+    left: 50%;
+    margin-left: -3px;
+}
+
+.cropper-point.point-ne {
+    cursor: nesw-resize;
+    right: -3px;
+    top: -3px;
+}
+
+.cropper-point.point-nw {
+    cursor: nwse-resize;
+    left: -3px;
+    top: -3px;
+}
+
+.cropper-point.point-sw {
+    bottom: -3px;
+    cursor: nesw-resize;
+    left: -3px;
+}
+
+.cropper-point.point-se {
+    bottom: -3px;
+    cursor: nwse-resize;
+    height: 20px;
+    opacity: 1;
+    right: -3px;
+    width: 20px;
+}
+
+@media (min-width: 768px) {
+    .cropper-point.point-se {
+        height: 15px;
+        width: 15px;
+    }
+}
+
+@media (min-width: 992px) {
+    .cropper-point.point-se {
+        height: 10px;
+        width: 10px;
+    }
+}
+
+@media (min-width: 1200px) {
+    .cropper-point.point-se {
+        height: 5px;
+        opacity: .75;
+        width: 5px;
+    }
+}
+
+.cropper-point.point-se:before {
+    background-color: #39f;
+    bottom: -50%;
+    content: ' ';
+    display: block;
+    height: 200%;
+    opacity: 0;
+    position: absolute;
+    right: -50%;
+    width: 200%;
+}
+
+.cropper-invisible {
+    opacity: 0;
+}
+
+.cropper-bg {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC');
+}
+
+.cropper-hide {
+    display: block;
+    height: 0;
+    position: absolute;
+    width: 0;
+}
+
+.cropper-hidden {
+    display: none !important;
+}
+
+.cropper-move {
+    cursor: move;
+}
+
+.cropper-crop {
+    cursor: crosshair;
+}
+
+.cropper-disabled .cropper-drag-box,
+.cropper-disabled .cropper-face,
+.cropper-disabled .cropper-line,
+.cropper-disabled .cropper-point {
+    cursor: not-allowed;
+}

data/app/assets/stylesheets/sibu/sibu.css

@@ -1,5 +1,6 @@
 /*
  *= require ../quill/quill.snow
+ *= require ../cropper/cropper
  *= require_self
  */
 

data/app/controllers/sibu/application_controller.rb

@@ -2,5 +2,9 @@ module Sibu
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
     before_action Rails.application.config.sibu[:auth_filter]
+
+    def sibu_user
+      send(Rails.application.config.sibu[:current_user])
+    end
   end
 end

data/app/controllers/sibu/images_controller.rb

@@ -2,23 +2,23 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class ImagesController < ApplicationController
-    before_action :set_site, only: [:index, :new, :create, :edit, :update, :destroy]
     before_action :set_image, only: [:edit, :update, :destroy]
     before_action :set_edition_context, only: [:new, :create]
 
     def index
-      @images = Sibu::Image.where(site_id: params[:site_id])
+      @images = Sibu::Image.for_user(sibu_user)
     end
 
     def new
-      @image = Sibu::Image.new(site_id: @site.id)
+      @image = Sibu::Image.new(user_id: send(Rails.application.config.sibu[:current_user]).id)
     end
 
     def create
       @image = Sibu::Image.new(image_params)
       if @image.save
         if !@page_id.blank? && !@section_id.blank? && !@element_id.blank? && !@size.blank?
-          entity = @entity_type == 'site' ? @site : Sibu::Page.find(@page_id)
+          p = Sibu::Page.find(@page_id)
+          entity = @entity_type == 'site' ? p.site : p
           ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
           elt = entity.update_element(*ids, {"id" => @img_id, "src" => @image.file_url(@size.to_sym), "alt" => @image.alt})
           if elt.nil?
@@ -28,7 +28,7 @@ module Sibu
           end
           redirect_to site_page_edit_content_path(@site.id, @page_id), msg
         else
-          redirect_to site_images_url(@image.site_id), notice: "L'image a bien été téléchargée."
+          redirect_to images_url, notice: "L'image a bien été téléchargée."
         end
       else
         flash.now[:alert] = "Une erreur s'est produite lors du téléchargement de l'image."
@@ -44,7 +44,7 @@ module Sibu
 
     def update
       if @image.update(image_params)
-        redirect_to site_images_url(@site.id), notice: "L'image a bien été mise à jour."
+        redirect_to images_url, notice: "L'image a bien été mise à jour."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement de l'image."
         render :index
@@ -53,15 +53,11 @@ module Sibu
 
     def destroy
       @image.destroy
-      redirect_to site_images_url(@site.id), notice: "L'image a bien été supprimée."
+      redirect_to images_url, notice: "L'image a bien été supprimée."
     end
 
     private
 
-    def set_site
-      @site = Sibu::Site.find(params[:site_id])
-    end
-
     def set_image
       @image = Sibu::Image.find(params[:id])
     end

data/app/controllers/sibu/pages_controller.rb

@@ -2,7 +2,7 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class PagesController < ApplicationController
-    before_action :set_page, only: [:edit, :update, :destroy, :edit_element, :update_element, :clone_element,
+    before_action :set_page, only: [:edit, :update, :destroy, :duplicate, :edit_element, :update_element, :clone_element,
                                     :delete_element, :child_element, :new_section, :create_section, :delete_section]
     before_action :set_site, only: [:index, :new]
     before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
@@ -15,9 +15,9 @@ module Sibu
 
     def show
       if params[:site_id].blank?
-        @site = Sibu::Site.find_by_domain(request.domain)
-        if @site
-          @page = @site.page(params[:path])
+        page = Page.lookup(request.domain, params[:path])
+        if page
+          @site = page.site
           @links = @site.pages_path_by_id
           view_template = @page ? 'show' : @site.not_found
         else
@@ -62,6 +62,16 @@ module Sibu
     def destroy
     end
 
+    def duplicate
+      new_page = @page.deep_copy
+      if new_page.save
+        redirect_to site_pages_url(@page.site_id), notice: "La page a bien été copiée."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la copie de la page."
+        render :index
+      end
+    end
+
     def edit_content
       @page = Sibu::Page.find(params[:page_id])
       @site = Sibu::Site.includes(:pages).find(@page.site_id) if @page

data/app/controllers/sibu/sites_controller.rb

@@ -2,11 +2,11 @@ require_dependency "sibu/application_controller"
 
 module Sibu
   class SitesController < ApplicationController
-    before_action :set_site, only: [:show, :edit, :update, :destroy]
+    before_action :set_site, only: [:show, :edit, :update, :destroy, :duplicate]
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
-      @sites = Sibu::Site.where(user_id: send(Rails.application.config.sibu[:current_user]).id)
+      @sites = Sibu::Site.for_user(sibu_user).order(:name, :version)
     end
 
     def show
@@ -15,7 +15,7 @@ module Sibu
     end
 
     def new
-      @site = Sibu::Site.new(user_id: send(Rails.application.config.sibu[:current_user]).id)
+      @site = Sibu::Site.new(user_id: sibu_user.id, version: Sibu::Site::DEFAULT_VERSION)
     end
 
     def create
@@ -50,6 +50,16 @@ module Sibu
       redirect_to sites_url, notice: "Le site a bien été supprimé."
     end
 
+    def duplicate
+      new_site = @site.deep_copy
+      if new_site.save
+        redirect_to sites_url, notice: "Le site a bien été copié."
+      else
+        flash.now[:alert] = "Une erreur s'est produite lors de la copie du site."
+        render :index
+      end
+    end
+
     private
 
     def set_site

data/app/helpers/sibu/application_helper.rb

@@ -3,5 +3,9 @@ module Sibu
     def conf
       Rails.application.config.sibu
     end
+
+    def sibu_user
+      send(Rails.application.config.sibu[:current_user])
+    end
   end
 end

data/app/helpers/sibu/pages_helper.rb

@@ -7,20 +7,12 @@ module Sibu
       p ? (@site.domain.blank? ? site_page_path(@site.id, p.id) : "/#{p.path}") : "#"
     end
 
-    def page_templates
-      [['Accueil', 'home'], ['Offre', 'offer'], ['Galerie', 'gallery'], ['Destination', 'destination'], ['Mentions légales', 'text']]
-    end
-
     def sections_templates
       @site.site_template.available_templates
     end
 
-    def page_languages
-      [['Français', 'fr'], ['Anglais', 'en']]
-    end
-
     def site_images
-      Sibu::Image.shared + @site.images
+      ([Sibu::Image.empty] + Sibu::Image.shared + Sibu::Image.for_user(sibu_user)).uniq
     end
 
     def available_links

data/app/helpers/sibu/sites_helper.rb

@@ -1,19 +1,23 @@
 module Sibu
   module SitesHelper
     def primary_colors
-      Rails.application.config.sibu[:primary_colors]
+      ([@site.site_template.primary_color] + Rails.application.config.sibu[:primary_colors]).uniq
     end
 
     def secondary_colors
-      Rails.application.config.sibu[:secondary_colors]
+      ([@site.site_template.secondary_color] + Rails.application.config.sibu[:secondary_colors]).uniq
     end
 
     def primary_fonts
-      [''] + Rails.application.config.sibu[:primary_fonts]
+      ([@site.site_template.primary_font] + Rails.application.config.sibu[:primary_fonts]).uniq.map.each_with_index {|f, i| [i == 0 ? (f + ' (par défaut)') : f, f]}
     end
 
     def secondary_fonts
-      [''] + Rails.application.config.sibu[:secondary_fonts]
+      ([@site.site_template.secondary_font] + Rails.application.config.sibu[:secondary_fonts]).uniq.map.each_with_index {|f, i| [i == 0 ? (f + ' (par défaut)') : f, f]}
+    end
+
+    def site_versions
+      [['Français (par défaut)', 'fr'], ['Anglais', 'en']]
     end
   end
 end

data/app/models/concerns/sibu/image_uploader.rb

@@ -18,10 +18,10 @@ class Sibu::ImageUploader < Shrine
   end
 
   def generate_location(io, context)
-    site_id  = context[:record].site_id
+    user_id  = context[:record].user_id
     style = context[:version] != :original ? "resized" : "originals"
     name  = super
 
-    [site_id, style, name].compact.join("/")
+    [user_id, style, name].compact.join("/")
   end
 end

data/app/models/concerns/sibu/user_concern.rb

@@ -0,0 +1,9 @@
+module Sibu
+  module UserConcern
+    include ActiveSupport::Concern
+
+    def for_user(usr)
+      where(user_id: usr.id)
+    end
+  end
+end

data/app/models/sibu/image.rb

@@ -1,15 +1,23 @@
 module Sibu
   class Image < ApplicationRecord
     include ImageUploader::Attachment.new(:file)
+    extend Sibu::UserConcern
 
-    belongs_to :site, :class_name => 'Sibu::Site', optional: true
-
-    store :metadata, accessors: [:alt], coder: JSON
+    store :metadata, accessors: [:alt, :reference], coder: JSON
 
     validates_presence_of :file_data
 
     def self.shared
-      where(site_id: nil)
+      where(user_id: nil)
+    end
+
+    def self.empty
+      empty_img = where("metadata ILIKE '%default_empty_image%'").first
+      if empty_img.nil?
+        empty_img = new(reference: 'default_empty_image', file: File.new('app/assets/images/empty.png'))
+        empty_img.save
+      end
+      empty_img
     end
   end
 end

data/app/models/sibu/page.rb

@@ -7,7 +7,12 @@ module Sibu
     store :metadata, accessors: [:title, :description, :keywords], coder: JSON
 
     before_save :update_path
-    validates_presence_of :name, :site, :language
+    validates_presence_of :name, :site
+
+    def self.lookup(domain_name, page_path)
+      joins(:site).where("sibu_sites.domain = ? AND ((sibu_sites.version = ? AND sibu_pages.path = ?) OR sibu_pages.path = LTRIM(REPLACE(?, sibu_sites.version, ''), '/'))",
+                         domain_name, Sibu::Site::DEFAULT_VERSION, page_path, page_path).first
+    end
 
     def save_and_init
       if valid?
@@ -25,5 +30,11 @@ module Sibu
     def site_template
       site.site_template
     end
+
+    def deep_copy
+      new_page = deep_dup
+      new_page.name = name + ' - copie'
+      new_page
+    end
   end
 end

data/app/models/sibu/site.rb

@@ -2,15 +2,17 @@ module Sibu
   class Site < ApplicationRecord
     include StyleUploader::Attachment.new(:style, cache: :styles_cache, store: :styles_store)
     include Sibu::SectionsConcern
+    extend Sibu::UserConcern
 
     store :custom_data, accessors: [:primary_font, :secondary_font, :primary_color, :secondary_color], coder: JSON
     store :metadata, accessors: [:analytics_id], coder: JSON
 
     belongs_to :site_template, :class_name => 'Sibu::SiteTemplate'
     has_many :pages, :class_name => 'Sibu::Page', dependent: :destroy
-    has_many :images, :class_name => 'Sibu::Image', dependent: :destroy
 
-    validates_presence_of :name, :site_template
+    validates_presence_of :name, :site_template, :version
+
+    DEFAULT_VERSION = 'fr'
 
     def style_url
       style ? style.url : site_template.path
@@ -54,6 +56,10 @@ module Sibu
         site_template.pages.each do |p|
           self.pages << Sibu::Page.new(p)
         end
+        self.primary_color = site_template.primary_color
+        self.secondary_color = site_template.secondary_color
+        self.primary_font = site_template.primary_font
+        self.secondary_font = site_template.secondary_font
       end
       save
     end
@@ -75,5 +81,16 @@ module Sibu
       self.sections = site_data.sections(self)
       save!
     end
+
+    def deep_copy
+      site_copy = deep_dup
+      pages.each do |p|
+        site_copy.name = name + ' - copie'
+        site_copy.domain = nil
+        site_copy.pages << p.deep_dup
+      end
+
+      site_copy
+    end
   end
 end