From ac94065e945daedd9f8d4ee85ecb02bd64e9f61d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 21 Oct 2020 23:52:23 +0000 Subject: [PATCH] Updated things, all ok except bug in v-text-field that was reported --- ayanova/devdocs/todo.txt | 15 ++--- ayanova/package-lock.json | 84 ++++++++++++++++--------- ayanova/package.json | 12 ++-- ayanova/src/api/authutil.js | 7 ++- ayanova/src/api/ayanova-version.js | 2 +- ayanova/src/components/wiki-control.vue | 4 -- ayanova/src/main.js | 5 +- 7 files changed, 78 insertions(+), 51 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index f8fce21e..b8e23385 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -4,13 +4,9 @@ - -todo: Email notification sb link to edit subscription? - Might be handy to directly click and turn off a subscription from teh notification? - http://localhost:8080/open/51/1 - -todo: v7 items .net final version update to if possible and feature request for search client notes direct open plus whatever is on the list - +todo: breaking change in latest vuetify with integer bound to v-text-field have kept this version awaiting fix, reported + https://github.com/vuetifyjs/vuetify/pull/12451 + If not fixed in a timely manner can downgrade to the build before this one todo: Update marked library to latest, view breaking changes first https://github.com/markedjs/marked/releases @@ -26,6 +22,11 @@ todo: Monaco editor and webpack plugin update https://github.com/microsoft/monaco-editor/blob/master/CHANGELOG.md https://github.com/Microsoft/monaco-editor-webpack-plugin#readme + +todo: Postgres 13? + +todo: when it's a general notification in the timeline the button to open the subscription should not be there since it goes to an uneditable default built in subscription + ### MEDIUM ITEMS ####### diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json index c9381f6e..0f4a42b8 100644 --- a/ayanova/package-lock.json +++ b/ayanova/package-lock.json @@ -9239,9 +9239,9 @@ } }, "dompurify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.1.1.tgz", - "integrity": "sha512-NijiNVkS/OL8mdQL1hUbCD6uty/cgFpmNiuFxrmJ5YPH2cXrPKIewoixoji56rbZ6XBPmtM8GA8/sf9unlSuwg==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.0.tgz", + "integrity": "sha512-bqFOQ7XRmmozp0VsKdIEe8UwZYxj0yttz7l80GBtBqdVRY48cOpXH2J/CVO7AEkV51qY0EBVXfilec18mdmQ/w==" }, "domutils": { "version": "1.7.0", @@ -10539,6 +10539,11 @@ "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", "dev": true }, + "fontsource-roboto": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fontsource-roboto/-/fontsource-roboto-3.0.3.tgz", + "integrity": "sha512-kfsC9qAP6XhwnSDAhg2lhWeaUJfLGXZh7GcLxFiz/4lXdkV2pVhWv2Xp9ES3b3BHdc9UuPrWXXLOphzHIStcOw==" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -12740,9 +12745,9 @@ } }, "jwt-decode": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz", - "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk=" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.0.0.tgz", + "integrity": "sha512-RBQv2MTm3FNKQkdzhEyQwh5MbdNgMa+FyIJIK5RMWEn6hRgRHr7j55cRxGhRe6vGJDElyi6f6u/yfkP7AoXddA==" }, "killable": { "version": "1.0.1", @@ -13149,6 +13154,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -13158,12 +13164,14 @@ "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true }, "json5": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, "requires": { "minimist": "^1.2.0" } @@ -13171,7 +13179,8 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true } } }, @@ -13381,9 +13390,9 @@ } }, "marked": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz", - "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz", + "integrity": "sha512-5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==" }, "md5.js": { "version": "1.3.5", @@ -13575,8 +13584,7 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "3.1.3", @@ -13688,16 +13696,41 @@ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "monaco-editor": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.20.0.tgz", - "integrity": "sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ==" + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.21.2.tgz", + "integrity": "sha512-jS51RLuzMaoJpYbu7F6TPuWpnWTLD4kjRW0+AZzcryvbxrTwhNy1KC9yboyKpgMTahpUbDUsuQULoo0GV1EPqg==" }, "monaco-editor-webpack-plugin": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz", - "integrity": "sha512-x7fx1w3i/uwZERIgztHAAK3VQMsL8+ku0lFXXbO81hKDg8IieACqjGEa2mqEueg0c/fX+wd0oI+75wB19KJAsA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-2.0.0.tgz", + "integrity": "sha512-z3nUGhnNis8eHcPepqrxyt3XwrnHD76E4KwV2ozWlBwYM6B3R5YYqzy40ECfJWqRFcwT4DhaLYaXOk5ym4MZhA==", "requires": { - "loader-utils": "^1.2.3" + "loader-utils": "^2.0.0" + }, + "dependencies": { + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "json5": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } } }, "move-concurrently": { @@ -17948,11 +17981,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "typeface-roboto": { - "version": "0.0.75", - "resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz", - "integrity": "sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==" - }, "uglify-js": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", @@ -18548,9 +18576,9 @@ "dev": true }, "vuetify": { - "version": "2.3.14", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.14.tgz", - "integrity": "sha512-1Ys1MreJQOL/Ddp3YotBi1SlC2+1A0/RVkDXX3Azspt8incPdAnNB0JyChHiJ/TM+L+KSA7T4EXF9YDrCWENmg==" + "version": "2.3.15", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.15.tgz", + "integrity": "sha512-YVJN/ld60S2mmFCKxoVFkB8X2kmuLT0E28ql4kr8HQUeCYdK8axoca/N8ZIP1hFH4NIz392f0nVpZKS4ZFZBVA==" }, "vuetify-loader": { "version": "1.6.0", diff --git a/ayanova/package.json b/ayanova/package.json index 216184b4..e50a23f8 100644 --- a/ayanova/package.json +++ b/ayanova/package.json @@ -23,19 +23,19 @@ "core-js": "^3.6.5", "dompurify": "^2.1.1", "github-markdown-css": "^4.0.0", - "jwt-decode": "^2.2.0", + "jwt-decode": "^3.0.0", "luxon": "^1.25.0", - "marked": "^0.8.2", - "monaco-editor": "^0.20.0", - "monaco-editor-webpack-plugin": "^1.9.1", + "marked": "^1.2.2", + "monaco-editor": "^0.21.2", + "monaco-editor-webpack-plugin": "^2.0.0", "nprogress": "^0.2.0", "register-service-worker": "^1.7.1", - "typeface-roboto": "0.0.75", + "fontsource-roboto": "^3.0.3", "vue": "^2.6.12", "vue-chartjs": "^3.5.1", "vue-currency-input": "1.20.3", "vue-router": "^3.4.7", - "vuetify": "^2.3.14", + "vuetify": "^2.3.15", "vuex": "^3.5.1", "vuex-persistedstate": "^2.7.1" }, diff --git a/ayanova/src/api/authutil.js b/ayanova/src/api/authutil.js index 23f04593..b9d56cff 100644 --- a/ayanova/src/api/authutil.js +++ b/ayanova/src/api/authutil.js @@ -1,5 +1,6 @@ /* xeslint-disable */ -import decode from "jwt-decode"; +//import decode from "jwt-decode"; +import jwt_decode from "jwt-decode"; import initialize from "./initialize"; import notifypoll from "./notifypoll"; @@ -20,7 +21,7 @@ export function processLogin(authResponse, loggedInWithKnownPassword) { ); return reject(); } - const token = decode(authResponse.token); + const token = jwt_decode(authResponse.token); if (!token || !token.iss) { window.$gz.store.commit( @@ -111,7 +112,7 @@ export function isLoggedIn() { } function getTokenExpirationDate(encodedToken) { - const token = decode(encodedToken); + const token = jwt_decode(encodedToken); if (!token.exp) { return null; } diff --git a/ayanova/src/api/ayanova-version.js b/ayanova/src/api/ayanova-version.js index 4730ea2d..bb9d5c98 100644 --- a/ayanova/src/api/ayanova-version.js +++ b/ayanova/src/api/ayanova-version.js @@ -1,4 +1,4 @@ export default { - version: "8.0.0-alpha.84", + version: "8.0.0-alpha.86", copyright: "© 1999-2020, Ground Zero Tech-Works Inc." }; diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue index 27517714..c1dc760a 100644 --- a/ayanova/src/components/wiki-control.vue +++ b/ayanova/src/components/wiki-control.vue @@ -326,10 +326,6 @@