diff --git a/backend/app/Controllers/ElementController.php b/backend/app/Controllers/ElementController.php index 5fc14d7..8665880 100644 --- a/backend/app/Controllers/ElementController.php +++ b/backend/app/Controllers/ElementController.php @@ -9,18 +9,15 @@ 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\Filesystem; +use App\Shared\Files\FileUploader; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Http\Response; use Illuminate\Http\UploadedFile; class ElementController @@ -31,8 +28,7 @@ class ElementController private DeleteChildElement $deleteChildElement, private ReorderChildElements $reorderChildElements, private UpdateElement $updateElement, - private GetElementPdf $getElementPdf, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -68,39 +64,6 @@ 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 { @@ -404,7 +367,7 @@ class ElementController } if (str_starts_with($path, $folderPrefix)) { - return $this->filesystem->url($path); + return $this->fileUploader->url($path); } return $path; diff --git a/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php b/backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php index a0c8257..954de01 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\Filesystem; +use App\Shared\Files\FileUploader; class DeleteChildElement { public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -78,6 +78,6 @@ class DeleteChildElement return; } - $this->filesystem->delete($path); + $this->fileUploader->delete($path); } } diff --git a/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php b/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php deleted file mode 100644 index cfce117..0000000 --- a/backend/app/Element/UseCases/GetElementPdf/GetElementPdf.php +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index ba7b565..0000000 --- a/backend/app/Element/UseCases/GetElementPdf/GetElementPdfRequest.php +++ /dev/null @@ -1,12 +0,0 @@ -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 0a0d9db..59dcaad 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateIconImage { @@ -21,7 +21,7 @@ class UpdateIconImage public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -73,7 +73,7 @@ class UpdateIconImage mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->filesystem->upload($iconImage, 'element-icons'); + $path = $this->fileUploader->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 3c0abdc..278c566 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateIconImageUrl { public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -60,6 +60,6 @@ class UpdateIconImageUrl return; } - $this->filesystem->delete($path); + $this->fileUploader->delete($path); } } diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php b/backend/app/Element/UseCases/UpdateElement/UpdateLongPdf.php index c887001..014ada9 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateLongPdf { @@ -19,7 +19,7 @@ class UpdateLongPdf public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -67,7 +67,7 @@ class UpdateLongPdf mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->filesystem->upload($pdf, 'element-pdfs/long'); + $path = $this->fileUploader->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 7f22976..ae04422 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateLongPdfPath { public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -60,6 +60,6 @@ class UpdateLongPdfPath return; } - $this->filesystem->delete($path); + $this->fileUploader->delete($path); } } diff --git a/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php b/backend/app/Element/UseCases/UpdateElement/UpdateShortPdf.php index 654643f..122eded 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateShortPdf { @@ -19,7 +19,7 @@ class UpdateShortPdf public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -67,7 +67,7 @@ class UpdateShortPdf mimeType: $request->fileMimeType, sizeBytes: $request->fileSizeBytes, ); - $path = $this->filesystem->upload($pdf, 'element-pdfs/short'); + $path = $this->fileUploader->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 9b4c409..ae4b4e3 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\Filesystem; +use App\Shared\Files\FileUploader; class UpdateShortPdfPath { public function __construct( private ElementRepository $elementRepository, - private Filesystem $filesystem, + private FileUploader $fileUploader, ) { } @@ -60,6 +60,6 @@ class UpdateShortPdfPath return; } - $this->filesystem->delete($path); + $this->fileUploader->delete($path); } } diff --git a/backend/app/Providers/AppServiceProvider.php b/backend/app/Providers/AppServiceProvider.php index 9c972cd..9ea2b0c 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\Filesystem; -use App\Shared\Files\LaravelFilesystem; +use App\Shared\Files\FileUploader; +use App\Shared\Files\LaravelFileUploader; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -29,8 +29,8 @@ class AppServiceProvider extends ServiceProvider SystemClock::class, ); $this->app->bind( - Filesystem::class, - LaravelFilesystem::class, + FileUploader::class, + LaravelFileUploader::class, ); } } diff --git a/backend/app/Shared/Files/Filesystem.php b/backend/app/Shared/Files/FileUploader.php similarity index 74% rename from backend/app/Shared/Files/Filesystem.php rename to backend/app/Shared/Files/FileUploader.php index bc27dae..ac30916 100644 --- a/backend/app/Shared/Files/Filesystem.php +++ b/backend/app/Shared/Files/FileUploader.php @@ -2,13 +2,11 @@ namespace App\Shared\Files; -interface Filesystem +interface FileUploader { 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/LaravelFilesystem.php b/backend/app/Shared/Files/LaravelFileUploader.php similarity index 82% rename from backend/app/Shared/Files/LaravelFilesystem.php rename to backend/app/Shared/Files/LaravelFileUploader.php index ff82c49..89416b0 100644 --- a/backend/app/Shared/Files/LaravelFilesystem.php +++ b/backend/app/Shared/Files/LaravelFileUploader.php @@ -5,7 +5,7 @@ namespace App\Shared\Files; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; -class LaravelFilesystem implements Filesystem +class LaravelFileUploader implements FileUploader { public function upload(FileToUpload $file, string $folder): string { @@ -25,15 +25,6 @@ class LaravelFilesystem implements Filesystem 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 82a3af4..f084592 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -12,10 +12,6 @@ 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/FakeFilesystem.php b/backend/tests/Fakes/FakeFileUploader.php similarity index 57% rename from backend/tests/Fakes/FakeFilesystem.php rename to backend/tests/Fakes/FakeFileUploader.php index 57ff059..9273887 100644 --- a/backend/tests/Fakes/FakeFilesystem.php +++ b/backend/tests/Fakes/FakeFileUploader.php @@ -3,9 +3,9 @@ namespace Tests\Fakes; use App\Shared\Files\FileToUpload; -use App\Shared\Files\Filesystem; +use App\Shared\Files\FileUploader; -class FakeFilesystem implements Filesystem +class FakeFileUploader implements FileUploader { /** * @var array @@ -17,16 +17,6 @@ class FakeFilesystem implements Filesystem */ 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]; @@ -43,16 +33,4 @@ class FakeFilesystem implements Filesystem { $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 ee3203f..1ebcb9c 100644 --- a/backend/tests/Unit/Controllers/ElementControllerTest.php +++ b/backend/tests/Unit/Controllers/ElementControllerTest.php @@ -8,7 +8,6 @@ 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; @@ -25,7 +24,7 @@ use App\Set\Set as DomainSet; use Illuminate\Http\Request; use Illuminate\Http\UploadedFile; use Tests\Fakes\FakeElementRepository; -use Tests\Fakes\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class ElementControllerTest extends TestCase @@ -34,43 +33,42 @@ class ElementControllerTest extends TestCase private FakeElementRepository $elementRepo; - private FakeFilesystem $filesystem; + private FakeFileUploader $fileUploader; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->filesystem = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $getElement = new GetElement($this->elementRepo); $updateElement = new UpdateElement( new UpdateTitle($this->elementRepo), new UpdateDescription($this->elementRepo), - new UpdateIconImageUrl($this->elementRepo, $this->filesystem), + new UpdateIconImageUrl($this->elementRepo, $this->fileUploader), new UpdateRichText($this->elementRepo), - new UpdateShortPdfPath($this->elementRepo, $this->filesystem), - new UpdateLongPdfPath($this->elementRepo, $this->filesystem), + new UpdateShortPdfPath($this->elementRepo, $this->fileUploader), + new UpdateLongPdfPath($this->elementRepo, $this->fileUploader), new UpdateYoutubeUrl($this->elementRepo), new UpdateIconImage( $this->elementRepo, - $this->filesystem, + $this->fileUploader, ), new UpdateShortPdf( $this->elementRepo, - $this->filesystem, + $this->fileUploader, ), new UpdateLongPdf( $this->elementRepo, - $this->filesystem, + $this->fileUploader, ), $this->elementRepo, ); $this->controller = new ElementController( $getElement, new CreateChildElement($this->elementRepo), - new DeleteChildElement($this->elementRepo, $this->filesystem), + new DeleteChildElement($this->elementRepo, $this->fileUploader), new ReorderChildElements($this->elementRepo), $updateElement, - new GetElementPdf($this->filesystem), - $this->filesystem, + $this->fileUploader, ); } @@ -246,82 +244,6 @@ 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'); @@ -351,7 +273,7 @@ class ElementControllerTest extends TestCase ); $this->assertSame( 'element-icons', - $this->filesystem->uploads[0]['folder'], + $this->fileUploader->uploads[0]['folder'], ); } @@ -385,7 +307,7 @@ class ElementControllerTest extends TestCase $this->assertArrayNotHasKey('pdfPath', $body['element']); $this->assertSame( 'element-pdfs/short', - $this->filesystem->uploads[0]['folder'], + $this->fileUploader->uploads[0]['folder'], ); } @@ -418,7 +340,7 @@ class ElementControllerTest extends TestCase ); $this->assertSame( 'element-pdfs/long', - $this->filesystem->uploads[0]['folder'], + $this->fileUploader->uploads[0]['folder'], ); } diff --git a/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php b/backend/tests/Unit/Element/UseCases/DeleteChildElementTest.php index c7f47e6..bac9af2 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class DeleteChildElementTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; private DeleteChildElement $deleteChildElement; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $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 deleted file mode 100644 index 7a21def..0000000 --- a/backend/tests/Unit/Element/UseCases/GetElementPdfTest.php +++ /dev/null @@ -1,120 +0,0 @@ -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 7382f8b..1d83906 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class UpdateElementFieldsTest extends TestCase { private FakeElementRepository $elementRepo; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); } public function testUpdateTitleUpdatesOnlyTitle(): void diff --git a/backend/tests/Unit/Element/UseCases/UpdateElementTest.php b/backend/tests/Unit/Element/UseCases/UpdateElementTest.php index 16e1579..6804e7a 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class UpdateElementTest extends TestCase { private FakeElementRepository $elementRepo; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; private UpdateElement $updateElement; protected function setUp(): void { $this->elementRepo = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $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 43cb115..2aef04a 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class UpdateIconImageTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; private UpdateIconImage $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $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 deaecac..ba34617 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class UpdateLongPdfTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; private UpdateLongPdf $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $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 6b48ab0..9cea03a 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\FakeFilesystem; +use Tests\Fakes\FakeFileUploader; use Tests\TestCase; class UpdateShortPdfTest extends TestCase { private FakeElementRepository $elementRepository; - private FakeFilesystem $fileUploader; + private FakeFileUploader $fileUploader; private UpdateShortPdf $useCase; protected function setUp(): void { $this->elementRepository = new FakeElementRepository(); - $this->fileUploader = new FakeFilesystem(); + $this->fileUploader = new FakeFileUploader(); $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 1254b43..82a9470 100644 --- a/frontend/rabbi_gerzi/cypress.config.ts +++ b/frontend/rabbi_gerzi/cypress.config.ts @@ -1,5 +1,4 @@ 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' @@ -8,9 +7,7 @@ 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' @@ -50,7 +47,6 @@ async function buildTemplate(): Promise { stdio: 'pipe', env: seedEnvironment, }) - resetSeedStorage() const markClient = controlClient() await markClient.connect() @@ -76,24 +72,10 @@ 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 bc4a7ae..ab70619 100644 --- a/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts +++ b/frontend/rabbi_gerzi/cypress/e2e/admin-element.cy.ts @@ -281,12 +281,14 @@ describe('admin element editing', () => { .should('be.visible') .and('have.attr', 'src') .and('include', '/storage/element-icons/') - cy.get('[data-cy="element-short-pdf-viewer-button"]') + cy.get('[data-cy="element-short-pdf-link"]') .should('be.visible') - .and('contain.text', 'View Short PDF') - cy.get('[data-cy="element-long-pdf-viewer-button"]') + .and('have.attr', 'href') + .and('include', '/storage/element-pdfs/short/') + cy.get('[data-cy="element-long-pdf-link"]') .should('be.visible') - .and('contain.text', 'View Long PDF') + .and('have.attr', 'href') + .and('include', '/storage/element-pdfs/long/') cy.resetDb() }) @@ -339,8 +341,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-viewer-button"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-viewer-button"]').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.resetDb() }) diff --git a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts index 0233789..805be28 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-viewer-button"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-viewer-button"]').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="child-element-list"]').should('be.visible') cy.get('[data-cy="child-element-list"]') .should( @@ -117,34 +117,14 @@ 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-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"]') + cy.contains('[data-cy="element-short-pdf-link"]', 'View Short PDF') + .as('shortPdfLink') .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="pdf-viewer-close"]').click() - cy.get('[data-cy="pdf-viewer-modal"]').should('not.exist') + cy.get('[data-cy="element-long-pdf-link"]').should('not.exist') cy.contains('[data-cy="child-element-link"]', introductionAudioTitle) .as('introductionAudioLink') .should('have.attr', 'href', '/element/8') @@ -154,8 +134,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-viewer-button"]').should('not.exist') - cy.get('[data-cy="element-long-pdf-viewer-button"]').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="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 707bb2c..6a19774 100644 --- a/frontend/rabbi_gerzi/package-lock.json +++ b/frontend/rabbi_gerzi/package-lock.json @@ -19,7 +19,6 @@ "lucide-vue-next": "^1.0.0", "pinia": "^3.0.4", "vue": "beta", - "vue-pdf-embed": "^2.1.5", "vue-router": "^5.0.4" }, "devDependencies": { @@ -1276,271 +1275,6 @@ "@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", @@ -7273,18 +7007,6 @@ "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", @@ -9062,18 +8784,6 @@ "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 c8ca08b..50ba0ca 100644 --- a/frontend/rabbi_gerzi/package.json +++ b/frontend/rabbi_gerzi/package.json @@ -28,7 +28,6 @@ "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 deleted file mode 100644 index ebfbbaf..0000000 --- a/frontend/rabbi_gerzi/src/components/PdfViewerModal.vue +++ /dev/null @@ -1,662 +0,0 @@ - - - - - diff --git a/frontend/rabbi_gerzi/src/views/ElementPage.vue b/frontend/rabbi_gerzi/src/views/ElementPage.vue index b0aa452..c2ed707 100644 --- a/frontend/rabbi_gerzi/src/views/ElementPage.vue +++ b/frontend/rabbi_gerzi/src/views/ElementPage.vue @@ -1,26 +1,16 @@