Move application views into correct folder

app/Http/Controllers/App/BookmarkletController.php

@@ -42,7 +42,7 @@ class BookmarkletController extends Controller
 
         session(['bookmarklet.create' => true]);
 
-        return view('actions.bookmarklet.create', [
+        return view('app.bookmarklet.create', [
             'bookmark_url' => $newUrl,
             'bookmark_title' => $newTitle,
             'bookmark_description' => $newDescription,
@@ -56,7 +56,7 @@ class BookmarkletController extends Controller
      */
     public function getCompleteView(): View
     {
-        return view('actions.bookmarklet.complete');
+        return view('app.bookmarklet.complete');
     }
 
     /**
@@ -66,6 +66,6 @@ class BookmarkletController extends Controller
      */
     public function getLoginForm(): View
     {
-        return view('actions.bookmarklet.login');
+        return view('app.bookmarklet.login');
     }
 }

app/Http/Controllers/App/ExportController.php

@@ -22,7 +22,7 @@ class ExportController extends Controller
      */
     public function getExport(): View
     {
-        return view('actions.export.export');
+        return view('app.export.export');
     }
 
     /**
@@ -39,7 +39,7 @@ class ExportController extends Controller
     {
         $links = Link::orderBy('title', 'asc')->with('tags')->get();
 
-        $fileContent = view()->make('actions.export.html-export', ['links' => $links])->render();
+        $fileContent = view()->make('app.export.html-export', ['links' => $links])->render();
         $fileName = config('app.name') . '_export.html';
 
         return response()->streamDownload(function () use ($fileContent) {

app/Http/Controllers/App/FeedController.php

@@ -21,7 +21,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -37,7 +37,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.lists', [
+        return new Response(view('app.feed.lists', [
             'meta' => $meta,
             'lists' => $lists,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -53,7 +53,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -69,7 +69,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.tags', [
+        return new Response(view('app.feed.tags', [
             'meta' => $meta,
             'tags' => $tags,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -85,7 +85,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);

app/Http/Controllers/App/ImportController.php

@@ -18,7 +18,7 @@ class ImportController extends Controller
      */
     public function getImport(): View
     {
-        return view('actions.import.import');
+        return view('app.import.import');
     }
 
     /**

app/Http/Controllers/App/SearchController.php

@@ -18,7 +18,7 @@ class SearchController extends Controller
      */
     public function getSearch(): View
     {
-        return view('actions.search.search')
+        return view('app.search.search')
             ->with('results', collect([]))
             ->with('order_by_options', $this->orderByOptions)
             ->with('query_settings', [
@@ -46,7 +46,7 @@ class SearchController extends Controller
         $search = $this->buildDatabaseQuery($request);
         $results = $search->paginate(getPaginationLimit());
 
-        return view('actions.search.search')
+        return view('app.search.search')
             ->with('results', $results)
             ->with('order_by_options', $this->orderByOptions)
             ->with('query_settings', [

app/Http/Controllers/App/SystemSettingsController.php

@@ -22,7 +22,7 @@ class SystemSettingsController extends Controller
      */
     public function getSystemSettings(): View
     {
-        return view('actions.settings.system', [
+        return view('app.settings.system', [
             'linkaceVersion' => UpdateHelper::currentVersion(),
         ]);
     }

app/Http/Controllers/App/TrashController.php

@@ -38,7 +38,7 @@ class TrashController extends Controller
             ->byUser(auth()->id())
             ->get();
 
-        return view('actions.trash.index', [
+        return view('app.trash.index', [
             'links' => $links,
             'lists' => $lists,
             'tags' => $tags,

app/Http/Controllers/App/UserSettingsController.php

@@ -27,7 +27,7 @@ class UserSettingsController extends Controller
     {
         $bookmarkletCode = LinkAce::generateBookmarkletCode();
 
-        return view('actions.settings.user', [
+        return view('app.settings.user', [
             'user' => auth()->user(),
             'bookmarklet_code' => $bookmarkletCode,
         ]);

app/Http/Controllers/Guest/FeedController.php

@@ -21,7 +21,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -37,7 +37,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.lists', [
+        return new Response(view('app.feed.lists', [
             'meta' => $meta,
             'lists' => $lists,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -54,7 +54,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -70,7 +70,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.tags', [
+        return new Response(view('app.feed.tags', [
             'meta' => $meta,
             'tags' => $tags,
         ]), 200, ['Content-Type' => 'application/xml']);
@@ -87,7 +87,7 @@ class FeedController extends Controller
             'id' => $request->fullUrl(),
         ];
 
-        return new Response(view('actions.feed.links', [
+        return new Response(view('app.feed.links', [
             'meta' => $meta,
             'links' => $links,
         ]), 200, ['Content-Type' => 'application/xml']);

resources/views/actions/settings/system.blade.php

@@ -1,13 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-    @include('actions.settings.partials.system.updates')
-
-    @include('actions.settings.partials.system.cron')
-
-    @include('actions.settings.partials.system.general-settings')
-
-    @include('actions.settings.partials.system.guest-settings')
-
-@endsection

resources/views/actions/settings/user.blade.php

@@ -1,17 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-    @include('actions.settings.partials.user.bookmarklet')
-
-    @include('actions.settings.partials.user.api')
-
-    @include('actions.settings.partials.user.account-settings')
-
-    @include('actions.settings.partials.user.change-pw')
-
-    @include('actions.settings.partials.user.two-factor')
-
-    @include('actions.settings.partials.user.app-settings')
-
-@endsection

resources/views/app/search/search.blade.php

@@ -138,7 +138,7 @@
                     @lang('search.no_results')
                 </div>
             @else
-                @include('actions.search.partials.table', ['results' => $results])
+                @include('app.search.partials.table', ['results' => $results])
             @endif
 
         </div>

resources/views/app/settings/partials/system/guest-settings.blade.php

@@ -97,9 +97,9 @@
                 <div class="col-12 col-sm-8 col-md-6"></div>
             </div>
 
-            @include('actions.settings.partials.system.guest.dark-mode')
+            @include('app.settings.partials.system.guest.dark-mode')
 
-            @include('actions.settings.partials.system.guest.sharing')
+            @include('app.settings.partials.system.guest.sharing')
 
             <button type="submit" class="btn btn-primary">
                 <x-icon.save class="mr-2"/> @lang('settings.save_settings')

resources/views/app/settings/partials/user/app-settings.blade.php

@@ -215,13 +215,13 @@
                 </div>
             </div>
 
-            @include('actions.settings.partials.user.app-settings.archive-backups')
+            @include('app.settings.partials.user.app-settings.archive-backups')
 
-            @include('actions.settings.partials.user.app-settings.privacy')
+            @include('app.settings.partials.user.app-settings.privacy')
 
-            @include('actions.settings.partials.user.app-settings.dark-mode')
+            @include('app.settings.partials.user.app-settings.dark-mode')
 
-            @include('actions.settings.partials.user.app-settings.sharing')
+            @include('app.settings.partials.user.app-settings.sharing')
 
             <button type="submit" class="btn btn-primary">
                 <x-icon.save class="mr-2"/> @lang('settings.save_settings')

resources/views/app/settings/system.blade.php

@@ -0,0 +1,13 @@
+@extends('layouts.app')
+
+@section('content')
+
+    @include('app.settings.partials.system.updates')
+
+    @include('app.settings.partials.system.cron')
+
+    @include('app.settings.partials.system.general-settings')
+
+    @include('app.settings.partials.system.guest-settings')
+
+@endsection

resources/views/app/settings/user.blade.php

@@ -0,0 +1,17 @@
+@extends('layouts.app')
+
+@section('content')
+
+    @include('app.settings.partials.user.bookmarklet')
+
+    @include('app.settings.partials.user.api')
+
+    @include('app.settings.partials.user.account-settings')
+
+    @include('app.settings.partials.user.change-pw')
+
+    @include('app.settings.partials.user.two-factor')
+
+    @include('app.settings.partials.user.app-settings')
+
+@endsection

resources/views/app/trash/index.blade.php

@@ -25,7 +25,7 @@
         </div>
         <div class="card-body">
 
-            @includeWhen($links->isNotempty(), 'actions.trash.partials.link-table', ['links' => $links])
+            @includeWhen($links->isNotempty(), 'app.trash.partials.link-table', ['links' => $links])
             @if($links->isEmpty())
                 <small class="text-muted">@lang('trash.delete_no_entries')</small>
             @endif
@@ -50,7 +50,7 @@
         </div>
         <div class="card-body">
 
-            @includeWhen($lists->isNotEmpty(), 'actions.trash.partials.list-table', ['lists' => $lists])
+            @includeWhen($lists->isNotEmpty(), 'app.trash.partials.list-table', ['lists' => $lists])
             @if($lists->isEmpty())
                 <small class="text-muted">@lang('trash.delete_no_entries')</small>
             @endif
@@ -75,7 +75,7 @@
         </div>
         <div class="card-body">
 
-            @includeWhen($tags->isNotEmpty(), 'actions.trash.partials.tag-table', ['tags' => $tags])
+            @includeWhen($tags->isNotEmpty(), 'app.trash.partials.tag-table', ['tags' => $tags])
             @if($tags->isEmpty())
                 <small class="text-muted">@lang('trash.delete_no_entries')</small>
             @endif
@@ -100,7 +100,7 @@
         </div>
         <div class="card-body">
 
-            @includeWhen($notes->isNotEmpty(), 'actions.trash.partials.note-table', ['notes' => $notes])
+            @includeWhen($notes->isNotEmpty(), 'app.trash.partials.note-table', ['notes' => $notes])
 
             @if($notes->isEmpty())
                 <small class="text-muted">@lang('trash.delete_no_entries')</small>