keppler 2.1.18 → 2.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0a8337002ce57f3a777fa0a3bf6c41d8eb0cc4b765a680c0ab43ac1074d9d4
-  data.tar.gz: d023f9d6354909d7709e610632a4e8fd8badf48d2a231cc18e28212221fe709a
+  metadata.gz: b50bd78d51288fdb1608e0466d38641befd92aeba1ed8a985f2284e80bfa6975
+  data.tar.gz: 3781c0658013fde286e8b3d522d61d82c3e369b6aa3be5053a17f54c966643ce
 SHA512:
-  metadata.gz: 24d39dcfa9c06d7bcf8139c2e761e8c3dd4b6e047bf3032668880421b39a3c9f242b59019ea98effe0654df48910a1d05480b0b02f97c27d9cc8bfe184c9e3ee
-  data.tar.gz: 10a7fcd7e4f94eeef7233c61ee6191c1dd6ece3d77ec3a43bdedec85fd38f41c853a896b50848d6d7f923ba20d80acf6a5e9558144f65527c2a42519ad8f814a
+  metadata.gz: '091850c5317c5602e335b4471cae313e41fc5410f6bf501de55c649c35884695ebce0680800d49c773671f49525a3c3cf64fbf802b72e47ea72ba96e548e20b2'
+  data.tar.gz: 60af85146c3956e9bdd2406c5a0312e23eeadfaaa2d94398d14b44b3438254b3b3776b0ce74b606d063561040f38e7ade80e08573d196ab53e5afbd23b6ee826

data/Gemfile.lock

@@ -1,19 +1,15 @@
 PATH
   remote: .
   specs:
-    keppler (2.1.18)
+    keppler (2.1.19)
       httparty
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    httparty (0.16.4)
-      mime-types (~> 3.0)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
     multi_xml (0.6.0)
     rake (10.5.0)
     thor (0.20.3)

data/installer/core/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/installer/core/Gemfile

@@ -25,6 +25,8 @@ gem 'sdoc', '1.0.0'
 # Pipelines
 gem 'coffee-rails', '4.2.2'
 gem 'haml-rails', '1.0'
+gem 'html-to-haml'
+gem 'html2haml', '2.2.0'
 gem 'sass-rails', '5.0.7'
 
 gem 'acts_as_list', '0.9.11'

data/installer/core/Gemfile.lock

@@ -250,6 +250,7 @@ GEM
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
     haml_rails (0.1.0)
+    html-to-haml (0.0.6)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -585,6 +586,8 @@ DEPENDENCIES
   guard-livereload (= 2.5.2)
   haml-rails (= 1.0)
   haml_lint (~> 0.27.0)
+  html-to-haml
+  html2haml (= 2.2.0)
   htmlbeautifier (= 1.3.1)
   httparty
   jquery-minicolors-rails (~> 2.2, >= 2.2.6.0)

data/installer/core/app/assets/stylesheets/admin/utils/_theme.scss

@@ -122,3 +122,12 @@
     padding: 10px 0;
   }
 }
+
+.time-zone-test {
+  background: $ededed;
+  border: 1px solid $light-black;
+  border-radius: 15px;
+  color: $light-black;
+  padding: .6rem;
+  text-align: center;
+}

data/installer/core/app/controllers/admin/admin_controller.rb

@@ -4,8 +4,8 @@ module Admin
   # AdminController
   class AdminController < ::ApplicationController
     layout 'admin/layouts/application'
-    before_action :authenticate_user!
-    before_action :validate_permissions
+    before_action :authenticate_admin_user, except: [:root]
+    before_action :validate_permissions, except: [:root]
     before_action :paginator_params
     before_action :set_setting
     before_action :can_multiple_destroy, only: [:destroy_multiple]
@@ -18,7 +18,7 @@ module Admin
       if current_user
         redirect_to dashboard_path
       else
-        redirect_to new_user_session_path
+        redirect_to frontend_path
       end
     end
 
@@ -91,5 +91,9 @@ module Admin
         authorize model.find(id)
       end
     end
+
+    def authenticate_admin_user
+      redirect_to main_app.not_authorized_path unless current_user
+    end
   end
 end

data/installer/core/app/controllers/admin/settings_controller.rb

@@ -30,13 +30,6 @@ module Admin
       end
     end
 
-    def update_ga_status(params)
-      return unless params[:setting][:google_analytics_setting]
-      status = params[:setting][:google_analytics_setting][:ga_status]
-      return if status.nil?
-      @setting.google_analytics_setting.update(ga_status: status)
-    end
-
     def change_locale
       Appearance.first.update(language: params[:locale])
       I18n.locale = Appearance.first.language
@@ -50,15 +43,6 @@ module Admin
       )
     end
 
-    def upload_p12(params)
-      return unless params['google_analytics_setting_attributes']
-      return unless params['google_analytics_setting_attributes']['p12']
-      file = params['google_analytics_setting_attributes']['p12']
-      name = file.original_filename
-      path = File.join('config', 'gaAuth', name)
-      File.open(path, 'wb') { |f| f.write(file.read) }
-    end
-
     private
 
     def appearance_service
@@ -75,6 +59,22 @@ module Admin
       end
     end
 
+    def update_ga_status(params)
+      return unless params[:setting][:google_analytics_setting]
+      status = params[:setting][:google_analytics_setting][:ga_status]
+      return if status.nil?
+      @setting.google_analytics_setting.update(ga_status: status)
+    end
+
+    def upload_p12(params)
+      return unless params['google_analytics_setting_attributes']
+      return unless params['google_analytics_setting_attributes']['p12']
+      file = params['google_analytics_setting_attributes']['p12']
+      name = file.original_filename
+      path = File.join('config', 'gaAuth', name)
+      File.open(path, 'wb') { |f| f.write(file.read) }
+    end
+
     # Use callbacks to share common setup or constraints between actions.
     def set_setting
       @setting = Setting.first
@@ -123,7 +123,7 @@ module Admin
 
     def apparence_permit_attributes
       %i[
-        id theme_name image_background language time_zone
+        id theme_name image_background language admin_code time_zone
         image_background_cache remove_image_background
       ]
     end

data/installer/core/app/controllers/application_controller.rb

@@ -40,6 +40,7 @@ class ApplicationController < ActionController::Base
   def appearance
     @setting = Setting.includes(:appearance, :social_account).first
     @appearance = @setting.appearance
+    Time.zone = @setting.appearance.time_zone
   end
 
   def set_apparience_colors

data/installer/core/app/controllers/devise/keppler_sessions_controller.rb

@@ -0,0 +1,116 @@
+# Devise module authenticate
+module Devise
+  # SessionsController
+  class KepplerSessionsController < DeviseController
+    prepend_before_action :require_no_authentication, only: [:new, :create]
+    prepend_before_action :allow_params_authentication!, only: :create
+    prepend_before_action :verify_signed_out_user, only: :destroy
+    prepend_before_action :session_history, only: [:create, :destroy]
+    prepend_before_action only: [:create, :destroy] do
+      request.env['devise.skip_timeout'] = true
+    end
+
+    before_action :validate_admin_code, only: [:new]
+
+    # GET /resource/sign_in
+    def new
+      self.resource = resource_class.new(sign_in_params)
+      clean_up_passwords(resource)
+      yield resource if block_given?
+      respond_with(resource, serialize_options(resource))
+    end
+
+    # POST /resource/sign_in
+    def create
+      self.resource = warden.authenticate!(auth_options(params))
+      set_flash_message(:notice, :signed_in) if is_flashing_format?
+      sign_in(resource_name, resource)
+      yield resource if block_given?
+      respond_with resource, location: after_sign_in_path_for(resource)
+    end
+
+    # DELETE /resource/sign_out
+    def destroy
+      signed_out =
+        (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
+      if signed_out && is_flashing_format?
+        set_flash_message :notice, :signed_out
+      end
+      yield if block_given?
+      respond_to_on_destroy
+    end
+
+    protected
+
+    def sign_in_params
+      devise_parameter_sanitizer.sanitize(:sign_in)
+    end
+
+    def serialize_options(resource)
+      methods = resource_class.authentication_keys.dup
+      methods = methods.keys if methods.is_a?(Hash)
+      methods << :password if resource.respond_to?(:password)
+      { methods: methods, only: [:password] }
+    end
+
+    def auth_options(params)
+      if params[:user].has_key?(:path)
+        { scope: resource_name, recall: params[:user][:path] }
+      else
+        { scope: resource_name, recall: "#{controller_path}#new" }
+      end
+    end
+
+    def translation_scope
+      'devise.sessions'
+    end
+
+    private
+
+    def validate_admin_code
+      unless params[:admin_code].eql?(Appearance.first.admin_code)
+        redirect_to main_app.not_authorized_path
+      end
+    end
+
+    # Check if there is no signed in user before doing the sign out.
+    #
+    # If there is no signed in user, it will set the flash message and redirect
+    # to the after_sign_out path.
+    def verify_signed_out_user
+      if all_signed_out?
+        set_flash_message :notice, :already_signed_out if is_flashing_format?
+
+        respond_to_on_destroy
+      end
+    end
+
+    def all_signed_out?
+      users = Devise.mappings.keys.map do |s|
+        warden.user(scope: s, run_callbacks: false)
+      end
+
+      users.all?(&:blank?)
+    end
+
+    # Create history to session
+    def session_history
+      PublicActivity::Activity.create(
+        trackable_type: controller_name.singularize.humanize,
+        key: "#{controller_name.singularize.downcase}.#{action_name}",
+        owner: current_user
+      )
+    end
+
+    def respond_to_on_destroy
+      # We actually need to hardcode this as Rails default responder doesn't
+      # support returning empty response on GET request
+      respond_to do |format|
+        format.all { head :no_content }
+        format.any(*navigational_formats) do
+          redirect_to after_sign_out_path_for(resource_name)
+        end
+      end
+    end
+  end
+end

data/installer/core/app/helpers/sessions_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# SessionsHelper Backoffice
+module SessionsHelper
+  def keppler_new_session
+    "/#{@appearance.admin_code}/sign_in"
+  end
+
+  def keppler_destroy_session
+    "/#{@appearance.admin_code}/sign_out"
+  end
+end

data/installer/core/app/views/admin/layouts/_navigation.html.haml

@@ -52,7 +52,7 @@
                   = current_user.updated_at.strftime('%d %b %Y')
               .btn-user
                 = link_to t('keppler.devise.profile'), "/admin/users/#{current_user.id}", class: 'btn btn-default btn-flat'
-                = link_to t('keppler.devise.sign_out'), destroy_session_path(current_user), class: 'btn btn-default btn-flat'
+                = link_to t('keppler.devise.sign_out'), keppler_destroy_session, method: :delete, class: 'btn btn-default btn-flat'
         - if listing?
           %li.hidden-xs
             %a#open-historial

data/installer/core/app/views/admin/layouts/_sidebar.html.haml

@@ -41,6 +41,9 @@
           %i.bx.bx-cog
           %span= t('keppler.sidebar-menu.setting')
         %ul.treeview-menu
+          %li
+            = link_to '/admin/settings/configuration' do
+              = t('keppler.sidebar-menu.setting-submenu.configuration')
           - if Rails.env.eql?('development')
             %li
               = link_to '/admin/settings/appearance' do
@@ -66,7 +69,7 @@
     ev.preventDefault();
     swal({
       html: '<h1 class="modal-h1">Keppler <span>Admin</span></h1><div class="modal-info">' +
-        '<span> v 2.1.18 </span>' +
+        '<span> v 2.1.19 </span>' +
         "<span>#{t('keppler.release_date')}: 25/10/2018</span>" +
         '<span>Ruby on Rails v 5.2.1</span>' +
         '<ul class= "modal-social">' +

data/installer/core/app/views/admin/settings/fields/_appearance.html.haml

@@ -31,14 +31,6 @@
             - if @render.eql?('appearance')
               = link_to appearance_default_admin_settings_path(@render), class: 'btn btn-default', method: :put do
                 = t('keppler.actions.appearance_defaut')
-      .box.slice-box.p-15
-        .box-header.with-border
-          %h3.box-title= t('keppler.customize.language')
-
-        .box-body
-          = f.input :language, collection: languages.map { |lang| [t("keppler.language.#{lang}"), lang] }, label: false, include_blank: false
-          .pull-right
-            = f.button :submit, t('keppler.actions.apply'), class: 'btn btn-primary change-color'
 :javascript
   $(function() {
       $('#colorpicker').on('change', function(e) {

data/installer/core/app/views/admin/settings/fields/_configuration.html.haml

@@ -0,0 +1,28 @@
+#colors
+  = f.simple_fields_for :appearance, html: { multipart: true } do |f|
+    .box.slice-box.p-15
+      .box-header.with-border
+        %h3.box-title= t('keppler.customize.login_security_url')
+
+      .box-body
+        = f.input :admin_code, label: false, include_blank: false
+    .box.slice-box.p-15
+      .box-header.with-border
+        %h3.box-title= t('keppler.customize.timezone')
+
+      .box-body
+        .row
+          .col-lg-8
+            = f.input :time_zone, label: false, include_blank: false
+          .col-lg-4
+            .time-zone-test
+              %b Time.zone.now =
+              = Time.zone.now
+    .box.slice-box.p-15
+      .box-header.with-border
+        %h3.box-title= t('keppler.customize.language')
+
+      .box-body
+        = f.input :language, collection: languages.map { |lang| [t("keppler.language.#{lang}"), lang] }, label: false, include_blank: false
+        .pull-right
+          = f.button :submit, t('keppler.actions.apply'), class: 'btn btn-primary change-color'

data/installer/core/app/views/devise/keppler_sessions/new.html.haml

@@ -0,0 +1,35 @@
+.container
+  .login-box
+    .center
+      .login-container
+        .login-logo
+          %a{ href: '#' }
+            %span{style:"font-family: 'Patua One'"} Keppler
+            Admin
+        / /.login-logo
+        .login-box-body
+          = form_for(resource, :as => resource_name, :url => keppler_new_session, :html => { :role => 'form'}) do |f|
+            %p.login-box-msg= t('keppler.login_message')
+            %form{:action => "../../index2.html", :method => "post"}
+              .form-group.has-feedback
+                = f.email_field :email, :autofocus => true, class: "form-control validate", :placeholder => "Email"
+                %i.icon-envelope.input-icon
+              .form-group.has-feedback
+                = f.password_field :password, :autofocus => true, class: "form-control validate #{'invalid' if flash[:alert]}", :placeholder => "Password"
+                %i.icon-lock.input-icon
+              .form-group.has-feedback
+                .devise-errors.center-align
+                  - flash.each do |name, msg|
+                    = content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String)
+              .has-feedback
+                .login-bottom
+                  .pull-left
+                    - if devise_mapping.recoverable?
+                      = link_to new_password_path(resource_name), class: "recoverable" do
+                        = t("devise.sessions.forgot_password")
+                  .pull-right
+                    = f.submit t("devise.sessions.log_in"), class: 'btn-primary'
+              .clearfix
+
+  .login-footer
+    = "#{t('keppler.powered')} <span>Slice Group</span>".html_safe

data/installer/core/app/views/errors/internal_server_error.html.haml

@@ -46,5 +46,5 @@
           %path.st4{:d => "M91.7,293.1c1.2,0.3,2.3,1,3,1.9c-0.6-1.8-2.1-3.3-4-3.8c-3.1-0.8-6.3,1.1-7.1,4.2c-0.5,1.9,0,3.8,1.1,5.2\n\tc-0.4-1-0.4-2.2-0.1-3.3C85.4,294.2,88.6,292.3,91.7,293.1L91.7,293.1z"}
           %path.st5{:d => "M253.2,82.4c10.2,27.7,12.4,58.6,4.5,89.4C236.9,251.7,155.3,299.7,75.4,279c-21.9-5.7-41.4-16-57.8-29.5\n\tc16.4,44.3,53.5,80.2,102.7,92.9c79.9,20.8,161.6-27.2,182.3-107.1C317.7,177.2,296.5,118.3,253.2,82.4L253.2,82.4z"}
       = link_to :back do
-        %button.denied__link Back to admin
+        %button.denied__link Back
 = javascript_include_tag 'errors/application', 'data-turbolinks-track' => true

data/installer/core/app/views/errors/not_found.html.haml

@@ -97,5 +97,5 @@
           %path.st4{:d => "M91.7,293.1c1.2,0.3,2.3,1,3,1.9c-0.6-1.8-2.1-3.3-4-3.8c-3.1-0.8-6.3,1.1-7.1,4.2c-0.5,1.9,0,3.8,1.1,5.2\n\tc-0.4-1-0.4-2.2-0.1-3.3C85.4,294.2,88.6,292.3,91.7,293.1L91.7,293.1z"}
           %path.st5{:d => "M253.2,82.4c10.2,27.7,12.4,58.6,4.5,89.4C236.9,251.7,155.3,299.7,75.4,279c-21.9-5.7-41.4-16-57.8-29.5\n\tc16.4,44.3,53.5,80.2,102.7,92.9c79.9,20.8,161.6-27.2,182.3-107.1C317.7,177.2,296.5,118.3,253.2,82.4L253.2,82.4z"}
       = link_to :back do
-        %button.denied__link Back to admin
+        %button.denied__link Back
 = javascript_include_tag 'errors/application', 'data-turbolinks-track' => true

data/installer/core/app/views/errors/unprocessable.html.haml

@@ -46,5 +46,5 @@
           %path.st4{:d => "M91.7,293.1c1.2,0.3,2.3,1,3,1.9c-0.6-1.8-2.1-3.3-4-3.8c-3.1-0.8-6.3,1.1-7.1,4.2c-0.5,1.9,0,3.8,1.1,5.2\n\tc-0.4-1-0.4-2.2-0.1-3.3C85.4,294.2,88.6,292.3,91.7,293.1L91.7,293.1z"}
           %path.st5{:d => "M253.2,82.4c10.2,27.7,12.4,58.6,4.5,89.4C236.9,251.7,155.3,299.7,75.4,279c-21.9-5.7-41.4-16-57.8-29.5\n\tc16.4,44.3,53.5,80.2,102.7,92.9c79.9,20.8,161.6-27.2,182.3-107.1C317.7,177.2,296.5,118.3,253.2,82.4L253.2,82.4z"}
       = link_to :back do
-        %button.denied__link Back to admin
+        %button.denied__link Back
 = javascript_include_tag 'errors/application', 'data-turbolinks-track' => true

data/installer/core/config/application.rb

@@ -25,7 +25,7 @@ module InyxmaterRails
     #   auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names.
     #   Default is UTC.
-    config.time_zone = 'Caracas'
+    # config.time_zone = 'Caracas'
 
     # The default locale is :en and all translations from config/locales/*.rb,
     #   yml are auto loaded.