mirror of
https://github.com/Kovah/LinkAce.git
synced 2025-03-20 06:39:38 +01:00
Large code cleanup and formatting of controllers
This commit is contained in:
parent
8c9c0062d2
commit
121cf4bd57
app
Http
Controllers
API
LinkCheckController.phpLinkController.phpLinkNotesController.phpListController.phpListLinksController.phpNoteController.phpTagController.phpTagLinksController.phpTrashController.php
Admin
App
DashboardController.phpExportController.phpImportController.phpSearchController.phpTrashController.phpUserSettingsController.php
FetchController.phpGuest
Models
RegistrationController.phpSetup
Requests/Models
Models
@ -9,12 +9,6 @@ use Illuminate\Http\Request;
|
||||
|
||||
class LinkCheckController extends Controller
|
||||
{
|
||||
/**
|
||||
* Search for a link based on a given url.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function __invoke(Request $request): JsonResponse
|
||||
{
|
||||
$searchedUrl = $request->input('url', false);
|
||||
|
@ -10,7 +10,6 @@ use App\Models\Link;
|
||||
use App\Repositories\LinkRepository;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class LinkController extends Controller
|
||||
{
|
||||
@ -22,12 +21,6 @@ class LinkController extends Controller
|
||||
$this->authorizeResource(Link::class, 'link');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
$this->orderBy = $request->input('order_by', 'created_at');
|
||||
@ -43,12 +36,6 @@ class LinkController extends Controller
|
||||
return response()->json($links);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param LinkStoreRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(LinkStoreRequest $request): JsonResponse
|
||||
{
|
||||
$link = LinkRepository::create($request->all());
|
||||
@ -56,12 +43,6 @@ class LinkController extends Controller
|
||||
return response()->json($link);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function show(Link $link): JsonResponse
|
||||
{
|
||||
$link->load(['lists', 'tags']);
|
||||
@ -69,13 +50,6 @@ class LinkController extends Controller
|
||||
return response()->json($link);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param LinkUpdateRequest $request
|
||||
* @param Link $link
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(LinkUpdateRequest $request, Link $link): JsonResponse
|
||||
{
|
||||
$updatedLink = LinkRepository::update($link, $request->all());
|
||||
@ -83,20 +57,14 @@ class LinkController extends Controller
|
||||
return response()->json($updatedLink);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(Link $link): JsonResponse
|
||||
{
|
||||
$deletionSuccessful = LinkRepository::delete($link);
|
||||
|
||||
if ($deletionSuccessful) {
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
return response()->json(null, Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
return response()->json(status: 500);
|
||||
}
|
||||
}
|
||||
|
@ -9,16 +9,10 @@ use Illuminate\Http\Request;
|
||||
|
||||
class LinkNotesController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get the notes for a specific link.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function __invoke(Request $request, Link $link): JsonResponse
|
||||
{
|
||||
if ($request->user()->cannot('view', $link)) {
|
||||
return response()->json([], 403);
|
||||
return response()->json(status: 403);
|
||||
}
|
||||
|
||||
$notes = $link->notes()->visibleForUser()->paginate(getPaginationLimit());
|
||||
|
@ -10,7 +10,6 @@ use App\Models\LinkList;
|
||||
use App\Repositories\ListRepository;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class ListController extends Controller
|
||||
{
|
||||
@ -22,12 +21,6 @@ class ListController extends Controller
|
||||
$this->authorizeResource(LinkList::class, 'list');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
$this->orderBy = $request->input('order_by', 'created_at');
|
||||
@ -43,12 +36,6 @@ class ListController extends Controller
|
||||
return response()->json($lists);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param ListStoreRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(ListStoreRequest $request): JsonResponse
|
||||
{
|
||||
$link = ListRepository::create($request->all());
|
||||
@ -56,26 +43,14 @@ class ListController extends Controller
|
||||
return response()->json($link);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param LinkList $list
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function show(LinkList $list): JsonResponse
|
||||
{
|
||||
// Instead of displaying all links for that list, show the URL to directly fetch all links for that list
|
||||
$list->setAttribute('links', route('api.lists.links', ['list' => $list], true));
|
||||
|
||||
return response()->json($list);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param ListUpdateRequest $request
|
||||
* @param LinkList $list
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(ListUpdateRequest $request, LinkList $list): JsonResponse
|
||||
{
|
||||
$updatedList = ListRepository::update($list, $request->all());
|
||||
@ -83,20 +58,14 @@ class ListController extends Controller
|
||||
return response()->json($updatedList);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param LinkList $list
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(LinkList $list): JsonResponse
|
||||
{
|
||||
$deletionSuccessful = ListRepository::delete($list);
|
||||
|
||||
if ($deletionSuccessful) {
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
return response()->json(null, Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
return response()->json(status: 500);
|
||||
}
|
||||
}
|
||||
|
@ -9,16 +9,10 @@ use Illuminate\Http\Request;
|
||||
|
||||
class ListLinksController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get the links for a specific list.
|
||||
*
|
||||
* @param LinkList $list
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function __invoke(Request $request, LinkList $list): JsonResponse
|
||||
{
|
||||
if ($request->user()->cannot('view', $list)) {
|
||||
return response()->json([], 403);
|
||||
return response()->json(status: 403);
|
||||
}
|
||||
|
||||
$links = $list->links()->paginate(getPaginationLimit());
|
||||
|
@ -17,12 +17,6 @@ class NoteController extends Controller
|
||||
$this->authorizeResource(Note::class, 'note');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param NoteStoreRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(NoteStoreRequest $request): JsonResponse
|
||||
{
|
||||
$note = NoteRepository::create($request->all());
|
||||
@ -30,13 +24,6 @@ class NoteController extends Controller
|
||||
return response()->json($note);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param NoteUpdateRequest $request
|
||||
* @param Note $note
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(NoteUpdateRequest $request, Note $note): JsonResponse
|
||||
{
|
||||
$updatedNote = NoteRepository::update($note, $request->validated());
|
||||
@ -44,20 +31,14 @@ class NoteController extends Controller
|
||||
return response()->json($updatedNote);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Note $note
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(Note $note): JsonResponse
|
||||
{
|
||||
$deletionSuccessful = NoteRepository::delete($note);
|
||||
|
||||
if ($deletionSuccessful) {
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
return response()->json(null, Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
return response()->json(status: Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
|
@ -10,31 +10,17 @@ use App\Models\Tag;
|
||||
use App\Repositories\TagRepository;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class TagController extends Controller
|
||||
{
|
||||
use ChecksOrdering;
|
||||
|
||||
protected array $allowedOrders = [
|
||||
'id',
|
||||
'name',
|
||||
'visibility',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
];
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->allowedOrderBy = Tag::$allowOrderBy;
|
||||
$this->authorizeResource(Tag::class, 'tag');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function index(Request $request): JsonResponse
|
||||
{
|
||||
$this->orderBy = $request->input('order_by', 'created_at');
|
||||
@ -50,12 +36,6 @@ class TagController extends Controller
|
||||
return response()->json($tags);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param TagStoreRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function store(TagStoreRequest $request): JsonResponse
|
||||
{
|
||||
$tag = TagRepository::create($request->all());
|
||||
@ -63,24 +43,11 @@ class TagController extends Controller
|
||||
return response()->json($tag);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function show(Tag $tag): JsonResponse
|
||||
{
|
||||
return response()->json($tag);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param TagUpdateRequest $request
|
||||
* @param Tag $tag
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function update(TagUpdateRequest $request, Tag $tag): JsonResponse
|
||||
{
|
||||
$updatedTag = TagRepository::update($tag, $request->all());
|
||||
@ -88,20 +55,14 @@ class TagController extends Controller
|
||||
return response()->json($updatedTag);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function destroy(Tag $tag): JsonResponse
|
||||
{
|
||||
$deletionSuccessful = TagRepository::delete($tag);
|
||||
|
||||
if ($deletionSuccessful) {
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
return response()->json(null, Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
return response()->json(status: 500);
|
||||
}
|
||||
}
|
||||
|
@ -9,16 +9,10 @@ use Illuminate\Http\Request;
|
||||
|
||||
class TagLinksController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get the links for a specific tag.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function __invoke(Request $request, Tag $tag): JsonResponse
|
||||
{
|
||||
if ($request->user()->cannot('view', $tag)) {
|
||||
return response()->json([], 403);
|
||||
return response()->json(status: 403);
|
||||
}
|
||||
|
||||
$links = $tag->links()->visibleForUser()->paginate(getPaginationLimit());
|
||||
|
@ -12,7 +12,6 @@ use App\Models\Tag;
|
||||
use App\Repositories\TrashRepository;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
|
||||
class TrashController extends Controller
|
||||
{
|
||||
@ -52,17 +51,11 @@ class TrashController extends Controller
|
||||
return response()->json($notes);
|
||||
}
|
||||
|
||||
/**
|
||||
* Permanently delete entries for a model from the trash.
|
||||
*
|
||||
* @param TrashClearRequest $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function clear(TrashClearRequest $request): JsonResponse
|
||||
{
|
||||
TrashRepository::delete($request->input('model'));
|
||||
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -75,6 +68,6 @@ class TrashController extends Controller
|
||||
{
|
||||
TrashRepository::restore($request->input('model'), $request->input('id'));
|
||||
|
||||
return response()->json(null, Response::HTTP_OK);
|
||||
return response()->json();
|
||||
}
|
||||
}
|
||||
|
@ -15,11 +15,6 @@ use Illuminate\Support\Str;
|
||||
|
||||
class SystemSettingsController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the system settings forms.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
return view('admin.system-settings.index', [
|
||||
@ -27,12 +22,6 @@ class SystemSettingsController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the updated system settings to the database.
|
||||
*
|
||||
* @param SystemSettingsUpdateRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(SystemSettingsUpdateRequest $request): RedirectResponse
|
||||
{
|
||||
$sysSettings = app(SystemSettings::class);
|
||||
@ -60,11 +49,6 @@ class SystemSettingsController extends Controller
|
||||
return redirect()->route('get-systemsettings');
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a new API token for the current user.
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function generateCronToken(SystemSettings $settings): JsonResponse
|
||||
{
|
||||
$newToken = Str::random(32);
|
||||
|
@ -11,11 +11,6 @@ use Illuminate\Contracts\View\View;
|
||||
|
||||
class DashboardController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the dashboard including all widgets.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$recentLinks = Link::query()
|
||||
|
@ -14,11 +14,6 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
class ExportController extends Controller
|
||||
{
|
||||
/**
|
||||
* Get the initial screen to start the export.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function getExport(): View
|
||||
{
|
||||
return view('app.export.export');
|
||||
|
@ -11,11 +11,6 @@ use Illuminate\Http\JsonResponse;
|
||||
|
||||
class ImportController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the initial screen to start the import.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function getImport(): View
|
||||
{
|
||||
return view('app.import.import');
|
||||
|
@ -11,11 +11,6 @@ class SearchController extends Controller
|
||||
{
|
||||
use SearchesLinks;
|
||||
|
||||
/**
|
||||
* Display the initial search form.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function getSearch(): View
|
||||
{
|
||||
return view('app.search.search')
|
||||
@ -35,12 +30,6 @@ class SearchController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the search query and display the view with all results.
|
||||
*
|
||||
* @param SearchRequest $request
|
||||
* @return View
|
||||
*/
|
||||
public function doSearch(SearchRequest $request): View
|
||||
{
|
||||
$search = $this->buildDatabaseQuery($request);
|
||||
|
@ -15,11 +15,6 @@ use Illuminate\Http\RedirectResponse;
|
||||
|
||||
class TrashController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the trash overview with all deleted entries for links, tags, etc.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$links = Link::onlyTrashed()->byUser()->get();
|
||||
@ -35,12 +30,6 @@ class TrashController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Permanently delete entries for a model from the trash.
|
||||
*
|
||||
* @param TrashClearRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function clearTrash(TrashClearRequest $request): RedirectResponse
|
||||
{
|
||||
TrashRepository::delete($request->input('model'));
|
||||
@ -49,12 +38,6 @@ class TrashController extends Controller
|
||||
return redirect()->route('get-trash');
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore an entry from the trash.
|
||||
*
|
||||
* @param TrashRestoreRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function restoreEntry(TrashRestoreRequest $request): RedirectResponse
|
||||
{
|
||||
TrashRepository::restore($request->input('model'), $request->input('id'));
|
||||
|
@ -17,11 +17,6 @@ use Illuminate\Validation\ValidationException;
|
||||
|
||||
class UserSettingsController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the user settings forms.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function getUserSettings(): View
|
||||
{
|
||||
return view('app.settings.user', [
|
||||
@ -30,13 +25,6 @@ class UserSettingsController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles changes of the user account itself.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function saveAccountSettings(Request $request): RedirectResponse
|
||||
{
|
||||
(new UpdateUserProfileInformation())->update($request->user(), $request->input());
|
||||
@ -45,12 +33,6 @@ class UserSettingsController extends Controller
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle changes of general application settings like share services.
|
||||
*
|
||||
* @param UserSettingsUpdateRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function saveAppSettings(UserSettings $settings, UserSettingsUpdateRequest $request): RedirectResponse
|
||||
{
|
||||
// Save all user settings or update them
|
||||
@ -73,13 +55,6 @@ class UserSettingsController extends Controller
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles the user password change.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
* @throws ValidationException
|
||||
*/
|
||||
public function changeUserPassword(Request $request): RedirectResponse
|
||||
{
|
||||
(new UpdateUserPassword())->update($request->user(), $request->input());
|
||||
|
@ -12,12 +12,6 @@ use Illuminate\Http\Response;
|
||||
|
||||
class FetchController extends Controller
|
||||
{
|
||||
/**
|
||||
* Returns all tags that match a given query, preformatted for Selectize.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function getTags(Request $request): JsonResponse
|
||||
{
|
||||
$query = $request->input('query');
|
||||
@ -36,12 +30,6 @@ class FetchController extends Controller
|
||||
return response()->json($tags);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all lists that match a given query, preformatted for Selectize.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public function getLists(Request $request): JsonResponse
|
||||
{
|
||||
$query = $request->input('query', false);
|
||||
@ -87,12 +75,6 @@ class FetchController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple endpoint for the system settings page which runs an update check
|
||||
* and returns the result to the frontend.
|
||||
*
|
||||
* @return JsonResponse
|
||||
*/
|
||||
public static function checkForUpdates(): JsonResponse
|
||||
{
|
||||
$updateCheck = UpdateHelper::checkForUpdates(true);
|
||||
|
@ -9,12 +9,6 @@ use Illuminate\Http\Request;
|
||||
|
||||
class LinkController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display an overview of all links.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$links = Link::publicOnly()
|
||||
|
@ -9,12 +9,6 @@ use Illuminate\Http\Request;
|
||||
|
||||
class ListController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display an overview of all lists.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$lists = LinkList::publicOnly()
|
||||
@ -32,13 +26,6 @@ class ListController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $listID
|
||||
* @return View
|
||||
*/
|
||||
public function show(Request $request, int $listID): View
|
||||
{
|
||||
$list = LinkList::publicOnly()->findOrFail($listID);
|
||||
|
@ -9,12 +9,6 @@ use Illuminate\Http\Request;
|
||||
|
||||
class TagController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display an overview of all lists.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$tags = Tag::publicOnly()
|
||||
@ -33,13 +27,6 @@ class TagController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param int $tagID
|
||||
* @return View
|
||||
*/
|
||||
public function show(Request $request, int $tagID): View
|
||||
{
|
||||
$tag = Tag::publicOnly()->findOrFail($tagID);
|
||||
|
@ -4,9 +4,9 @@ namespace App\Http\Controllers\Models;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Controllers\Traits\ChecksOrdering;
|
||||
use App\Http\Requests\Models\LinkMarkWorkingRequest;
|
||||
use App\Http\Requests\Models\MarkLinkWorkingRequest;
|
||||
use App\Http\Requests\Models\LinkStoreRequest;
|
||||
use App\Http\Requests\Models\LinkToggleCheckRequest;
|
||||
use App\Http\Requests\Models\ToggleLinkCheckRequest;
|
||||
use App\Http\Requests\Models\LinkUpdateRequest;
|
||||
use App\Models\Link;
|
||||
use App\Repositories\LinkRepository;
|
||||
@ -25,12 +25,6 @@ class LinkController extends Controller
|
||||
$this->authorizeResource(Link::class, 'link');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$this->orderBy = $request->input('orderBy', session()->get('links.index.orderBy', 'created_at'));
|
||||
@ -55,11 +49,6 @@ class LinkController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function create(): View
|
||||
{
|
||||
// Reset the bookmarklet session identifier to prevent issues on regular pages
|
||||
@ -70,12 +59,6 @@ class LinkController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param LinkStoreRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(LinkStoreRequest $request): RedirectResponse
|
||||
{
|
||||
$link = LinkRepository::create($request->all(), true);
|
||||
@ -108,12 +91,6 @@ class LinkController extends Controller
|
||||
: redirect()->route('links.show', [$link->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return View
|
||||
*/
|
||||
public function show(Link $link): View
|
||||
{
|
||||
return view('models.links.show', [
|
||||
@ -122,12 +99,6 @@ class LinkController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return View
|
||||
*/
|
||||
public function edit(Link $link): View
|
||||
{
|
||||
return view('models.links.edit', [
|
||||
@ -136,13 +107,6 @@ class LinkController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param LinkUpdateRequest $request
|
||||
* @param Link $link
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(LinkUpdateRequest $request, Link $link): RedirectResponse
|
||||
{
|
||||
$link = LinkRepository::update($link, $request->input());
|
||||
@ -151,13 +115,6 @@ class LinkController extends Controller
|
||||
return redirect()->route('links.show', [$link->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Link $link
|
||||
* @return RedirectResponse
|
||||
* @throws Exception
|
||||
*/
|
||||
public function destroy(Link $link): RedirectResponse
|
||||
{
|
||||
$deletionSuccessful = LinkRepository::delete($link);
|
||||
@ -172,14 +129,7 @@ class LinkController extends Controller
|
||||
return request()->has('redirect_back') ? redirect()->back() : redirect()->route('links.index');
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggles the setting of a link to be either checked or not.
|
||||
*
|
||||
* @param LinkToggleCheckRequest $request
|
||||
* @param Link $link
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function updateCheckToggle(LinkToggleCheckRequest $request, Link $link): RedirectResponse
|
||||
public function updateCheckToggle(ToggleLinkCheckRequest $request, Link $link): RedirectResponse
|
||||
{
|
||||
$link->check_disabled = $request->input('toggle');
|
||||
$link->save();
|
||||
@ -187,14 +137,7 @@ class LinkController extends Controller
|
||||
return redirect()->route('links.show', ['link' => $link]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark the link as working manually.
|
||||
*
|
||||
* @param LinkMarkWorkingRequest $request
|
||||
* @param Link $link
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function markWorking(LinkMarkWorkingRequest $request, Link $link): RedirectResponse
|
||||
public function markWorking(MarkLinkWorkingRequest $request, Link $link): RedirectResponse
|
||||
{
|
||||
$link->status = Link::STATUS_OK;
|
||||
$link->save();
|
||||
|
@ -8,7 +8,6 @@ use App\Http\Requests\Models\ListStoreRequest;
|
||||
use App\Http\Requests\Models\ListUpdateRequest;
|
||||
use App\Models\LinkList;
|
||||
use App\Repositories\ListRepository;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@ -23,12 +22,6 @@ class ListController extends Controller
|
||||
$this->authorizeResource(LinkList::class, 'list');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$this->orderBy = $request->input('orderBy', session()->get('lists.index.orderBy', 'name'));
|
||||
@ -58,22 +51,11 @@ class ListController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function create(): View
|
||||
{
|
||||
return view('models.lists.create');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param ListStoreRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(ListStoreRequest $request): RedirectResponse
|
||||
{
|
||||
$data = $request->validated();
|
||||
@ -89,13 +71,6 @@ class ListController extends Controller
|
||||
return redirect()->route('lists.show', ['list' => $list]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param LinkList $list
|
||||
* @return View
|
||||
*/
|
||||
public function show(Request $request, LinkList $list): View
|
||||
{
|
||||
$links = $list->links()
|
||||
@ -115,24 +90,11 @@ class ListController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param LinkList $list
|
||||
* @return View
|
||||
*/
|
||||
public function edit(LinkList $list): View
|
||||
{
|
||||
return view('models.lists.edit', ['list' => $list]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param ListUpdateRequest $request
|
||||
* @param LinkList $list
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(ListUpdateRequest $request, LinkList $list): RedirectResponse
|
||||
{
|
||||
$list = ListRepository::update($list, $request->validated());
|
||||
@ -141,13 +103,6 @@ class ListController extends Controller
|
||||
return redirect()->route('lists.show', ['list' => $list]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param LinkList $list
|
||||
* @return RedirectResponse
|
||||
* @throws Exception
|
||||
*/
|
||||
public function destroy(LinkList $list): RedirectResponse
|
||||
{
|
||||
$deletionSuccessful = ListRepository::delete($list);
|
||||
|
@ -19,12 +19,6 @@ class NoteController extends Controller
|
||||
$this->authorizeResource(Note::class, 'note');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param NoteStoreRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(NoteStoreRequest $request): RedirectResponse
|
||||
{
|
||||
$link = Link::findOrFail($request->input('link_id'));
|
||||
@ -37,24 +31,11 @@ class NoteController extends Controller
|
||||
return redirect()->route('links.show', ['link' => $link]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Note $note
|
||||
* @return View
|
||||
*/
|
||||
public function edit(Note $note): View
|
||||
{
|
||||
return view('models.notes.edit', ['note' => $note]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param NoteUpdateRequest $request
|
||||
* @param Note $note
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(NoteUpdateRequest $request, Note $note): RedirectResponse
|
||||
{
|
||||
$note = NoteRepository::update($note, $request->except(['_token']));
|
||||
@ -64,13 +45,6 @@ class NoteController extends Controller
|
||||
return redirect()->route('links.show', ['link' => $note->link]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Note $note
|
||||
* @return RedirectResponse
|
||||
* @throws Exception
|
||||
*/
|
||||
public function destroy(Note $note): RedirectResponse
|
||||
{
|
||||
$link = $note->link;
|
||||
|
@ -24,12 +24,6 @@ class TagController extends Controller
|
||||
$this->authorizeResource(Tag::class, 'tag');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @return View
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$this->orderBy = $request->input('orderBy', session()->get('tags.index.orderBy', 'name'));
|
||||
@ -60,22 +54,11 @@ class TagController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function create(): View
|
||||
{
|
||||
return view('models.tags.create');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param TagStoreRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(TagStoreRequest $request): RedirectResponse
|
||||
{
|
||||
$tag = TagRepository::create($request->validated());
|
||||
@ -89,13 +72,6 @@ class TagController extends Controller
|
||||
return redirect()->route('tags.show', ['tag' => $tag]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Tag $tag
|
||||
* @return View
|
||||
*/
|
||||
public function show(Request $request, Tag $tag): View
|
||||
{
|
||||
$this->allowedOrderBy = Link::$allowOrderBy;
|
||||
@ -118,24 +94,11 @@ class TagController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @return View
|
||||
*/
|
||||
public function edit(Tag $tag): View
|
||||
{
|
||||
return view('models.tags.edit', ['tag' => $tag]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param TagUpdateRequest $request
|
||||
* @param Tag $tag
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function update(TagUpdateRequest $request, Tag $tag): RedirectResponse
|
||||
{
|
||||
$tag = TagRepository::update($tag, $request->validated());
|
||||
@ -144,13 +107,6 @@ class TagController extends Controller
|
||||
return redirect()->route('tags.show', ['tag' => $tag]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param Tag $tag
|
||||
* @return RedirectResponse
|
||||
* @throws Exception
|
||||
*/
|
||||
public function destroy(Tag $tag): RedirectResponse
|
||||
{
|
||||
$deletionSuccessful = TagRepository::delete($tag);
|
||||
|
@ -5,6 +5,7 @@ namespace App\Http\Controllers;
|
||||
use App\Actions\Fortify\CreateNewUser;
|
||||
use App\Http\Requests\Auth\RegisterRequest;
|
||||
use App\Models\UserInvitation;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
@ -32,7 +33,7 @@ class RegistrationController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
public function register(RegisterRequest $request)
|
||||
public function register(RegisterRequest $request): RedirectResponse
|
||||
{
|
||||
$invitation = UserInvitation::where('token', $request->input('token'))->first();
|
||||
|
||||
|
@ -17,23 +17,11 @@ class AccountController extends Controller
|
||||
return route('setup.complete');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the registration form for the first user account.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
return view('setup.account');
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate and create the new user, then login him, and redirect him to the dashboard
|
||||
*
|
||||
* @param Request $request
|
||||
* @return RedirectResponse
|
||||
* @throws ValidationException
|
||||
*/
|
||||
protected function register(Request $request): RedirectResponse
|
||||
{
|
||||
$user = (new CreateNewUser())->create($request->input());
|
||||
|
@ -18,22 +18,11 @@ class DatabaseController extends Controller
|
||||
{
|
||||
protected array $dbConfig;
|
||||
|
||||
/**
|
||||
* Display the form for configuration of the database.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
return view('setup.database');
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle the test and configuration of a new database connection.
|
||||
*
|
||||
* @param SetupDatabaseRequest $request
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function configure(SetupDatabaseRequest $request): RedirectResponse
|
||||
{
|
||||
$this->createTempDatabaseConnection($request->validated());
|
||||
@ -54,11 +43,6 @@ class DatabaseController extends Controller
|
||||
return redirect()->route('setup.account');
|
||||
}
|
||||
|
||||
/**
|
||||
* Accepts new credentials for a database and sets them accordingly.
|
||||
*
|
||||
* @param array $credentials
|
||||
*/
|
||||
protected function createTempDatabaseConnection(array $credentials): void
|
||||
{
|
||||
$this->dbConfig = config('database.connections.mysql');
|
||||
|
@ -8,22 +8,11 @@ use Illuminate\Contracts\View\View;
|
||||
|
||||
class MetaController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a very simple welcome screen to start the setup process.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function welcome(): View
|
||||
{
|
||||
return view('setup.welcome');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a final screen after the setup was successful.
|
||||
*
|
||||
* @param SystemSettings $settings
|
||||
* @return View
|
||||
*/
|
||||
public function complete(SystemSettings $settings): View
|
||||
{
|
||||
$settings->setup_completed = true;
|
||||
|
@ -8,11 +8,6 @@ use Illuminate\Support\Facades\File;
|
||||
|
||||
class RequirementsController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display all requirements that must be fulfilled to run the setup.
|
||||
*
|
||||
* @return View
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
[$success, $results] = $this->checkRequirements();
|
||||
|
@ -5,7 +5,7 @@ namespace App\Http\Requests\Models;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class LinkMarkWorkingRequest extends FormRequest
|
||||
class MarkLinkWorkingRequest extends FormRequest
|
||||
{
|
||||
public function authorize(Request $request): bool
|
||||
{
|
@ -5,7 +5,7 @@ namespace App\Http\Requests\Models;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class LinkToggleCheckRequest extends FormRequest
|
||||
class ToggleLinkCheckRequest extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
@ -68,13 +68,11 @@ class LinkList extends Model implements Auditable
|
||||
|
||||
public string $langBase = 'list';
|
||||
|
||||
/**
|
||||
* Add the OrderNameScope to the Tag model
|
||||
*/
|
||||
protected static function boot(): void
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
// Add the OrderNameScope to the Tag model
|
||||
static::addGlobalScope(new OrderNameScope());
|
||||
}
|
||||
|
||||
|
@ -63,13 +63,11 @@ class Tag extends Model implements Auditable
|
||||
|
||||
public string $langBase = 'tag';
|
||||
|
||||
/**
|
||||
* Add the OrderNameScope to the Tag model
|
||||
*/
|
||||
protected static function boot()
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
// Add the OrderNameScope to the Tag model
|
||||
static::addGlobalScope(new OrderNameScope());
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user