Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Notifications/PushNews.php

skolehjem/app/Http/Controllers/EventController.php

@@ -162,7 +162,6 @@ class EventController extends Controller
      */
     public function update(Request $request, $id)
     {
-
         $data = $request->all();
 
         $event = Event::find($id);

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();
 

skolehjem/app/Notifications/PushNews.php

@@ -33,9 +33,9 @@ class PushNews extends Notification
         return (new WebPushMessage)
             ->title('Ny Nyhed')
             ->icon('/images/icons/appIcon.svg')
-            ->body('Der er kommet en ny nyhed i ekapp\'en')
-	        ->badge('/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('Klik her for at se nyheder', route('root.index'));
     }