Skip to content

Commit d82000a

Browse files
smarcetsmarcet
committed
Punny code UI fixes
Signed-off-by: smarcet@gmail.com <smarcet@gmail.com> Change-Id: I1bf4cd436ca288e0f7ea63e4f30b8c7df7760b6d
1 parent f02c9a1 commit d82000a

7 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎app/libs/Auth/Models/User.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,9 +1286,9 @@ public function setWechatUser(string $wechat_user): void
12861286
}
12871287

12881288
/**
1289-
* @return string
1289+
* @return string|null
12901290
*/
1291-
public function getPassword(): string
1291+
public function getPassword(): ?string
12921292
{
12931293
return $this->password;
12941294
}

‎public/assets/js/admin/edit-user.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@ $(document).ready(function() {
7777
var form = $('#user-form');
7878
var validator = form.validate({
7979
rules: {
80-
"first_name" : {required: true},
81-
"last_name" : {required: true},
82-
"email" : {required: true, custom_email: true}
80+
"first_name" : { required: true },
81+
"last_name" : { required: true },
82+
"email" : { required: true, custom_email: true },
83+
"second_email": { custom_email: true },
84+
"third_email": { custom_email: true }
8385
}
8486
});
8587

86-
//$('#bio').summernote();
87-
//$('#statement_of_interest').summernote();
88-
8988
var simplemdeBio = new SimpleMDE({ element: $("#bio")[0] });
9089
var simplemdeStatement = new SimpleMDE({ element: $("#statement_of_interest")[0] });
9190

‎public/assets/js/jquery.validate.additional.custom.methods.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ $.validator.addMethod("dateUS", function (value, element,options) {
8888
}, "Please enter a valid date.");
8989

9090
$.validator.addMethod("custom_email", function(value, element) {
91+
if(!value) return true;
92+
value = value.trim();
93+
if(value == '') return true;
9194
return /^\S+@\S+(\.\S+)*$/.test( value )
9295
}, "field should be a valid email.");
9396

‎public/assets/js/profile.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
var validator = form.validate({
3131
rules: {
32-
"first_name": {required: true},
33-
"last_name": {required: true},
34-
"identifier": {required: true},
35-
"email": {required: true, custom_email: true},
36-
"second_email": {custom_email: true},
37-
"third_email": {custom_email: true},
32+
"first_name": { required: true},
33+
"last_name": { required: true},
34+
"identifier": { required: true},
35+
"email": { required: true, custom_email: true},
36+
"second_email": { custom_email: true},
37+
"third_email": { custom_email: true},
3838
}
3939
});
4040

‎resources/views/admin/add-user-form.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
<div class="form-group">
1111
<label for="email">Email</label>
12-
<input class="form-control" autocomplete="off" type="email" name="email" id="email" data-lpignore="true">
12+
<input class="form-control" autocomplete="off" type="text" name="email" id="email" data-lpignore="true">
1313
</div>
1414
<div class="form-group">
1515
<label for="country_iso_code">Country</label>

‎resources/views/admin/edit-user.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@
4040

4141
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
4242
<label for="email">Email</label>
43-
<input autocomplete="off" class="form-control" type="email" name="email" id="email" value="{!! $user->email !!}" data-lpignore="true">
43+
<input autocomplete="off" class="form-control" type="text" name="email" id="email" value="{!! $user->email !!}" data-lpignore="true">
4444
</div>
4545
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
4646
<label for="second_email">Second Email</label>
47-
<input autocomplete="off" class="form-control" type="email" name="second_email" id="second_email" value="{!! $user->second_email !!}" data-lpignore="true">
47+
<input autocomplete="off" class="form-control" type="text" name="second_email" id="second_email" value="{!! $user->second_email !!}" data-lpignore="true">
4848
</div>
4949
<div class="clearfix"></div>
5050

5151
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
5252
<label for="email">Third Email</label>
53-
<input autocomplete="off" class="form-control" type="email" name="third_email" id="third_email" value="{!! $user->third_email !!}" data-lpignore="true">
53+
<input autocomplete="off" class="form-control" type="text" name="third_email" id="third_email" value="{!! $user->third_email !!}" data-lpignore="true">
5454
</div>
5555
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
5656
<label for="gender">Gender</label>

‎resources/views/profile.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
5858
<label for="email">Email</label>
59-
<input class="form-control" type="email" name="email" id="email"
59+
<input class="form-control" type="text" name="email" id="email"
6060
autocomplete="username"
6161
data-lpignore="true"
6262
value="{!! $user->email !!}">
@@ -71,13 +71,13 @@
7171
<div class="clearfix"></div>
7272
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
7373
<label for="second_email">Second Email</label>
74-
<input autocomplete="off" class="form-control" type="email" name="second_email" id="second_email"
74+
<input autocomplete="off" class="form-control" type="text" name="second_email" id="second_email"
7575
data-lpignore="true"
7676
value="{!! $user->second_email !!}">
7777
</div>
7878
<div class="form-group col-xs-10 col-sm-4 col-md-6 col-lg-6">
7979
<label for="third_email">Third Email</label>
80-
<input autocomplete="off" class="form-control" type="email" name="third_email" id="third_email"
80+
<input autocomplete="off" class="form-control" type="text" name="third_email" id="third_email"
8181
data-lpignore="true"
8282
value="{!! $user->third_email !!}">
8383
</div>

0 commit comments

Comments
 (0)