diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 38112ce..73902b3 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -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"; + } + } + } diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 779f707..fcb8e7f 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -23,10 +23,11 @@ } -

Opret Aktivitet:

+

Opret Aktivitet:

@csrf + @@ -44,7 +45,7 @@ - +
@endsection diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index c41177e..0aa22a0 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -51,9 +51,9 @@
@if($event->resource_id !== null)
-

{{ $event->name }}

-

{{__('msg.af')}}: {{ $event->accountable }}

-

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

+

{{ $event->name }}

+

{{__('msg.af')}}: {{ $event->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

@else
diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index d2f86d3..7f4128f 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -43,9 +43,9 @@
@if($userevent->resource_id !== null)
-

{{ $userevent->name }}

-

{{__('msg.af')}}: {{ $userevent->accountable }}

-

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

+

{{ $userevent->name }}

+

{{__('msg.af')}}: {{ $userevent->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}

@else
diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index 1bd1187..02e7194 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -39,7 +39,7 @@
@if($guide->resource_id !== null)
-

{{ $guide->name}}

+

{{ $guide->name}}

@else
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 1a5ef87..19e11d5 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -32,8 +32,8 @@
@if($new->resource_id !== null)
-

{{ $new->name }}

-

{{ $new->subname }}

+

{{ $new->name }}

+

{{ $new->subname }}

@else
diff --git a/skolehjem/resources/views/app/settings/index.blade.php b/skolehjem/resources/views/app/settings/index.blade.php index 1490717..3126a0f 100644 --- a/skolehjem/resources/views/app/settings/index.blade.php +++ b/skolehjem/resources/views/app/settings/index.blade.php @@ -5,6 +5,66 @@ @endsection @section("content") +
@@ -33,6 +93,17 @@ @endif + +
+ +