Skip to content

Commit 9346105

Browse files
committed
Added validation to Page URL
1 parent 5aa453b commit 9346105

File tree

2 files changed

+45
-42
lines changed

2 files changed

+45
-42
lines changed
Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
<script>{!! file_get_contents(base_path("assets/js/jquery.min.js")) !!}</script>
22
<script>
3-
$(document).ready(function () {
4-
var submitBtn = $('#submit-btn');
5-
6-
$('#littlelink_name').on('keyup', function () {
7-
var littlelinkName = $(this).val();
8-
9-
if (littlelinkName.trim() !== '') {
10-
$.ajax({
11-
type: 'POST',
12-
url: '{{url("/validate-handle")}}',
13-
data: {
14-
'_token': '{{ csrf_token() }}',
15-
'littlelink_name': littlelinkName
16-
},
17-
success: function (data) {
18-
$('#littlelink_name').removeClass('is-valid is-invalid');
19-
$('#username-error').remove();
20-
21-
if (data.valid) {
22-
$('#littlelink_name').addClass('is-valid');
23-
submitBtn.prop('disabled', false);
24-
} else {
25-
$('#littlelink_name').addClass('is-invalid');
26-
$('<div id="username-error" class="invalid-feedback">That username is already taken</div>').insertAfter('#littlelink_name');
27-
submitBtn.prop('disabled', true);
3+
$(document).ready(function () {
4+
var submitBtn = $('#submit-btn');
5+
6+
$('#littlelink_name').on('keyup', function () {
7+
var littlelinkName = $(this).val();
8+
9+
if (littlelinkName.trim() !== '') {
10+
$.ajax({
11+
type: 'POST',
12+
url: '{{url("/validate-handle")}}',
13+
data: {
14+
'_token': '{{ csrf_token() }}',
15+
'littlelink_name': littlelinkName
16+
},
17+
success: function (data) {
18+
$('#littlelink_name').removeClass('is-valid is-invalid');
19+
$('#username-error').remove();
20+
21+
if (typeof exceptionvar !== 'undefined' && littlelinkName.trim() === exceptionvar) {
22+
submitBtn.prop('disabled', false);
23+
} else {
24+
if (data.valid) {
25+
$('#littlelink_name').addClass('is-valid');
26+
submitBtn.prop('disabled', false);
27+
} else {
28+
$('#littlelink_name').addClass('is-invalid');
29+
$('<div id="username-error" class="invalid-feedback">That username is already taken</div>').insertAfter('#littlelink_name');
30+
submitBtn.prop('disabled', true);
31+
}
32+
}
2833
}
29-
}
30-
});
31-
} else {
32-
$('#littlelink_name').removeClass('is-valid is-invalid');
33-
$('#username-error').remove();
34-
submitBtn.prop('disabled', true);
35-
}
34+
});
35+
} else {
36+
$('#littlelink_name').removeClass('is-valid is-invalid');
37+
$('#username-error').remove();
38+
submitBtn.prop('disabled', true);
39+
}
40+
});
3641
});
37-
});
38-
</script>
42+
</script>

resources/views/studio/page.blade.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,13 @@
229229
$url = $_SERVER['REQUEST_URI'];
230230
if( strpos( $url, "no_page_name" ) == true ) echo '<span style="color:#FF0000; font-size:120%;">You do not have a Page URL</span>'; ?>
231231
<br>
232-
<label>{{__('messages.Page URL')}}</label>
233-
<div class="input-group">
234-
<div class="input-group-prepend">
235-
<div class="d-none d-md-block input-group-text">{{ url('') }}/@</div>
236-
<div class="d-md-none input-group-text">@</div>
237-
</div>
238-
<input type="text" class="form-control" name="littlelink_name" value="{{ $page->littlelink_name ?? '' }}" required>
232+
<label for="littlelink_name" class="form-label">{{__('messages.Page URL')}}</label>
233+
<div class="input-group mb-3 has-validation">
234+
<span class="input-group-text" id="basic-addon3">{{str_replace(['http://', 'https://'], '', url(''))}}/@</span>
235+
<input type="littlelink_name" class="form-control" id="littlelink_name" name="littlelink_name" aria-describedby="littlelink_name" value="{{ $page->littlelink_name ?? '' }}" :value="old('littlelink_name')" required autofocus >
239236
</div>
237+
<script>var exceptionvar = " value="{{ $page->littlelink_name }}";</script>
238+
@include('auth.url-validation')
240239
241240
<label style="margin-top:15px">{{__('messages.Display name')}}</label>
242241
<div class="input-group">
@@ -280,7 +279,7 @@
280279
<label class="form-check-label" for="tablinks">{{__('messages.Enable')}}</label>
281280
</div>
282281
283-
<button type="submit" class="mt-3 ml-3 btn btn-primary">{{__('messages.Save')}}</button>
282+
<button id="submit-btn" type="submit" class="mt-3 ml-3 btn btn-primary">{{__('messages.Save')}}</button>
284283
</form>
285284
286285
@if(env('ALLOW_USER_HTML') === true)

0 commit comments

Comments
 (0)