From b330c431ab7ea60cb3c2b6ddb506e269bc2055ec Mon Sep 17 00:00:00 2001
From: weeb <weeb@lolispace.moe>
Date: Sat, 3 May 2025 20:39:46 +0200
Subject: [PATCH] Simplify Form logic

---
 app/Livewire/ApplicationForm.php              |  4 --
 .../views/livewire/application-form.blade.php | 48 +++++++++----------
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/app/Livewire/ApplicationForm.php b/app/Livewire/ApplicationForm.php
index 157226e..b047770 100644
--- a/app/Livewire/ApplicationForm.php
+++ b/app/Livewire/ApplicationForm.php
@@ -21,8 +21,6 @@ class ApplicationForm extends Component
 
     public $message = '';
 
-    public $applicationId;
-
     public $applicationUuid;
 
     public $captcha;
@@ -73,10 +71,8 @@ class ApplicationForm extends Component
             ]);
         }
 
-        $this->applicationId = $application->id;
         $this->applicationUuid = (string) $application->uuid;
 
-        session()->flash('message', 'Application submitted successfully!');
         $this->reset(['photos', 'message', 'captchaInput']);
     }
 
diff --git a/resources/views/livewire/application-form.blade.php b/resources/views/livewire/application-form.blade.php
index 83a23ec..959fd5a 100644
--- a/resources/views/livewire/application-form.blade.php
+++ b/resources/views/livewire/application-form.blade.php
@@ -1,19 +1,15 @@
 <div class="max-w-2xl w-full md:w-xl mx-auto mt-10 flex flex-col gap-6">
-    @if (session()->has('message'))
-        @if ($applicationUuid)
-            <flux:callout variant="success" icon="check-circle">
-                <flux:callout.heading>Your application has been submitted.</flux:callout.heading>
-                <flux:callout.text>
-                    You can check its status here: <flux:callout.link
-                        href="{{ route('application', ['uuid' => $applicationUuid]) }}">View Application Status
-                    </flux:callout.link>
-                    <br>Please save or bookmark that link, as the approval process can take 24-48 hours.
-                </flux:callout.text>
-            </flux:callout>
-        @endif
-    @endif
-
-    @if (!$applicationUuid)
+    @if ($applicationUuid)
+        <flux:callout variant="success" icon="check-circle">
+            <flux:callout.heading>Your application has been submitted.</flux:callout.heading>
+            <flux:callout.text>
+                You can check its status here: <flux:callout.link
+                    href="{{ route('application', ['uuid' => $applicationUuid]) }}">View Application Status
+                </flux:callout.link>
+                <br>Please save or bookmark that link, as the approval process can take 24-48 hours.
+            </flux:callout.text>
+        </flux:callout>
+    @else
         <form wire:submit.prevent="submit" enctype="multipart/form-data">
             <div class="flex flex-col gap-4 mb-6">
                 <flux:callout variant="secondary" icon="information-circle" heading="Here you can submit your application."
@@ -28,6 +24,17 @@
                 <flux:input type="file" wire:model="photos" label="Loli Photos (max. 6 files, max. 8MB per file)"
                     multiple />
 
+                @if ($photos)
+                    <div class="mt-4">
+                        <flux:heading>Photo Preview</flux:heading>
+                        <div class="flex gap-4 mt-2">
+                            @foreach ($photos as $photo)
+                                <img src="{{ $photo->temporaryUrl() }}" class="w-24 h-24 object-cover rounded">
+                            @endforeach
+                        </div>
+                    </div>
+                @endif
+
                 <div class="mt-4">
                     <div class="flex">
                         <flux:input label="Captcha" wire:model.defer="captchaInput" />
@@ -39,15 +46,4 @@
             <flux:button class="w-full" variant="primary" wire:click="submit">Submit Application</flux:button>
         </form>
     @endif
-
-    @if ($photos)
-        <div class="mt-4">
-            <h3 class="font-bold">Photo Preview:</h3>
-            <div class="flex gap-4 mt-2">
-                @foreach ($photos as $photo)
-                    <img src="{{ $photo->temporaryUrl() }}" class="w-24 h-24 object-cover rounded">
-                @endforeach
-            </div>
-        </div>
-    @endif
 </div>