Merge branch 'main' into improve-tagging

app/Http/Controllers/DocsController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Inertia\Inertia;
+use Inertia\Response;
+
+class DocsController extends Controller
+{
+    public function __invoke(): Response
+    {
+        return Inertia::render('Docs');
+    }
+}

app/Http/Controllers/HomeController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Inertia\Inertia;
+use Inertia\Response;
+
+class HomeController extends Controller
+{
+    public function __invoke(): Response
+    {
+        return Inertia::render('Home');
+    }
+}

app/Http/Controllers/UploadPhotosController.php

@@ -8,9 +8,16 @@
 use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\UploadedFile;
+use Inertia\Inertia;
+use Inertia\Response;
 
 class UploadPhotosController extends Controller
 {
+    public function show(): Response
+    {
+        return Inertia::render('Upload');
+    }
+
     public function store(
         StorePhotosRequest $request,
         ExtractsExifFromPhoto $extractExif,

resources/js/Pages/Photos/Index.vue

@@ -134,6 +134,7 @@ const filter = (filters) => {
                         :photoIds="selectedPhotos"
                         :tags="tags"
                         :items="items"
+                        @closeModalWithSuccess="clearSelection"
                     ></BulkTag>
                 </div>
 

resources/js/Pages/Photos/Partials/BulkTag.vue

@@ -14,6 +14,8 @@ const props = defineProps({
     tags: Object,
 });
 
+const emit = defineEmits(['closeModalWithSuccess'])
+
 const page = usePage();
 const selectedItem = ref(null);
 const showModal = ref(false);
@@ -69,7 +71,11 @@ const closeModalWithSuccess = () => {
     form.reset();
     message.value = 'Tagged successfully!';
 
-    setTimeout(() => showModal.value = false, 3000);
+    setTimeout(() => {
+        showModal.value = false;
+
+        emit('closeModalWithSuccess');
+    }, 3000);
 };
 
 const closeModal = () => {

routes/web.php

@@ -5,14 +5,15 @@
 use App\Http\Controllers\Auth\TwitterController;
 use App\Http\Controllers\BulkPhotoItemsController;
 use App\Http\Controllers\CopyPhotoItemController;
+use App\Http\Controllers\DocsController;
+use App\Http\Controllers\HomeController;
 use App\Http\Controllers\PhotoItemsController;
 use App\Http\Controllers\PhotoItemTagsController;
 use App\Http\Controllers\PhotosController;
 use App\Http\Controllers\PhotoTagsController;
 use App\Http\Controllers\UploadPhotosController;
 use App\Http\Controllers\UserSettingsController;
 use Illuminate\Support\Facades\Route;
-use Inertia\Inertia;
 
 /*
 |--------------------------------------------------------------------------
@@ -25,12 +26,8 @@
 |
 */
 
-Route::get('/', function () {
-    return Inertia::render('Home');
-})->name('home');
-Route::get('/docs/en/', function () {
-    return Inertia::render('Docs');
-})->name('docs');
+Route::get('/', HomeController::class)->name('home');
+Route::get('/docs/en/', DocsController::class)->name('docs');
 
 Route::get('/auth/google/redirect', [GoogleController::class, 'redirect'])->name('auth.google.redirect');
 Route::get('/auth/google/callback', [GoogleController::class, 'callback']);
@@ -44,9 +41,8 @@
     config('jetstream.auth_session'),
     'verified',
 ])->group(function () {
-    Route::get('/upload', function () {
-        return Inertia::render('Upload');
-    })->name('upload');
+    Route::get('/upload', [UploadPhotosController::class, 'show'])->name('upload');
+    Route::post('/upload', [UploadPhotosController::class, 'store']);
 
     Route::get('/my-photos', [PhotosController::class, 'index'])->name('my-photos');
     Route::get('/photos/{photo}', [PhotosController::class, 'show'])->name('photos.show');
@@ -64,7 +60,5 @@
 
     Route::post('/photo-items/{photoItem}/copy', CopyPhotoItemController::class);
 
-    Route::post('/upload', [UploadPhotosController::class, 'store']);
-
     Route::post('/settings', [UserSettingsController::class, 'update'])->name('user-settings.update');
 });