update composer to fix livewire locked

LycheeOrg · Nov 20, 2023 · ac4d339 · ac4d339
1 parent 95cc531
commit ac4d339
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ public/dist/user.css
 public/dist/custom.js
 
 # Pictures we do not commit
-public/uploads/**
+public/uploads-*/**
 
 # Storage stuff: useless
 /storage/*.key

diff --git a/app/Livewire/Forms/ImportFromUrlForm.php b/app/Livewire/Forms/ImportFromUrlForm.php
@@ -10,9 +10,12 @@
 
 class ImportFromUrlForm extends Form
 {
-	#[Locked] public ?string $albumID = null;
+	#[Locked]
+	public ?string $albumID = null;
+	#[Locked]
 	/** @var array<int,string> */
-	#[Locked] public array $urls = [];
+	public array $urls = [];
+
 	public string $url = '';
 
 	/**

diff --git a/resources/views/livewire/pages/gallery/album.blade.php b/resources/views/livewire/pages/gallery/album.blade.php
@@ -100,14 +100,14 @@ class="my-0 w-5 h-5 mr-0 ml-0 transition-all duration-300
                 x-masonry
             @elseif ($flags->layout() === AlbumLayoutType::GRID)
                 x-grid
+            @endif
+            >
+            @foreach ($this->album->photos as $photo)
+                <x-gallery.album.thumbs.photo :data="$photo" albumId="{{ $albumId }}" :layout="$flags->layout()" />
+            @endforeach
+            </div>
+            <livewire:pages.gallery.sensitive-warning :album="$this->album" />
+        </div>
+        <x-gallery.album.sharing-links :album="$this->album" x-show="sharingLinksOpen" />
     @endif
-    >
-    @foreach ($this->album->photos as $photo)
-        <x-gallery.album.thumbs.photo :data="$photo" albumId="{{ $albumId }}" :layout="$flags->layout()" />
-    @endforeach
-</div>
-<livewire:pages.gallery.sensitive-warning :album="$this->album" />
-</div>
-<x-gallery.album.sharing-links :album="$this->album" x-show="sharingLinksOpen" />
-@endif
 </div>
diff --git a/resources/views/livewire/pages/gallery/photo.blade.php b/resources/views/livewire/pages/gallery/photo.blade.php
@@ -1,5 +1,5 @@
 <div class="w-full flex flex-col" x-data="photoView(
-        $wire.entangle('sessionFlags.are_photo_details_open'),
+        @entangle('sessionFlags.are_photo_details_open'),
         @entangle('sessionFlags.is_fullscreen'),
         @js($photo->description !== null),
         @js($overlayType),