From c0077a60394c7dd6681e3347207aa1186c1e6d16 Mon Sep 17 00:00:00 2001
From: root <remcojandijkstra@ziggo.nl>
Date: Tue, 26 May 2026 16:59:49 +0200
Subject: [PATCH] Fix session same_site to use env, fix Article model import,
 remove unused traits

---
 .../Atom/Articles/Pages/CreateArticle.php     |  2 +-
 .../Atom/Articles/Pages/ViewArticle.php       |  2 +-
 .../Compositions/HasNotificationUrl.php       | 13 ----
 app/Models/Concerns/HasCommonScopes.php       | 64 -------------------
 config/session.php                            |  2 +-
 5 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100755 app/Models/Compositions/HasNotificationUrl.php
 delete mode 100755 app/Models/Concerns/HasCommonScopes.php

diff --git a/app/Filament/Resources/Atom/Articles/Pages/CreateArticle.php b/app/Filament/Resources/Atom/Articles/Pages/CreateArticle.php
index 68ca0dd..4ef420d 100755
--- a/app/Filament/Resources/Atom/Articles/Pages/CreateArticle.php
+++ b/app/Filament/Resources/Atom/Articles/Pages/CreateArticle.php
@@ -3,7 +3,7 @@
 namespace App\Filament\Resources\Atom\Articles\Pages;
 
 use App\Filament\Resources\Atom\Articles\ArticleResource;
-use App\Models\Article;
+use App\Models\Articles\WebsiteArticle as Article;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateArticle extends CreateRecord
diff --git a/app/Filament/Resources/Atom/Articles/Pages/ViewArticle.php b/app/Filament/Resources/Atom/Articles/Pages/ViewArticle.php
index 873a933..2ca0449 100755
--- a/app/Filament/Resources/Atom/Articles/Pages/ViewArticle.php
+++ b/app/Filament/Resources/Atom/Articles/Pages/ViewArticle.php
@@ -3,7 +3,7 @@
 namespace App\Filament\Resources\Atom\Articles\Pages;
 
 use App\Filament\Resources\Atom\Articles\ArticleResource;
-use App\Models\Article;
+use App\Models\Articles\WebsiteArticle as Article;
 use Filament\Actions\Action;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
diff --git a/app/Models/Compositions/HasNotificationUrl.php b/app/Models/Compositions/HasNotificationUrl.php
deleted file mode 100755
index 9b940b1..0000000
--- a/app/Models/Compositions/HasNotificationUrl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Models\Compositions;
-
-trait HasNotificationUrl
-{
-    public function getNotificationUrl(): string
-    {
-        return route('articles.show', [$this->id, $this->slug]);
-    }
-}
diff --git a/app/Models/Concerns/HasCommonScopes.php b/app/Models/Concerns/HasCommonScopes.php
deleted file mode 100755
index 08bc4cf..0000000
--- a/app/Models/Concerns/HasCommonScopes.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Models\Concerns;
-
-use Illuminate\Database\Eloquent\Builder;
-
-trait HasCommonScopes
-{
-    /**
-     * Scope to get active records.
-     */
-    public function scopeActive(Builder $query): Builder
-    {
-        return $query->where('active', true);
-    }
-
-    /**
-     * Scope to get pending records.
-     */
-    public function scopePending(Builder $query): Builder
-    {
-        return $query->where('status', 'pending');
-    }
-
-    /**
-     * Scope to get ordered records.
-     */
-    public function scopeOrdered(Builder $query, $column = 'order', $direction = 'asc'): Builder
-    {
-        return $query->orderBy($column, $direction);
-    }
-
-    /**
-     * Scope to get latest records.
-     */
-    public function scopeLatest(Builder $query, $column = 'created_at'): Builder
-    {
-        return $query->orderBy($column, 'desc');
-    }
-
-    /**
-     * Scope to get records created today.
-     */
-    public function scopeToday(Builder $query, $column = 'created_at'): Builder
-    {
-        return $query->whereDate($column, today());
-    }
-
-    /**
-     * Scope to get records from the last days.
-     */
-    public function scopeLastDays(Builder $query, $days, $column = 'created_at'): Builder
-    {
-        return $query->where($column, '>=', now()->subDays($days));
-    }
-
-    /**
-     * Default behavior scope (can be overridden).
-     */
-    public function scopeDefaultBehavior(Builder $query): Builder
-    {
-        return $query;
-    }
-}
diff --git a/config/session.php b/config/session.php
index 79e7bfe..cb41ab2 100755
--- a/config/session.php
+++ b/config/session.php
@@ -196,6 +196,6 @@ return [
     |
     */
 
-    'same_site' => 'lax',
+    'same_site' => env('SESSION_SAME_SITE', 'lax'),
 
 ];