beautiful_scaffold 2.0.0.pre → 2.0.3

data/lib/generators/beautiful_sorcery_generator.rb

@@ -0,0 +1,137 @@
+# encoding : utf-8
+class BeautifulSorceryGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  #argument :model, :type => :string, :desc => "Name of model (ex: User)"
+  
+  def install_sorcery
+    model = "User"
+    view_path = "app/views/"
+
+    if !File.read('Gemfile').include?("sorcery")
+      gem("sorcery", "0.16.0")
+    end
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    raise "Model must be specified" if model.blank?
+
+    # Install sorcery
+    generate("sorcery:install", "remember_me reset_password user_activation brute_force_protection external --model #{model}")
+
+    # If exist users migration just add columns
+    create_user_migration = Dir.glob("db/migrate/*create_users.rb").first
+    if create_user_migration
+      already_email = File.read(create_user_migration).include?(":email")
+      sorcery_core_file = Dir.glob("db/migrate/*sorcery_core.rb").first
+      File.open(sorcery_core_file, "w+") do |f|
+        f.write("class SorceryCore < ActiveRecord::Migration[6.1]
+  def change
+    #{(already_email ? '' : 'add_column :users, :email, :string')}
+    add_column :users, :crypted_password, :string
+    add_column :users, :salt, :string
+
+    #{(already_email ? '' : 'add_index :users, :email, unique: true')}
+  end
+end")
+      end
+    end
+
+    # Generate mailer
+    copy_file("app/mailers/user_mailer.rb")
+
+    # Install controllers
+    copy_file("app/controllers/user_sessions_controller.rb")
+
+    # ===== Controller
+    inject_into_file("app/controllers/users_controller.rb",
+ "\n
+  skip_before_action :require_login, only: [:new, :create, :activate]
+\n", after: "< BeautifulController")
+
+    inject_into_file("app/controllers/users_controller.rb",
+   "def activate
+    if @user = User.load_from_activation_token(params[:id])
+      @user.activate!
+      redirect_to(login_path, :notice => 'User was successfully activated.')
+    else
+      not_authenticated
+    end
+  end\n\n  ", before: "private")
+
+    # ====== Model
+    # Add password & password_confirmation in model
+    inject_into_file("app/models/user.rb",
+    "\n
+  validates :password, length: { minimum: 3 }, if: -> { new_record? || changes[:crypted_password] }
+  validates :password, confirmation: true, if: -> { new_record? || changes[:crypted_password] }
+  validates :password_confirmation, presence: true, if: -> { new_record? || changes[:crypted_password] }
+
+  before_update :setup_activation, if: -> { email_changed? }
+  after_update :send_activation_needed_email!, if: -> { previous_changes['email'].present? }\n",
+                     after: "ApplicationRecord")
+
+    inject_into_file("app/models/user.rb", ":password,:password_confirmation,", :after => "def self.permitted_attributes\n    return ")
+
+    # ====== Views
+    inject_into_file("app/views/users/_form.html.erb",
+    '  <div class="form-group">
+    <%= f.label :password, t(\'app.models.user.bs_attributes.password\', :default => \'password\').capitalize, :class => "control-label" %><br />
+    <%= f.password_field :password, :class => "form-control" %>
+  </div>
+  <div class="form-group">
+    <%= f.label :password_confirmation, t(\'app.models.user.bs_attributes.password_confirmation\', :default => \'password_confirmation\').capitalize, :class => "control-label" %><br />
+    <%= f.password_field :password_confirmation, :class => "form-control" %>
+  </div>', before: '<!-- Beautiful_scaffold - AddField - Do not remove -->')
+
+    # Install all views for login/logout
+    directory "app/views/login_logout", "app/views"
+
+    # Domain in action_mailer
+    for current_env in ['production', 'development', 'test']
+      inject_into_file("config/environments/#{current_env}.rb",  "  config.action_mailer.default_url_options = { :host => 'localhost:3000' }", :after => "Rails.application.configure do\n" )
+    end
+
+    # In model
+    #remove_file("app/models/user.rb") # remove generated by sorcery
+    #copy_file("app/models/user.rb") # copy BS version ;)
+
+    # Limited access
+    inject_into_file("app/controllers/beautiful_controller.rb",
+                     "\n  before_action :require_login, except: [:dashboard]\n",
+                     :after => 'layout "beautiful_layout"' + "\n")
+
+    inject_into_file("config/initializers/sorcery.rb",
+                     "\nuser.user_activation_mailer = UserMailer\n",
+                     :after => "# user.user_activation_mailer =\n")
+
+    # Routes (session)
+    inject_into_file("config/routes.rb",
+                     '
+  resources :user_sessions, only: [:create]
+  get "login" => "user_sessions#new", :as => :login
+  post "logout" => "user_sessions#destroy", :as => :logout' + "\n\n\n",
+                     :after => "Rails.application.routes.draw do\n")
+
+    # Activate
+    inject_into_file("config/routes.rb", " do
+    member do
+      get :activate
+    end
+  end", after: 'resources :users, concerns: :bs_routes')
+
+    copy_file("#{view_path}partials/_login_logout_register.html.erb", "#{view_path}layouts/_login_logout_register.html.erb")
+
+    # Sign in sign out
+    inject_into_file("#{view_path}layouts/beautiful_layout.html.erb",
+                     "\n<%= render :partial => 'layouts/login_logout_register' %>\n",
+                     :after => "<!-- Beautiful_scaffold - Signin - Do not remove -->")
+
+    say "Beautiful-Scaffold enable 'user_activation' sorcery module for you, so when you sign up, find in logs the activation link. You can't sign in yourself until you activate the account"
+  end
+end

data/lib/generators/beautiful_storage_generator.rb

@@ -0,0 +1,61 @@
+# encoding : utf-8
+class BeautifulStorageGenerator < Rails::Generators::Base
+  require_relative 'beautiful_scaffold_common_methods'
+  include BeautifulScaffoldCommonMethods
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  # TODO voir pour engine
+
+  argument :model, :type => :string, :desc => "Name of model (ex: user)"
+  argument :storage_name, :type => :string, :desc => "Storage's name (ex: picture_file)"
+
+  class_option :mountable_engine, default: nil
+  
+  def install_storage
+
+    #if !File.read('Gemfile').include?("image_processing")
+      gem("image_processing", '~> 1.2')
+    #end
+
+    Bundler.with_unbundled_env do
+      run "bundle install"
+    end
+
+    # Install activestorage
+    run "bin/rails active_storage:install"
+    #run "rake db:migrate"
+
+    raise "Model must be specified" if model.blank?
+    raise "Attachment must be specified" if storage_name.blank?
+
+    # ===== Model
+    inject_into_file("app/models/#{engine_name}#{model}.rb",
+ "\n
+  has_one_attached :#{storage_name}
+\n", after: "< ApplicationRecord")
+    inject_into_file("app/models/#{engine_name}#{model}.rb", ":#{storage_name},", :after => "def self.permitted_attributes\n    return ")
+
+    # ====== Views
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/_form.html.erb",
+"  <div class='form-group'>
+    <%= f.label :#{storage_name}, t('app.models.#{model}.bs_attributes.#{storage_name}', :default => '#{storage_name}').capitalize, :class => 'control-label' %><br />
+    <%= f.file_field :#{storage_name}, direct_upload: true, :class => 'form-control' %>
+  </div>\n", before: '<!-- Beautiful_scaffold - AddField - Do not remove -->')
+
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/_form.html.erb",
+                     ", multipart: true", after: "form_for(@#{model}")
+
+    inject_into_file("app/views/#{engine_name}#{model_pluralize}/show.html.erb",
+                     "<p><b><%= t('app.models.#{model}.bs_attributes.#{storage_name}', :default => '#{storage_name}') %>:</b><br><%= image_tag @#{model}.#{storage_name}.variant(resize_to_limit: [100, 100]) %></p>",
+                     before: "<!-- Beautiful_scaffold - AddField - Field - Do not remove -->")
+
+    # Controller
+    #inject_into_file("app/controllers/#{engine_name}#{model_pluralize}_controller.rb",
+    #                 "\n  before_action :require_login, except: [:dashboard]\n",
+    #                 :after => 'layout "beautiful_layout"' + "\n")
+
+    say "You must run 'rake db:migrate' to create activestorage migrations !"
+
+  end
+end

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -4,14 +4,12 @@
 //= require popper
 //= require bootstrap-sprockets
 //= require a-wysihtml5-0.3.0.min
-//= require bootstrap-colorpicker
 //= require moment
 //= require moment/fr
 //= require tempusdominus-bootstrap-4.js
 //= require bootstrap-datetimepicker-for-beautiful-scaffold
 //= require bootstrap-wysihtml5
 //= require jstree.min.js
-//= require tagit.js
 //= require jquery-barcode
 //= require beautiful_scaffold
 //= require fixed_menu

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -18,42 +18,27 @@ function bs_init(){
         return false;
     });
 
-    // Tagit
+    // habtm (select2 - tag)
     $('.bs-tagit').each(function( index ) {
         var tagitelt = this;
-        $(tagitelt).tagit({
-            tagSource : function( request, response ) {
-
-                var par = $(tagitelt).attr("data-param");
-                var url = $(tagitelt).attr("data-url");
-                var result = $(tagitelt).attr("data-result");
-                var data_to_send = {
-                    "skip_save_search": true
-                };
-                data_to_send[par] = request.term;
-                $.ajax({
-                    url: url,
-                    type: "POST",
-                    data: data_to_send,
-                    dataType: "json",
-                    success: function( data ) {
-                        response( $.map( data, function( item ) {
-                            return { label: item[result], value: item.id };
-                        }));
-                    }
-                });
-            },
-            triggerKeys:['enter', 'comma', 'tab'],
-            select : true,
-            allowNewTags : false
+        $(tagitelt).select2({
+            ajax: {
+                processResults: function (data) {
+                    // Transforms the top-level key of the response object from 'items' to 'results'
+                    return {
+                        results: $.map(data, function (obj) {
+                            obj.id = obj.id;
+                            obj.text = obj.caption;
+                            return obj;
+                        })
+                    };
+                }
+            }
         });
-        // Bootstrap...
-        $('.tagit-input').addClass("form-control");
     });
 
-    // Wysiwyg and color field
+    // Wysiwyg field
     $('.wysiwyg-editor').wysihtml5({"html": true});
-    $('.color').colorpicker({format: 'rgba'});
 
     // Processing
     $(document).on('click', '#checkall', function(){

data/lib/generators/templates/app/assets/javascripts/bootstrap-datetimepicker-for-beautiful-scaffold.js

@@ -1,21 +1,22 @@
 function datetimepicker_init(){
-    $('.tpicker').datetimepicker({ format: 'LT' }).on('change.datetimepicker', function(elt){
-        console.log('===============> time');
-        console.log(elt);
-        console.log($(elt.target).attr('data-field'));
+    $('.tpicker').datetimepicker({ format: 'LT', widgetPositioning: {
+            horizontal: 'auto',
+            vertical: 'auto'
+        } });
+    $('.tpicker').on('change.datetimepicker', function(elt){
         var eltid = $(elt.target).attr('data-field');
-        $('#' + eltid + '_4i').val(elt.date.hour());
-        $('#' + eltid + '_5i').val(elt.date.minute());
+        $('#' + eltid + '4i').val(elt.date.hour());
+        $('#' + eltid + '5i').val(elt.date.minute());
     });
-
-    $('.dpicker').datetimepicker({ format: 'L' }).on('change.datetimepicker', function(elt){
-        console.log('===============> date');
-        console.log(elt);
-        console.log($(elt.target).attr('data-field'));
+    $('.dpicker').datetimepicker({ format: 'L', widgetPositioning: {
+            horizontal: 'auto',
+            vertical: 'auto'
+        } });
+    $('.dpicker').on('change.datetimepicker', function(elt){
         var eltid = $(elt.target).attr('data-field');
-        $('#' + eltid + '_3i').val(elt.date.date());
-        $('#' + eltid + '_2i').val(elt.date.month()+1);
-        $('#' + eltid + '_1i').val(elt.date.year());
+        $('#' + eltid + '3i').val(elt.date.date());
+        $('#' + eltid + '2i').val(elt.date.month()+1);
+        $('#' + eltid + '1i').val(elt.date.year());
     });
     $(document).on('click', '.dpicker', function(e){
         $(this).datetimepicker('show');
@@ -24,6 +25,6 @@ function datetimepicker_init(){
         $(this).datetimepicker('show');
     });
     $(".datetimepicker-input").each(function(i, elt){
-       $(elt).removeAttr("name");
+        $(elt).removeAttr("name");
     });
 }

data/lib/generators/templates/app/assets/stylesheets/application-bs.css

@@ -11,8 +11,6 @@
  *= require_self
  *= require jquery-ui
  *= require beautiful-scaffold
- *= require tagit-dark-grey
- *= require colorpicker
  *= require bootstrap-wysihtml5
  *= require themes/default/style
  */

data/lib/generators/templates/app/assets/stylesheets/beautiful-scaffold.css.scss

@@ -177,10 +177,12 @@ html, body {
   margin-bottom: 0px;
   margin-left: 20px;
 }
+/*
 .search-and-filter .form-group label{
   margin-bottom: 0;
   margin-top: 5px;
 }
+*/
 
 /*
 div.filler.show-menu{
@@ -199,4 +201,10 @@ div.fixed.hide-menu{
 
 .title-index{
   font-size: 30px;
-}
+}
+
+.overview-color{
+  display:inline-block;
+  width: 40px;
+  height: 24px;
+}

data/lib/generators/templates/app/controllers/user_sessions_controller.rb

@@ -0,0 +1,20 @@
+class UserSessionsController < BeautifulController
+
+  skip_before_action :require_login, only: [:new, :create]
+
+  def create
+    @user = login(params[:email], params[:password])
+
+    if @user
+      redirect_back_or_to(:users, notice: 'Login successful')
+    else
+      flash.now[:alert] = 'Login failed'
+      render action: 'new'
+    end
+  end
+
+  def destroy
+    logout
+    redirect_to(:users, notice: 'Logged out!')
+  end
+end

data/lib/generators/templates/app/helpers/beautiful_helper.rb

@@ -92,12 +92,15 @@ module BeautifulHelper
 
     cap = i18n_translate_path(model_name, attribute_name)
 
+    type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?
+    type_of_column ||= :other
+
     infostr   = ''
     response  = '' # See at end
+    response += '<div class="form-check form-check-inline">' if type_of_column == :boolean
     response += f.label name_field, t(cap, :default => default_caption).capitalize, :class => "control-label"
+    response += '</div>' if type_of_column == :boolean
 
-    type_of_column = ar_model.columns_hash[attribute_name].type unless ar_model.columns_hash[attribute_name].nil?
-    type_of_column ||= :other
     case type_of_column
       when :date, :datetime
         dt = (type_of_column == :datetime)
@@ -178,9 +181,20 @@ module BeautifulHelper
         infostr = info_input(model_name, [(name_field + "_dp_lt").to_sym, (name_field + "_tp_lt").to_sym, (name_field + "_dp_gt").to_sym, (name_field + "_tp_gt").to_sym])
       when :boolean
         # Specify a default value (false) in rails migration
-        response += f.label name_field + "_eq_true",   raw(f.radio_button((name_field + "_eq").to_sym, true))   + " " + h(t(:yes, :default => "Yes")), :class => "checkbox inline"
-        response += f.label name_field + "_eq_false",  raw(f.radio_button((name_field + "_eq").to_sym, false))  + " " + h(t(:no, :default => "No")),   :class => "checkbox inline"
-        response += f.label name_field + "_eq",        raw(f.radio_button((name_field + "_eq").to_sym, nil))    + " " + h(t(:all, :default => "All")), :class => "checkbox inline"
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, true, { class: 'form-check-input'})
+        response += f.label name_field + "_eq_true", h(t(:yes, default: "Yes")), class: "form-check-label"
+        response += '</div>'
+
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, false, { class: 'form-check-input'})
+        response += f.label name_field + "_eq_false", h(t(:no, default: "No")), class: "form-check-label"
+        response += '</div>'
+
+        response += '<div class="form-check form-check-inline">'
+        response += f.radio_button((name_field + "_eq").to_sym, nil, { class: 'form-check-input'})
+        response += f.label name_field + "_eq", h(t(:all, default: "All")), class: "form-check-label"
+        response += '</div>'
 
         infostr = (begin session['search'][model_name][(name_field + "_eq").to_sym] == "on" ? "" : "info" rescue "" end)
       when :string

data/lib/generators/templates/app/locales/beautiful_scaffold.en.yml

@@ -47,3 +47,11 @@ en:
   register: "Register"
   search_and_filter: "Search and filter"
   more_options: "More options..."
+  edit_profile: "edit profile"
+  logout: "Logout"
+  register: "Register"
+  login: "Login"
+  logged_out: "Logged out"
+  login_failed: "Login failed"
+  login_successful: "Login successful"
+  crypted_password: "Crypted password"

data/lib/generators/templates/app/locales/beautiful_scaffold.fr.yml

@@ -46,4 +46,12 @@ fr:
   send_me_reset_password_instructions: "Me ré-envoyer les instructions de réinitialisation du mot de passe"
   register: "Inscription"
   search_and_filter: "Option de filtre"
-  more_options: "Plus d'options..."
+  more_options: "Plus d'options..."
+  edit_profile: "Editer mon profil"
+  logout: "Déconnexion"
+  register: "S'incrire"
+  login: "S'identifier"
+  logged_out: "déconnecté"
+  login_failed: "Erreur d'identification"
+  login_successful: "Identification réussie"
+  crypted_password: "Crypted password"