From bbbba1f20a1986baf959086efafd77ebe7e69a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Barbeau?= Date: Fri, 7 Jun 2019 16:06:02 -0400 Subject: [PATCH] feat(toast): in progress --- package-lock.json | 118 ++++++++++-------- package.json | 16 ++- src/app/pages/portal/portal.component.html | 1 - .../toast-panel/toast-panel.component.html | 8 +- .../toast-panel/toast-panel.component.ts | 22 ++-- 5 files changed, 88 insertions(+), 77 deletions(-) diff --git a/package-lock.json b/package-lock.json index 385556798..aae5a96d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -735,7 +735,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1150,7 +1151,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1206,6 +1208,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1249,12 +1252,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -1662,33 +1667,34 @@ } }, "@igo2/auth": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/auth/-/auth-1.0.0-alpha.1.tgz", - "integrity": "sha512-dXlFEyHG4B8lmmVMUlLjMUY0Dr899E9YWT+XZVmDGGrcybqY2iqkqxOXDTAGFNZ/3MJ0INpwRWazI07+a97Pzw==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/auth/-/auth-1.0.0-alpha.2.tgz", + "integrity": "sha512-Mm7lGOlwH4e2IK8JURdk+ehCyM8yZe8vp2evg85O0Q/NUz3mLU5+6QeBElE7FvVleRJSZvpSY7YWbaDOoGdbxA==", "requires": { + "jwt-decode": "^2.2.0", "tslib": "^1.9.0" } }, "@igo2/common": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/common/-/common-1.0.0-alpha.1.tgz", - "integrity": "sha512-0plyERE7df4fVZHh5L024SHmJou4MPup5qeCa0HYMUlCX0aBJmm80VOTYzBUh4+r4Yrkf4QNoCFfMMCEtg6osQ==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/common/-/common-1.0.0-alpha.2.tgz", + "integrity": "sha512-sQjzQmeP6N1cJvIrJrTXVvmSC92syVBwCwr23tfjdlYhjRkEtsNzVEpZ7uGe+THfTv+EcZiAOtjK/tSnPEjIhQ==", "requires": { "tslib": "^1.9.0" } }, "@igo2/context": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/context/-/context-1.0.0-alpha.1.tgz", - "integrity": "sha512-0ln8Cde3epP2GB1KK3uo/r0uBv3B42ze78bUPFXrjfFK6s7fzcq6gncYV4ipxh2BgF34+c/Jw9NDvwuOjgwidA==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/context/-/context-1.0.0-alpha.2.tgz", + "integrity": "sha512-vt29tSpMR1JW+F4XEqwQ6saDC1ArPMGujvJ+7KiUERs+NSmj4ZPTaJXvndqV8K7IWfHYY+fZ9pBjqdocTwxCwQ==", "requires": { "tslib": "^1.9.0" } }, "@igo2/core": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/core/-/core-1.0.0-alpha.1.tgz", - "integrity": "sha512-A6HS8JvpK0ddIr3auQdWr/JXVZ1uzDL6Y8a2xEr3BVJXhj84Wxt95WIbJ11S1Ge4PUMwcbcjQnQkmSn+Kk1KSg==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/core/-/core-1.0.0-alpha.2.tgz", + "integrity": "sha512-XljSqnqK0WRRW1Yl+2rhagOA23vPJgeQCkNWqpC35Pw2U32ie3EiVyWj6EZz2STceLLj2a/5H+lvaNvRioDgjw==", "requires": { "@ngx-translate/core": "^10.0.1", "angular2-notifications": "^2.0.0", @@ -1696,11 +1702,12 @@ } }, "@igo2/geo": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/geo/-/geo-1.0.0-alpha.1.tgz", - "integrity": "sha512-LC+ACkbqHi4cyUiLh55DBLA2+s6SS/GWjuH86jfpxfHcO2gpMcYIavXXOc4ztn09Gj1IKB8kL3ydUxMpCBNEOg==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/geo/-/geo-1.0.0-alpha.2.tgz", + "integrity": "sha512-OsyLQPq7I40wY+hw8ysJ0tGelxtba9IpygPuCBs6Qqt0ed0TylgrMFxpCl0VXOMEiqWqRaZKgJEq8Ui2u/KiVw==", "requires": { - "@mat-datetimepicker/core": "^2.0.1", + "@turf/helpers": "^6.1.4", + "@turf/line-intersect": "^6.0.2", "file-saver": "^1.3.8", "html2canvas": "^1.0.0-alpha.12", "jspdf": "^1.5.3", @@ -1712,36 +1719,22 @@ } }, "@igo2/integration": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/integration/-/integration-1.0.0-alpha.1.tgz", - "integrity": "sha512-FhyTlwazs1077EghV7LkyAKBub56o9vS4u1szUbH7DZq+ptZwQq3AjT3qnFL51mYuqBNtq0E/XaRm3VeThb/fQ==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/integration/-/integration-1.0.0-alpha.2.tgz", + "integrity": "sha512-DQ+70Zn0VIdSvJdADKM72oNYLTSOB2y69Z3604xYqABdd3MJCK80iusRWdA51l24USR40191WmZ6MBB0vC4VPQ==", "requires": { "tslib": "^1.9.0" } }, "@igo2/utils": { - "version": "1.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@igo2/utils/-/utils-1.0.0-alpha.1.tgz", - "integrity": "sha512-lBkcBz0w7qQ4BXhgJVwUy8AgUVjeMPEpSDZNSTgB+b9vckEDdlhYzxoW6BkmB3KUdFGEgImudKDYB1MbtEHPrA==", + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@igo2/utils/-/utils-1.0.0-alpha.2.tgz", + "integrity": "sha512-Q5gkTQNsCND3Dn85X2FvJNXlz8zMhGr/DkS+lEJFogqtiNK28h2QCrC8bRLSfmUDjyTUr39vPEYWGClJHLTeSg==", "requires": { "bowser": "^1.9.2", "tslib": "^1.9.0" } }, - "@mat-datetimepicker/core": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@mat-datetimepicker/core/-/core-2.0.1.tgz", - "integrity": "sha1-4NsdtdTPe6Vrck7AQIF8totXdfI=", - "optional": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "@mdi/angular-material": { - "version": "3.6.95", - "resolved": "https://registry.npmjs.org/@mdi/angular-material/-/angular-material-3.6.95.tgz", - "integrity": "sha512-c4FHaG/gMyVfnI79dNzcVoP/eYlgVrE/GZ+0KW9H8vuOxrKVNefv1Il5G+49kCbQBQY2VrkXwm4duxEeEYVXAA==" - }, "@ngtools/json-schema": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@ngtools/json-schema/-/json-schema-1.1.0.tgz", @@ -6419,7 +6412,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -6447,6 +6441,7 @@ "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6461,7 +6456,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -6472,7 +6468,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6589,7 +6586,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6601,6 +6599,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6615,6 +6614,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6622,12 +6622,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6646,6 +6648,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6726,7 +6729,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6738,6 +6742,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6823,7 +6828,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6859,6 +6865,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6878,6 +6885,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6921,12 +6929,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -6974,14 +6984,14 @@ "dev": true }, "geojson-rbush": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.1.1.tgz", - "integrity": "sha512-Bl6U75yDCsERl2P6PiBkvxIoXsSv5SEEiDJy+a7JarcEe17jEm8zamAmi82KLRcIlcuRZxgeVCl1xw5UkxOREw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.1.2.tgz", + "integrity": "sha512-grkfdg3HIeTjwTfiJe5FT8+fGU3fABCc+vRJDBwdQz9kkLF0Sbif2gs2JUzjewwgmnvLGy9fInySDeADoNuk7w==", "requires": { "@turf/bbox": "*", "@turf/helpers": "6.x", "@turf/meta": "6.x", - "rbush": "*" + "rbush": "^2.0.0" } }, "get-caller-file": { @@ -9463,7 +9473,7 @@ "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==", "requires": { "canvg": "1.5.3", - "file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e", + "file-saver": "github:eligrey/FileSaver.js#1.3.8", "html2canvas": "1.0.0-alpha.12", "omggif": "1.0.7", "promise-polyfill": "8.1.0", diff --git a/package.json b/package.json index a7001cb86..694e3dd69 100644 --- a/package.json +++ b/package.json @@ -49,15 +49,13 @@ "@angular/platform-browser": "^7.2.6", "@angular/platform-browser-dynamic": "^7.2.6", "@angular/router": "^7.2.6", - "@igo2/auth": "^1.0.0-alpha.1", - "@igo2/common": "^1.0.0-alpha.1", - "@igo2/context": "^1.0.0-alpha.1", - "@igo2/core": "^1.0.0-alpha.1", - "@igo2/geo": "^1.0.0-alpha.1", - "@igo2/integration": "^1.0.0-alpha.1", - "@igo2/utils": "^1.0.0-alpha.1", - "@turf/helpers": "^6.1.4", - "@turf/line-intersect": "^6.0.2", + "@igo2/auth": "^1.0.0-alpha.2", + "@igo2/common": "^1.0.0-alpha.2", + "@igo2/context": "^1.0.0-alpha.2", + "@igo2/core": "^1.0.0-alpha.2", + "@igo2/geo": "^1.0.0-alpha.2", + "@igo2/integration": "^1.0.0-alpha.2", + "@igo2/utils": "^1.0.0-alpha.2", "classlist.js": "^1.1.20150312", "core-js": "^2.6.5", "file-saver": "^1.3.8", diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html index 80ef7c73d..c6dd0b1e3 100644 --- a/src/app/pages/portal/portal.component.html +++ b/src/app/pages/portal/portal.component.html @@ -90,7 +90,6 @@ diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.html b/src/app/pages/portal/toast-panel/toast-panel.component.html index 340aa2703..5977920b7 100644 --- a/src/app/pages/portal/toast-panel/toast-panel.component.html +++ b/src/app/pages/portal/toast-panel/toast-panel.component.html @@ -8,7 +8,7 @@ igoStopPropagation panelLeftButton (click)="onListClick()"> - list +
[]; - - @Input() store: EntityStore[]>; + @Input() store: EntityStore>; resultSelected: SearchResult; @@ -48,10 +46,10 @@ export class ToastPanelComponent { return this.opened; } - // @HostBinding('style.visibility') - // get displayStyle() { - // return this.opened ? 'visible' : 'hidden'; - // } + @HostBinding('style.visibility') + get displayStyle() { + return this.results.length ? 'visible' : 'hidden'; + } // @ViewChild('content') content: ElementRef; // @@ -59,6 +57,10 @@ export class ToastPanelComponent { // return this.content.nativeElement.children.length === 0; // } + get results(): SearchResult[] { + return this.store.all(); + } + constructor() {} getTitle(result: SearchResult) { @@ -70,11 +72,13 @@ export class ToastPanelComponent { } onToggleClick() { + console.log(this.store); this.opened = !this.opened; } onCloseClick() { - this.results = undefined; + this.store.clear(); + this.selectResult(undefined); } onPreviousClick() {