React rewrite

app/Http/Controllers/Admin/UserController.php → app/Http/Controllers/Api/Admin/UserController.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Api\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\RedirectResponse;
-use Inertia\Inertia;
-use Inertia\Response;
+use Illuminate\Http\JsonResponse;
 
 class UserController extends Controller
 {
@@ -19,9 +17,9 @@ public function __construct()
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index(): JsonResponse
     {
-        return Inertia::render('Admin/Users/Index', [
+        return response()->json([
             'users' => User::orderBy('name')
                 ->withCount([
                     'feeds',
@@ -36,13 +34,13 @@ public function index(): Response
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(User $user): RedirectResponse
+    public function destroy(User $user): JsonResponse
     {
         $user->feedItems()->delete();
         $user->feeds()->delete();
         $user->categories()->delete();
         $user->delete();
 
-        return redirect()->route('admin.users.index');
+        return response()->json();
     }
 }

app/Http/Controllers/Api/Auth/PasswordController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\Api\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Rules\Password;
+
+class PasswordController extends Controller
+{
+    /**
+     * Update the user's password.
+     */
+    public function update(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'current_password' => ['required', 'current_password'],
+            'password' => ['required', Password::defaults(), 'confirmed'],
+        ]);
+
+        $request->user()->update([
+            'password' => Hash::make($validated['password']),
+        ]);
+
+        return response()->json();
+    }
+}

app/Http/Controllers/CategoryController.php → app/Http/Controllers/Api/CategoryController.php

@@ -1,14 +1,13 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreCategoryRequest;
 use App\Http\Requests\UpdateCategoryRequest;
 use App\Models\Category;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
-use Inertia\Inertia;
-use Inertia\Response;
 
 class CategoryController extends Controller
 {
@@ -20,42 +19,32 @@ public function __construct()
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index(): JsonResponse
     {
-        return Inertia::render('Categories/Index', [
+        return response()->json([
             'categories' => Auth::user()->categories()->withCount('feeds')->get(),
             'canCreate' => Auth::user()->can('create', Category::class),
         ]);
     }
 
-    /**
-     * Show the form for creating a new resource.
-     */
-    public function create(): Response
-    {
-        return Inertia::render('Categories/Create', [
-            'category' => new Category(),
-        ]);
-    }
-
     /**
      * Store a newly created resource in storage.
      */
-    public function store(StoreCategoryRequest $request): RedirectResponse
+    public function store(StoreCategoryRequest $request): JsonResponse
     {
         $validated = $request->validated();
 
         Auth::user()->categories()->save(new Category($validated));
 
-        return redirect()->route('categories.index');
+        return response()->json();
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit(Category $category): Response
+    public function edit(Category $category): JsonResponse
     {
-        return Inertia::render('Categories/Edit', [
+        return response()->json([
             'category' => $category,
             'canDelete' => Auth::user()->can('delete', $category),
         ]);
@@ -64,22 +53,22 @@ public function edit(Category $category): Response
     /**
      * Update the specified resource in storage.
      */
-    public function update(UpdateCategoryRequest $request, Category $category): RedirectResponse
+    public function update(UpdateCategoryRequest $request, Category $category): JsonResponse
     {
         $validated = $request->validated();
 
         $category->update($validated);
 
-        return redirect()->route('categories.index');
+        return response()->json();
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(Category $category): RedirectResponse
+    public function destroy(Category $category): JsonResponse
     {
         $category->delete();
 
-        return redirect()->route('categories.index');
+        return response()->json();
     }
 }

app/Http/Controllers/DashboardController.php → app/Http/Controllers/Api/DashboardController.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\DashboardRequest;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Routing\ResponseFactory;
 use Illuminate\Support\Facades\Auth;
-use Inertia\Inertia;
-use Inertia\Response;
 
 class DashboardController extends Controller
 {
     /**
      * Handle the incoming request.
      */
-    public function __invoke(DashboardRequest $request): RedirectResponse|Response
+    public function __invoke(DashboardRequest $request): ResponseFactory|JsonResponse
     {
         $feedId = $request->exists('feed_id') ? $request->integer('feed_id') : null;
 
@@ -32,12 +32,7 @@ public function __invoke(DashboardRequest $request): RedirectResponse|Response
             ->cursorPaginate()
             ->withQueryString();
 
-        // if feed filtering is active and there are no unread feed items go back to dashboard without query strings
-        if ($feedId && $feedItems->isEmpty()) {
-            return redirect()->route('dashboard');
-        }
-
-        return Inertia::render('Dashboard', [
+        return response()->json([
             'selectedFeed' => $feedId ? $unreadFeeds->firstWhere('id', $feedId) : null,
             'totalNumberOfFeedItems' => $totalNumberOfFeedItems,
             'unreadFeeds' => $unreadFeeds,

app/Http/Controllers/FeedController.php → app/Http/Controllers/Api/FeedController.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreFeedRequest;
 use App\Http\Requests\UpdateFeedRequest;
 use App\Models\Feed;
-use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
-use Inertia\Inertia;
-use Inertia\Response;
 
 class FeedController extends Controller
 {
@@ -21,9 +21,9 @@ public function __construct()
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index(): JsonResponse
     {
-        return Inertia::render('Feeds/Index', [
+        return response()->json([
             'feeds' => Auth::user()->feeds()->with('category')->withCount('feedItems')->get(),
             'canCreate' => Auth::user()->can('create', Feed::class),
         ]);
@@ -32,18 +32,17 @@ public function index(): Response
     /**
      * Show the form for creating a new resource.
      */
-    public function create(): Response
+    public function create(): JsonResponse
     {
-        return Inertia::render('Feeds/Create', [
-            'categories' => Auth::user()->categories()->pluck('name', 'id')->map(fn (string $name, int $id) => ['value' => $id, 'name' => $name])->values(),
-            'feed' => new Feed(),
+        return response()->json([
+            'categories' => $this->categories(),
         ]);
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store(StoreFeedRequest $request): RedirectResponse
+    public function store(StoreFeedRequest $request): JsonResponse
     {
         $validated = $request->validated();
 
@@ -52,16 +51,16 @@ public function store(StoreFeedRequest $request): RedirectResponse
 
         Auth::user()->feeds()->save($feed);
 
-        return redirect()->route('feeds.index');
+        return response()->json();
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit(Feed $feed): Response
+    public function edit(Feed $feed): JsonResponse
     {
-        return Inertia::render('Feeds/Edit', [
-            'categories' => Auth::user()->categories()->pluck('name', 'id')->map(fn (string $name, int $id) => ['value' => $id, 'name' => $name])->values(),
+        return response()->json([
+            'categories' => $this->categories(),
             'feed' => $feed,
             'canDelete' => Auth::user()->can('delete', $feed),
         ]);
@@ -70,7 +69,7 @@ public function edit(Feed $feed): Response
     /**
      * Update the specified resource in storage.
      */
-    public function update(UpdateFeedRequest $request, Feed $feed): RedirectResponse
+    public function update(UpdateFeedRequest $request, Feed $feed): JsonResponse
     {
         $validated = $request->validated();
 
@@ -79,17 +78,25 @@ public function update(UpdateFeedRequest $request, Feed $feed): RedirectResponse
 
         $feed->save();
 
-        return redirect()->route('feeds.index');
+        return response()->json();
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(Feed $feed): RedirectResponse
+    public function destroy(Feed $feed): JsonResponse
     {
         $feed->feedItems()->delete();
         $feed->delete();
 
-        return redirect()->route('feeds.index');
+        return response()->json();
+    }
+
+    /**
+     * @return Collection<int, array{value: int, name: string}>
+     */
+    private function categories(): Collection
+    {
+        return Auth::user()->categories()->pluck('name', 'id')->map(fn (string $name, int $id) => ['value' => $id, 'name' => $name])->values();
     }
 }

app/Http/Controllers/FeedDiscovererController.php → app/Http/Controllers/Api/FeedDiscovererController.php

@@ -1,10 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\FeedDiscovererRequest;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ConnectException;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Arr;
 use Kaishiyoku\HeraRssCrawler\HeraRssCrawler;
 
@@ -13,11 +15,10 @@ class FeedDiscovererController extends Controller
     /**
      * Handle the incoming request.
      *
-     * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Exception
      */
-    public function __invoke(FeedDiscovererRequest $request, HeraRssCrawler $heraRssCrawler)
+    public function __invoke(FeedDiscovererRequest $request, HeraRssCrawler $heraRssCrawler): JsonResponse
     {
         $validated = $request->validated();
 

app/Http/Controllers/FeedUrlDiscovererController.php → app/Http/Controllers/Api/FeedUrlDiscovererController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\FeedUrlDiscovererRequest;
 use Illuminate\Support\Arr;
 use Kaishiyoku\HeraRssCrawler\HeraRssCrawler;

app/Http/Controllers/MarkAllUnreadFeedItemsAsReadController.php → app/Http/Controllers/Api/MarkAllUnreadFeedItemsAsReadController.php

@@ -1,23 +1,25 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Api;
 
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class MarkAllUnreadFeedItemsAsReadController extends Controller
 {
     /**
      * Handle the incoming request.
-     *
-     * @return void
      */
-    public function __invoke(Request $request)
+    public function __invoke(Request $request): JsonResponse
     {
         $now = now();
 
         Auth::user()->feedItems()->unread()->update([
             'read_at' => $now,
         ]);
+
+        return response()->json();
     }
 }