From 9816efb81688c91cdb3d4e2a4188b7301bf76758 Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Fri, 5 Mar 2021 23:19:44 +0100 Subject: [PATCH] Revert "Merge pull request #628 from shamoon/feature/popover-previews" This reverts commit 8da15215087e4b7d605dc7fd32985fb5a656ff5d, reversing changes made to a7846925b1892c7c1148723b559135bc0fd7e47d. --- src-ui/package.json | 1 + src-ui/src/app/app.module.ts | 2 + .../document-detail.component.html | 17 ++++++- .../document-detail.component.ts | 12 +++++ .../document-card-large.component.html | 15 ++---- .../document-card-large.component.ts | 47 ++---------------- .../document-card-small.component.html | 14 +----- .../document-card-small.component.ts | 48 ++----------------- .../document-list.component.html | 2 +- .../popover-preview/popover-preview.scss | 22 --------- .../manage/settings/settings.component.html | 15 +++++- .../manage/settings/settings.component.ts | 2 + src-ui/src/app/services/settings.service.ts | 2 + src-ui/src/theme_dark.scss | 23 --------- 14 files changed, 61 insertions(+), 161 deletions(-) delete mode 100644 src-ui/src/app/components/document-list/popover-preview/popover-preview.scss diff --git a/src-ui/package.json b/src-ui/package.json index b005d843a..595228501 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -25,6 +25,7 @@ "bootstrap": "^4.5.0", "file-saver": "^2.0.5", "ng-bootstrap": "^1.6.3", + "ng2-pdf-viewer": "^6.3.2", "ngx-color": "^6.2.0", "ngx-cookie-service": "^10.1.1", "ngx-file-drop": "^10.0.0", diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index dc8b185ea..be7ea2d0b 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -47,6 +47,7 @@ import { SavedViewWidgetComponent } from './components/dashboard/widgets/saved-v import { StatisticsWidgetComponent } from './components/dashboard/widgets/statistics-widget/statistics-widget.component'; import { UploadFileWidgetComponent } from './components/dashboard/widgets/upload-file-widget/upload-file-widget.component'; import { WidgetFrameComponent } from './components/dashboard/widgets/widget-frame/widget-frame.component'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; import { WelcomeWidgetComponent } from './components/dashboard/widgets/welcome-widget/welcome-widget.component'; import { YesNoPipe } from './pipes/yes-no.pipe'; import { FileSizePipe } from './pipes/file-size.pipe'; @@ -143,6 +144,7 @@ registerLocaleData(localeRo) ReactiveFormsModule, NgxFileDropModule, InfiniteScrollModule, + PdfViewerModule, NgSelectModule, ColorSliderModule ], diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 79215c51c..f9b87aee3 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -1,4 +1,14 @@ +
+
+
Page
+
+ +
+
of {{previewNumPages}}
+
+
+