diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 2d4dc8bff7..6f4fc059f2 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -59,6 +59,6 @@ class HomeController extends Controller $email = $pref->data; } - return view('admin.index', compact('title', 'mainTitleIcon', 'email')); + return view('settings.index', compact('title', 'mainTitleIcon', 'email')); } } diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index d14aede448..88d87ac3a1 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -78,7 +78,7 @@ class LinkController extends Controller $this->rememberPreviousUrl('link-types.create.url'); } - return view('admin.link.create', compact('subTitle', 'subTitleIcon')); + return view('settings.link.create', compact('subTitle', 'subTitleIcon')); } /** @@ -111,7 +111,7 @@ class LinkController extends Controller // put previous url in session $this->rememberPreviousUrl('link-types.delete.url'); - return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count')); + return view('settings.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count')); } /** @@ -155,7 +155,7 @@ class LinkController extends Controller } $request->session()->forget('link-types.edit.fromUpdate'); - return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType')); + return view('settings.link.edit', compact('subTitle', 'subTitleIcon', 'linkType')); } /** @@ -176,7 +176,7 @@ class LinkController extends Controller } ); - return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes')); + return view('settings.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes')); } /** @@ -192,7 +192,7 @@ class LinkController extends Controller Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id)); - return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links')); + return view('settings.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links')); } /** @@ -253,7 +253,7 @@ class LinkController extends Controller // set value so edit routine will not overwrite URL: $request->session()->put('link-types.edit.fromUpdate', true); - $redirect = redirect(route('admin.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]); + $redirect = redirect(route('settings.links.edit', [$linkType->id]))->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php index 1fc2c9256d..aafcb69f69 100644 --- a/app/Http/Controllers/Admin/NotificationController.php +++ b/app/Http/Controllers/Admin/NotificationController.php @@ -71,7 +71,7 @@ class NotificationController extends Controller $forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken; return view( - 'admin.notifications.index', + 'settings.notifications.index', compact( 'title', 'subTitle', diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 4a165a896f..ab35af1662 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -81,7 +81,7 @@ class UpdateController extends Controller 'alpha' => (string) trans('firefly.update_channel_alpha'), ]; - return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions')); + return view('settings.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions')); } /** diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 52b8b5edd4..07abf76b4d 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -144,7 +144,7 @@ class UserController extends Controller 'email_changed' => (string) trans('firefly.block_code_email_changed'), ]; - return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin')); + return view('settings.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin')); } /** @@ -174,7 +174,7 @@ class UserController extends Controller } ); - return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers')); + return view('settings.users.index', compact('subTitle', 'subTitleIcon', 'users', 'allowInvites', 'invitedUsers')); } public function invite(InviteUserFormRequest $request): RedirectResponse @@ -203,7 +203,7 @@ class UserController extends Controller $information = $this->repository->getUserData($user); return view( - 'admin.users.show', + 'settings.users.show', compact( 'title', 'mainTitleIcon', diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index ee9184b31b..4215b9ceed 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -235,7 +235,7 @@ {% if hasRole('owner') %}