sibu 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23580168267b70a604f22863c33d73268eed7967
-  data.tar.gz: 0cac86156e41ebd512473aa887fab6fd02fb5b1b
+  metadata.gz: 3ab0e87dab04c591e1072ba7606a327ab09c39b2
+  data.tar.gz: 55ad274ae00c536177c6b1b558a7c39bfc23b205
 SHA512:
-  metadata.gz: a48297363054e2ec96bcc07821a45395ef9a3e56e72f2c3edcaa4c28cf05612ec1d6b3b7dd046f67f5ccfd1e564f2c6564467383f2c8ea5e9a417fe17e551ac7
-  data.tar.gz: abd171b04e211b2b22d3d2136ee35101bb48f7e0d40b93377c377e6ab3e5c47372ddfdf0578594eb8d7591814ce93923b4659f3846f868c0529df465cc068fd6
+  metadata.gz: 6630c445f0902e0be6e6e0256b954a5815afa031c3fa3b5b3c7fc0dffa3dd39d18c64e44b5ac3e64e3edbf80a5bf035e499245c79b6625db356b0e8227d74ab3
+  data.tar.gz: 4b8dc78d1031281490e6c6c2a43a9c75586783617358c3f323a37e6c8b1fa719656b35e3cb376a410ec053ef943ca991c8c4d78bb058fc24d7be25a175abe1cb

data/app/assets/stylesheets/sibu/defaults.scss

@@ -0,0 +1,272 @@
+$sibu-color1 : #acb3c2 !default;
+$sibu-color2 : #727e96 !default;
+$sibu-color3 : #333 !default;
+
+.sibu_view {
+  padding: 2rem;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+
+  h2 {
+    padding-bottom: 1rem;
+    border-bottom: 2px solid $sibu-color1;
+  }
+
+  > .actions {
+    float: right;
+
+    a {
+      text-decoration: none;
+    }
+  }
+
+  .sibu_images {
+    width: 70%;
+    float: left;
+    max-height: calc(100vh - 160px);
+    overflow: auto;
+  }
+
+  .sibu_edit_image {
+    margin-top: 1rem;
+    padding: 1rem;
+    text-align: center;
+    height: calc(100vh - 160px);
+    float: right;
+    width: 30%;
+    background-color: $sibu-color2;
+
+    .sibu_field {
+      margin-top: 1rem;
+      label {
+        font-weight: bold;
+      }
+    }
+  }
+
+  .sibu_image {
+    display: inline-block;
+    margin-right: 1rem;
+    margin-top: 1rem;
+
+    img {
+      padding: 5px;
+      border: 1px solid $sibu-color3;
+      height: 100px;
+      width: auto;
+    }
+
+    &.selected {
+      background-color: $sibu-color3;
+    }
+  }
+
+  .sibu_form {
+    padding: 2rem;
+    text-align: center;
+
+    .sibu_field {
+      width: 90%;
+      margin: 0 auto 2rem auto;
+
+      label {
+        display: inline-block;
+        width: 20%;
+        text-align: right;
+        padding-right: 1rem;
+        vertical-align: top;
+        font-weight: bold;
+        margin-top: 0.5rem;
+        line-height: 1;
+
+        & + * {
+          display: inline-block;
+          width: 75%;
+          > * {
+            display: inline-block;
+            width: 100%;
+          }
+          small {
+            text-align: left;
+            font-style: italic;
+          }
+        }
+      }
+    }
+
+    .sibu_colors {
+      label {
+        vertical-align: top;
+      }
+
+      label + div {
+        text-align: left;
+      }
+
+      .sibu_color {
+        display: inline-block;
+        width: 4rem;
+        height: 4rem;
+        margin-right: 0.5rem;
+
+        &.selected {
+          border: 2px solid $sibu-color3;
+          outline: solid white 2px;
+          outline-offset: -3px;
+        }
+
+        &:hover {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .sibu_edit_form {
+    padding: 2rem 0;
+    text-align: left;
+
+    .sibu_actions {
+      text-align: center;
+    }
+
+    .sibu_field {
+      width: 100%;
+      margin: 0 auto 2rem auto;
+
+      p {
+        font-weight: bold;
+      }
+
+      label {
+        text-align: left;
+        font-weight: bold;
+
+        & + * {
+          display: block;
+          width: 100%;
+        }
+
+        & + input[type='checkbox'] {
+          display: inline-block;
+          width: 2rem;
+          margin-right: 2rem;
+        }
+      }
+    }
+
+    .sibu_image_selection {
+      display: flex;
+      flex-direction: row;
+    }
+
+    .sibu_select_images {
+      width: 70%;
+      max-height: calc(100vh - 300px);
+      overflow: auto;
+
+      .sibu_image {
+        position: relative;
+        span {
+          position: absolute;
+          z-index: -1;
+          line-height: 1;
+          width: 100%;
+          text-align: center;
+          top: 30px;
+
+          & + .selected {
+            background-color: transparentize($sibu-color3, 0.5);
+          }
+        }
+      }
+
+      img {
+        padding: 5px;
+        border: 1px solid $sibu-color3;
+
+        &.selected {
+          background-color: $sibu-color3;
+        }
+
+        &:hover {
+          cursor: pointer;
+        }
+      }
+    }
+
+    .sibu_selected_image {
+      background-color: $sibu-color2;
+      width: 30%;
+      margin-bottom: 2rem;
+      text-align: center;
+      padding: 1rem;
+
+      .sibu_field {
+        margin-top: 1rem;
+        label {
+          font-weight: bold;
+        }
+      }
+    }
+
+    #editor-container .ql-editor {
+      color: $sibu-color2;
+    }
+  }
+
+  .sibu_actions {
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+
+    input, a {
+      font-size: 18px;
+      padding: 0.5em 1em;
+    }
+  }
+
+  .sibu_template {
+    display: inline-block;
+    width: 33%;
+    vertical-align: top;
+    padding: 2rem;
+
+    img {
+      padding-top: 2rem;
+      padding-bottom: 2rem;
+      border-top: 2px solid $sibu-color1;
+      box-shadow: 0 0 5px #ccc;
+    }
+  }
+}
+
+#sections_panel {
+  .sibu_sections {
+    padding: 2rem;
+
+    > div {
+      > * {
+        padding: 2rem;
+        border-bottom: 2px solid $sibu-color1;
+        &:hover {
+          cursor: pointer;
+          outline: dashed $sibu-color2 4px;
+          outline-offset: -5px;
+        }
+
+        &.selected {
+          outline: solid $sibu-color2 5px;
+          outline-offset: -5px;
+        }
+
+        > * {
+          margin-top: 0 !important;
+          margin-bottom: 0 !important;
+        }
+      }
+    }
+  }
+
+  .sibu_actions {
+    text-align: center;
+  }
+}

data/app/controllers/sibu/application_controller.rb

@@ -3,8 +3,12 @@ module Sibu
     protect_from_forgery with: :exception
     before_action Rails.application.config.sibu[:auth_filter]
 
+    def conf
+      Rails.application.config.sibu
+    end
+
     def sibu_user
-      send(Rails.application.config.sibu[:current_user])
+      send(conf[:current_user])
     end
   end
 end

data/app/controllers/sibu/pages_controller.rb

@@ -7,6 +7,7 @@ module Sibu
     before_action :set_site, only: [:index, :new]
     before_action :set_edit_context, only: [:edit_element, :update_element, :clone_element, :delete_element,
                                             :child_element, :new_section, :create_section, :delete_section]
+    before_action :set_online, only: [:show, :edit]
     skip_before_action Rails.application.config.sibu[:auth_filter], only: [:show]
 
     def index
@@ -14,23 +15,28 @@ module Sibu
     end
 
     def show
+      return_code = :ok
       if params[:site_id].blank?
-        @page = Page.lookup(request.domain, params[:path])
+        @page = Sibu::Page.lookup(request.host, params[:path])
         if @page
+          @query_path =  params[:path][@page.path.length + 1..-1] unless @page.path.blank?
+          @query_params = show_params.except(:controller, :action, :path).to_h
           @site = @page.site
           @links = @site.pages_path_by_id
-          view_template = @page ? 'show' : @site.not_found
+          view_template = 'show'
         else
           view_template = Rails.application.config.sibu[:not_found]
+          return_code = :not_found
         end
       else
         @site = Sibu::Site.find(params[:site_id])
         @page = Sibu::Page.find(params[:id])
         @links = @site.pages_path_by_id
+        @query_path = params[:path]
         view_template = 'show'
       end
 
-      render view_template, layout: 'sibu/site'
+      render view_template, layout: 'sibu/site', status: return_code
     end
 
     def new
@@ -153,6 +159,10 @@ module Sibu
       @entity = @entity_type == 'site' ? @site : @page
     end
 
+    def set_online
+      @online = request.host != conf[:host]
+    end
+
     def page_params
       params.require(:page).permit!
     end
@@ -164,5 +174,9 @@ module Sibu
     def section_params
       params.require(:section).permit!
     end
+
+    def show_params
+      params.permit!
+    end
   end
 end

data/app/controllers/sibu/sites_controller.rb

@@ -21,7 +21,7 @@ module Sibu
     def create
       @site = Sibu::Site.new(site_params)
       if @site.save_and_init
-        generate_styles(@site)
+        generate_styles(@site) if conf[:custom_styles]
         redirect_to sites_url, notice: "Le site a bien été créé."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de la création du site."
@@ -30,15 +30,14 @@ module Sibu
     end
 
     def edit
-      @next_page = params[:next_page]
     end
 
     def update
       if @site.update(site_params)
-        if @site.previous_changes.has_key?(:custom_data)
+        if conf[:custom_styles] && @site.previous_changes.has_key?(:custom_data)
           generate_styles(@site)
         end
-        redirect_to (params[:next_page].blank? ? sites_url : params[:next_page]), notice: "Le site a bien été mis à jour."
+        redirect_to sites_url, notice: "Le site a bien été mis à jour."
       else
         flash.now[:alert] = "Une erreur s'est produite lors de l'enregistrement du site."
         render :edit
@@ -53,8 +52,10 @@ module Sibu
     def duplicate
       new_site = @site.deep_copy
       if new_site.save
-        generate_styles(@site)
-        generate_styles(new_site)
+        if conf[:custom_styles]
+          generate_styles(@site)
+          generate_styles(new_site)
+        end
         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."

data/app/helpers/sibu/pages_helper.rb

@@ -4,7 +4,7 @@ module Sibu
 
     def link_path(page_id)
       p = @site.page_by_id(page_id)
-      p ? (request.host == conf[:domain] ? site_page_path(@site.id, p.id) : "/#{p.path}") : "#"
+      p ? (request.host == conf[:host] ? site_page_path(@site.id, p.id) : "/#{p.path}") : "#"
     end
 
     def sections_templates
@@ -24,7 +24,7 @@ module Sibu
     end
 
     def link_type(val)
-      if val.blank? || val == '#' || /^\d{1,3}$/.match(val.to_s)
+      if val.blank? || val == '#' || /^\d+$/.match(val.to_s)
         'internal'
       elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
         'document'
@@ -92,7 +92,7 @@ module Sibu
 
     def widget(elt, widget_type, opts = {}, &block)
       content = elt.is_a?(Hash) ? elt : (select_element(elt) || {})
-      opts.merge!({data: {id: elt_id(elt), type: "widget_#{widget_type.to_s.underscore}"}}) if action_name != 'show'
+      opts.merge!({data: {id: elt_id(elt), type: "widget_#{widget_type.to_s.split('::').last.underscore}"}}) if action_name != 'show'
       content_tag(:div, capture(widget_type.new(content), &block), opts)
     end
 

data/app/models/sibu/page.rb

@@ -9,9 +9,16 @@ module Sibu
     before_save :update_path
     validates_presence_of :name, :site
 
-    def self.lookup(domain_name, page_path)
-      joins(:site).where("sibu_sites.domain = ? AND ((sibu_sites.version = ? AND COALESCE(sibu_pages.path, '') = ?) OR sibu_pages.path = LTRIM(REPLACE(?, sibu_sites.version, ''), '/'))",
-                         domain_name, Sibu::Site::DEFAULT_VERSION, page_path.nil? ? '' : page_path.strip, page_path.nil? ? '' : page_path.strip).first
+    def self.lookup(domain_name, page_query)
+      page_path = (page_query || '').strip.split('?')[0]
+      if page_path.blank?
+        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') = ''", domain_name).first
+      else
+        paths = page_path.split('/').inject([]) {|p, s| p << (p.length == 0 ? s : "#{p[-1]}/#{s}")}
+        joins(:site).where("sibu_sites.domain = ? AND COALESCE(sibu_pages.path, '') IN (?)", domain_name, paths)
+            .order(path: :desc)
+            .first
+      end
     end
 
     def save_and_init

data/app/views/layouts/sibu/edit_content.html.erb

@@ -7,7 +7,7 @@
   <%= javascript_include_tag "#{conf[:javascript]}-edit" %>
   <%= javascript_include_tag 'sibu/sibu' %>
   <% if @site %>
-    <%= stylesheet_link_tag @site.style_url, media: "all" %>
+    <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
     <%= javascript_include_tag "#{@site.site_template.path}-core" %>
   <% end %>
   <%= csrf_meta_tags %>

data/app/views/layouts/sibu/site.html.erb

@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <% if @site %>
-    <%= stylesheet_link_tag @site.style_url, media: "all" %>
+    <%= stylesheet_link_tag (conf[:custom_styles] ? @site.style_url : @site.site_template.path), media: "all" %>
     <%= javascript_include_tag @site.site_template.path %>
     <% unless @site.analytics_id.blank? %>
       <script async src="https://www.googletagmanager.com/gtag/js?id=<%= @site.analytics_id %>"></script>

data/app/views/sibu/pages/index.html.erb

@@ -9,7 +9,7 @@
       <th>Nom</th>
       <th>Chemin d'accès</th>
       <th>Mise à jour</th>
-      <th colspan="2"></th>
+      <th></th>
     </tr>
     </thead>
     <tbody>
@@ -18,7 +18,7 @@
         <td><%= p.name %></td>
         <td><%= p.path %></td>
         <td><%= l p.updated_at %></td>
-        <td colspan="2">
+        <td>
           <%= link_to 'Voir', site_page_path(@site.id, p), target: '_blank' %> |
           <%= link_to 'Modifier', site_page_edit_content_path(site_id: @site.id, page_id: p.id) %> |
           <%= link_to 'Copier', duplicate_site_page_path(@site.id, p), method: :post, data: {confirm: "Copier la page \"#{p.name}\" ?"} %> |

data/app/views/sibu/sites/_form.html.erb

@@ -34,7 +34,7 @@
       <small>Renseignez l'identifiant Google Analytics pour suivre les statistiques d'audience du site</small>
     </div>
   </div>
-  <% if @site.persisted? && @next_page %>
+  <% if conf[:custom_styles] && @site.persisted? %>
   <div class="sibu_field sibu_colors">
     <%= f.label :primary_color, 'Couleur principale' %>
     <div>
@@ -70,7 +70,6 @@
     </div>
   </div>
   <% end %>
-  <%= hidden_field_tag :next_page, @next_page %>
   <%= f.hidden_field :user_id %>
   <div class="sibu_actions">
     <%= f.submit 'Valider', data: {disable_with: 'Enregistrement en cours...'} %>

data/app/views/sibu/sites/edit.html.erb

@@ -1,6 +1,6 @@
 <div class="sibu_view">
   <div class="actions">
-    <% if @site.persisted? && @next_page %><%= link_to 'Rétablir les paramètres par défaut', '#', onclick: 'resetValues()' %><% end %>
+    <% if conf[:custom_styles] && @site.persisted? %><%= link_to 'Rétablir les paramètres par défaut', '#', onclick: 'resetValues()' %><% end %>
     <%= link_to 'Retour', :back %>
   </div>
   <h2>Modifier un site</h2>

data/config/routes.rb

@@ -1,8 +1,7 @@
 Sibu::Engine.routes.draw do
 
-  # Note : fix the issue with domain & subdomain & internal links
-  get '/', to: 'pages#show', constraints: lambda {|req| req.domain != Rails.application.config.sibu[:domain]}
-  get '*path', to: 'pages#show', constraints: lambda {|req| req.domain != Rails.application.config.sibu[:domain]}
+  get '/', to: 'pages#show', constraints: lambda {|req| req.host != Rails.application.config.sibu[:host]}
+  get '*path', to: 'pages#show', constraints: lambda {|req| req.host != Rails.application.config.sibu[:host]}
 
   scope path_names: {new: 'creer', edit: 'modifier'} do
     resources :sites do
@@ -19,6 +18,7 @@ Sibu::Engine.routes.draw do
         get 'new_section', on: :member
         post 'create_section', on: :member
         delete 'delete_section', on: :member
+        get '*path', to: 'pages#show', on: :member
       end
     end
     resources :images, :documents

data/lib/sibu/engine.rb

@@ -11,6 +11,9 @@ module Sibu
       rescue
         Rails.logger.info("Sibu custom helper is not available - skipping")
       end
+      Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+        require_dependency(c)
+      end
     end
   end
 end

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - app/assets/javascripts/sibu/sibu.js.erb
 - app/assets/stylesheets/cropper/cropper.css
 - app/assets/stylesheets/quill/quill.snow.css
+- app/assets/stylesheets/sibu/defaults.scss
 - app/assets/stylesheets/sibu/icons.scss
 - app/assets/stylesheets/sibu/sibu.css
 - app/controllers/sibu/application_controller.rb