Visibility (#326)

* Start with visibility: hidden on load * Add new has_albums field for the front end Reduce the recursion level in get_albums(). Optimize eager loading in search. * Remove a forgotten return
LycheeOrg · Sep 3, 2019 · fb2d66c · fb2d66c
1 parent f7f1020
commit fb2d66c
Show file tree

Hide file tree

Showing 12 changed files with 524 additions and 2,912 deletions.
diff --git a/app/Http/Controllers/AlbumController.php b/app/Http/Controllers/AlbumController.php
@@ -141,11 +141,9 @@ public function get(Request $request)
 				}
 
 				$full_photo = $album->full_photo_visible();
-				// To speed things up, we limit subalbum data to at most two
-				// levels down.  The second level is needed only for the
-				// displaying of the subalbum_badge for the subalbums in the
-				// front end.
-				$return['albums'] = $this->albumFunctions->get_albums($album, $username, 2);
+				// To speed things up, we limit subalbum data to at most one
+				// level down.
+				$return['albums'] = $this->albumFunctions->get_albums($album, $username, 1);
 				$photos_sql = Photo::set_order(Photo::where('album_id', '=', $request['albumID']));
 				foreach ($return['albums'] as &$alb) {
 					unset($alb['thumbIDs']);

diff --git a/app/Http/Controllers/DemoController.php b/app/Http/Controllers/DemoController.php
@@ -87,7 +87,7 @@ public function js()
 				$return_album_json['owner'] = $username = $album->owner->username;
 			}
 			$full_photo = $album->full_photo_visible();
-			$return_album_json['albums'] = $albumFunctions->get_albums($album, $username, 2);
+			$return_album_json['albums'] = $albumFunctions->get_albums($album, $username, 1);
 			$photos_sql = Photo::set_order(Photo::where('album_id', '=', $album->id));
 			foreach ($return_album_json['albums'] as &$alb) {
 				unset($alb['thumbIDs']);

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
@@ -158,16 +158,17 @@ function (Builder $query) use ($escaped_term) {
 			$i = 0;
 			foreach ($albums as $album_model) {
 				$album = $album_model->prepareData();
-				$username = null;
 				if ($this->sessionFunctions->is_logged_in()) {
-					$album['owner'] = $username = $album_model->owner->username;
+					$album['owner'] = $album_model->owner->username;
 				}
 				if ($this->readAccessFunctions->album($album_model) === 1) {
-					// We need 'albums' just for the displaying of the
-					// subalbum_badge in the front end, and for that we don't
-					// need more than one level down.
-					$album['albums'] = $this->albumFunctions->get_albums($album_model, $username, 1);
-					$this->albumFunctions->gen_thumbs($album, [$album_model->id]);
+					// We don't need 'albums' but we do need to come up with
+					// all the subalbums in order to get accurate thumbs info
+					// and to let the front end know if there are any.
+					$subAlbums = [$album_model->id];
+					$this->albumFunctions->get_sub_albums($subAlbums, $album_model);
+					$this->albumFunctions->gen_thumbs($album, $subAlbums);
+					$album['has_albums'] = count($subAlbums) > 1 ? '1' : '0';
 				}
 				unset($album['thumbIDs']);
 				$return['albums'][$i] = $album;
@@ -189,7 +190,7 @@ function (Builder $query) use ($escaped_term) {
 				$i++;
 			}
 		}
-		$query = Photo::where(
+		$query = Photo::with('album')->where(
 			function (Builder $query) use ($albumIDs) {
 				$query->whereIn('album_id', $albumIDs);
 				// Add the 'Unsorted' album.

diff --git a/app/ModelFunctions/AlbumFunctions.php b/app/ModelFunctions/AlbumFunctions.php
@@ -496,6 +496,7 @@ public function get_albums(Album $album, $username, $recursionLimit = 0): array
 						$subSubAlbums = [$subAlbum->id];
 						$this->get_sub_albums($subSubAlbums, $subAlbum);
 						$this->gen_thumbs($subAlbumData, $subSubAlbums);
+						$subAlbumData['has_albums'] = count($subSubAlbums) > 1 ? '1' : '0';
 					}
 				}
 
@@ -568,8 +569,6 @@ public function get_sub_albums(array &$return, Album $parentAlbum, $includePassP
 				}
 			}
 		}
-
-		return $return;
 	}
 
 	/**

diff --git a/public/Lychee-front b/public/Lychee-front
diff --git a/public/dist/frame.js b/public/dist/frame.js
diff --git a/public/dist/landing.js b/public/dist/landing.js
diff --git a/public/dist/main.css b/public/dist/main.css
diff --git a/public/dist/main.js b/public/dist/main.js
diff --git a/public/dist/view.js b/public/dist/view.js
diff --git a/resources/views/gallery.blade.php b/resources/views/gallery.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.simple')
+@extends('layouts.gallery')
 
 @section('head-js')
 @endsection

diff --git a/resources/views/layouts/gallery.blade.php b/resources/views/layouts/gallery.blade.php
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html lang="{{ $locale['language'] }}" style="visibility: hidden;">
+<head>
+@include('includes.head')
+</head>
+<body>
+@yield('content')
+</body>
+</html>
+260 −0		deps/basiccontext/scripts/basicContext.js
+11 −0		deps/basiccontext/styles/_container.scss
+50 −0		deps/basiccontext/styles/_context.scss
+2 −0		deps/basiccontext/styles/_vars.scss
+12 −0		deps/basiccontext/styles/addons/fadein.scss
+12 −0		deps/basiccontext/styles/addons/popin.scss
+6 −0		deps/basiccontext/styles/main.scss
+50 −0		deps/basiccontext/styles/themes/bright.scss
+48 −0		deps/basiccontext/styles/themes/dark.scss
+50 −0		deps/basiccontext/styles/themes/default.scss
+9 −9		gulpfile.js
+0 −1		package.json
+1 −1		scripts/main/build.js
+2 −0		scripts/main/init.js
+2 −2		scripts/main/photo.js
+5 −5		scripts/main/view.js