From 5e53c1ad91b74286f3670f8f13b9588386f2d392 Mon Sep 17 00:00:00 2001 From: Matthew Ross Date: Tue, 2 Jun 2020 10:01:49 -0400 Subject: [PATCH] Update dependencies and re-instate dashboard --- package-lock.json | 43 +++++++++++-------- package.json | 10 ++--- src/api/composer.lock | 26 ++++++++--- src/app/app.module.ts | 4 +- src/app/app.routes.ts | 12 +++--- src/app/shared/top-nav/top-nav.component.html | 4 +- src/index.html | 2 +- 7 files changed, 61 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7be4322..9505e0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1799,9 +1799,9 @@ "dev": true }, "@types/node": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz", - "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==", + "version": "14.0.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz", + "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==", "dev": true }, "@types/parse-json": { @@ -7800,9 +7800,9 @@ } }, "karma-coverage-istanbul-reporter": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.2.tgz", - "integrity": "sha512-pg23tKKF867UIJUIZF252cNbiBnuMIPOMkeiULzjysr9K267Js2O/SoQBL1PCPctJVzvhOkE47yQPUKrWtyl6w==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz", + "integrity": "sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==", "dev": true, "requires": { "istanbul-lib-coverage": "^3.0.0", @@ -7813,9 +7813,9 @@ } }, "karma-jasmine": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.2.0.tgz", - "integrity": "sha512-NkMgcMVKZJ2LtxWXXWD+d6OSFf8ehjxhfgpjdx9DgjwpLDpirm66kEc7+S0i4HcTJzgNhyTWutDzzfnbvKJpNg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.3.1.tgz", + "integrity": "sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==", "dev": true, "requires": { "jasmine-core": "^3.5.0" @@ -8675,6 +8675,12 @@ "through2": "^2.0.0" } }, + "mitt": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-2.0.1.tgz", + "integrity": "sha512-FhuJY+tYHLnPcBHQhbUFzscD5512HumCPE4URXZUgPi3IvOJi4Xva5IIgy3xX56GqCmw++MAm5UURG6kDBYTdg==", + "dev": true + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -12240,15 +12246,16 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "puppeteer": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.1.0.tgz", - "integrity": "sha512-jLa9sqdVx0tPnr2FcwAq+8DSjGhSM4YpkwOf3JE22Ycyqm71SW7B5uGfTyMGFoLCmbCozbLZclCjasPb0flTRw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.2.0.tgz", + "integrity": "sha512-wkVid0V1p3Gw0u8Jyq0JxBaenx6H+/lmQIYDfHZS20IrhAobP70LSrWI6bF75olAKlrdR50w7IZxjaB09M6tDQ==", "dev": true, "requires": { "debug": "^4.1.0", "extract-zip": "^2.0.0", "https-proxy-agent": "^4.0.0", "mime": "^2.0.3", + "mitt": "^2.0.1", "progress": "^2.0.1", "proxy-from-env": "^1.0.0", "rimraf": "^3.0.2", @@ -15120,9 +15127,9 @@ } }, "ts-node": { - "version": "8.10.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz", - "integrity": "sha512-bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==", + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", "dev": true, "requires": { "arg": "^4.1.0", @@ -15270,9 +15277,9 @@ "dev": true }, "unbzip2-stream": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz", - "integrity": "sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", "dev": true, "requires": { "buffer": "^5.2.1", diff --git a/package.json b/package.json index bff08cf..2e6e072 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@types/jasmine": "~3.5.10", "@types/jasminewd2": "~2.0.8", "@types/marked": "^0.7.4", - "@types/node": "^14.0.5", + "@types/node": "^14.0.6", "bourbon": "7.0.0", "bourbon-neat": "4.0.0", "codelyzer": "^5.2.2", @@ -92,14 +92,14 @@ "jasmine-spec-reporter": "~5.0.2", "karma": "^5.0.9", "karma-chrome-launcher": "^3.1.0", - "karma-coverage-istanbul-reporter": "^3.0.2", - "karma-jasmine": "^3.2.0", + "karma-coverage-istanbul-reporter": "^3.0.3", + "karma-jasmine": "^3.3.1", "karma-jasmine-html-reporter": "^1.5.4", "npm-run-all": "^4.1.5", "npm-watch": "^0.6.0", "protractor": "^7.0.0", - "puppeteer": "^3.1.0", - "ts-node": "^8.10.1", + "puppeteer": "^3.2.0", + "ts-node": "^8.10.2", "tslint": "^6.1.2", "typescript": "^3.8.3" } diff --git a/src/api/composer.lock b/src/api/composer.lock index 9499e01..684aceb 100644 --- a/src/api/composer.lock +++ b/src/api/composer.lock @@ -8,20 +8,20 @@ "packages": [ { "name": "doctrine/instantiator", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -60,7 +60,21 @@ "constructor", "instantiate" ], - "time": "2019-10-21T16:45:58+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-05-29T17:27:14+00:00" }, { "name": "fig/http-message-util", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0077bfc..a6059d2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,7 +12,7 @@ import { ApiInterceptor } from './app.api-http'; import { LoginComponent } from './login/login.component'; import { BoardModule } from './board/board.module'; import { FileModule } from './files/file-viewer.module'; -// import { DashboardModule } from './dashboard/dashboard.module'; +import { DashboardModule } from './dashboard/dashboard.module'; import { SettingsModule } from './settings/settings.module'; import { SharedModule } from './shared/shared.module'; @@ -23,7 +23,7 @@ import { SharedModule } from './shared/shared.module'; HttpClientModule, BoardModule, FileModule, - // DashboardModule, + DashboardModule, DragDropModule, SettingsModule, SharedModule, diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 20e6dd5..2571004 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -4,7 +4,7 @@ import { BoardDisplayComponent } from './board/board.component'; import { FileViewerComponent } from './files/file-viewer.component'; import { LoginComponent } from './login/login.component'; import { SettingsComponent } from './settings/settings.component'; -// import { DashboardComponent } from './dashboard/dashboard.component'; +import { DashboardComponent } from './dashboard/dashboard.component'; import { AuthGuard } from './shared/auth/auth.guard'; export const ROUTES: Routes = [ @@ -27,11 +27,11 @@ export const ROUTES: Routes = [ component: SettingsComponent, canActivate: [ AuthGuard ] }, - // { - // path: 'dashboard', - // component: DashboardComponent, - // canActivate: [ AuthGuard ] - // }, + { + path: 'dashboard', + component: DashboardComponent, + canActivate: [ AuthGuard ] + }, { path: 'files/:hash', component: FileViewerComponent, diff --git a/src/app/shared/top-nav/top-nav.component.html b/src/app/shared/top-nav/top-nav.component.html index 12e9e5d..cacfd6c 100644 --- a/src/app/shared/top-nav/top-nav.component.html +++ b/src/app/shared/top-nav/top-nav.component.html @@ -10,8 +10,8 @@
- - + diff --git a/src/index.html b/src/index.html index 8341307..f1fc46f 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ TaskBoard - Kanban App - +