diff --git a/package-lock.json b/package-lock.json index 5334c2834..4238e7813 100644 --- a/package-lock.json +++ b/package-lock.json @@ -306,14 +306,14 @@ } }, "@angular/animations": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.0.1.tgz", - "integrity": "sha512-R0FLhAfylFIiRArhtLOUokOAVtWCH20ocRXo6E8HHOc3fbaUS9ci3rIbFZQkaAv9RgZfKewrcV6Wa3TY905w5g==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.0.4.tgz", + "integrity": "sha512-zTCgrIAA9FYPMbqqpQnoNltiLR58q0FMfzP2t96q/1tjyVy/Y/IaNgVQ7eL0HeQ0nG6IAzQ1HVx8Xeneg4Yj5Q==" }, "@angular/cdk": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.0.0.tgz", - "integrity": "sha512-2kYpyYbewIB6fubSIDMvSprJLNplRZoL/AtXW3od4dLyRxtzX+7iWTAtzUG/dhq8CKev0lpd1HENh5lLR/Lhjw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.0.tgz", + "integrity": "sha512-qKpAudJx9z0MD+ADptS0OZViJBTA49+JCKym0hPQUkcB9Po4Al6gu6oZ1VSXV5Ln3T84z9aAw/AhUGP/YCFNSQ==", "requires": { "parse5": "^5.0.0" }, @@ -428,14 +428,14 @@ } }, "@angular/common": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.0.1.tgz", - "integrity": "sha512-40jbKdCb4xi6NTzLt1kE0V/X7JxCLLo8eUEr3Z34Z9Ljnd4LC+/CkuThPdQJ3HW1Z8r5SWXj+rES+sn75YNVmA==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.0.4.tgz", + "integrity": "sha512-F3qoYrceEdCd5SlgObcbSIIdKfRXgyTBO2gbbArQHFe4GvewkH3isTn5uqAF6sfJlb7rXWZGrD6C3d9brw/fEw==" }, "@angular/compiler": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.1.tgz", - "integrity": "sha512-ldamsPzIx+FLT/IYBqwsFL6qbP3BDgvPQa4Y3F/gFXDsoe+VTY5qwJfhr2iLbtF+fYomwOgY2kSL42BVQL873Q==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.4.tgz", + "integrity": "sha512-+Ku8RUU00yHaKVkVw6YIfM3c5Gmvas5gJcEleiagkLbc1f/jKk1cY4gaUP6xn4TLypFM7NQglneWd+E+8wh0hQ==" }, "@angular/compiler-cli": { "version": "9.0.1", @@ -543,14 +543,14 @@ } }, "@angular/core": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.1.tgz", - "integrity": "sha512-q/3VLGM98euB/ZluSuMqvWyQb563iabRcVkC/DrHqCQMadV1ZpvuOgf8Gm092d8GY/iC4CGlTsN0wiVapMxplQ==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.4.tgz", + "integrity": "sha512-6RqQb1GO2uglSlgiGbxhvy8plztZtABCWLRn0X+T1PnrxoqgxqA5WkKJjGxao+1M/ECW1V0fw4Xy7DE6KvAJwQ==" }, "@angular/forms": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.0.1.tgz", - "integrity": "sha512-yzzlCslWp7IiFSYjSGNqexPmnKn9xhpT8FKzxNT0qEpQ+SieQ7apsjvMfR3TCip0Nnfus2qTh3kz1ZCaawAcjQ==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.0.4.tgz", + "integrity": "sha512-WyfZ2u2JzGrwkxQmfxHvZMoYHEGfoUL+JlSXa2Sy3T/FPGNckHzIzggqweJij/qGjabWLabZDla4vak42f+4PA==" }, "@angular/language-service": { "version": "9.0.4", @@ -559,24 +559,24 @@ "dev": true }, "@angular/material": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.0.0.tgz", - "integrity": "sha512-QxN2rmR5mvg2YE1NoIGWLpbnmcJq0iFidzy6odzvN17+XkoCJBZ65IdYsHrJgfwGpoIy6bywuixrDHHcSh9I5w==" + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.1.0.tgz", + "integrity": "sha512-KjA1ARoZ1vBg4jUH1y39muynxAFvkD8QZFGKH8Nh4zXW5pOP/7NyjokxXsNx5qSBCq/6ac2xBxCrCYJN7HmoDw==" }, "@angular/platform-browser": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.0.1.tgz", - "integrity": "sha512-0o2aRxbQ3xZ/ZeLXajDqhrRK6vcICzdJ7GKvPgZxdohnnJ7JN1qp8U7J4aEotPqfSAde/aD2JvoDDtKZ0XIDWg==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.0.4.tgz", + "integrity": "sha512-mbiqmw0rDGPxEgKVgDuK7yZvtgjJmzpMGBYAMwkQ9YIE0SoA5XP0NvZiFkHZqDXwLgCv2IJ/kvkhfCBwnBKCXQ==" }, "@angular/platform-browser-dynamic": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.1.tgz", - "integrity": "sha512-DslT339T+TBt4jUlXMblPR4IghXtykB+jQctm02G4AJUlvMa4b798N1oM6sD5F8NmBMa6beZ2dcRJ07f75LVBA==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.4.tgz", + "integrity": "sha512-9vAn2QH07khuF4n7kyMJzgE6l30Yxg1AGd8GtOfa/4nbna+EZxFVYOkto9bpv4uEwDr9o7QrFLplko9a8xs7kg==" }, "@angular/router": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.0.1.tgz", - "integrity": "sha512-pHLDooNvXEUtjYANWtJ7fMxG9l2mDJgPphOi/S6c27U5yNf0NVk+Qh3kuuNi2hQQ5RaR4jdRyCQePD2H4g2+/g==" + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.0.4.tgz", + "integrity": "sha512-03A8RpjtqB02y1DWgCPfhCprdCCkhEYU0Fo3qWCHnpa02ikejzKxyjoJyrVU/AMNbljOj5ZMcpSfyj07aPp4tQ==" }, "@babel/code-frame": { "version": "7.5.5", @@ -1601,24 +1601,24 @@ } }, "@fortawesome/fontawesome-common-types": { - "version": "0.2.25", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz", - "integrity": "sha512-3RuZPDuuPELd7RXtUqTCfed14fcny9UiPOkdr2i+cYxBoTOfQgxcDoq77fHiiHcgWuo1LoBUpvGxFF1H/y7s3Q==" + "version": "0.2.27", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz", + "integrity": "sha512-97GaByGaXDGMkzcJX7VmR/jRJd8h1mfhtA7RsxDBN61GnWE/PPCZhOdwG/8OZYktiRUF0CvFOr+VgRkJrt6TWg==" }, "@fortawesome/fontawesome-svg-core": { - "version": "1.2.25", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz", - "integrity": "sha512-MotKnn53JKqbkLQiwcZSBJVYtTgIKFbh7B8+kd05TSnfKYPFmjKKI59o2fpz5t0Hzl35vVGU6+N4twoOpZUrqA==", + "version": "1.2.27", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz", + "integrity": "sha512-sOD3DKynocnHYpuw2sLPnTunDj7rLk91LYhi2axUYwuGe9cPCw7Bsu9EWtVdNJP+IYgTCZIbyARKXuy5K/nv+Q==", "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.25" + "@fortawesome/fontawesome-common-types": "^0.2.27" } }, "@fortawesome/free-solid-svg-icons": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz", - "integrity": "sha512-zBue4i0PAZJUXOmLBBvM7L0O7wmsDC8dFv9IhpW5QL4kT9xhhVUsYg/LX1+5KaukWq4/cbDcKT+RT1aRe543sg==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz", + "integrity": "sha512-k3MwRFFUhyL4cuCJSaHDA0YNYMELDXX0h8JKtWYxO5XD3Dn+maXOMrVAAiNGooUyM2v/wz/TOaM0jxYVKeXX7g==", "requires": { - "@fortawesome/fontawesome-common-types": "^0.2.25" + "@fortawesome/fontawesome-common-types": "^0.2.27" } }, "@hapi/address": { diff --git a/src/app/files.service.ts b/src/app/files.service.ts index ce2c94cb5..1dc253f45 100644 --- a/src/app/files.service.ts +++ b/src/app/files.service.ts @@ -115,6 +115,11 @@ export class FilesService { printTime: this.service.convertSecondsToHours(data.gcodeAnalysis.estimatedPrintTime), filamentWeight: this.service.convertFilamentLengthToAmount(filamentLength), date: this.service.convertDateToString(new Date(data.date * 1000)), + thumbnail: data.path.endsWith('.ufp.gcode') + ? this.configService + .getURL('plugin/UltimakerFormatPackage/thumbnail/') + .replace('/api/', '/') + data.path.replace('.ufp.gcode', '.png') + : undefined, } as unknown) as File; resolve(file); }, @@ -205,4 +210,5 @@ export interface File { printTime?: string; filamentWeight?: number; date?: string; + thumbnail?: string; } diff --git a/src/app/files/files.component.html b/src/app/files/files.component.html index 74f92704f..37667fb26 100644 --- a/src/app/files/files.component.html +++ b/src/app/files/files.component.html @@ -70,7 +70,7 @@ {{ fileDetail.name }} {{ fileDetail.path }} {{ fileDetail.date }} - + @@ -158,4 +158,4 @@
{{ fileDetail.size }}mb
- \ No newline at end of file +