keppler 2.0.2 → 2.0.3

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

@@ -1,8 +1,8 @@
 module Admin
   # SettingsController
   class SettingsController < AdminController
-    before_action :set_setting, only: [:edit, :update, :appearance_default]
-    before_action :authorization, only: [:edit, :update]
+    before_action :set_setting, only: %i[edit update appearance_default]
+    before_action :authorization, except: %i[reload appearance_default]
 
     def edit
       @social_medias = social_account_permit_attributes
@@ -11,9 +11,7 @@ module Admin
 
     def update
       if @setting.update(setting_params)
-        if get_theme?
-          get_apparience_colors([params[:color], params[:darken], params[:accent]])
-        end
+        get_apparience_colors([params[:color], params[:darken], params[:accent]]) if theme?
         redirect_to(
           admin_settings_path(@render), notice: actions_messages(@setting)
         )
@@ -24,8 +22,9 @@ module Admin
 
     def appearance_default
       appearance = Appearance.last
-      appearance.update(image_background: nil)
-      get_apparience_colors(["#f50e1e"])
+      appearance.remove_image_background!
+      appearance.save
+      get_apparience_colors(['#f44336'])
       redirect_to(
         admin_settings_path(@render), notice: actions_messages(@setting)
       )
@@ -33,9 +32,9 @@ module Admin
 
     private
 
-    def get_theme?
+    def theme?
       colors = [params[:color]]
-      !colors.include?('') and !colors.include?(nil)
+      !colors.include?('') && !colors.include?(nil)
     end
 
     def get_apparience_colors(values)
@@ -45,7 +44,7 @@ module Admin
         variables_file.map { |line| indx = variables_file.find_index(line) if line.include?("$keppler-#{attribute}") }
         variables_file[indx] = "$keppler-#{attribute}:#{values[i]};\n"
       end
-      variables_file = variables_file.join("")
+      variables_file = variables_file.join('')
       File.write(style_file, variables_file)
     end
 
@@ -56,9 +55,9 @@ module Admin
     end
 
     def authorization
-      authorize @setting
+      authorize Setting
     end
-    
+
     def style_file
       "#{Rails.root}/app/assets/stylesheets/admin/utils/_variables.scss"
     end
@@ -76,35 +75,35 @@ module Admin
     end
 
     def smpt_setting_permit_attributes
-      [:id, :address, :port, :domain_name, :email, :password]
+      %i[id address port domain_name email password]
     end
 
     def ga_setting_permit_attributes
-      [:ga_account_id, :ga_tracking_id, :ga_status]
+      %i[ga_account_id ga_tracking_id ga_status]
     end
 
     def social_account_permit_attributes
-      [
-        :facebook, :twitter, :instagram, :google_plus,
-        :tripadvisor, :pinterest, :flickr, :behance,
-        :dribbble, :tumblr, :github, :linkedin,
-        :soundcloud, :youtube, :skype, :vimeo
+      %i[
+        facebook twitter instagram google_plus
+        tripadvisor pinterest flickr behance
+        dribbble tumblr github linkedin
+        soundcloud youtube skype vimeo
       ]
     end
 
     def social_account_colors
-      [
-        '#3b5998', '#1da1f2', '#e1306c', '#dd4b39',
-        '#00af87', '#bd081c', '#ff0084', '#1769ff',
-        '#ff8833', '#35465c', '#333333', '#0077b5',
-        '#ff8800', '#ff0000', '#00aff0', '#162221'
+      %w[
+        #3b5998 #1da1f2 #e1306c #dd4b39
+        #00af87 #bd081c #ff0084 #1769ff
+        #ff8833 #35465c #333333 #0077b5
+        #ff8800 #ff0000 #00aff0 #162221
       ]
     end
 
     def apparence_permit_attributes
-      [
-        :id, :theme_name, :image_background,
-        :image_background_cache, :remove_image_background
+      %i[
+        id theme_name image_background
+        image_background_cache remove_image_background
       ]
     end
   end

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

@@ -1,42 +1,41 @@
 module Admin
   # UsersController
   class UsersController < AdminController
-    before_action :set_user, only: [:show, :edit, :update, :destroy]
-    before_action :set_roles, only: [:index, :new, :edit, :create, :update]
-    before_action :show_history, only: [:index]
+    before_action :set_user, only: %i[show edit update destroy]
+    before_action :set_roles, only: %i[index new edit create update]
+    before_action :show_history, only: %i[index]
+    before_action :authorization, except: %i[reload filter_by_role]
+    before_action :set_objects, only: %i[index filter_by_role reload]
 
     def index
-      @q = User.ransack(params[:q])
-      users = @q.result(distinct: true).where('id != ?', User.first.id).order(created_at: :desc)
-      @objects = users.page(@current_page)
-      @total = users.size
-      @users = User.all.reverse
+      @users = User.all.drop(1)
 
       if !@objects.first_page? && @objects.size.zero?
         redirect_to users_path(page: @current_page.to_i.pred, search: @query)
       end
+
       respond_to do |format|
         format.html
         format.json { render :json => @objects }
       end
     end
 
-    def new
-      @user = User.new
-      respond_to do |format|
-        format.html
-        format.json { render :json => @user }
+    def filter_by_role
+      if params[:role].eql?('all')
+        @users = User.all.drop(1)
+      else
+        @users = User.filter_by_role(@objects, params[:role])
       end
-
-      authorize @user
     end
 
-    def show
+    def new
+      @user = User.new
+      respond_to_formats(@user)
     end
 
-    def edit
-      authorize @user
-    end
+    def show; end
+
+    def edit; end
 
     def update
       update_attributes = user_params.delete_if do |_, value|
@@ -48,7 +47,6 @@ module Admin
       else
         render action: 'edit'
       end
-      authorize @user
     end
 
     def create
@@ -64,29 +62,33 @@ module Admin
     def destroy
       @user.destroy
       redirect_to admin_users_path, notice: actions_messages(@user)
-      authorize @user
     end
 
     def destroy_multiple
-      # byebug
       User.destroy redefine_ids(params[:multiple_ids])
       redirect_to(
         admin_users_path(page: @current_page, search: @query),
         notice: actions_messages(User.new)
       )
-      authorize @user
     end
 
-    def reload
-      @q = User.ransack(params[:q])
-      users = @q.result(distinct: true).where('id != ?', User.first.id).order(created_at: :desc)
-      @objects = users.page(@current_page)
-    end
+    def reload; end
 
     private
 
     def set_user
-      @user = User.find(params[:id])
+      if params[:id].eql?('clients') || params[:id].eql?('admins')
+        redirect_to action: :index, role: params[:id]
+      else
+        @user = User.find(params[:id])
+      end
+    end
+
+    def set_objects
+      @q = User.ransack(params[:q])
+      users = @q.result(distinct: true).where('id != ?', User.first.id).order(created_at: :desc)
+      @objects = users.page(@current_page)
+      @total = users.size
     end
 
     def set_roles
@@ -94,6 +96,10 @@ module Admin
       @roles = all_roles.drop(1)
     end
 
+    def authorization
+      authorize User
+    end
+
     def user_params
       params.require(:user).permit(
         :name, :email, :password, :password_confirmation,

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

@@ -2,22 +2,45 @@ module App
   # AppController -> Controller out the back-office
   class AppController < ::ApplicationController
     layout 'app/layouts/application'
+    skip_before_action :verify_authenticity_token
+    before_action :set_locale
     before_action :set_metas
     before_action :set_analytics
 
     def set_metas
+      @theme_color = nil
+      # Descomentar el modelo que exista depende del proyecto
+      # @post = KepplerBlog::Post.find(params[:id])
+      # @product = Product.find(params[:id])
       @setting = Setting.first
-      @title = @setting.name
-      @description = @setting.description
-      @favicon = @setting.favicon
       @meta = MetaTag.get_by_url(request.url)
       @social = SocialAccount.last
+      @meta_title = MetaTag.title(@post, @product, @setting)
+      @meta_description = MetaTag.description(@post, @product, @setting)
+      @meta_image = MetaTag.image(request, @post, @product, @setting)
+      @meta_locale = @locale.eql?('es') ? 'es_VE' : 'en_US'
+      @meta_locale_alternate = @locale.eql?('es') ? 'en_US' : 'es_VE'
+      @country_code = @locale.eql?('es') ? 'VE' : 'US'
     end
 
     private
 
+    def set_locale
+      if params[:locale]
+        @locale = I18n.locale = params[:locale]
+      elsif request.env['HTTP_ACCEPT_LANGUAGE']
+        request_lang = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/)[0]
+        @locale = I18n.locale = request_lang.eql?('es') ? 'es' : 'en'
+      end
+    end
+
+    def default_url_options(options = {})
+      logger.debug "default_url_options is passed options: #{options.inspect}\n"
+      { locale: I18n.locale }
+    end
+
     def set_analytics
-      @scripts = Script.all
+      @scripts = Script.select { |x| x.url == request.env['PATH_INFO'] }
     end
   end
 end

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

@@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base
   before_action :appearance
   before_action :set_apparience_colors
   before_action :set_sidebar
+  before_action :set_modules
   skip_around_action :set_locale_from_url
   include Pundit
   include PublicActivity::StoreController
@@ -19,8 +20,29 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def class_exists?(klass)
+    defined?(klass) && klass.is_a?(Class)
+  end
+
+  def redirect_to_index(_objects_path)
+    redirect_to objects_path(page: @current_page.to_i.pred, search: @query)
+  end
+
+  def nothing_in_first_page?(objects)
+    !objects.first_page? && objects.size.zero?
+  end
+
+  def respond_to_formats(objects)
+    respond_to do |format|
+      format.html
+      format.csv { send_data objects.to_csv }
+      format.xls { send_data objects.to_xls }
+      format.json { render json: objects }
+    end
+  end
+
   def user_not_authorized
-    flash[:alert] = "No tienes permiso para realizar esa acción"
+    flash[:alert] = t('keppler.messages.not_authorized_action')
     redirect_to(request.referrer || root_path)
   end
   # block access dashboard
@@ -46,6 +68,22 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def set_modules
+    @modules = YAML.load_file(
+      "#{Rails.root}/config/permissions.yml"
+    ).values.each(&:symbolize_keys!)
+    modules = Dir[File.join("#{Rails.root}/plugins", '*')]
+    modules.each do |m|
+      module_name = YAML.load_file(
+        "#{m}/config/permissions.yml"
+      ).values
+      if !module_name.first.nil?
+        module_name.each(&:symbolize_keys!)
+        @modules[0] = @modules[0].merge(module_name[0])
+      end
+    end
+  end
+
   def appearance
     @appearance = Setting.first.appearance
   end

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

@@ -1,5 +1,10 @@
 # AdminHelper Backoffice
 module AdminHelper
+
+  def keppler_boolean_script
+    render 'admin/layouts/keppler_boolean_script'
+  end
+
   def preloader
     render "admin/layouts/preloader"
   end

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

@@ -15,7 +15,16 @@ module ApplicationHelper
     current_user
   end
 
+  def can?(model)
+    Pundit.policy(current_user, model)
+  end
+
   def landing?
     controller_name.eql?('front') && action_name.eql?('index')
   end
+
+  def can?(model)
+    Pundit.policy(current_user, model)
+  end
+  
 end

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

@@ -0,0 +1,2 @@
+module RolesHelper
+end

data/installer/core/app/inputs/file_material_input.rb

@@ -13,8 +13,10 @@ class FileMaterialInput < SimpleForm::Inputs::Base
   private
 
   def file_input
-    template.content_tag(:span, t("activerecord.attributes.#{attribute_name}").humanize) +
-      @builder.file_field(attribute_name)
+    template.content_tag(
+      :span,
+      t("activerecord.attributes.#{attribute_name}").humanize
+    ) + @builder.file_field(attribute_name)
   end
 
   def file_path

data/installer/core/app/inputs/keppler_boolean_input.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# Creates a much prettier version of the file input field
+class KepplerBooleanInput < SimpleForm::Inputs::Base
+  def input(_wrapper_options)
+    initializers
+    template.content_tag(:label, '', class: 'keppler-switch') do
+      template.tag(
+        :input,
+        class: ('active' if try_boolean),
+        name: @input_name,
+        type: 'checkbox',
+        checked: true,
+        value: try_boolean.to_s
+      ) +
+        template.content_tag(:span, '', class: 'slider round') +
+        template.content_tag(
+          :label,
+          try_boolean.to_s,
+          class: "inline-label #{'active' if try_boolean}"
+        )
+    end
+  end
+
+  def label_switch
+    template.content_tag(:label, '', class: 'keppler-switch')
+  end
+
+  def input_switch
+    template.tag(
+      :input,
+      class: ('active' if try_boolean),
+      id: "switch-#{object}-#{attribute_name}",
+      type: 'checkbox',
+      checked: try_boolean.to_s
+    )
+  end
+
+  def span_slider_round
+    template.content_tag(:span, '', class: 'slider round')
+  end
+
+  # def script
+  #   template.content_tag(
+  #     :script,
+  #       `$('.keppler-switch').click(function(event) {
+  #         event.preventDefault()
+  #         var input = $(this).find('input')
+  #         var label = $(this).find('.inline-label')
+  #         input
+  #           .toggleClass('active')
+  #           .val(input.hasClass('active'))
+  #         label
+  #           .toggleClass('active')
+  #           .text(label.hasClass('active'))
+  #       })`
+  #   )
+  # end
+
+  private
+
+  def try_boolean
+    object.try(attribute_name) ? true : false
+  end
+
+  protected
+
+  def initializers
+    @model = lookup_model_names.join('_')
+    @attribute = reflection_or_attribute_name
+    @input_id = "#{@model}_#{@attribute}"
+    @input_name = "#{@model}[#{@attribute}]"
+  end
+end