From 658b25b176ed6fddf4c01b2c4ee4c728f3fe61ed Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Fri, 15 Oct 2021 17:53:41 +0200
Subject: [PATCH] cropper
---
Gemfile.lock | 2 +-
app/assets/javascripts/admin.js | 2 ++
app/assets/stylesheets/admin.sass | 1 +
app/controllers/admin/users_controller.rb | 2 +-
app/controllers/users/registrations_controller.rb | 4 ++--
app/views/devise/registrations/edit.html.erb | 1 +
package.json | 2 ++
yarn.lock | 10 ++++++++++
8 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ac32c6f7..448d65555 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -314,7 +314,7 @@ GEM
simple_form (5.1.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
- simple_form_bs5_file_input (0.0.1)
+ simple_form_bs5_file_input (0.0.3)
rails
simple_form
simple_form_password_with_hints (0.0.2)
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 308fd0308..226a7da47 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -4,5 +4,7 @@
//= require notyf/notyf.min
//= require simple_form_password_with_hints
//= require simple_form_bs5_file_input
+//= require cropperjs/dist/cropper
+//= require jquery-cropper/dist/jquery-cropper
//= require appstack/app
//= require_tree ./admin
diff --git a/app/assets/stylesheets/admin.sass b/app/assets/stylesheets/admin.sass
index 112d13696..945fc63ec 100644
--- a/app/assets/stylesheets/admin.sass
+++ b/app/assets/stylesheets/admin.sass
@@ -3,5 +3,6 @@
@import 'appstack/light'
@import 'simple_form_password_with_hints'
@import 'simple_form_bs5_file_input'
+@import 'cropperjs/dist/cropper'
@import 'commons/*'
@import 'admin/*'
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 86d995b33..df691fbb1 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -67,6 +67,6 @@ class Admin::UsersController < Admin::ApplicationController
end
def user_params
- params.require(:user).permit(:first_name, :last_name, :role, :language_id, :picture, :picture_delete, :mobile_phone)
+ params.require(:user).permit(:first_name, :last_name, :role, :language_id, :picture, :picture_delete, :picture_infos, :mobile_phone)
end
end
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index 23e45fcd9..c13527e25 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -31,10 +31,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
end
def configure_sign_up_params
- devise_parameter_sanitizer.permit(:sign_up, keys: [:language_id, :first_name, :last_name, :picture, :picture_delete])
+ devise_parameter_sanitizer.permit(:sign_up, keys: [:language_id, :first_name, :last_name, :picture, :picture_infos, :picture_delete])
end
def configure_account_update_params
- devise_parameter_sanitizer.permit(:account_update, keys: [:mobile_phone, :language_id, :first_name, :last_name, :picture, :picture_delete])
+ devise_parameter_sanitizer.permit(:account_update, keys: [:mobile_phone, :language_id, :first_name, :last_name, :picture, :picture_infos, :picture_delete])
end
end
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index ee0c153b7..56b1081e0 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -29,6 +29,7 @@
as: :single_deletable_file,
input_html: { accept: '.jpg,.jpeg,.png' },
preview: 200,
+ resize: 1,
direct_upload: true %>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>
diff --git a/package.json b/package.json
index 587e15688..bd3625599 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,7 @@
{
"dependencies": {
+ "cropperjs": "^1.5.12",
+ "jquery-cropper": "^1.0.1",
"notyf": "^3.10.0"
}
}
diff --git a/yarn.lock b/yarn.lock
index a4bd56507..84aaabbb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,16 @@
# yarn lockfile v1
+cropperjs@^1.5.12:
+ version "1.5.12"
+ resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.12.tgz#d9c0db2bfb8c0d769d51739e8f916bbc44e10f50"
+ integrity sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==
+
+jquery-cropper@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/jquery-cropper/-/jquery-cropper-1.0.1.tgz#6ba9faf1c2c86c0ac3c648d40554ba53673113cf"
+ integrity sha512-KGlY8b0IJQi2Bxe3lqMKmd5Z2Ce4GrnDE5O8Iciza9xCzXISkL6EqX/jFHwnLL1H6Q4FGjoRguuv3lxezsbKJQ==
+
notyf@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/notyf/-/notyf-3.10.0.tgz#67a64443c69ea0e6495c56ea0f91198860163d06"
--
GitLab