v1.4.4 Made news expiration date, add category to app homepages, made small css things

skolehjem/app/Http/Controllers/GuideController.php

@@ -80,6 +80,7 @@ class GuideController extends Controller
                 $news->subname = $guide->name;
                 $news->arrangement_id = $guide->id;
                 $news->type_id = '4';
+                $news->news_expiration_date = $request->input("news_expiration_date");
 
                 $news->content = $guide->guide_articles;
 

skolehjem/app/Http/Controllers/NewsController.php

@@ -11,6 +11,8 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
+date_default_timezone_set('Europe/Copenhagen');
+
 class NewsController extends Controller
 {
     public function __construct()
@@ -31,6 +33,11 @@ class NewsController extends Controller
      */
     public function index(Request $request)
     {
+        $news = News::query()->where('news_expiration_date', '<=', date('Y-m-d').'T'.date('H:i') )->get();
+        foreach ($news as $new) {
+            $new->delete();
+        }
+
         $news = News::query()->orderBy('id', 'desc')->get();
 
         return Response::detect("news.index", [ "news" => $news ]);
@@ -56,7 +63,8 @@ class NewsController extends Controller
     {
         $data = $request->validate([
             "subname" => "required",
-            "content" => "required"
+            "content" => "required",
+            "news_expiration_date" => ""
         ]);
 
         $news = new News($data);
@@ -116,7 +124,8 @@ class NewsController extends Controller
     {
         $data = $request->validate([
             "subname" => "required",
-            "content" => "required"
+            "content" => "required",
+            "news_expiration_date" => ""
         ]);
 
         $news->update($data);

skolehjem/app/Http/Controllers/RootController.php

@@ -7,6 +7,8 @@ use App\News;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
+date_default_timezone_set('Europe/Copenhagen');
+
 class RootController extends Controller
 {
     function __construct()
@@ -18,6 +20,13 @@ class RootController extends Controller
     public function index() {
         $perPage = 5;
 
+        //Delete news Articels
+        $news = News::query()->where('news_expiration_date', '<=', date('Y-m-d').'T'.date('H:i'))->get();
+        foreach ($news as $new) {
+            $new->delete();
+        }
+
+
         //All news
         $newsCollection = News::query()->orderBy('id', 'desc')->get();
 
@@ -34,12 +43,12 @@ class RootController extends Controller
             if(Response::detect("root.index")->name() == "admin.root.index")
                 return view("admin.root.index");
             else {
-                $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
+                $news = News::query()->select(['news_types.type', 'news.subname', 'news.id', 'news.resource_id', 'news.created_at', 'news.arrangement_id', 'news.content' ])->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
                 return view("app.root.index", ["news" => $news]);
             }
         }
         else {
-            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
+            $news = News::query()->select(['news_types.type', 'news.subname', 'news.id', 'news.resource_id', 'news.created_at' ])->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('news.id', 'desc')->get();
 
             return Response::detect('root.index', ["news" => $news]);
         }

skolehjem/app/News.php

@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class News extends Model
 {
     protected $fillable = [
-        'name', 'subname', 'content', 'resource_id', 'arrangement_id', 'type'
+        'name', 'subname', 'news_expiration_date', 'content', 'resource_id', 'arrangement_id', 'type'
     ];
 }