openinfra
/
openstackid
Code Issues Proposed changes

Change fields input format from HTML to MD 

* bio
* statement_of_interest

Change-Id: Ib2d897ff4c58083ad244075547419c644c2c77da
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-04-14 11:33:59 -03:00
parent e13fe1f376
commit c47546816c
7 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,6 +29,7 @@ public/assets/images/
public/assets/svg/
public/assets/css/index.css.map
public/assets/css/index.css
public/assets/simplemde/
/public/assets/pwstrength-bootstrap/
/public/assets/sweetalert2/
/public/assets/urijs

20
app/Http/Controllers/Api/UserApiController.php
View File

@ -193,16 +193,24 @@ final class UserApiController extends APICRUDController
protected function curateUpdatePayload(array $payload): array
{
return HTMLCleaner::cleanData($payload, [
'bio', 'statement_of_interest'
]);
if(in_array("bio", $payload)){
$payload["bio"] = strip_tags($payload["bio"]);
}
if(in_array("statement_of_interest", $payload)){
$payload["statement_of_interest"] = strip_tags($payload["statement_of_interest"]);
}
return $payload;
}
protected function curateCreatePayload(array $payload): array
{
return HTMLCleaner::cleanData($payload, [
'bio', 'statement_of_interest'
]);
if(in_array("bio", $payload)){
$payload["bio"] = strip_tags($payload["bio"]);
}
if(in_array("statement_of_interest", $payload)){
$payload["statement_of_interest"] = strip_tags($payload["statement_of_interest"]);
}
return $payload;
}
/**

14
public/assets/js/admin/edit-user.js
View File

@ -83,8 +83,12 @@ $(document).ready(function() {
}
});
$('#bio').summernote();
$('#statement_of_interest').summernote();
//$('#bio').summernote();
//$('#statement_of_interest').summernote();
var simplemdeBio = new SimpleMDE({ element: $("#bio")[0] });
var simplemdeStatement = new SimpleMDE({ element: $("#statement_of_interest")[0] });
$('#birthday').datepicker();
$('#country_iso_code').chosen({width: '100%', height: '34px'});
@ -140,6 +144,10 @@ $(document).ready(function() {
user.birthday = '';
}
// get values
user.bio = simplemdeBio.value();
user.statement_of_interest = simplemdeStatement.value();
var groups = user.groups;
delete user.groups;
user.groups = [];
@ -175,7 +183,7 @@ $(document).ready(function() {
type: "success",
text: "User info updated successfully!",
});
location.reload();
location.reload(true);
},
error: function (jqXHR, textStatus, errorThrown) {
$('body').ajax_loader('stop');

13
public/assets/js/profile.js
View File

@ -35,8 +35,12 @@ $(document).ready(function() {
}
});
$('#bio').summernote();
$('#statement_of_interest').summernote();
//$('#bio').summernote();
//$('#statement_of_interest').summernote();
var simplemdeBio = new SimpleMDE({ element: $("#bio")[0] });
var simplemdeStatement = new SimpleMDE({ element: $("#statement_of_interest")[0] });
$('#birthday').datepicker();
$('#img-pic',form).data('original-src', $('#img-pic', form).attr('src'));
@ -93,6 +97,10 @@ $(document).ready(function() {
user.birthday = '';
}
// get values
user.bio = simplemdeBio.value();
user.statement_of_interest = simplemdeStatement.value();
var href = $(this).attr('action');
var data = new FormData();
@ -123,6 +131,7 @@ $(document).ready(function() {
$("#password").val('');
$("#current_password").val('');
$('.change-password-link').show();
location.reload(true);
},
error: function (jqXHR, textStatus, errorThrown) {
$('body').ajax_loader('stop');

2
resources/views/admin/edit-user.blade.php
View File

@ -237,6 +237,8 @@
@endforeach
</script>
{!! HTML::script('assets/simplemde/simplemde.min.js') !!}
{!! HTML::style('assets/simplemde/simplemde.min.css') !!}
{!! HTML::script('assets/pwstrength-bootstrap/pwstrength-bootstrap.js') !!}
{!! HTML::style('assets/chosen-js/chosen.css') !!}
{!! HTML::script('assets/chosen-js/chosen.jquery.js') !!}

3
resources/views/profile.blade.php
View File

@ -369,7 +369,10 @@
var current_language = '{!!$user->language!!}';
var current_country = '{!!$user->country_iso_code!!}';
var current_gender = '{!! $user->gender !!}';
</script>
{!! HTML::script('assets/simplemde/simplemde.min.js') !!}
{!! HTML::style('assets/simplemde/simplemde.min.css') !!}
{!! HTML::script('assets/pwstrength-bootstrap/pwstrength-bootstrap.js') !!}
{!! HTML::style('assets/chosen-js/chosen.css') !!}
{!! HTML::script('assets/chosen-js/chosen.jquery.js') !!}

1
webpack.config.js
View File

@ -42,6 +42,7 @@ var plugins = [
{from: './node_modules/chosen-js', to: 'chosen-js'},
{from: './node_modules/moment', to: 'moment'},
{from: './node_modules/@github/clipboard-copy-element/dist', to: 'clipboard-copy-element'},
{from: './node_modules/simplemde/dist', to: 'simplemde'},
],
{copyUnmodified: false}
),