diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 59555ed..9d1d3a4 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -163,7 +163,6 @@ class EventController extends Controller */ public function update(Request $request, $id) { - $data = $request->all(); $event = Event::find($id); diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index d377336..88c2744 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -4,10 +4,12 @@ namespace App\Http\Controllers; use App\Event; use App\Guide; +use App\MultipleEvents; use App\MultipleEventsParent; use App\News; use App\Resource; use App\User; +use App\WashingReservation; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\File; @@ -45,6 +47,28 @@ class RootController extends Controller } else File::makeDirectory(public_path('uploads'), 0777, true, true); + // Delete events, reservations, news and multiple events (not parent) - If they have been in the DB too long + $deleteevents = Event::where('date', '<', date("Y-m-d H:i:s", strtotime("-1 month")))->get(); + $deletereservations = WashingReservation::where('time', '<', date("Y-m-d H:i:s", strtotime("-1 hour")))->get(); + $deletenews = News::where('news_expiration_date', '<', date("Y-m-d H:i:s"))->get(); + $deletemultievent = MultipleEvents::where('date', '<', strtotime("-1 month"))->get(); + + foreach ($deleteevents as $event) { + $event->delete(); + } + + foreach ($deletereservations as $reservation) { + $reservation->delete(); + } + + foreach ($deletenews as $new) { + $new->delete(); + } + + foreach ($deletemultievent as $multievent) { + $multievent->delete(); + } + //All news $newsCollection = News::query()->orderBy('id', 'desc')->get(); diff --git a/skolehjem/app/Notifications/PushNews.php b/skolehjem/app/Notifications/PushNews.php index de4d6d6..b769822 100644 --- a/skolehjem/app/Notifications/PushNews.php +++ b/skolehjem/app/Notifications/PushNews.php @@ -32,10 +32,11 @@ class PushNews extends Notification { return (new WebPushMessage) ->title('Ny Nyhed') - ->icon('/images/icons/appIcon.png') + ->icon('/images/icons/appIcon.svg') + ->vibrate([100, 200, 100, 200, 300]) ->body('Der er en ny nyhed i ekapp\'en') ->badge('/images/icons/appIcon.png') - ->action('Se nyheder', route('root.index')); + ->action('Klik her for at se nyheder', route('root.index')); } /** diff --git a/skolehjem/resources/views/admin/contacts/create.blade.php b/skolehjem/resources/views/admin/contacts/create.blade.php index 4fd6a24..74e4c2e 100644 --- a/skolehjem/resources/views/admin/contacts/create.blade.php +++ b/skolehjem/resources/views/admin/contacts/create.blade.php @@ -21,15 +21,15 @@
@csrf - + - + - + - + - +
diff --git a/skolehjem/resources/views/admin/contacts/edit.blade.php b/skolehjem/resources/views/admin/contacts/edit.blade.php index 36460c0..2306906 100644 --- a/skolehjem/resources/views/admin/contacts/edit.blade.php +++ b/skolehjem/resources/views/admin/contacts/edit.blade.php @@ -22,15 +22,15 @@ @csrf @method("put") - + - + - + - + - + diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 54e2138..c36c2f8 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -28,15 +28,15 @@ @csrf - + - + For at kunne indsætte et link, skal du markere teksten du vil lave op til et link først. -
- +
{!! old('description') !!}
+ - +