Generate multiple avatar sizes for better performance loading and frugal traffic

This commit is contained in:
Čarodej
2021-11-03 16:28:14 +01:00
parent dc8ec5f20b
commit f139dbae08
30 changed files with 280 additions and 152 deletions
+6 -3
View File
@@ -236,9 +236,12 @@ class AdminTest extends TestCase
'name' => 'John Doe',
]);
Storage::disk('local')
->assertExists(
User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar')
$avatar = User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar');
collect(config('vuefilemanager.avatar_sizes'))
->each(fn ($size) =>
Storage::disk('local')
->assertExists("avatars/{$size['name']}-{$avatar}")
);
}
+9
View File
@@ -110,12 +110,21 @@ class BrowseTest extends TestCase
],
],
'isMovable' => true,
'isOpen' => true,
],
[
'location' => 'team-folders',
'name' => 'Team Folders',
'folders' => [],
'isMovable' => false,
'isOpen' => false,
],
[
'location' => 'shared-with-me',
'name' => 'Shared With Me',
'folders' => [],
'isMovable' => false,
'isOpen' => false,
],
]);
}
+11 -12
View File
@@ -1,4 +1,5 @@
<?php
namespace Tests\Domain\Files;
use Storage;
@@ -79,20 +80,19 @@ class ContentAccessTest extends TestCase
->create();
$thumbnail = UploadedFile::fake()
->image(Str::random() . '-fake-thumbnail.jpg');
->image('fake-thumbnail.jpg');
Storage::putFileAs("files/$user->id", $thumbnail, $thumbnail->name);
File::factory(File::class)
->create([
'user_id' => $user->id,
'thumbnail' => $thumbnail->name,
'name' => 'fake-thumbnail.jpg',
'user_id' => $user->id,
'basename' => 'fake-thumbnail.jpg',
]);
$this
->actingAs($user)
->get("thumbnail/$thumbnail->name")
->get("thumbnail/xs-$thumbnail->name")
->assertStatus(200);
}
@@ -101,24 +101,23 @@ class ContentAccessTest extends TestCase
*/
public function logged_user_try_to_get_another_private_user_image_thumbnail()
{
$users = User::factory(User::class)
$users = User::factory()
->count(2)
->create();
$thumbnail = UploadedFile::fake()
->image(Str::random() . '-fake-thumbnail.jpg');
->image('fake-thumbnail.jpg', 2000, 2000);
Storage::putFileAs("files/{$users[0]->id}", $thumbnail, $thumbnail->name);
File::factory(File::class)
File::factory()
->create([
'user_id' => $users[0]->id,
'thumbnail' => $thumbnail->name,
'name' => 'fake-thumbnail.jpg',
'user_id' => $users[0]->id,
'basename' => 'fake-thumbnail.jpg',
]);
$this->actingAs($users[1])
->get("thumbnail/$thumbnail->name")
->get("thumbnail/xs-$thumbnail->name")
->assertForbidden();
}
+15 -12
View File
@@ -31,9 +31,9 @@ class FileTest extends TestCase
public function it_upload_image_file_and_create_thumbnail()
{
$file = UploadedFile::fake()
->image('fake-image.jpg');
->image('fake-image.jpg', 2000, 2000);
$user = User::factory(User::class)
$user = User::factory()
->create();
$this
@@ -47,17 +47,18 @@ class FileTest extends TestCase
$disk = Storage::disk('local');
$file = File::first();
$disk->assertMissing(
'chunks/fake-image.jpg'
"chunks/$file->basename"
);
$disk->assertExists(
"files/$user->id/fake-image.jpg"
);
$disk->assertExists(
"files/$user->id/thumbnail-fake-image.jpg"
);
collect(config('vuefilemanager.image_sizes'))
->each(fn ($item) =>
$disk->assertExists(
"files/{$user->id}/{$item['name']}-{$file->basename}"
)
);
}
/**
@@ -82,12 +83,14 @@ class FileTest extends TestCase
$disk = Storage::disk('local');
$file = File::first();
$disk->assertMissing(
'chunks/fake-file.pdf'
"chunks/$file->basename"
);
$disk->assertExists(
"files/$user->id/fake-file.pdf"
"files/$user->id/$file->basename"
);
}
+13 -10
View File
@@ -1,4 +1,5 @@
<?php
namespace Tests\Domain\Homepage;
use Mail;
@@ -83,17 +84,18 @@ class HomepageTest extends TestCase
*/
public function it_get_og_page_for_image()
{
$user = User::factory(User::class)
$user = User::factory()
->create();
$file = File::factory(File::class)
$file = File::factory()
->create([
'user_id' => $user->id,
'name' => 'Fake Image',
'thumbnail' => 'fake-image-thumbnail.jpg',
'user_id' => $user->id,
'name' => 'Fake Image',
'basename' => 'fake-image.jpg',
'type' => 'image',
]);
$share = Share::factory(Share::class)
$share = Share::factory()
->create([
'item_id' => $file->id,
'user_id' => $user->id,
@@ -105,7 +107,7 @@ class HomepageTest extends TestCase
->get("/api/og-site/$share->token")
->assertStatus(200)
->assertSee('Fake Image')
->assertSee('fake-image-thumbnail.jpg');
->assertSee('md-fake-image.jpg');
}
/**
@@ -118,9 +120,10 @@ class HomepageTest extends TestCase
$file = File::factory(File::class)
->create([
'user_id' => $user->id,
'name' => 'Fake Image',
'thumbnail' => 'fake-image-thumbnail.jpg',
'user_id' => $user->id,
'name' => 'Fake Image',
'basename' => 'fake-image.jpg',
'type' => 'image',
]);
$share = Share::factory(Share::class)
+5 -1
View File
@@ -272,7 +272,11 @@ class SetupWizardTest extends TestCase
$this->assertNotNull($avatar);
Storage::assertExists($avatar);
collect(config('vuefilemanager.avatar_sizes'))
->each(fn ($size) =>
Storage::disk('local')
->assertExists("avatars/{$size['name']}-{$avatar}")
);
}
/**
@@ -72,8 +72,8 @@ class VisitorAccessToItemsTest extends TestCase
$file = File::factory(File::class)
->create([
'user_id' => $user->id,
'name' => 'fake-thumbnail.jpg',
'user_id' => $user->id,
'name' => 'fake-thumbnail.jpg',
]);
$share = Share::factory(Share::class)
@@ -99,17 +99,18 @@ class VisitorAccessToItemsTest extends TestCase
$user = User::factory(User::class)
->create();
$thumbnail = UploadedFile::fake()
->image(Str::random() . '-fake-image.jpg');
$fileName = Str::random() . '-fake-image.jpg';
Storage::putFileAs("files/$user->id", $thumbnail, $thumbnail->name);
$thumbnail = UploadedFile::fake()
->image($fileName, 2000, 2000);
Storage::putFileAs("files/$user->id", $thumbnail, $fileName);
$file = File::factory(File::class)
->create([
'user_id' => $user->id,
'thumbnail' => $thumbnail->name,
'basename' => $thumbnail->name,
'name' => 'fake-thumbnail.jpg',
'basename' => $fileName,
'name' => $fileName,
'type' => 'image',
'mimetype' => 'jpg',
]);
@@ -152,16 +153,18 @@ class VisitorAccessToItemsTest extends TestCase
$user = User::factory(User::class)
->create();
$thumbnail = UploadedFile::fake()
->image(Str::random() . '-fake-thumbnail.jpg');
$fileName = Str::random() . '-fake-thumbnail.jpg';
Storage::putFileAs("files/$user->id", $thumbnail, $thumbnail->name);
$thumbnail = UploadedFile::fake()
->image($fileName);
Storage::putFileAs("files/$user->id", $thumbnail, $fileName);
$file = File::factory(File::class)
->create([
'user_id' => $user->id,
'thumbnail' => $thumbnail->name,
'name' => 'fake-thumbnail.jpg',
'user_id' => $user->id,
'name' => $fileName,
'basename' => $fileName,
]);
$share = Share::factory(Share::class)
@@ -182,12 +185,12 @@ class VisitorAccessToItemsTest extends TestCase
];
$this->withCookies($cookie)
->get("/thumbnail/$thumbnail->name/$share->token")
->get("/thumbnail/xs-$fileName/$share->token")
->assertStatus(200);
}
if (!$is_protected) {
$this->get("/thumbnail/$thumbnail->name/$share->token")
$this->get("/thumbnail/xs-$fileName/$share->token")
->assertStatus(200);
}
@@ -348,9 +348,11 @@ class VisitorManipulatingTest extends TestCase
'author' => 'visitor',
]);
$file = File::all()->last();
Storage::disk('local')
->assertExists(
"files/$user->id/fake-file.pdf"
"files/$user->id/$file->basename"
);
});
}