refactor: Make dashboard the default view

Also: - Refactor view folder - Remove 'Web/Api' Controller - Move 'User/*' Controller to Web folder
StarCitizenWiki · Dec 29, 2023 · 68332fa · 68332fa
1 parent 67d9d61
commit 68332fa
Show file tree

Hide file tree

Showing 277 changed files with 1,464 additions and 2,194 deletions.
diff --git a/...rs/Web/User/Account/AccountController.php → ...rollers/Web/Account/AccountController.php b/...rs/Web/User/Account/AccountController.php → ...rollers/Web/Account/AccountController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Account;
+namespace App\Http\Controllers\Web\Account;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -34,10 +34,10 @@ public function __construct()
      */
     public function index()
     {
-        $this->authorize('web.user.account.view');
+        $this->authorize('web.account.view');
 
         return view(
-            'user.account.index',
+            'web.account.index',
             [
                 'user' => Auth::user(),
             ]
@@ -53,7 +53,7 @@ public function index()
      */
     public function update(Request $request)
     {
-        $this->authorize('web.user.account.update');
+        $this->authorize('web.account.update');
 
         Validator::validate($request->all(), [
            'language' => 'required|in:en,de'
@@ -70,7 +70,7 @@ public function update(Request $request)
             ]
         );
 
-        return redirect()->route('web.user.account.index')->withMessages(
+        return redirect()->route('web.account.index')->withMessages(
             [
                 'success' => [
                     __('crud.updated', ['type' => __('Einstellungen')]),

diff --git a/app/Http/Controllers/Web/Api/CommLinkController.php b/app/Http/Controllers/Web/Api/CommLinkController.php
diff --git a/app/Http/Controllers/Web/Api/ItemController.php b/app/Http/Controllers/Web/Api/ItemController.php
diff --git a/app/Http/Controllers/Web/Api/PageController.php b/app/Http/Controllers/Web/Api/PageController.php
diff --git a/...rollers/Web/User/Auth/LoginController.php → .../Controllers/Web/Auth/LoginController.php b/...rollers/Web/User/Auth/LoginController.php → .../Controllers/Web/Auth/LoginController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Auth;
+namespace App\Http\Controllers\Web\Auth;
 
 use App\Contracts\Web\User\AuthRepositoryInterface;
 use App\Http\Controllers\Controller;
@@ -82,7 +82,7 @@ public function username()
      */
     public function showLoginForm()
     {
-        return view('user.auth.login');
+        return view('web.auth.login');
     }
 
     /**
@@ -144,6 +144,6 @@ public function getRedirectTo(): string
      */
     protected function loggedOut(Request $request): RedirectResponse
     {
-        return redirect()->route('web.user.auth.login');
+        return redirect()->route('web.auth.login');
     }
 }
diff --git a/...eb/User/Changelog/ChangelogController.php → ...ers/Web/Changelog/ChangelogController.php b/...eb/User/Changelog/ChangelogController.php → ...ers/Web/Changelog/ChangelogController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Changelog;
+namespace App\Http\Controllers\Web\Changelog;
 
 use App\Http\Controllers\Controller;
 use App\Models\System\ModelChangelog;
@@ -34,7 +34,7 @@ public function __construct()
      */
     public function index(Request $request)
     {
-        $this->authorize('web.user.changelogs.view');
+        $this->authorize('web.changelogs.view');
 
         $query = ModelChangelog::query()
             #->where('changelog_type', '!=', ShopItem::class)
@@ -56,7 +56,7 @@ public function index(Request $request)
         }
 
         return view(
-            'user.changelog.index',
+            'web.changelog.index',
             [
                 'changelogs' => $query->paginate($request->get('limit', 25)),
                 'models' => ModelChangelog::query()->select('changelog_type')->distinct()->get(),

diff --git a/...trollers/Web/User/DashboardController.php → ...p/Controllers/Web/DashboardController.php b/...trollers/Web/User/DashboardController.php → ...p/Controllers/Web/DashboardController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User;
+namespace App\Http\Controllers\Web;
 
 use App\Http\Controllers\Controller;
 use App\Models\Account\User\User;
@@ -41,7 +41,7 @@ public function __construct()
     public function index(): View
     {
         $data = [];
-        if (Auth::user() !== null && Auth::user()->can('web.user.dashboard.view')) {
+        if (Auth::user() !== null && Auth::user()->can('web.dashboard.view')) {
             $data = [
                 'users' => $this->getUserStats(),
                 'deepl' => $this->getDeeplStats(),
@@ -50,7 +50,7 @@ public function index(): View
         }
 
         return view(
-            'user.dashboard',
+            'web.dashboard',
             $data
         );
     }

diff --git a/...ontrollers/Web/User/Job/JobController.php → ...ttp/Controllers/Web/Job/JobController.php b/...ontrollers/Web/User/Job/JobController.php → ...ttp/Controllers/Web/Job/JobController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Job;
+namespace App\Http\Controllers\Web\Job;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -30,9 +30,9 @@ public function __construct()
      */
     public function viewFailed(): View
     {
-        $this->authorize('web.user.jobs.view_failed');
+        $this->authorize('web.jobs.view_failed');
 
-        return view('user.jobs.failed_index')
+        return view('web.jobs.failed_index')
             ->with(
                 [
                     'failed' => DB::table('failed_jobs')
@@ -59,11 +59,11 @@ public function viewFailed(): View
      */
     public function truncate(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.truncate');
+        $this->authorize('web.jobs.truncate');
 
         DB::table('failed_jobs')->truncate();
 
-        return redirect()->route('web.user.dashboard')->withMessages(
+        return redirect()->route('web.dashboard')->withMessages(
             [
                 'success' => [
                     __('Jobs gelöscht'),

diff --git a/...b/User/Job/Rsi/CommLink/JobController.php → ...rs/Web/Job/Rsi/CommLink/JobController.php b/...b/User/Job/Rsi/CommLink/JobController.php → ...rs/Web/Job/Rsi/CommLink/JobController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Job\Rsi\CommLink;
+namespace App\Http\Controllers\Web\Job\Rsi\CommLink;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -15,7 +15,7 @@
  */
 class JobController extends Controller
 {
-    private const DASHBOARD_ROUTE = 'web.user.dashboard';
+    private const DASHBOARD_ROUTE = 'web.dashboard';
 
     /**
      * JobController constructor.
@@ -33,7 +33,7 @@ public function __construct()
      */
     public function startCommLinkTranslationJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.start_translation');
+        $this->authorize('web.jobs.start_translation');
 
         Artisan::call('comm-links:translate', ['modifiedTime' => -1]);
 
@@ -53,7 +53,7 @@ public function startCommLinkTranslationJob(): RedirectResponse
      */
     public function startCommLinkImageDownloadJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.start_image_download');
+        $this->authorize('web.jobs.start_image_download');
 
         Artisan::call('comm-links:download-images');
 
@@ -75,7 +75,7 @@ public function startCommLinkImageDownloadJob(): RedirectResponse
      */
     public function startCommLinkDownloadJob(Request $request): RedirectResponse
     {
-        $this->authorize('web.user.jobs.start_download');
+        $this->authorize('web.jobs.start_download');
 
         $data = $request->validate(
             [

diff --git a/...rollers/Web/User/Job/SC/JobController.php → .../Controllers/Web/Job/SC/JobController.php b/...rollers/Web/User/Job/SC/JobController.php → .../Controllers/Web/Job/SC/JobController.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Web\User\Job\SC;
+namespace App\Http\Controllers\Web\Job\SC;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Access\AuthorizationException;
@@ -11,7 +11,7 @@
 
 class JobController extends Controller
 {
-    private const DASHBOARD_ROUTE = 'web.user.dashboard';
+    private const DASHBOARD_ROUTE = 'web.dashboard';
 
     /**
      * JobController constructor.
@@ -29,7 +29,7 @@ public function __construct()
      */
     public function startItemImportJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.sc-import');
+        $this->authorize('web.jobs.sc-import');
 
         Artisan::call('sc:import-items');
 
@@ -49,7 +49,7 @@ public function startItemImportJob(): RedirectResponse
      */
     public function startVehicleImportJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.sc-import');
+        $this->authorize('web.jobs.sc-import');
 
         Artisan::call('sc:import-vehicles');
 
@@ -69,7 +69,7 @@ public function startVehicleImportJob(): RedirectResponse
      */
     public function startShopImportJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.sc-import');
+        $this->authorize('web.jobs.sc-import');
 
         Artisan::call('sc:import-shops');
 
@@ -89,7 +89,7 @@ public function startShopImportJob(): RedirectResponse
      */
     public function startImageUploadJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.sc-import');
+        $this->authorize('web.jobs.sc-import');
 
         Artisan::call('sc:upload-images');
 
@@ -109,7 +109,7 @@ public function startImageUploadJob(): RedirectResponse
      */
     public function startTranslateJob(): RedirectResponse
     {
-        $this->authorize('web.user.jobs.sc-import');
+        $this->authorize('web.jobs.sc-import');
 
         Artisan::call('sc:translate');