Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts: skolehjem/app/Http/Controllers/EventController.php
This commit is contained in:
frederikpyt
commit
55eed84b86
|
|
@ -309,6 +309,14 @@ class EventController extends Controller
|
|||
return "ERROR";
|
||||
}
|
||||
}
|
||||
|
||||
public function nameCheck(Request $request){
|
||||
$events = DB::table('events')->where('name', '=',$request->nameCheck)->get();
|
||||
if(count($events) > 0){
|
||||
return "Det er allerede en event med det navn";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@
|
|||
}
|
||||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<h1>Opret Aktivitet:</h1>
|
||||
<h1 id="errormesseages" >Opret Aktivitet:</h1>
|
||||
<form method="post" action="{{ route("events.store") }}" enctype="multipart/form-data">
|
||||
@csrf
|
||||
<label for="name">Event Navn:</label>
|
||||
<label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
|
||||
<input type="text" name="name" id="name" max="60" required>
|
||||
<label for="accountable">Event Ansvarlig:</label>
|
||||
<input type="text" name="accountable" id="accountable" required>
|
||||
|
|
@ -44,7 +45,7 @@
|
|||
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
|
||||
<input id="fileuploade" type="file" name="resource">
|
||||
|
||||
<input type="submit" class="btn btn-dark text-white" value="Opret">
|
||||
<input id="disable" type="submit" class="btn btn-dark text-white" value="Opret">
|
||||
</form>
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
<script>
|
||||
|
|
@ -76,6 +77,7 @@
|
|||
@endsection
|
||||
@section("scripts")
|
||||
<script>
|
||||
|
||||
$(function() {
|
||||
$('form').areYouSure(
|
||||
{
|
||||
|
|
@ -84,5 +86,55 @@
|
|||
}
|
||||
);
|
||||
});
|
||||
|
||||
$(document).ready(function () {
|
||||
$value = $('#name').val();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('events.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);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('#name').on('keyup', function () {
|
||||
$value = $(this).val();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: '{{route('events.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>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -51,9 +51,9 @@
|
|||
<div class="card">
|
||||
@if($event->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
|
||||
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $event->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $event->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $event->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
</div>
|
||||
@else
|
||||
<div class="header">
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@
|
|||
<div class="card">
|
||||
@if($userevent->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $userevent->resource_id)->first()->filename) }}');">
|
||||
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $userevent->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $userevent->name }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{__('msg.af')}}: {{ $userevent->accountable }}</p>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
|
||||
</div>
|
||||
@else
|
||||
<div class="header">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<div class="card">
|
||||
@if($guide->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
|
||||
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $guide->name}}</h3>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $guide->name}}</h3>
|
||||
</div>
|
||||
@else
|
||||
<div class="header">
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
<div class="card">
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');">
|
||||
<p style="text-shadow: 2px 2px 2px #00078A;"><b>{{ $new->name }}</b></p>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $new->subname }}</h3>
|
||||
<p style="text-shadow: 2px 2px 2px #00788A;"><b>{{ $new->name }}</b></p>
|
||||
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $new->subname }}</h3>
|
||||
</div>
|
||||
@else
|
||||
<div class="header">
|
||||
|
|
|
|||
|
|
@ -5,6 +5,66 @@
|
|||
@endsection
|
||||
|
||||
@section("content")
|
||||
<style>
|
||||
/* The switch - the box around the slider */
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 60px;
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
/* Hide default HTML checkbox */
|
||||
.switch input {
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/* The slider */
|
||||
.slider {
|
||||
position: absolute;
|
||||
cursor: pointer;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #ccc;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
.slider:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
left: 4px;
|
||||
bottom: 4px;
|
||||
background-color: white;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
input:checked + .slider {
|
||||
background-color: #00788A;
|
||||
}
|
||||
|
||||
input:focus + .slider {
|
||||
box-shadow: 0 0 1px #00788A;
|
||||
}
|
||||
|
||||
input:checked + .slider:before {
|
||||
transform: translateX(32px);
|
||||
}
|
||||
|
||||
/* Rounded sliders */
|
||||
.slider.round {
|
||||
border-radius: 34px;
|
||||
}
|
||||
|
||||
.slider.round:before {
|
||||
border-radius: 50%;
|
||||
}
|
||||
</style>
|
||||
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
|
||||
<main style="justify-content: unset">
|
||||
<label for="langu" class="mt-2">Sprog / Languages:</label>
|
||||
|
|
@ -33,6 +93,17 @@
|
|||
<option name="dark" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
|
||||
@endif
|
||||
</select>
|
||||
<label for="dark">E-mail Notifikationer / E-mail Notifications:</label>
|
||||
<div>
|
||||
<label class="switch">
|
||||
@if(\App\User::query()->where('id', '=', auth()->user()->id)->first()->wants_emails == true)
|
||||
<input type="checkbox" checked>
|
||||
@else
|
||||
<input type="checkbox">
|
||||
@endif
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
</main>
|
||||
<script>
|
||||
$(document).ready(function (){
|
||||
|
|
|
|||
|
|
@ -53,6 +53,9 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode")
|
|||
//Convert to PDF
|
||||
Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id");
|
||||
|
||||
//admin Check
|
||||
Route::get("/namecheck", "EventController@nameCheck")->name("events.nameCheck");
|
||||
|
||||
|
||||
Route::resource("contacts", "ContactController");
|
||||
Route::resource("menu-plans", "MenuPlanController");
|
||||
|
|
|
|||
Loading…
Reference in New Issue