From b55c197994979f48584c3d7f0511f12c59b65188 Mon Sep 17 00:00:00 2001 From: paperboyo Date: Thu, 18 Feb 2021 02:02:39 +0100 Subject: [PATCH 1/6] Only show chequerboard in Viewer if there is transparency --- kahuna/public/js/image/view.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kahuna/public/js/image/view.html b/kahuna/public/js/image/view.html index 48f03378c1..1e0ac4e0c1 100644 --- a/kahuna/public/js/image/view.html +++ b/kahuna/public/js/image/view.html @@ -145,7 +145,13 @@ ng-if="!ctrl.crop" draggable="true" ui-drag-data="ctrl.image | asImageDragData"> - preview of original image + preview of original image Date: Thu, 18 Feb 2021 02:03:29 +0100 Subject: [PATCH 2/6] Chequerboard background in cropper.js CSS overrides --- .../js/directives/ui-crop-box/cropper-override.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/kahuna/public/js/directives/ui-crop-box/cropper-override.css b/kahuna/public/js/directives/ui-crop-box/cropper-override.css index 132147e98b..c719a7b951 100644 --- a/kahuna/public/js/directives/ui-crop-box/cropper-override.css +++ b/kahuna/public/js/directives/ui-crop-box/cropper-override.css @@ -9,6 +9,15 @@ } .easel .cropper-canvas { - background-color: #000; + background-color: #bdbdbd; + background-image: + linear-gradient(45deg, white 25%, transparent 25%), + linear-gradient(135deg, white 25%, transparent 25%), + linear-gradient(45deg, transparent 75%, white 75%), + linear-gradient(135deg, transparent 75%, white 75%); + + background-size: 20px 20px; + + background-position: 0 0, 10px 0, 10px -10px, 0px 10px; opacity: .5; } From 3b3b11231b4d9b549fcc87f475e3466812d57e59 Mon Sep 17 00:00:00 2001 From: paperboyo Date: Thu, 18 Feb 2021 17:10:00 +0100 Subject: [PATCH 3/6] Make chequerboard fully visible within the crop area --- .../ui-crop-box/cropper-override.css | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/kahuna/public/js/directives/ui-crop-box/cropper-override.css b/kahuna/public/js/directives/ui-crop-box/cropper-override.css index c719a7b951..fe9e5ba81c 100644 --- a/kahuna/public/js/directives/ui-crop-box/cropper-override.css +++ b/kahuna/public/js/directives/ui-crop-box/cropper-override.css @@ -21,3 +21,23 @@ background-position: 0 0, 10px 0, 10px -10px, 0px 10px; opacity: .5; } + +.easel .cropper-view-box :first-child { + display: block; + height: 100%; + outline: 1px solid #39f; + outline-color: rgba(51, 153, 255, 0.75); + overflow: hidden; + width: 100%; + background-color: #bdbdbd; + background-image: + linear-gradient(45deg, white 25%, transparent 25%), + linear-gradient(135deg, white 25%, transparent 25%), + linear-gradient(45deg, transparent 75%, white 75%), + linear-gradient(135deg, transparent 75%, white 75%); + + background-size: 20px 20px; + + background-position: 0 0, 10px 0, 10px -10px, 0px 10px; +} + From 78b8102472f59969ea03d700c3a3d49384e4589e Mon Sep 17 00:00:00 2001 From: Alex Ware Date: Thu, 25 Feb 2021 14:44:19 +0000 Subject: [PATCH 4/6] Update kahuna/public/js/image/view.html --- kahuna/public/js/image/view.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kahuna/public/js/image/view.html b/kahuna/public/js/image/view.html index 1e0ac4e0c1..6de4ae64b0 100644 --- a/kahuna/public/js/image/view.html +++ b/kahuna/public/js/image/view.html @@ -145,13 +145,7 @@ ng-if="!ctrl.crop" draggable="true" ui-drag-data="ctrl.image | asImageDragData"> - preview of original image - preview of original image Date: Fri, 26 Feb 2021 11:56:00 +0000 Subject: [PATCH 5/6] this syntax looks worse, but works? --- dev/script/generate-config/package-lock.json | 152 ++++++++++++++++++- kahuna/public/js/image/view.html | 2 +- 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dev/script/generate-config/package-lock.json b/dev/script/generate-config/package-lock.json index 789d662127..9806fbc3dd 100644 --- a/dev/script/generate-config/package-lock.json +++ b/dev/script/generate-config/package-lock.json @@ -1,8 +1,158 @@ { "name": "generate-config", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "aws-sdk": "^2.659.0", + "dotenv": "^8.2.0", + "json5": "^2.1.3" + } + }, + "node_modules/aws-sdk": { + "version": "2.659.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.659.0.tgz", + "integrity": "sha512-gtMIHS0BL/ckq6tm6NpeJhI6+GIXI0YrDVkpbHP2lfazsno9TgRyGI/P19QOa8tWaAujgw+GustTtZCEi0LVDA==", + "dependencies": { + "buffer": "4.9.1", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.15.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "uuid": "3.3.2", + "xml2js": "0.4.19" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + }, + "node_modules/buffer": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "node_modules/dotenv": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", + "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/jmespath": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", + "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=", + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + }, + "node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" + }, + "node_modules/url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "node_modules/uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/xml2js": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + } + }, + "node_modules/xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "engines": { + "node": ">=4.0" + } + } + }, "dependencies": { "aws-sdk": { "version": "2.659.0", diff --git a/kahuna/public/js/image/view.html b/kahuna/public/js/image/view.html index 6de4ae64b0..acbba2e51c 100644 --- a/kahuna/public/js/image/view.html +++ b/kahuna/public/js/image/view.html @@ -145,7 +145,7 @@ ng-if="!ctrl.crop" draggable="true" ui-drag-data="ctrl.image | asImageDragData"> - preview of original image Date: Mon, 1 Mar 2021 16:02:44 +0000 Subject: [PATCH 6/6] revert package-lock --- dev/script/generate-config/package-lock.json | 152 +------------------ 1 file changed, 1 insertion(+), 151 deletions(-) diff --git a/dev/script/generate-config/package-lock.json b/dev/script/generate-config/package-lock.json index 9806fbc3dd..789d662127 100644 --- a/dev/script/generate-config/package-lock.json +++ b/dev/script/generate-config/package-lock.json @@ -1,158 +1,8 @@ { "name": "generate-config", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "aws-sdk": "^2.659.0", - "dotenv": "^8.2.0", - "json5": "^2.1.3" - } - }, - "node_modules/aws-sdk": { - "version": "2.659.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.659.0.tgz", - "integrity": "sha512-gtMIHS0BL/ckq6tm6NpeJhI6+GIXI0YrDVkpbHP2lfazsno9TgRyGI/P19QOa8tWaAujgw+GustTtZCEi0LVDA==", - "dependencies": { - "buffer": "4.9.1", - "events": "1.1.1", - "ieee754": "1.1.13", - "jmespath": "0.15.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "uuid": "3.3.2", - "xml2js": "0.4.19" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" - }, - "node_modules/buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dependencies": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "node_modules/dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "node_modules/jmespath": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=", - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, - "node_modules/punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - }, - "node_modules/querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "engines": { - "node": ">=0.4.x" - } - }, - "node_modules/sax": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" - }, - "node_modules/url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "node_modules/uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "bin": { - "uuid": "bin/uuid" - } - }, - "node_modules/xml2js": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", - "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dependencies": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" - } - }, - "node_modules/xmlbuilder": { - "version": "9.0.7", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", - "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", - "engines": { - "node": ">=4.0" - } - } - }, "dependencies": { "aws-sdk": { "version": "2.659.0",