Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-08-17 08:26:08 +02:00
commit 4358f272ed
8 changed files with 142 additions and 19 deletions

View File

@ -197,4 +197,14 @@ class GuideController extends Controller
return $html; return $html;
} }
public function nameCheck(Request $request){
$guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
} }

View File

@ -576,4 +576,14 @@ class UserController extends Controller
} }
} }
/*
public function nameCheck(Request $request){
$users = User::query()->where('mail', 'LIKE',$request->mailCheck)
->get();
if(count($users) > 0 && $request->mailCheck !== NULL){
return 1;
}
}
*/
} }

View File

@ -153,14 +153,4 @@ class WashingMachineController extends Controller
return redirect()->route("washing-machines.index"); return redirect()->route("washing-machines.index");
} }
public function nameCheck(Request $request){
$washing = Role::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($washing) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
} }

View File

@ -16,7 +16,7 @@ class CreateGuidesTable extends Migration
Schema::create('guides', function (Blueprint $table) { Schema::create('guides', function (Blueprint $table) {
$table->id(); $table->id();
$table->timestamps(); $table->timestamps();
$table->string('name'); $table->string('name')->unique();
$table->longText('guide_articles'); $table->longText('guide_articles');
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); $table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
}); });

View File

@ -95,7 +95,7 @@
data: {'nameCheck':$value}, data: {'nameCheck':$value},
success:function (data) { success:function (data) {
console.log(data); console.log(data);
if(data === false){ if(data){
$("#error").show(100); $("#error").show(100);
$("#error").css('color', 'red'); $("#error").css('color', 'red');
$("#disable").prop('disabled', true); $("#disable").prop('disabled', true);

View File

@ -23,10 +23,11 @@
} }
</style> </style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet"> <link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<h1>Opret Vejledning</h1> <h1 id="errormesseages" >Opret Vejledning</h1>
<form method="post" action="{{ route("guides.store") }}" enctype="multipart/form-data"> <form method="post" action="{{ route("guides.store") }}" enctype="multipart/form-data">
@csrf @csrf
<label for="title">Titel guiden</label> <label for="title">Titel guiden</label>
<label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input type="text" name="name" id="title" required> <input type="text" name="name" id="title" required>
<div id="editor"></div> <div id="editor"></div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea> <textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
@ -38,7 +39,7 @@
</label> </label>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label> <label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
<input id="fileuploade" type="file" name="resource"> <input id="fileuploade" type="file" name="resource">
<input type="submit" class="btn btn-dark text-white" value="Opret"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form> </form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script> <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@ -79,5 +80,59 @@
} }
); );
}); });
$(document).ready(function () {
$value = $('#title').val();
$.ajax({
type: 'get',
url: '{{route('guides.nameCheck')}}',
data: {'nameCheck':$value},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#title').on('keyup', function () {
$value = $(this).val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('guides.nameCheck')}}',
data: {'nameCheck':$value},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script> </script>
@endsection @endsection

View File

@ -10,13 +10,14 @@
@endsection @endsection
@section("content") @section("content")
<h1>Opret Bruger:</h1> <h1 id="errormesseages" >Opret Bruger:</h1>
{!! session()->get('error#notsamepass') !!} {!! session()->get('error#notsamepass') !!}
{!! session()->get('EmailExists') !!} {!! session()->get('EmailExists') !!}
{!! session()->get('PhoneExists') !!} {!! session()->get('PhoneExists') !!}
<form method="post" action="{{ route("users.store") }}"> <form method="post" action="{{ route("users.store") }}">
@csrf @csrf
<label for="name_first">Fornavn:</label> <label for="name_first">Fornavn:</label>
<label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
<input type="text" name="name_first" id="name_first" placeholder="Fornavn" required> <input type="text" name="name_first" id="name_first" placeholder="Fornavn" required>
<label for="name_last">Efternavn:</label> <label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" required> <input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
@ -32,8 +33,8 @@
<input type="password" class="form-control" name="password2" id="password2" placeholder="******" required> <input type="password" class="form-control" name="password2" id="password2" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('password2', 'fa-confirm')"></span> <span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('password2', 'fa-confirm')"></span>
</div> </div>
<label for="tel">Telefon nr:</label> <label for="phone">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required> <input type="tel" name="phone" id="phone" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<label for="roles">Rolle:</label> <label for="roles">Rolle:</label>
<select name="roles[]" id="roles" class="mb-2" multiple="multiple" required> <select name="roles[]" id="roles" class="mb-2" multiple="multiple" required>
<option disabled selected value> -- Vælg Rolle(r) -- </option> <option disabled selected value> -- Vælg Rolle(r) -- </option>
@ -42,7 +43,7 @@
<option value="{{ $role->name }}">{{ $role->name }}</option> <option value="{{ $role->name }}">{{ $role->name }}</option>
@endforeach @endforeach
</select> </select>
<input type="submit" class="btn btn-dark text-white" value="Opret"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form> </form>
@endsection @endsection
@ -70,5 +71,60 @@
} }
); );
}); });
$(document).ready(function () {
$mail = $('#email').val();
//$phone = $('#phone').val();
$.ajax({
type: 'get',
url: '{{route('users.nameCheck')}}',
data: {'mailChek':$mail},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#name').on('keyup', function () {
// $mail = $('#email').val();
$phone = $('#phone').val();
$.ajax({
type: 'get',
url: '{{route('users.nameCheck')}}',
data: {'mailCheck':$mail},
success:function (data) {
console.log($mail);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script> </script>
@endsection @endsection

View File

@ -58,7 +58,9 @@ Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->
//Check name adminpanle //Check name adminpanle
Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck"); Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck");
Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck"); Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck");
Route::get("/washingCheck", "WashingMachineController@nameCheck")->name("washing-machines.nameCheck"); Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
Route::get("/guidesCheck", "GuideController@nameCheck")->name("guides.nameCheck");
Route::resource("contacts", "ContactController"); Route::resource("contacts", "ContactController");