From 1916a5d19cad13793826029e4de15a3c946f9eca Mon Sep 17 00:00:00 2001 From: David Date: Tue, 24 Dec 2024 18:42:48 +0100 Subject: [PATCH] Fix issues with SSR by disabling ng2-pdf-viewer and removing ng2-dragula --- package-lock.json | 70 ------------------- package.json | 9 --- src/app/app.module.ts | 6 +- .../author-series-page.component.html | 7 +- .../author-series-page.component.ts | 9 +-- src/polyfills.ts | 2 - src/styles.scss | 32 --------- 7 files changed, 4 insertions(+), 131 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1cedd0d..8472930a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,6 @@ "http": "0.0.0", "jszip": "^3.10.1", "localforage": "^1.10.0", - "ng2-dragula": "^5.1.0", "ng2-pdf-viewer": "^10.4.0", "ngx-file-helpers": "^13.0.1", "pocketlib-server": "file:server", @@ -3763,12 +3762,6 @@ "@types/node": "*" } }, - "node_modules/@types/dragula": { - "version": "3.7.5", - "resolved": "https://registry.npmjs.org/@types/dragula/-/dragula-3.7.5.tgz", - "integrity": "sha512-jojr2JVJB8DawAKXApGnollMvVOMyiMKpchH8gLeoExx35Eq0BQ4WgAiAHoBoEn7h/9eDrIl0yz//cM6ALIJbg==", - "peer": true - }, "node_modules/@types/estree": { "version": "1.0.6", "dev": true, @@ -4163,12 +4156,6 @@ "version": "0.4.0", "license": "MIT" }, - "node_modules/atoa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz", - "integrity": "sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ==", - "peer": true - }, "node_modules/atob": { "version": "2.1.2", "dev": true, @@ -5219,16 +5206,6 @@ "node": ">= 0.6" } }, - "node_modules/contra": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/contra/-/contra-1.9.4.tgz", - "integrity": "sha512-N9ArHAqwR/lhPq4OdIAwH4e1btn6EIZMAz4TazjnzCiVECcWUPTma+dRAM38ERImEJBh8NiCCpjoQruSZ+agYg==", - "peer": true, - "dependencies": { - "atoa": "1.0.0", - "ticky": "1.0.1" - } - }, "node_modules/convert-source-map": { "version": "1.9.0", "license": "MIT" @@ -5769,15 +5746,6 @@ "node": ">= 8" } }, - "node_modules/crossvent": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/crossvent/-/crossvent-1.5.5.tgz", - "integrity": "sha512-MY4xhBYEnVi+pmTpHCOCsCLYczc0PVtGdPBz6NXNXxikLaUZo4HdAeUb1UqAo3t3yXAloSelTmfxJ+/oUqkW5w==", - "peer": true, - "dependencies": { - "custom-event": "^1.0.0" - } - }, "node_modules/crypto-js": { "version": "4.2.0", "license": "MIT" @@ -5838,12 +5806,6 @@ "node": ">=4" } }, - "node_modules/custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==", - "peer": true - }, "node_modules/damerau-levenshtein": { "version": "1.0.8", "dev": true, @@ -6035,16 +5997,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/dragula": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/dragula/-/dragula-3.7.3.tgz", - "integrity": "sha512-/rRg4zRhcpf81TyDhaHLtXt6sEywdfpv1cRUMeFFy7DuypH2U0WUL0GTdyAQvXegviT4PJK4KuMmOaIDpICseQ==", - "peer": true, - "dependencies": { - "contra": "1.9.4", - "crossvent": "1.5.5" - } - }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -8797,22 +8749,6 @@ "node": ">= 0.6" } }, - "node_modules/ng2-dragula": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ng2-dragula/-/ng2-dragula-5.1.0.tgz", - "integrity": "sha512-5P185NWZXIAA/lmZ8Bb6alMxfxYcMRu4Mw+JGJVj4ACplsUUq77Odfhpwk1a5R1pyI+3CC4sOwYrJg+nTi0e6Q==", - "dependencies": { - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/animations": ">=16.0.0 <18.0.0", - "@angular/common": ">=16.0.0 <18.0.0", - "@angular/core": ">=16.0.0 <18.0.0", - "@types/dragula": "^2.1.34", - "dragula": "^3.7.2", - "rxjs": ">=6.0.0" - } - }, "node_modules/ng2-pdf-viewer": { "version": "10.4.0", "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-10.4.0.tgz", @@ -11526,12 +11462,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ticky": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ticky/-/ticky-1.0.1.tgz", - "integrity": "sha512-RX35iq/D+lrsqhcPWIazM9ELkjOe30MSeoBHQHSsRwd1YuhJO5ui1K1/R0r7N3mFvbLBs33idw+eR6j+w6i/DA==", - "peer": true - }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 670966cf..80fbf944 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "http": "0.0.0", "jszip": "^3.10.1", "localforage": "^1.10.0", - "ng2-dragula": "^5.1.0", "ng2-pdf-viewer": "^10.4.0", "ngx-file-helpers": "^13.0.1", "pocketlib-server": "file:server", @@ -80,13 +79,5 @@ "ts-node": "^10.9.2", "tslint": "^6.1.3", "typescript": "^5.6.3" - }, - "overrides": { - "ng2-dragula": { - "@types/dragula": "^3.7.3", - "@angular/animations": "^19.0.5", - "@angular/common": "^19.0.5", - "@angular/core": "^19.0.5" - } } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 894a3479..27f5a335 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -17,9 +17,8 @@ import { AppRoutingModule } from "./app-routing.module" import { NgxFileHelpersModule } from "ngx-file-helpers" import { BrowserAnimationsModule } from "@angular/platform-browser/animations" import { PortalModule } from "@angular/cdk/portal" -import { PdfViewerModule } from "ng2-pdf-viewer" +//import { PdfViewerModule } from "ng2-pdf-viewer" import { FontAwesomeModule } from "@fortawesome/angular-fontawesome" -import { DragulaModule } from "ng2-dragula" import { ServiceWorkerModule } from "@angular/service-worker" // Apollo @@ -209,9 +208,8 @@ import { OrderConfirmationPageComponent } from "./pages/order-confirmation-page/ NgxFileHelpersModule, BrowserAnimationsModule, PortalModule, - PdfViewerModule, + //PdfViewerModule, FontAwesomeModule, - DragulaModule.forRoot(), ServiceWorkerModule.register("ngsw-worker.js", { enabled: environment.environment == Environment.Staging || diff --git a/src/app/pages/author-series-page/author-series-page.component.html b/src/app/pages/author-series-page/author-series-page.component.html index 29742e3f..9c35a8e9 100644 --- a/src/app/pages/author-series-page/author-series-page.component.html +++ b/src/app/pages/author-series-page/author-series-page.component.html @@ -12,12 +12,7 @@ -
+
@for (book of books; track book.uuid) {
(this.dragging = true)) - this.dragulaService - .dragend("books") - .subscribe(() => (this.dragging = false)) - this.dataService.setMeta() } diff --git a/src/polyfills.ts b/src/polyfills.ts index b9dcb403..7e1f7ffe 100644 --- a/src/polyfills.ts +++ b/src/polyfills.ts @@ -55,5 +55,3 @@ import 'zone.js'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS */ -// Required for Dragula -(window as any).global = window \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 83947dc9..836f5596 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -667,35 +667,3 @@ $alpha: 0.4; } } } - -// Dragula styles -/* in-flight clone */ -.gu-mirror { - position: fixed !important; - margin: 0 !important; - z-index: 9999 !important; - opacity: 0.8; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; - filter: alpha(opacity=80); - pointer-events: none; -} - -/* high-performance display:none; helper */ -.gu-hide { - left: -9999px !important; -} - -/* added to mirrorContainer (default = body) while dragging */ -.gu-unselectable { - -webkit-user-select: none !important; - -moz-user-select: none !important; - -ms-user-select: none !important; - user-select: none !important; -} - -/* added to the source element while its mirror is dragged */ -.gu-transit { - opacity: 0.2; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; - filter: alpha(opacity=20); -}