updated design

Modules/Helpdesk/Config/config.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 return [
     'route_prefix' => env('HELPDESK_ROUTE_PREFIX', 'admin/helpdesk'),
-    'middleware' => ['web', 'auth', 'thredary.admin'],
+    'middleware' => ['web', 'auth'],
     'disk' => env('HELPDESK_ATTACHMENTS_DISK', 'local'),
     'max_upload_kb' => (int) env('HELPDESK_MAX_UPLOAD_KB', 10240),
     'allowed_extensions' => [

Modules/Helpdesk/Http/Controllers/HelpdeskController.php

@@ -6,7 +6,6 @@ namespace Modules\Helpdesk\Http\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\View\View;
-use Illuminate\Support\HtmlString;
 
 final class HelpdeskController extends Controller
 {
@@ -15,9 +14,6 @@ final class HelpdeskController extends Controller
      */
     public function __invoke(): View
     {
-        return view('layouts.app', [
-            'title' => __('Helpdesk'),
-            'slot' => new HtmlString(view('helpdesk::index')->render()),
-        ]);
+        return view('modules.helpdesk.index');
     }
 }

Modules/Helpdesk/Http/Controllers/TicketCommentDeleteController.php

@@ -21,7 +21,7 @@ final class TicketCommentDeleteController extends Controller
     {
         $user = $request->user();
 
-        abort_unless($user !== null && method_exists($user, 'isAdmin') && $user->isAdmin(), 403);
+        abort_unless($user !== null && $user->isHelpdeskAdmin(), 403);
         abort_unless((int) $comment->ticket_id === (int) $ticket->id, 404);
 
         DB::transaction(function () use ($comment, $ticket, $user): void {

Modules/Helpdesk/Http/Controllers/TicketCommentStoreController.php

@@ -156,7 +156,7 @@ final class TicketCommentStoreController extends Controller
             return false;
         }
 
-        return (method_exists($user, 'isAdmin') && $user->isAdmin()) || (bool) ($user->helpdesk_agent ?? false);
+        return $user->isHelpdeskAgent();
     }
 
     /**

Modules/Helpdesk/Livewire/HelpdeskDashboardWidget.php

@@ -17,9 +17,9 @@ final class HelpdeskDashboardWidget extends Component
         $user = Auth::user();
         $base = Ticket::query();
 
-        if ($user->helpdesk_admin ?? false) {
+        if ($user->isHelpdeskAdmin()) {
             // no filter
-        } elseif ($user->helpdesk_agent ?? false) {
+        } elseif ($user->isHelpdeskAgent()) {
             $base->where(function ($q) use ($user) {
                 $q->where('agent_id', $user->id)
                     ->orWhere('user_id', $user->id);

Modules/Helpdesk/Livewire/TicketShow.php

@@ -691,7 +691,7 @@ final class TicketShow extends Component
     {
         $user = Auth::user();
 
-        return $user !== null && (method_exists($user, 'isAdmin') ? $user->isAdmin() : (bool) ($user->helpdesk_admin ?? false));
+        return $user !== null && $user->isHelpdeskAdmin();
     }
 
     private function buildCommentTree(Collection $grouped, ?int $parentId = null): Collection

Modules/Helpdesk/Models/Ticket.php

@@ -194,11 +194,11 @@ final class Ticket extends Model
     /** @param Builder<Ticket> $query @return Builder<Ticket> */
     public function scopeVisibleTo(Builder $query, User $user): Builder
     {
-        if ($user->isAdmin() || (bool) ($user->helpdesk_admin ?? false)) {
+        if ($user->isHelpdeskAdmin()) {
             return $query;
         }
 
-        if ((bool) ($user->helpdesk_agent ?? false)) {
+        if ($user->isHelpdeskAgent()) {
             return $query->where(static function (Builder $subQuery) use ($user): void {
                 $subQuery->where('agent_id', $user->id)->orWhere('user_id', $user->id);
             });

Modules/Helpdesk/Policies/TicketPolicy.php

@@ -17,7 +17,7 @@ final class TicketPolicy
     public function view(User $user, Ticket $ticket): bool
     {
         return $this->isPrivileged($user)
-            || ((bool) ($user->helpdesk_agent ?? false) && ((int) $ticket->agent_id === (int) $user->id || (int) $ticket->user_id === (int) $user->id))
+            || ($user->isHelpdeskAgent() && ((int) $ticket->agent_id === (int) $user->id || (int) $ticket->user_id === (int) $user->id))
             || (int) $ticket->user_id === (int) $user->id;
     }
 
@@ -29,7 +29,7 @@ final class TicketPolicy
     public function update(User $user, Ticket $ticket): bool
     {
         return $this->isPrivileged($user)
-            || ((bool) ($user->helpdesk_agent ?? false) && (int) $ticket->agent_id === (int) $user->id);
+            || ($user->isHelpdeskAgent() && (int) $ticket->agent_id === (int) $user->id);
     }
 
     public function comment(User $user, Ticket $ticket): bool
@@ -44,14 +44,6 @@ final class TicketPolicy
 
     private function isPrivileged(User $user): bool
     {
-        if ($user->isAdmin() || (bool) ($user->helpdesk_admin ?? false)) {
-            return true;
-        }
-
-        if (method_exists($user, 'isAdmin') && $user->isAdmin()) {
-            return true;
-        }
-
-        return false;
+        return $user->isHelpdeskAdmin();
     }
 }

Modules/Helpdesk/Providers/HelpdeskServiceProvider.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Modules\Helpdesk\Providers;
 
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
@@ -82,8 +83,8 @@ final class HelpdeskServiceProvider extends ServiceProvider
     {
         Gate::policy(Ticket::class, TicketPolicy::class);
 
-        Gate::define('helpdesk-admin', static fn ($user): bool => method_exists($user, 'isAdmin') && $user->isAdmin());
-        Gate::define('helpdesk-agent', static fn ($user): bool => (method_exists($user, 'isAdmin') && $user->isAdmin()) || (bool) ($user->helpdesk_agent ?? false));
+        Gate::define('helpdesk-admin', static fn ($user): bool => $user->isHelpdeskAdmin());
+        Gate::define('helpdesk-agent', static fn ($user): bool => $user->isHelpdeskAgent());
     }
 
     /**
@@ -135,19 +136,14 @@ final class HelpdeskServiceProvider extends ServiceProvider
      */
     protected function registerViews(): void
     {
+        $viewPath = resource_path('views/modules/'.ModuleInfo::nameLower());
         $sourcePath = module_path(ModuleInfo::name(), 'Resources/views');
-        $themeRoot = rtrim((string) config('stylist.themes_path', resource_path('themes')), DIRECTORY_SEPARATOR);
-        $backendTheme = (string) config('stylist.default_backend_theme', 'backend');
-        $viewPath = $themeRoot.DIRECTORY_SEPARATOR.$backendTheme
-            .DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'modules'.DIRECTORY_SEPARATOR.ModuleInfo::nameLower();
 
-        // Module source views remain module-owned. Any application override is
-        // published into the selected backend theme, never resources/views.
         $this->publishes([
             $sourcePath => $viewPath,
         ], ['views', ModuleInfo::nameLower().'-module-views']);
 
-        $this->loadViewsFrom($sourcePath, ModuleInfo::nameLower());
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), ModuleInfo::nameLower());
 
         Blade::componentNamespace('Modules\Helpdesk\View\Components', 'helpdesk');
         Blade::anonymousComponentPath($sourcePath.'/components', 'helpdesk');
@@ -169,6 +165,24 @@ final class HelpdeskServiceProvider extends ServiceProvider
         $this->loadTranslationsFrom(module_path(ModuleInfo::name(), 'Resources/lang'), ModuleInfo::nameLower());
     }
 
+    /**
+     * Get publishable view override paths.
+     *
+     * @return array<int, string>
+     */
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+
+        foreach (Config::get('view.paths') as $path) {
+            if (is_dir($path.'/modules/'.ModuleInfo::nameLower())) {
+                $paths[] = $path.'/modules/'.ModuleInfo::nameLower();
+            }
+        }
+
+        return $paths;
+    }
+
     /**
      * Get provided services.
      *