diff --git a/backend/app/Controllers/ElementController.php b/backend/app/Controllers/ElementController.php index 8665880..5fc14d7 100644 --- a/backend/app/Controllers/ElementController.php +++ b/backend/app/Controllers/ElementController.php @@ -9,15 +9,18 @@ use App\Element\UseCases\DeleteChildElement\DeleteChildElement; use App\Element\UseCases\DeleteChildElement\DeleteChildElementRequest; use App\Element\UseCases\GetElement\GetElement; use App\Element\UseCases\GetElement\GetElementRequest; +use App\Element\UseCases\GetElementPdf\GetElementPdf; +use App\Element\UseCases\GetElementPdf\GetElementPdfRequest; use App\Element\UseCases\ReorderChildElements\ReorderChildElements; use App\Element\UseCases\ReorderChildElements\ReorderChildElementsRequest; use App\Element\UseCases\UpdateElement\UpdateElement; use App\Element\UseCases\UpdateElement\UpdateElementRequest; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Http\UploadedFile; class ElementController @@ -28,7 +31,8 @@ class ElementController private DeleteChildElement $deleteChildElement, private ReorderChildElements $reorderChildElements, private UpdateElement $updateElement, - private FileUploader $fileUploader, + private GetElementPdf $getElementPdf, + private Filesystem $filesystem, ) { } @@ -64,6 +68,39 @@ class ElementController ], 200); } + public function showPdf( + ?string $folder, + ?string $fileName, + ): Response|JsonResponse { + try { + $result = $this->getElementPdf->execute( + new GetElementPdfRequest( + folder: $folder, + fileName: $fileName, + ) + ); + } catch (BadRequestException $exception) { + return new JsonResponse([ + 'error' => $exception->getMessage(), + ], 400); + } catch (NotFoundException $exception) { + return new JsonResponse([ + 'error' => $exception->getMessage(), + ], 404); + } + + return new Response( + $result->getContents(), + 200, + [ + 'Content-Type' => $result->getMimeType(), + 'Content-Disposition' => 'inline; filename="' + . $result->getFileName() + . '"', + ], + ); + } + public function createChild(Request $request, ?int $parentId): JsonResponse { try { @@ -367,7 +404,7 @@ class ElementController } if (str_starts_with($path, $folderPrefix)) { - return $this->fileUploader->url($path); + return $this->filesystem->url($path); } return $path; diff --git a/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php b/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php index 954de01..a0c8257 100644 --- a/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php +++ b/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php @@ -6,13 +6,13 @@ use App\Element\Element; use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class DeleteChildElement { public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -78,6 +78,6 @@ class DeleteChildElement return; } - $this->fileUploader->delete($path); + $this->filesystem->delete($path); } } diff --git a/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php b/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php new file mode 100644 index 0000000..cfce117 --- /dev/null +++ b/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php @@ -0,0 +1,63 @@ +folder === null) { + throw new BadRequestException('folder is required'); + } + + if ($request->fileName === null) { + throw new BadRequestException('fileName is required'); + } + + if (!$this->isAllowedPdfFolder($request->folder)) { + throw new BadRequestException('folder is invalid'); + } + + if (!$this->isValidPdfFileName($request->fileName)) { + throw new BadRequestException('fileName is invalid'); + } + + $path = "element-pdfs/$request->folder/$request->fileName"; + $contents = $this->filesystem->read($path); + if ($contents === null) { + throw new NotFoundException('PDF not found'); + } + + return new GetElementPdfResult( + contents: $contents, + fileName: $request->fileName, + mimeType: self::PDF_MIME_TYPE, + ); + } + + private function isAllowedPdfFolder(string $folder): bool + { + return in_array($folder, self::PDF_FOLDERS, true); + } + + private function isValidPdfFileName(string $fileName): bool + { + return preg_match('/^[A-Za-z0-9._-]+\.pdf$/', $fileName) === 1; + } +} diff --git a/backend/app/Element/UseCases/GetElementPdf/GetElementPdfRequest.php b/backend/app/Element/UseCases/GetElementPdf/GetElementPdfRequest.php new file mode 100644 index 0000000..ba7b565 --- /dev/null +++ b/backend/app/Element/UseCases/GetElementPdf/GetElementPdfRequest.php @@ -0,0 +1,12 @@ +contents; + } + + public function getFileName(): string + { + return $this->fileName; + } + + public function getMimeType(): string + { + return $this->mimeType; + } +} diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateIconImage.php b/backend/app/Element/UseCases/UpdateElement/UpdateIconImage.php index 59dcaad..0a0d9db 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateIconImage.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateIconImage.php @@ -7,7 +7,7 @@ use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Shared\Files\FileToUpload; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateIconImage { @@ -21,7 +21,7 @@ class UpdateIconImage public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -73,7 +73,7 @@ class UpdateIconImage mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->fileUploader->upload($iconImage, 'element-icons'); + $path = $this->filesystem->upload($iconImage, 'element-icons'); $element->setIconImageUrl($path); return $this->elementRepository->update($element); diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateIconImageUrl.php b/backend/app/Element/UseCases/UpdateElement/UpdateIconImageUrl.php index 278c566..3c0abdc 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateIconImageUrl.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateIconImageUrl.php @@ -6,13 +6,13 @@ use App\Element\Element; use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateIconImageUrl { public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -60,6 +60,6 @@ class UpdateIconImageUrl return; } - $this->fileUploader->delete($path); + $this->filesystem->delete($path); } } diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php b/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php index 014ada9..c887001 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php @@ -7,7 +7,7 @@ use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Shared\Files\FileToUpload; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateLongPdf { @@ -19,7 +19,7 @@ class UpdateLongPdf public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -67,7 +67,7 @@ class UpdateLongPdf mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->fileUploader->upload($pdf, 'element-pdfs/long'); + $path = $this->filesystem->upload($pdf, 'element-pdfs/long'); $element->setLongPdfPath($path); return $this->elementRepository->update($element); diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateLongPdfPath.php b/backend/app/Element/UseCases/UpdateElement/UpdateLongPdfPath.php index ae04422..7f22976 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateLongPdfPath.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateLongPdfPath.php @@ -6,13 +6,13 @@ use App\Element\Element; use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateLongPdfPath { public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -60,6 +60,6 @@ class UpdateLongPdfPath return; } - $this->fileUploader->delete($path); + $this->filesystem->delete($path); } } diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php b/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php index 122eded..654643f 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php @@ -7,7 +7,7 @@ use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Shared\Files\FileToUpload; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateShortPdf { @@ -19,7 +19,7 @@ class UpdateShortPdf public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -67,7 +67,7 @@ class UpdateShortPdf mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->fileUploader->upload($pdf, 'element-pdfs/short'); + $path = $this->filesystem->upload($pdf, 'element-pdfs/short'); $element->setShortPdfPath($path); return $this->elementRepository->update($element); diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateShortPdfPath.php b/backend/app/Element/UseCases/UpdateElement/UpdateShortPdfPath.php index ae4b4e3..9b4c409 100644 --- a/backend/app/Element/UseCases/UpdateElement/UpdateShortPdfPath.php +++ b/backend/app/Element/UseCases/UpdateElement/UpdateShortPdfPath.php @@ -6,13 +6,13 @@ use App\Element\Element; use App\Element\ElementRepository; use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; class UpdateShortPdfPath { public function __construct( private ElementRepository $elementRepository, - private FileUploader $fileUploader, + private Filesystem $filesystem, ) { } @@ -60,6 +60,6 @@ class UpdateShortPdfPath return; } - $this->fileUploader->delete($path); + $this->filesystem->delete($path); } } diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php index 9ea2b0c..9c972cd 100644 --- a/backend/app/Providers/AppServiceProvider.php +++ b/backend/app/Providers/AppServiceProvider.php @@ -8,8 +8,8 @@ use App\Auth\PasswordHasher; use App\Auth\RandomTokenGenerator; use App\Auth\SystemClock; use App\Auth\TokenGenerator; -use App\Shared\Files\FileUploader; -use App\Shared\Files\LaravelFileUploader; +use App\Shared\Files\Filesystem; +use App\Shared\Files\LaravelFilesystem; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -29,8 +29,8 @@ class AppServiceProvider extends ServiceProvider SystemClock::class, ); $this->app->bind( - FileUploader::class, - LaravelFileUploader::class, + Filesystem::class, + LaravelFilesystem::class, ); } } diff --git a/backend/app/Shared/Files/FileUploader.php b/backend/app/Shared/Files/Filesystem.php similarity index 74% rename from backend/app/Shared/Files/FileUploader.php rename to backend/app/Shared/Files/Filesystem.php index ac30916..bc27dae 100644 --- a/backend/app/Shared/Files/FileUploader.php +++ b/backend/app/Shared/Files/Filesystem.php @@ -2,11 +2,13 @@ namespace App\Shared\Files; -interface FileUploader +interface Filesystem { public function upload(FileToUpload $file, string $folder): string; public function url(string $path): string; public function delete(string $path): void; + + public function read(string $path): ?string; } diff --git a/backend/app/Shared/Files/LaravelFileUploader.php b/backend/app/Shared/Files/LaravelFilesystem.php similarity index 82% rename from backend/app/Shared/Files/LaravelFileUploader.php rename to backend/app/Shared/Files/LaravelFilesystem.php index 89416b0..ff82c49 100644 --- a/backend/app/Shared/Files/LaravelFileUploader.php +++ b/backend/app/Shared/Files/LaravelFilesystem.php @@ -5,7 +5,7 @@ namespace App\Shared\Files; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -class LaravelFileUploader implements FileUploader +class LaravelFilesystem implements Filesystem { public function upload(FileToUpload $file, string $folder): string { @@ -25,6 +25,15 @@ class LaravelFileUploader implements FileUploader Storage::disk('public')->delete($path); } + public function read(string $path): ?string + { + if (!Storage::disk('public')->exists($path)) { + return null; + } + + return Storage::disk('public')->get($path); + } + private function extensionFor(FileToUpload $file): string { $mimeExtensions = [ diff --git a/backend/routes/api.php b/backend/routes/api.php index f084592..82a3af4 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -12,6 +12,10 @@ Route::get('/me', [AuthController::class, 'me']) ->middleware(AuthMiddleware::class); Route::get('/sets', [SetController::class, 'index']); Route::get('/elements/{id}', [ElementController::class, 'show']); +Route::get('/element-pdfs/{folder}/{fileName}', [ + ElementController::class, + 'showPdf', +]); Route::post('/elements/{parentId}/children', [ ElementController::class, 'createChild', diff --git a/backend/tests/Fakes/FakeFileUploader.php b/backend/tests/Fakes/FakeFilesystem.php similarity index 57% rename from backend/tests/Fakes/FakeFileUploader.php rename to backend/tests/Fakes/FakeFilesystem.php index 9273887..57ff059 100644 --- a/backend/tests/Fakes/FakeFileUploader.php +++ b/backend/tests/Fakes/FakeFilesystem.php @@ -3,9 +3,9 @@ namespace Tests\Fakes; use App\Shared\Files\FileToUpload; -use App\Shared\Files\FileUploader; +use App\Shared\Files\Filesystem; -class FakeFileUploader implements FileUploader +class FakeFilesystem implements Filesystem { /** * @var array @@ -17,6 +17,16 @@ class FakeFileUploader implements FileUploader */ public array $deletedPaths = []; + /** + * @var string[] + */ + public array $readPaths = []; + + /** + * @var array + */ + private array $filesByPath = []; + public function upload(FileToUpload $file, string $folder): string { $this->uploads[] = ['file' => $file, 'folder' => $folder]; @@ -33,4 +43,16 @@ class FakeFileUploader implements FileUploader { $this->deletedPaths[] = $path; } + + public function put(string $path, string $contents): void + { + $this->filesByPath[$path] = $contents; + } + + public function read(string $path): ?string + { + $this->readPaths[] = $path; + + return $this->filesByPath[$path] ?? null; + } } diff --git a/backend/tests/Unit/Controllers/ElementControllerTest.php b/backend/tests/Unit/Controllers/ElementControllerTest.php index 1ebcb9c..ee3203f 100644 --- a/backend/tests/Unit/Controllers/ElementControllerTest.php +++ b/backend/tests/Unit/Controllers/ElementControllerTest.php @@ -8,6 +8,7 @@ use App\Element\Element; use App\Element\UseCases\CreateChildElement\CreateChildElement; use App\Element\UseCases\DeleteChildElement\DeleteChildElement; use App\Element\UseCases\GetElement\GetElement; +use App\Element\UseCases\GetElementPdf\GetElementPdf; use App\Element\UseCases\ReorderChildElements\ReorderChildElements; use App\Element\UseCases\UpdateElement\UpdateDescription; use App\Element\UseCases\UpdateElement\UpdateElement; @@ -24,7 +25,7 @@ use App\Set\Set as DomainSet; use Illuminate\Http\Request; use Illuminate\Http\UploadedFile; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class ElementControllerTest extends TestCase @@ -33,42 +34,43 @@ class ElementControllerTest extends TestCase private FakeElementRepository $elementRepo; - private FakeFileUploader $fileUploader; + private FakeFilesystem $filesystem; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->filesystem = new FakeFilesystem(); $getElement = new GetElement($this->elementRepo); $updateElement = new UpdateElement( new UpdateTitle($this->elementRepo), new UpdateDescription($this->elementRepo), - new UpdateIconImageUrl($this->elementRepo, $this->fileUploader), + new UpdateIconImageUrl($this->elementRepo, $this->filesystem), new UpdateRichText($this->elementRepo), - new UpdateShortPdfPath($this->elementRepo, $this->fileUploader), - new UpdateLongPdfPath($this->elementRepo, $this->fileUploader), + new UpdateShortPdfPath($this->elementRepo, $this->filesystem), + new UpdateLongPdfPath($this->elementRepo, $this->filesystem), new UpdateYoutubeUrl($this->elementRepo), new UpdateIconImage( $this->elementRepo, - $this->fileUploader, + $this->filesystem, ), new UpdateShortPdf( $this->elementRepo, - $this->fileUploader, + $this->filesystem, ), new UpdateLongPdf( $this->elementRepo, - $this->fileUploader, + $this->filesystem, ), $this->elementRepo, ); $this->controller = new ElementController( $getElement, new CreateChildElement($this->elementRepo), - new DeleteChildElement($this->elementRepo, $this->fileUploader), + new DeleteChildElement($this->elementRepo, $this->filesystem), new ReorderChildElements($this->elementRepo), $updateElement, - $this->fileUploader, + new GetElementPdf($this->filesystem), + $this->filesystem, ); } @@ -244,6 +246,82 @@ class ElementControllerTest extends TestCase ); } + public function testShowPdfReturnsPdfResponse(): void + { + $this->filesystem->put( + 'element-pdfs/short/baderech.pdf', + 'pdf-bytes', + ); + + $response = $this->controller->showPdf('short', 'baderech.pdf'); + + $this->assertEquals(200, $response->getStatusCode()); + $this->assertSame('pdf-bytes', $response->getContent()); + $this->assertSame( + 'application/pdf', + $response->headers->get('Content-Type'), + ); + $this->assertSame( + 'inline; filename="baderech.pdf"', + $response->headers->get('Content-Disposition'), + ); + } + + public function testShowPdfReturns404WhenPdfDoesNotExist(): void + { + $response = $this->controller->showPdf('short', 'missing.pdf'); + + $this->assertEquals(404, $response->getStatusCode()); + $this->assertSame( + ['error' => 'PDF not found'], + json_decode($response->getContent(), true), + ); + } + + public function testShowPdfReturns400WhenFolderIsInvalid(): void + { + $response = $this->controller->showPdf('archive', 'baderech.pdf'); + + $this->assertEquals(400, $response->getStatusCode()); + $this->assertSame( + ['error' => 'folder is invalid'], + json_decode($response->getContent(), true), + ); + } + + public function testShowPdfReturns400WhenFolderIsMissing(): void + { + $response = $this->controller->showPdf(null, 'baderech.pdf'); + + $this->assertEquals(400, $response->getStatusCode()); + $this->assertSame( + ['error' => 'folder is required'], + json_decode($response->getContent(), true), + ); + } + + public function testShowPdfReturns400WhenFileNameIsInvalid(): void + { + $response = $this->controller->showPdf('short', '../baderech.pdf'); + + $this->assertEquals(400, $response->getStatusCode()); + $this->assertSame( + ['error' => 'fileName is invalid'], + json_decode($response->getContent(), true), + ); + } + + public function testShowPdfReturns400WhenFileNameIsMissing(): void + { + $response = $this->controller->showPdf('short', null); + + $this->assertEquals(400, $response->getStatusCode()); + $this->assertSame( + ['error' => 'fileName is required'], + json_decode($response->getContent(), true), + ); + } + public function testUpdateWithIconImageReturnsElementPayload(): void { $set = $this->createSet(1, 'Baderech'); @@ -273,7 +351,7 @@ class ElementControllerTest extends TestCase ); $this->assertSame( 'element-icons', - $this->fileUploader->uploads[0]['folder'], + $this->filesystem->uploads[0]['folder'], ); } @@ -307,7 +385,7 @@ class ElementControllerTest extends TestCase $this->assertArrayNotHasKey('pdfPath', $body['element']); $this->assertSame( 'element-pdfs/short', - $this->fileUploader->uploads[0]['folder'], + $this->filesystem->uploads[0]['folder'], ); } @@ -340,7 +418,7 @@ class ElementControllerTest extends TestCase ); $this->assertSame( 'element-pdfs/long', - $this->fileUploader->uploads[0]['folder'], + $this->filesystem->uploads[0]['folder'], ); } diff --git a/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php b/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php index bac9af2..c7f47e6 100644 --- a/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php +++ b/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php @@ -10,21 +10,21 @@ use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class DeleteChildElementTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; private DeleteChildElement $deleteChildElement; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); $this->deleteChildElement = new DeleteChildElement( $this->elementRepository, $this->fileUploader, diff --git a/backend/tests/Unit/Element/UseCases/GetElementPdfTest.php b/backend/tests/Unit/Element/UseCases/GetElementPdfTest.php new file mode 100644 index 0000000..7a21def --- /dev/null +++ b/backend/tests/Unit/Element/UseCases/GetElementPdfTest.php @@ -0,0 +1,120 @@ +filesystem = new FakeFilesystem(); + $this->useCase = new GetElementPdf($this->filesystem); + } + + public function testReturnsShortPdfFile(): void + { + $this->filesystem->put( + 'element-pdfs/short/baderech.pdf', + 'short-pdf-bytes', + ); + + $result = $this->useCase->execute(new GetElementPdfRequest( + folder: 'short', + fileName: 'baderech.pdf', + )); + + $this->assertSame('short-pdf-bytes', $result->getContents()); + $this->assertSame('baderech.pdf', $result->getFileName()); + $this->assertSame('application/pdf', $result->getMimeType()); + $this->assertSame( + ['element-pdfs/short/baderech.pdf'], + $this->filesystem->readPaths, + ); + } + + public function testReturnsLongPdfFile(): void + { + $this->filesystem->put( + 'element-pdfs/long/baderech-long.pdf', + 'long-pdf-bytes', + ); + + $result = $this->useCase->execute(new GetElementPdfRequest( + folder: 'long', + fileName: 'baderech-long.pdf', + )); + + $this->assertSame('long-pdf-bytes', $result->getContents()); + $this->assertSame('baderech-long.pdf', $result->getFileName()); + $this->assertSame('application/pdf', $result->getMimeType()); + $this->assertSame( + ['element-pdfs/long/baderech-long.pdf'], + $this->filesystem->readPaths, + ); + } + + public function testInvalidFolderThrowsBadRequest(): void + { + $this->expectException(BadRequestException::class); + $this->expectExceptionMessage('folder is invalid'); + + $this->useCase->execute(new GetElementPdfRequest( + folder: 'archive', + fileName: 'baderech.pdf', + )); + } + + public function testMissingFolderThrowsBadRequest(): void + { + $this->expectException(BadRequestException::class); + $this->expectExceptionMessage('folder is required'); + + $this->useCase->execute(new GetElementPdfRequest( + folder: null, + fileName: 'baderech.pdf', + )); + } + + public function testMissingFileNameThrowsBadRequest(): void + { + $this->expectException(BadRequestException::class); + $this->expectExceptionMessage('fileName is required'); + + $this->useCase->execute(new GetElementPdfRequest( + folder: 'short', + fileName: null, + )); + } + + public function testInvalidFileNameThrowsBadRequest(): void + { + $this->expectException(BadRequestException::class); + $this->expectExceptionMessage('fileName is invalid'); + + $this->useCase->execute(new GetElementPdfRequest( + folder: 'short', + fileName: '../baderech.pdf', + )); + } + + public function testMissingStorageFileThrowsNotFound(): void + { + $this->expectException(NotFoundException::class); + $this->expectExceptionMessage('PDF not found'); + + $this->useCase->execute(new GetElementPdfRequest( + folder: 'short', + fileName: 'missing.pdf', + )); + } +} diff --git a/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php b/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php index 1d83906..7382f8b 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php @@ -21,19 +21,19 @@ use App\Element\UseCases\UpdateElement\UpdateYoutubeUrlRequest; use App\Exceptions\BadRequestException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class UpdateElementFieldsTest extends TestCase { private FakeElementRepository $elementRepo; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); } public function testUpdateTitleUpdatesOnlyTitle(): void diff --git a/backend/tests/Unit/Element/UseCases/UpdateElementTest.php b/backend/tests/Unit/Element/UseCases/UpdateElementTest.php index 6804e7a..16e1579 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateElementTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateElementTest.php @@ -20,21 +20,21 @@ use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class UpdateElementTest extends TestCase { private FakeElementRepository $elementRepo; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; private UpdateElement $updateElement; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); $this->updateElement = new UpdateElement( new UpdateTitle($this->elementRepo), new UpdateDescription($this->elementRepo), diff --git a/backend/tests/Unit/Element/UseCases/UpdateIconImageTest.php b/backend/tests/Unit/Element/UseCases/UpdateIconImageTest.php index 2aef04a..43cb115 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateIconImageTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateIconImageTest.php @@ -10,21 +10,21 @@ use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class UpdateIconImageTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; private UpdateIconImage $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); $this->useCase = new UpdateIconImage( $this->elementRepository, $this->fileUploader, diff --git a/backend/tests/Unit/Element/UseCases/UpdateLongPdfTest.php b/backend/tests/Unit/Element/UseCases/UpdateLongPdfTest.php index ba34617..deaecac 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateLongPdfTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateLongPdfTest.php @@ -9,21 +9,21 @@ use App\Element\UseCases\UpdateElement\UpdateLongPdfRequest; use App\Exceptions\BadRequestException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class UpdateLongPdfTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; private UpdateLongPdf $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); $this->useCase = new UpdateLongPdf( $this->elementRepository, $this->fileUploader, diff --git a/backend/tests/Unit/Element/UseCases/UpdateShortPdfTest.php b/backend/tests/Unit/Element/UseCases/UpdateShortPdfTest.php index 9cea03a..6b48ab0 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateShortPdfTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateShortPdfTest.php @@ -10,21 +10,21 @@ use App\Exceptions\BadRequestException; use App\Exceptions\NotFoundException; use App\Set\Set as DomainSet; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFileUploader; +use Tests\Fakes\FakeFilesystem; use Tests\TestCase; class UpdateShortPdfTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFileUploader $fileUploader; + private FakeFilesystem $fileUploader; private UpdateShortPdf $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFileUploader(); + $this->fileUploader = new FakeFilesystem(); $this->useCase = new UpdateShortPdf( $this->elementRepository, $this->fileUploader, diff --git a/frontend/rabbi_gerzi/cypress.config.ts b/frontend/rabbi_gerzi/cypress.config.ts index 82a9470..1254b43 100644 --- a/frontend/rabbi_gerzi/cypress.config.ts +++ b/frontend/rabbi_gerzi/cypress.config.ts @@ -1,4 +1,5 @@ import { execSync } from 'node:child_process' +import { cpSync, mkdirSync, rmSync } from 'node:fs' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' import { defineConfig } from 'cypress' @@ -7,7 +8,9 @@ import { Client } from 'pg' const configDirectory = dirname(fileURLToPath(import.meta.url)) const backendDirectory = resolve(configDirectory, '../../backend') +const seedAssetDirectory = resolve(backendDirectory, 'database/seeders/assets') const socketDirectory = resolve(configDirectory, '../../.postgres') +const storagePublicDirectory = resolve(backendDirectory, 'storage/app/public') const appDatabase = 'postgres' const templateDatabase = 'postgres_cypress_template' @@ -47,6 +50,7 @@ async function buildTemplate(): Promise { stdio: 'pipe', env: seedEnvironment, }) + resetSeedStorage() const markClient = controlClient() await markClient.connect() @@ -72,10 +76,24 @@ async function resetFromTemplate(): Promise { TEMPLATE ${templateDatabase}`, ) await client.end() + resetSeedStorage() return null } +function resetSeedStorage(): void { + rmSync(resolve(storagePublicDirectory, 'element-icons'), { + recursive: true, + force: true, + }) + rmSync(resolve(storagePublicDirectory, 'element-pdfs'), { + recursive: true, + force: true, + }) + mkdirSync(storagePublicDirectory, { recursive: true }) + cpSync(seedAssetDirectory, storagePublicDirectory, { recursive: true }) +} + export default defineConfig({ e2e: { baseUrl: 'http://localhost:5173', diff --git a/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts b/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts index ab70619..bc4a7ae 100644 --- a/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts +++ b/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts @@ -281,14 +281,12 @@ describe('admin element editing', () => { .should('be.visible') .and('have.attr', 'src') .and('include', '/storage/element-icons/') - cy.get('[data-cy="element-short-pdf-link"]') + cy.get('[data-cy="element-short-pdf-viewer-button"]') .should('be.visible') - .and('have.attr', 'href') - .and('include', '/storage/element-pdfs/short/') - cy.get('[data-cy="element-long-pdf-link"]') + .and('contain.text', 'View Short PDF') + cy.get('[data-cy="element-long-pdf-viewer-button"]') .should('be.visible') - .and('have.attr', 'href') - .and('include', '/storage/element-pdfs/long/') + .and('contain.text', 'View Long PDF') cy.resetDb() }) @@ -341,8 +339,8 @@ describe('admin element editing', () => { cy.contains('header.site-header a', 'View Element').click() cy.get('[data-cy="element-icon"]').should('not.exist') - cy.get('[data-cy="element-short-pdf-link"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-link"]').should('not.exist') + cy.get('[data-cy="element-short-pdf-viewer-button"]').should('not.exist') + cy.get('[data-cy="element-long-pdf-viewer-button"]').should('not.exist') cy.resetDb() }) diff --git a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts index 805be28..0233789 100644 --- a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts +++ b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts @@ -51,8 +51,8 @@ describe('media page sets', () => { cy.get('[data-cy="element-rich-text"]').should('not.exist') cy.get('[data-cy="element-youtube-embed"]') .should('not.exist') - cy.get('[data-cy="element-short-pdf-link"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-link"]').should('not.exist') + cy.get('[data-cy="element-short-pdf-viewer-button"]').should('not.exist') + cy.get('[data-cy="element-long-pdf-viewer-button"]').should('not.exist') cy.get('[data-cy="child-element-list"]').should('be.visible') cy.get('[data-cy="child-element-list"]') .should( @@ -117,14 +117,34 @@ describe('media page sets', () => { ) .should('have.css', 'text-align', 'center') cy.get('[data-cy="element-youtube-embed"]').should('not.exist') - cy.contains('[data-cy="element-short-pdf-link"]', 'View Short PDF') - .as('shortPdfLink') + cy.contains( + '[data-cy="element-short-pdf-viewer-button"]', + 'View Short PDF', + ) + .as('shortPdfButton') + .should('be.visible') + cy.get('[data-cy="element-long-pdf-viewer-button"]').should('not.exist') + cy.get('@shortPdfButton').click() + cy.get('[data-cy="pdf-viewer-modal"]').should('be.visible') + cy.contains('[data-cy="pdf-viewer-title"]', 'Short PDF').should( + 'be.visible', + ) + cy.get('[data-cy="pdf-viewer-document"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-page-status"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-previous-page"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-next-page"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-zoom-out"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-zoom-in"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-search-input"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-download"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-print"]').should('be.visible') + cy.get('[data-cy="pdf-viewer-open-link"]') .should('be.visible') .and('have.attr', 'target', '_blank') - cy.get('@shortPdfLink') .and('have.attr', 'href') .and('include', '/storage/element-pdfs/short/baderech.pdf') - cy.get('[data-cy="element-long-pdf-link"]').should('not.exist') + cy.get('[data-cy="pdf-viewer-close"]').click() + cy.get('[data-cy="pdf-viewer-modal"]').should('not.exist') cy.contains('[data-cy="child-element-link"]', introductionAudioTitle) .as('introductionAudioLink') .should('have.attr', 'href', '/element/8') @@ -134,8 +154,8 @@ describe('media page sets', () => { cy.contains('h1', introductionAudioTitle).should('be.visible') cy.get('[data-cy="element-icon"]').should('not.exist') cy.get('[data-cy="element-rich-text"]').should('not.exist') - cy.get('[data-cy="element-short-pdf-link"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-link"]').should('not.exist') + cy.get('[data-cy="element-short-pdf-viewer-button"]').should('not.exist') + cy.get('[data-cy="element-long-pdf-viewer-button"]').should('not.exist') cy.get('[data-cy="child-element-list"]').should('not.exist') cy.get('[data-cy="element-youtube-embed"]') .should('be.visible') diff --git a/frontend/rabbi_gerzi/package-lock.json b/frontend/rabbi_gerzi/package-lock.json index 6a19774..707bb2c 100644 --- a/frontend/rabbi_gerzi/package-lock.json +++ b/frontend/rabbi_gerzi/package-lock.json @@ -19,6 +19,7 @@ "lucide-vue-next": "^1.0.0", "pinia": "^3.0.4", "vue": "beta", + "vue-pdf-embed": "^2.1.5", "vue-router": "^5.0.4" }, "devDependencies": { @@ -1275,6 +1276,271 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@napi-rs/canvas": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.100.tgz", + "integrity": "sha512-xglYA6q3XO5P3BNJYxVZ1IV7DLVjp1Py6nwag88YntrS+3vKHyYcMqXVS4ZztJmwz2uGvz1FWhI/4LgbR5uQDA==", + "license": "MIT", + "optional": true, + "workspaces": [ + "e2e/*" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "optionalDependencies": { + "@napi-rs/canvas-android-arm64": "0.1.100", + "@napi-rs/canvas-darwin-arm64": "0.1.100", + "@napi-rs/canvas-darwin-x64": "0.1.100", + "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.100", + "@napi-rs/canvas-linux-arm64-gnu": "0.1.100", + "@napi-rs/canvas-linux-arm64-musl": "0.1.100", + "@napi-rs/canvas-linux-riscv64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-musl": "0.1.100", + "@napi-rs/canvas-win32-arm64-msvc": "0.1.100", + "@napi-rs/canvas-win32-x64-msvc": "0.1.100" + } + }, + "node_modules/@napi-rs/canvas-android-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.100.tgz", + "integrity": "sha512-hjhCKhntPv9+t4ckHymdx0phYNcVW+GKQR6Lzw2zE+pOVjOplSmtx9nNNknTjbEDLcuLZqA1y8ufKg1XfgftzQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.100.tgz", + "integrity": "sha512-2PcswRaC7Ly645DGt88///zuFDhJxJYdKAs1uU3mfk1atYkXufgcgLfBpk6Tm12nCQBaNt1wpybuPZ4qOhTo8A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-x64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.100.tgz", + "integrity": "sha512-ePNZtj7pNIva/siZMg+HmbeozkIjqUIYdoymH8HaA3qK7LfzFN4WMBM8G6HQ9ZC+H3+Dnn5pqtiXpgLykaPOhw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.100.tgz", + "integrity": "sha512-d5cDB48oWFGU8/XPhUOFAlySgb/VAu7D+s8fi55K1Pcfg8aPplHWqMgibhVLU8ky7Pyg/fuiVLz4Nf3JrSTuUA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.100.tgz", + "integrity": "sha512-rDxgxRu69RvDlX/bh9o22DxLsGr8EqsNgotL9+RwQE1S0b0cqeatqsw6aW45mukm0B42DIAaAacKaYQ8cqS1nw==", + "cpu": [ + "arm64" + ], + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.100.tgz", + "integrity": "sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==", + "cpu": [ + "arm64" + ], + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-riscv64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.100.tgz", + "integrity": "sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==", + "cpu": [ + "riscv64" + ], + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.100.tgz", + "integrity": "sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==", + "cpu": [ + "x64" + ], + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.100.tgz", + "integrity": "sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==", + "cpu": [ + "x64" + ], + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-arm64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.100.tgz", + "integrity": "sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-x64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.100.tgz", + "integrity": "sha512-MyT1j3mHC2+Lu4pBi9mKyMJhtP6U7k7EldY7sj/uS5gJA65gTXt8MefJQXLJo5d/vZbuWmfxzkEUNc/urV3pHA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", @@ -7007,6 +7273,18 @@ "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", "license": "MIT" }, + "node_modules/pdfjs-dist": { + "version": "5.7.284", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.7.284.tgz", + "integrity": "sha512-h4EdYQczmGhbOlqc3PPZwxevn7ApdWPbovAuWXOB/DjIyigSnwfy2oze7c6mRcSr9XgLp3eN3EeL4DyySTPMFw==", + "license": "Apache-2.0", + "engines": { + "node": ">=22.13.0 || >=24" + }, + "optionalDependencies": { + "@napi-rs/canvas": "^0.1.100" + } + }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -8784,6 +9062,18 @@ "node": ">=10" } }, + "node_modules/vue-pdf-embed": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/vue-pdf-embed/-/vue-pdf-embed-2.1.5.tgz", + "integrity": "sha512-IGFVBYlnOz2zSql1zk4YJyBu584EZa6RUykk5f8wkHF/AR31khCa+ruJoRag+Ff2UyntkWu0brENIKoikQ7F8g==", + "license": "MIT", + "dependencies": { + "pdfjs-dist": "^5.7.284" + }, + "peerDependencies": { + "vue": "^3.3.0" + } + }, "node_modules/vue-router": { "version": "5.0.7", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.0.7.tgz", diff --git a/frontend/rabbi_gerzi/package.json b/frontend/rabbi_gerzi/package.json index 50ba0ca..c8ca08b 100644 --- a/frontend/rabbi_gerzi/package.json +++ b/frontend/rabbi_gerzi/package.json @@ -28,6 +28,7 @@ "lucide-vue-next": "^1.0.0", "pinia": "^3.0.4", "vue": "beta", + "vue-pdf-embed": "^2.1.5", "vue-router": "^5.0.4" }, "devDependencies": { diff --git a/frontend/rabbi_gerzi/src/components/PdfViewerModal.vue b/frontend/rabbi_gerzi/src/components/PdfViewerModal.vue new file mode 100644 index 0000000..ebfbbaf --- /dev/null +++ b/frontend/rabbi_gerzi/src/components/PdfViewerModal.vue @@ -0,0 +1,662 @@ + + + + + diff --git a/frontend/rabbi_gerzi/src/views/ElementPage.vue b/frontend/rabbi_gerzi/src/views/ElementPage.vue index c2ed707..b0aa452 100644 --- a/frontend/rabbi_gerzi/src/views/ElementPage.vue +++ b/frontend/rabbi_gerzi/src/views/ElementPage.vue @@ -1,16 +1,26 @@