Merge remote-tracking branch 'origin/main' into ultra

# Conflicts:
#	resources/views/components/dashboard-menu.blade.php
#	resources/views/customer/dashboard.blade.php
#	resources/views/customer/licenses/index.blade.php
#	resources/views/customer/licenses/list.blade.php
#	resources/views/customer/licenses/show.blade.php
#	resources/views/customer/purchased-plugins/index.blade.php

Author: simonhamp

app/Livewire/Customer/WallOfLove/Edit.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Livewire\Customer\WallOfLove;
+
+use App\Models\WallOfLoveSubmission;
+use Livewire\Attributes\Layout;
+use Livewire\Attributes\Title;
+use Livewire\Component;
+
+#[Layout('components.layouts.dashboard')]
+#[Title('Edit Your Listing')]
+class Edit extends Component
+{
+    public WallOfLoveSubmission $wallOfLoveSubmission;
+
+    public function mount(WallOfLoveSubmission $wallOfLoveSubmission): void
+    {
+        abort_if($wallOfLoveSubmission->user_id !== auth()->id(), 403);
+    }
+}

app/Livewire/WallOfLoveBanner.php

@@ -10,34 +10,83 @@ class WallOfLoveSubmissionForm extends Component
 {
     use WithFileUploads;
 
+    public ?WallOfLoveSubmission $submission = null;
+
+    public bool $isEditing = false;
+
     public $name = '';
 
     public $company = '';
 
     public $photo;
 
+    public ?string $existingPhoto = null;
+
     public $url = '';
 
     public $testimonial = '';
 
-    protected $rules = [
-        'name' => 'required|string|max:255',
-        'company' => 'nullable|string|max:255',
-        'photo' => 'nullable|image|max:2048', // 2MB max
-        'url' => 'nullable|url|max:255',
-        'testimonial' => 'nullable|string|max:1000',
-    ];
+    public function mount(?WallOfLoveSubmission $submission = null): void
+    {
+        if ($submission && $submission->exists && $submission->user_id === auth()->id()) {
+            $this->submission = $submission;
+            $this->isEditing = true;
+            $this->name = $submission->name;
+            $this->company = $submission->company ?? '';
+            $this->existingPhoto = $submission->photo_path;
+            $this->url = $submission->url ?? '';
+            $this->testimonial = $submission->testimonial ?? '';
+        } else {
+            // Pre-fill name if user has a name
+            $this->name = auth()->user()->name ?? '';
+        }
+    }
 
-    public function mount()
+    public function rules(): array
     {
-        // Pre-fill name if user has a name
-        $this->name = auth()->user()->name ?? '';
+        if ($this->isEditing) {
+            return [
+                'company' => 'nullable|string|max:255',
+                'photo' => 'nullable|image|max:2048',
+            ];
+        }
+
+        return [
+            'name' => 'required|string|max:255',
+            'company' => 'nullable|string|max:255',
+            'photo' => 'nullable|image|max:2048',
+            'url' => 'nullable|url|max:255',
+            'testimonial' => 'nullable|string|max:1000',
+        ];
     }
 
-    public function submit()
+    public function submit(): mixed
     {
         $this->validate();
 
+        if ($this->isEditing && $this->submission) {
+            $data = [
+                'company' => $this->company ?: null,
+            ];
+
+            if ($this->photo) {
+                $data['photo_path'] = $this->photo->store('wall-of-love-photos', 'public');
+            } elseif ($this->existingPhoto === null) {
+                $data['photo_path'] = null;
+            }
+
+            $this->submission->update($data);
+
+            if ($this->photo) {
+                $this->existingPhoto = $data['photo_path'];
+                $this->reset('photo');
+            }
+
+            session()->flash('success', 'Your listing has been updated.');
+
+            return null;
+        }
+
         $photoPath = null;
         if ($this->photo) {
             $photoPath = $this->photo->store('wall-of-love-photos', 'public');
@@ -55,6 +104,11 @@ public function submit()
         return to_route('dashboard')->with('success', 'Thank you! Your submission has been received and is awaiting review.');
     }
 
+    public function removeExistingPhoto(): void
+    {
+        $this->existingPhoto = null;
+    }
+
     public function render()
     {
         return view('livewire.wall-of-love-submission-form');

app/Livewire/WallOfLoveSubmissionForm.php

@@ -79,9 +79,11 @@
     }
 }
 
-/* Compensate for custom scrollbar width when Flux locks scroll */
-html[data-flux-scroll-unlock] {
-    padding-right: 8px !important;
+/* Compensate for custom scrollbar width when Flux locks scroll (desktop only) */
+@media (pointer: fine) {
+    html[data-flux-scroll-unlock] {
+        padding-right: 8px !important;
+    }
 }
 
 /* Scrollbar width */

package-lock.json

@@ -115,6 +115,17 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
                     <flux:sidebar.item href="{{ route('customer.showcase.index') }}" :current="request()->routeIs('customer.showcase.*')">
                         Showcase
                     </flux:sidebar.item>
+                    @if(auth()->user()->licenses()->where('created_at', '<', '2025-06-01')->exists())
+                        @php
+                            $wallOfLoveSubmission = auth()->user()->wallOfLoveSubmissions()->first();
+                            $wallOfLoveUrl = $wallOfLoveSubmission
+                                ? route('customer.wall-of-love.edit', $wallOfLoveSubmission)
+                                : route('customer.wall-of-love.create');
+                        @endphp
+                        <flux:sidebar.item href="{{ $wallOfLoveUrl }}" :current="request()->routeIs('customer.wall-of-love.*')">
+                            Wall of Love
+                        </flux:sidebar.item>
+                    @endif
                     <flux:sidebar.item href="https://discord.gg/nativephp" target="_blank">
                         Discord
                     </flux:sidebar.item>