diff --git a/app/Http/Livewire/Album.php b/app/Http/Livewire/Album.php deleted file mode 100644 index 236eedc299..0000000000 --- a/app/Http/Livewire/Album.php +++ /dev/null @@ -1,65 +0,0 @@ -album = $album; - $this->info = []; - $this->info['albums'] = []; - - $this->albumFactory = $albumFactory; - } - - /** - * @throws BindingResolutionException - * @throws ConfigurationKeyMissingException - */ - public function render() - { - switch (Configs::getValueAsString('layout')) { - case '0': - $this->layout = Album::SQUARE; - break; - case '1': - $this->layout = Album::FLKR; - break; - case '2': - $this->layout = Album::MASONRY; - break; - default: - $this->layout = Album::FLKR; - } - - $this->info = $this->album->toArray(); - - return view('livewire.album'); - } -} diff --git a/app/Http/Livewire/Albums.php b/app/Http/Livewire/Albums.php deleted file mode 100644 index a32133544d..0000000000 --- a/app/Http/Livewire/Albums.php +++ /dev/null @@ -1,37 +0,0 @@ -topAlbums = $top->get(); - } - - /** - * Render component. - * - * @throws BindingResolutionException - */ - public function render() - { - return view('livewire.albums'); - } -} diff --git a/app/Http/Livewire/Fullpage.php b/app/Http/Livewire/Fullpage.php deleted file mode 100644 index 7f7178ce46..0000000000 --- a/app/Http/Livewire/Fullpage.php +++ /dev/null @@ -1,83 +0,0 @@ -mode = 'albums'; - } else { - $this->mode = 'album'; - $this->album = $albumFactory->findAbstractAlbumOrFail($albumId); - - if ($photoId !== null) { - $this->mode = 'photo'; - $this->photo = Photo::with('album')->findOrFail($photoId); - } - } - } - - public function openAlbum($albumId) - { - return redirect('/livewire/' . $albumId); - } - - public function openPhoto($photoId) - { - return redirect('/livewire/' . $this->album->id . '/' . $photoId); - } - - // Ideal we would like to avoid the redirect as they are slow. - public function back() - { - if ($this->photo !== null) { - // $this->photo = null; - return redirect('/livewire/' . $this->album->id); - } - if ($this->album !== null) { - if ($this->album instanceof BaseSmartAlbum) { - // $this->album = null; - return redirect('/livewire/'); - } - if ($this->album instanceof Album && $this->album->parent_id !== null) { - return redirect('/livewire/' . $this->album->parent_id); - } - - return redirect('/livewire/'); - } - } - - /** - * @throws BindingResolutionException - */ - public function render() - { - return view('livewire.fullpage'); - } -} diff --git a/app/Http/Livewire/Header.php b/app/Http/Livewire/Header.php deleted file mode 100644 index c6288a9fa6..0000000000 --- a/app/Http/Livewire/Header.php +++ /dev/null @@ -1,30 +0,0 @@ -title = Configs::getValueAsString('site_title'); - if ($album !== null) { - $this->title = $album->title; - } - $this->mode = $mode ?? 'albums'; - } - - /** - * @throws BindingResolutionException - */ - public function render() - { - return view('livewire.header'); - } -} diff --git a/app/Http/Livewire/LeftMenu.php b/app/Http/Livewire/LeftMenu.php deleted file mode 100644 index 6753ac221e..0000000000 --- a/app/Http/Livewire/LeftMenu.php +++ /dev/null @@ -1,17 +0,0 @@ -album = $photo->album; - $this->photo = $photo; - } - - /** - * @throws BindingResolutionException - * @throws IllegalOrderOfOperationException - */ - public function render() - { - $this->data = $this->photo->toArray(); - - return view('livewire.photo'); - } -} diff --git a/app/Http/Livewire/PhotoOverlay.php b/app/Http/Livewire/PhotoOverlay.php deleted file mode 100644 index 7804f2580b..0000000000 --- a/app/Http/Livewire/PhotoOverlay.php +++ /dev/null @@ -1,119 +0,0 @@ -photo_data = $data; - $overlay_type = Configs::getValueAsString('image_overlay_type'); - - $this->idx = array_search($overlay_type, $this->types, true); - } - - private function checkOverlayType(): string - { - if ($this->idx < 0) { - return 'none'; - } - - $n = count($this->types); - for ($i = 0; $i < $n; $i++) { - $type = $this->types[($this->idx + $i) % $n]; - if ($type === 'date' || $type === 'none') { - return $type; - } - if ($type === 'desc' && $this->photo_data['description'] !== '') { - return $type; - } - if ($type === 'exif' && $this->genExifHash() !== '') { - return $type; - } - } - } - - private function genExifHash() - { - $exifHash = $this->photo_data['make']; - $exifHash .= $this->photo_data['model']; - $exifHash .= $this->photo_data['shutter']; - if (Str::contains($this->photo_data['type'], 'video')) { - $exifHash .= $this->photo_data['aperture']; - $exifHash .= $this->photo_data['focal']; - } - $exifHash .= $this->photo_data['iso']; - - return $exifHash; - } - - /** - * @throws BindingResolutionException - */ - public function render() - { - $this->title = $this->photo_data['title']; - - $this->type = $this->checkOverlayType(); - $this->description = $this->photo_data['description']; - if ($this->photo_data['taken_at'] !== '') { - $this->camera_date = true; - $this->date = $this->photo_data['taken_at']; - } else { - $this->camera_date = false; - $this->date = $this->data['sysdate']; - } - - $exif1 = ''; - $exif2 = ''; - if ($this->genExifHash() !== '') { - if ($this->photo_data['shutter'] !== '') { - $exif1 = str_replace('s', 'sec', $this->photo_data['shutter']); - } - if ($this->photo_data['aperture'] !== '') { - $this->c($exif1, ' at ', str_replace('f/', 'ƒ / ', $this->photo_data['aperture'])); - } - if ($this->photo_data['iso'] !== '') { - $this->c($exif1, ', ', Lang::get('PHOTO_ISO') . ' ' . $this->photo_data['iso']); - } - if ($this->photo_data['focal'] !== '') { - $exif2 = $this->photo_data['focal'] . ($this->photo_data['lens'] !== '' ? ' (' . $this->photo_data['lens'] . ')' : ''); - } - } - $this->exif1 = trim($exif1); - $this->exif2 = trim($exif2); - - return view('livewire.photo-overlay'); - } - - private function c(string &$in, string $glue, string $content): void - { - if ($in !== '') { - $in .= $glue; - } - $in .= $content; - } -} diff --git a/app/Http/Livewire/Sidebar.php b/app/Http/Livewire/Sidebar.php deleted file mode 100644 index 7d4d12c6b4..0000000000 --- a/app/Http/Livewire/Sidebar.php +++ /dev/null @@ -1,114 +0,0 @@ -album = $album; - $this->photo = $photo; - } - - public function generateAlbumStructure() - { - $this->title = Lang::get('ALBUM_ABOUT'); - $this->data = []; - $basic = new \stdClass(); - $basic->title = Lang::get('ALBUM_BASICS'); - $basic->content = []; - - $basic->content[] = ['head' => Lang::get('ALBUM_TITLE'), 'value' => $this->album->title]; - if ($this->album->description !== '') { - ['head' => Lang::get('ALBUM_DESCRIPTION'), 'value' => $this->album->description]; - } - - if ($this->album instanceof TagAlbum) { - $basic->content[] = ['head' => Lang::get('ALBUM_SHOW_TAGS'), 'value' => $this->album->showtags]; - } - - $album = new \stdClass(); - $album->title = Lang::get('ALBUM_ALBUM'); - $album->content = [ - ['head' => Lang::get('ALBUM_CREATED'), 'value' => $this->album->created_at->format('F Y')], - ]; - if ($this->album->children->count() > 0) { - $album->content[] = ['head' => Lang::get('ALBUM_SUBALBUMS'), 'value' => $this->album->children->count()]; - } - - $counted = $this->album->photos->countBy(function (Photo $photo) { - return $photo->isVideo() ? 'videos' : 'photos'; - })->all(); - if (isset($counted['photos'])) { - $album->content[] = ['head' => Lang::get('ALBUM_IMAGES'), 'value' => $counted['photos']]; - } - if (isset($counted['videos'])) { - $album->content[] = ['head' => Lang::get('ALBUM_VIDEOS'), 'value' => $counted['videos']]; - } - if (isset($counted['photos'])) { - if ($this->album->sorting_col === '') { - $sorting = Lang::get('DEFAULT'); - } else { - $sorting = $this->album->sorting_col . ' ' . $this->album->sorting_order; - } - - $album->content[] = ['head' => Lang::get('ALBUM_ORDERING'), 'value' => $sorting]; - } - - $share = new \stdClass(); - $share->title = Lang::get('ALBUM_SHARING'); - $_public = $this->album->is_public ? Lang::get('ALBUM_SHR_YES') : Lang::get('ALBUM_SHR_NO'); - $_hidden = $this->album->is_link_required ? Lang::get('ALBUM_SHR_YES') : Lang::get('ALBUM_SHR_NO'); - $_downloadable = $this->album->grants_download ? Lang::get('ALBUM_SHR_YES') : Lang::get('ALBUM_SHR_NO'); - $_password = $this->album->is_password_required ? Lang::get('ALBUM_SHR_YES') : Lang::get('ALBUM_SHR_NO'); - $share->content = [ - ['head' => Lang::get('ALBUM_PUBLIC'), 'value' => $_public], - ['head' => Lang::get('ALBUM_HIDDEN'), 'value' => $_hidden], - ['head' => Lang::get('ALBUM_DOWNLOADABLE'), 'value' => $_downloadable], - ['head' => Lang::get('ALBUM_PASSWORD'), 'value' => $_password], - ]; - if ($this->album->owner_id !== null) { - $share->content[] = ['head' => Lang::get('ALBUM_OWNER'), 'value' => $this->album->owner->name]; - } - - $license = new \stdClass(); - $license->title = Lang::get('ALBUM_REUSE'); - $license->content = [ - ['head' => Lang::get('ALBUM_LICENSE'), 'value' => $this->album->license], - ]; - - $this->data = [$basic, $album, $license]; - - if (Auth::check()) { - $this->data[] = $share; - } - } - - /** - * @throws BindingResolutionException - */ - public function render() - { - if ($this->album !== null) { - $this->generateAlbumStructure(); - } else { - $this->data = []; - $this->title = ''; - } - - return view('livewire.sidebar'); - } -} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index e3cf3835c3..afdd19274c 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -51,9 +51,6 @@ public function boot() Route::middleware('web-admin') ->group(base_path('routes/web-admin.php')); - Route::middleware('web') - ->group(base_path('routes/web-livewire.php')); - Route::middleware('web') ->group(base_path('routes/web.php')); }); diff --git a/app/View/Components/Album/Thumbimg.php b/app/View/Components/Album/Thumbimg.php deleted file mode 100644 index 9287be9753..0000000000 --- a/app/View/Components/Album/Thumbimg.php +++ /dev/null @@ -1,50 +0,0 @@ -isVideo = Str::contains($type, 'video'); - $this->thumb = $thumb; - $this->thumb2x = $thumb2x; - $this->type = $type; - } - - /** - * Get the view / contents that represent the component. - * - * @return \Illuminate\Contracts\View\View|\Closure|string - * - * @throws BindingResolutionException - */ - public function render() - { - // TODO: Don't hardcode paths - if ($this->thumb === 'uploads/thumb/' && $this->isVideo) { - return view('components.album.thumb-play'); - } - // TODO: Don't query the MIME type directly; use the methods of Photo or MediaFile - if ($this->thumb === 'uploads/thumb/' && Str::contains($this->type, 'raw')) { - return view('components.album.thumb-placeholder'); - } - - return view('components.album.thumbimg'); - } -} diff --git a/app/View/Components/Icon.php b/app/View/Components/Icon.php deleted file mode 100644 index 63a3f29139..0000000000 --- a/app/View/Components/Icon.php +++ /dev/null @@ -1,35 +0,0 @@ -class = $class; - $this->icon = $icon; - } - - /** - * Get the view / contents that represent the component. - * - * @return \Illuminate\Contracts\View\View|\Closure|string - * - * @throws BindingResolutionException - */ - public function render() - { - return view('components.icon'); - } -} diff --git a/app/View/Components/Iconic.php b/app/View/Components/Iconic.php deleted file mode 100644 index abbcfa8f52..0000000000 --- a/app/View/Components/Iconic.php +++ /dev/null @@ -1,35 +0,0 @@ -class = $class; - $this->icon = $icon; - } - - /** - * Get the view / contents that represent the component. - * - * @return \Illuminate\Contracts\View\View|\Closure|string - * - * @throws BindingResolutionException - */ - public function render() - { - return view('components.iconic'); - } -} diff --git a/app/View/Components/Photo.php b/app/View/Components/Photo.php deleted file mode 100644 index 7cd3a973d7..0000000000 --- a/app/View/Components/Photo.php +++ /dev/null @@ -1,132 +0,0 @@ -album_id = $data['album']; - $this->photo_id = $data['id']; - $this->title = $data['title']; - $this->takedate = $data['taken_at']; - $this->created_at = $data['created_at']; - $this->is_starred = $data['is_starred']; - $this->is_public = $data['is_public']; - - // TODO: Don't query the MIME type directly; use the methods of Photo or MediaFile - $isVideo = Str::contains($data['type'], 'video'); - // TODO: Won't work any longer, as `type` always contains the true MIME type, not some faked "raw" - $isRaw = Str::contains($data['type'], 'raw'); - $isLivePhoto = filled($data['live_Photo_filename']); - - $this->class = ''; - $this->class .= $isVideo ? ' video' : ''; - $this->class .= $isLivePhoto ? ' livephoto' : ''; - - $this->layout = Configs::getValueAsInt('layout') === 0; - - // TODO: Don't hardcode paths - if ($data['sizeVariants']['thumb']['url'] === 'uploads/thumb/') { - $this->show_live = $isLivePhoto; - $this->show_play = $isVideo; - $this->show_placeholder = $isRaw; - } - - $dim = ''; - $dim2x = ''; - $thumb2x = ''; - - // TODO: The class Photo for the database model does not anymore contain the attributes `small`, `small_dim`, etc. - // Probably this code needs some fix/refactoring, too. However, where is this method invoked and - // what is the structure of the passed `data` array? (Could find any invocation.) - if ($this->layout) { - $thumb = $data['sizeVariants']['thumb']['url']; - $thumb2x = $data['sizeVariants']['thumb2x']['url']; - } elseif ($data['sizeVariants']['small'] !== null) { - $thumb = $data['sizeVariants']['small']['url']; - $thumb2x = $data['sizeVariants']['small2x']['url'] ?? ''; - $this->_w = $data['sizeVariants']['small']['width']; - $this->_h = $data['sizeVariants']['small']['height']; - $dim = $data['sizeVariants']['small']['width']; - $dim2x = $data['sizeVariants']['small2x']['width'] ?? 0; - } elseif ($data['sizeVariants']['medium'] !== null) { - $thumb = $data['sizeVariants']['medium']['url']; - $thumb2x = $data['sizeVariants']['medium2x']['url'] ?? ''; - $this->_w = $data['sizeVariants']['medium']['width']; - $this->_h = $data['sizeVariants']['medium']['height']; - $dim = $data['sizeVariants']['medium']['width']; - $dim2x = $data['sizeVariants']['medium2x']['width'] ?? 0; - } elseif (!$isVideo) { - // Fallback for images with no small or medium. - $thumb = $data['url']; - $this->_w = $data['width']; - $this->_h = $data['height']; - } else { - // Fallback for videos with no small (the case of no thumb is handled else where). - $this->class = 'video'; - $thumb = $data['sizeVariants']['thumb']['url']; - $thumb2x = $data['sizeVariants']['thumb2x']['url']; - $dim = (string) PhotoModel::THUMBNAIL_DIM; - $dim2x = (string) PhotoModel::THUMBNAIL2X_DIM; - } - - $this->src = "src='" . URL::asset('img/placeholder.png') . "'"; - $this->srcset = "data-src='" . URL::asset($thumb) . "'"; - $thumb2x_src = ''; - - if ($this->layout) { - $thumb2x_src = URL::asset($thumb2x) . ' 2x'; - } else { - $thumb2x_src = URL::asset($thumb) . ' ' . $dim . 'w, '; - $thumb2x_src .= URL::asset($thumb2x) . ' ' . $dim2x . 'w'; - } - - $this->srcset2x = $thumb2x !== '' ? "data-srcset='" . $thumb2x_src . "'" : ''; - } - - /** - * Get the view / contents that represent the component. - * - * @return \Illuminate\Contracts\View\View|\Closure|string - * - * @throws BindingResolutionException - */ - public function render() - { - return view('components.photo'); - } -} diff --git a/composer.json b/composer.json index 56c2cd8cab..e5144eea71 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,6 @@ "geocoder-php/nominatim-provider": "^5.5", "laragear/webauthn": "1.x-dev", "laravel/framework": "^9.2", - "livewire/livewire": "^2.7", "lychee-org/nestedset": "^6", "lychee-org/php-exif": "^0.8", "maennchen/zipstream-php": "^2.1", diff --git a/composer.lock b/composer.lock index 09cbf43e6d..2aadb7f716 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f86fb251cf5ffb86dccabe141160f8b", + "content-hash": "fa16e9d314d9baa911872b686fc43094", "packages": [ { "name": "bepsvpt/secure-headers", @@ -2336,79 +2336,6 @@ ], "time": "2022-04-17T13:12:02+00:00" }, - { - "name": "livewire/livewire", - "version": "v2.10.8", - "source": { - "type": "git", - "url": "https://github.com/livewire/livewire.git", - "reference": "4cc5dedaab1e9512efb4d528fde67df98e9b465a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/4cc5dedaab1e9512efb4d528fde67df98e9b465a", - "reference": "4cc5dedaab1e9512efb4d528fde67df98e9b465a", - "shasum": "" - }, - "require": { - "illuminate/database": "^7.0|^8.0|^9.0", - "illuminate/support": "^7.0|^8.0|^9.0", - "illuminate/validation": "^7.0|^8.0|^9.0", - "league/mime-type-detection": "^1.9", - "php": "^7.2.5|^8.0", - "symfony/http-kernel": "^5.0|^6.0" - }, - "require-dev": { - "calebporzio/sushi": "^2.1", - "laravel/framework": "^7.0|^8.0|^9.0", - "mockery/mockery": "^1.3.1", - "orchestra/testbench": "^5.0|^6.0|^7.0", - "orchestra/testbench-dusk": "^5.2|^6.0|^7.0", - "phpunit/phpunit": "^8.4|^9.0", - "psy/psysh": "@stable" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Livewire\\LivewireServiceProvider" - ], - "aliases": { - "Livewire": "Livewire\\Livewire" - } - } - }, - "autoload": { - "files": [ - "src/helpers.php" - ], - "psr-4": { - "Livewire\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Caleb Porzio", - "email": "calebporzio@gmail.com" - } - ], - "description": "A front-end framework for Laravel.", - "support": { - "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v2.10.8" - }, - "funding": [ - { - "url": "https://github.com/livewire", - "type": "github" - } - ], - "time": "2022-12-21T22:28:25+00:00" - }, { "name": "lychee-org/nestedset", "version": "v6.0.2", diff --git a/config/app.php b/config/app.php index f675ee229a..14c6a201ff 100644 --- a/config/app.php +++ b/config/app.php @@ -29,17 +29,6 @@ 'env' => env('APP_ENV', 'production'), - /* - |-------------------------------------------------------------------------- - | Application Environment - |-------------------------------------------------------------------------- - | - | This value determines whether livewire front-end is enabled as it is - | currently under development. - | - */ - - 'livewire' => (bool) env('LIVEWIRE_ENABLED', false), /* |-------------------------------------------------------------------------- diff --git a/resources/views/components/album/thumb-placeholder.blade.php b/resources/views/components/album/thumb-placeholder.blade.php deleted file mode 100644 index e0b494d157..0000000000 --- a/resources/views/components/album/thumb-placeholder.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - - Photo thumbnail - \ No newline at end of file diff --git a/resources/views/components/album/thumb-play.blade.php b/resources/views/components/album/thumb-play.blade.php deleted file mode 100644 index e4ce985cc1..0000000000 --- a/resources/views/components/album/thumb-play.blade.php +++ /dev/null @@ -1,6 +0,0 @@ - - Photo thumbnail - \ No newline at end of file diff --git a/resources/views/components/album/thumbimg.blade.php b/resources/views/components/album/thumbimg.blade.php deleted file mode 100644 index 585acc9732..0000000000 --- a/resources/views/components/album/thumbimg.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - - Photo thumbnail - diff --git a/resources/views/components/icon.blade.php b/resources/views/components/icon.blade.php deleted file mode 100644 index c24c5668ad..0000000000 --- a/resources/views/components/icon.blade.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/views/components/iconic.blade.php b/resources/views/components/iconic.blade.php deleted file mode 100644 index 2fd188229c..0000000000 --- a/resources/views/components/iconic.blade.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/resources/views/components/photo.blade.php b/resources/views/components/photo.blade.php deleted file mode 100644 index b023ccf4b0..0000000000 --- a/resources/views/components/photo.blade.php +++ /dev/null @@ -1,51 +0,0 @@ -
- - @if ($show_live) - @include('components.photo.thumb-live') - - @elseif ($show_play) - @include('components.photo.thumb-play') - - @elseif ($show_placeholder) - @include('components.photo.thumb-placeholder') - - @else - - Photo thumbnail - - @endif - -
-

{{ $title }}

- - @if ($takedate !== "") - {{ $takedate }} - @else - {{ $sysdate }} - @endif -
- - @if (Auth::check()) -
- @if($star) - - @endif - @if($public // && album.json.public !== "1" - ) - - @endif -
- @endif -
\ No newline at end of file diff --git a/resources/views/components/photo/thumb-live.blade.php b/resources/views/components/photo/thumb-live.blade.php deleted file mode 100644 index a6184a939d..0000000000 --- a/resources/views/components/photo/thumb-live.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - - Photo thumbnail - diff --git a/resources/views/components/photo/thumb-placeholder.blade.php b/resources/views/components/photo/thumb-placeholder.blade.php deleted file mode 100644 index 18b5259c44..0000000000 --- a/resources/views/components/photo/thumb-placeholder.blade.php +++ /dev/null @@ -1,6 +0,0 @@ - - Photo thumbnail - \ No newline at end of file diff --git a/resources/views/components/photo/thumb-play.blade.php b/resources/views/components/photo/thumb-play.blade.php deleted file mode 100644 index b0e3d57276..0000000000 --- a/resources/views/components/photo/thumb-play.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - - Photo thumbnail - \ No newline at end of file diff --git a/resources/views/livewire/album.blade.php b/resources/views/livewire/album.blade.php deleted file mode 100644 index 9fe6d4d245..0000000000 --- a/resources/views/livewire/album.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -
- @php - Helpers::data_index_set(100); - @endphp - @if($info['albums']->count() > 0) - @if(count($photos) > 0) -

{{ Lang::get('ALBUMS') }}

- @endif - @foreach ($info['albums'] as $data) - @include('livewire.parts.album') - @endforeach - - @if(count($photos) > 0) -

{{ Lang::get('PHOTOS') }}

- @endif - @endif -
- @foreach ($photos as $data) - - @endforeach -
-
\ No newline at end of file diff --git a/resources/views/livewire/albums.blade.php b/resources/views/livewire/albums.blade.php deleted file mode 100644 index 1bd4b5064e..0000000000 --- a/resources/views/livewire/albums.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@if (!$smartalbums && !$albums && !$shared_albums) -
- -

{{ Lang::get('VIEW_NO_PUBLIC_ALBUMS') }}

-
-@else -
- - @isset($smartalbums) -

{{ Lang::get('SMART_ALBUMS') }}

- @foreach ($smartalbums as $data) - @include('livewire.parts.album') - @endforeach - @if(count($albums) > 0) -

{{ Lang::get('ALBUMS') }}

- @endif - @endisset - - @if(count($albums) > 0) - @foreach ($albums as $data) - @include('livewire.parts.album') - @endforeach - @endif - - @if(count($shared_albums) > 0) -

{{ Lang::get('SHARED_ALBUMS') }}

- @foreach ($shared_albums as $data) - @include('livewire.parts.album') - @endforeach - @endif -
-@endif \ No newline at end of file diff --git a/resources/views/livewire/fullpage.blade.php b/resources/views/livewire/fullpage.blade.php deleted file mode 100644 index 7c69a6bc92..0000000000 --- a/resources/views/livewire/fullpage.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -
- -
- - - - @if($mode == 'albums') - - - @elseif($mode == 'album') - - {{-- --}} - - @elseif($mode == 'photo') - - - @elseif($mode == 'map') - Later... - - @endif - {{-- @livewire('left-menu') --}} - {{-- @livewire('albums') --}} - - {{-- @include('includes.footer') --}} -
- \ No newline at end of file diff --git a/resources/views/livewire/header.blade.php b/resources/views/livewire/header.blade.php deleted file mode 100644 index 44aba726fb..0000000000 --- a/resources/views/livewire/header.blade.php +++ /dev/null @@ -1,155 +0,0 @@ -
- @if($mode == 'albums') -
- @if(!Auth::check()) - - - - @else - - - - @endif - - {{ $title }} -
- - × -
- - - - - @if(Auth::check()) - - - - @endif -
- - @elseif( $mode == 'album') -
- - - - - - {{ $title }} - - @if(Auth::check()) - - - - - - - - - - @endif - - - - - - - - - - - @if(Auth::check()) - - - - - - - @endif - - - - - - - - @if(Auth::check()) - - - - @endif -
- - @elseif ($mode == 'photo') -
- - - - - - {{ $title }} - - @if(Auth::check()) - - - - - - - - - - - - - @endif - - - - - - - - @if(Auth::check()) - - - - - - - @endif - - - - - - - - - - -
- - @elseif ($mode == 'map') -
- - - - - - {{ $title }} - -
- - @else -
- - - - {{ $title }} -
- @endif -
diff --git a/resources/views/livewire/left-menu.blade.php b/resources/views/livewire/left-menu.blade.php deleted file mode 100644 index 4aba00d1d6..0000000000 --- a/resources/views/livewire/left-menu.blade.php +++ /dev/null @@ -1,29 +0,0 @@ - -
- {{ Lang::get("CLOSE") }} - × - - {{ Lang::get("SETTINGS") }} - - - {{ Lang::get("USERS") }} - - - {{ Lang::get("U2F") }} - - - {{ Lang::get("SHARING") }} - - - {{ Lang::get("LOGS") }} - - - {{ Lang::get("DIAGNOSTICS") }} - - - {{ Lang::get("ABOUT_LYCHEE") }} - - - {{ Lang::get("SIGN_OUT") }} - -
diff --git a/resources/views/livewire/parts/album.blade.php b/resources/views/livewire/parts/album.blade.php deleted file mode 100644 index 60a7725a2c..0000000000 --- a/resources/views/livewire/parts/album.blade.php +++ /dev/null @@ -1,59 +0,0 @@ -
- @for ($i = 0; $i < 3; $i++) - @if($data['thumb']) - - @else - @include('components.album.thumb-placeholder') - @endif - @endfor - -
-

{{ $data['title'] }}

- {{-- {{ $data['date_stamp'] }} --}} -
- -@if (Auth::check()) -
- @if (isset($data['nsfw']) && $data['nsfw'] == "1") - - @endif - @if (isset($data['star']) && $data['star'] == "1") - - @endif - @if (isset($data['public']) && $data['public'] == "1") - - @endif - @if (isset($data['unsorted']) && $data['unsorted'] == "1") - - @endif - @if (isset($data['recent']) && $data['recent'] == "1") - - @endif - @if (isset($data['password']) && $data['password'] == "1") - - @endif - @if (isset($data['tag_album']) && $data['tag_album'] == "1") - - @endif - @if (isset($data['cover_id']) && isset($data['thumb']['id']) && $data['cover_id'] == $data['thumb']['id']) - - @endif -
-@endif - -
- @if (isset($data['show_num_photos']) && isset($data['num_photos'] && $data['num_photos'] > 0) -
{{ $data['num_photos'] }}
; - @endif - @if ((isset($data['show_num_albums']) && isset($data['num_albums'] && $data['num_albums'] > 0)) -
- @if ($data['num_albums'] > 1) - {{ $data['num_albums'] }} -
; - @endif -
-
diff --git a/resources/views/livewire/photo-overlay.blade.php b/resources/views/livewire/photo-overlay.blade.php deleted file mode 100644 index 6e5d788813..0000000000 --- a/resources/views/livewire/photo-overlay.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -
-

{{ $title }}

-

- @switch($type) - @case('desc') - {{ $description }} - @break - @case('date') - @if($camera_date) - - - {{ $date }} - - @else - {{ $date }} - @endif - @break - @case('exif') - {{ html_entity_decode($exif1) }} -
- {{ $exif2 }} - @break - @default - @endswitch -

-
\ No newline at end of file diff --git a/resources/views/livewire/photo.blade.php b/resources/views/livewire/photo.blade.php deleted file mode 100644 index d59eb544d7..0000000000 --- a/resources/views/livewire/photo.blade.php +++ /dev/null @@ -1,79 +0,0 @@ -
-@if (Str::contains($data['type'], 'video')) - -@elseif(Str::contains($data['type'], 'raw')) - big -@else - @if ($data['livePhotoUrl'] === "" || $data['livePhotoUrl'] === null) - @if ($data['sizeVariants']['medium'] !== null) - - @else - big - @endif - @else - @if ($data['medium'] !== "") - @php - $medium_dims = explode('x',$data['medium_dim']); - $medium_width = $medium_dims[0]; - $medium_height = $medium_dims[1]; - @endphp -
-
- @else -
-
- @endif - @endif -@endif - -{{-- --}} -{{-- --}} -
diff --git a/resources/views/livewire/sidebar.blade.php b/resources/views/livewire/sidebar.blade.php deleted file mode 100644 index a1a8b8e1ff..0000000000 --- a/resources/views/livewire/sidebar.blade.php +++ /dev/null @@ -1,23 +0,0 @@ - - \ No newline at end of file diff --git a/routes/web-livewire.php b/routes/web-livewire.php deleted file mode 100644 index b2c59d011f..0000000000 --- a/routes/web-livewire.php +++ /dev/null @@ -1,28 +0,0 @@ - ''], function () { - Route::get('/livewire', Fullpage::class)->middleware(['installation:complete', 'migration:complete']); - Route::get('/livewire/{albumId}', Fullpage::class)->middleware(['installation:complete', 'migration:complete']); - Route::get('/livewire/{albumId}/{photoId}', Fullpage::class)->middleware(['installation:complete', 'migration:complete']); - }); -}