Merge branch 'branle/master' into astral

This commit is contained in:
Leo Wandersleb 2022-05-27 14:39:18 -04:00
commit b884aec482
No known key found for this signature in database
GPG Key ID: 90B2F570DA9B91E4
5 changed files with 5613 additions and 5455 deletions

View File

@ -11,18 +11,13 @@ npm install
### Start the app in development mode (hot-code reloading, error reporting, etc.)
```bash
quasar dev
./node_modules/.bin/quasar dev
```
### Lint the files
```bash
yarn lint
# or
npm run lint
yarn run lint
```
### Format the files
```bash
yarn format
@ -30,11 +25,9 @@ yarn format
npm run format
```
### Build the app for production
```bash
quasar build
./node_modules/.bin/quasar build
```
## Docker

165
package-lock.json generated
View File

@ -10,10 +10,13 @@
"dependencies": {
"@quasar/extras": "^1.0.0",
"core-js": "^3.6.5",
"cross-fetch": "^3.1.5",
"emoji-mart-vue-fast": "^10.2.1",
"identicon.js": "2.3",
"javascript-time-ago": "^2.3.13",
"markdown-it": "12.3",
"markdown-it-deflist": "2.1",
"markdown-it-emoji": "^2.0.2",
"markdown-it-highlightjs": "3.6",
"markdown-it-sub": "1.0",
"markdown-it-sup": "1.0",
@ -23,9 +26,8 @@
"pouchdb-core": "^6.4.3",
"pouchdb-mapreduce": "^6.4.3",
"pouchdb-upsert": "^2.2.0",
"quasar": "2.0",
"readable-stream": "3.6",
"relative-date": "^1.1.3",
"quasar": "2.5.5",
"readable-stream": "3.6.0",
"stream": "^0.0.2",
"tributejs": "^5.1.3",
"vue": "^3.0.0",
@ -1596,6 +1598,23 @@
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/polyfill": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
"integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
"deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
"dependencies": {
"core-js": "^2.6.5",
"regenerator-runtime": "^0.13.4"
}
},
"node_modules/@babel/polyfill/node_modules/core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
"deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
"hasInstallScript": true
},
"node_modules/@babel/preset-env": {
"version": "7.16.11",
"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
@ -1704,7 +1723,6 @@
"version": "7.17.8",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
"integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
"dev": true,
"dependencies": {
"regenerator-runtime": "^0.13.4"
},
@ -4825,6 +4843,40 @@
"resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz",
"integrity": "sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY="
},
"node_modules/emoji-mart-vue-fast": {
"version": "10.2.2",
"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-10.2.2.tgz",
"integrity": "sha512-SO37LI60Oksog3RhNpEUoQjfceBXfZ3yW9ALhlQgyut7hE6MghHsBJrGPeI6KKK8bQfTMBYlci/RWKsUsmbkPw==",
"dependencies": {
"@babel/polyfill": "^7.12.1",
"@babel/runtime": "^7.16.3",
"vue-virtual-scroller": "^1.0.10"
},
"peerDependencies": {
"vue": ">2.0.0"
}
},
"node_modules/emoji-mart-vue-fast/node_modules/vue-virtual-scroller": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz",
"integrity": "sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA==",
"dependencies": {
"scrollparent": "^2.0.1",
"vue-observe-visibility": "^0.4.4",
"vue-resize": "^0.4.5"
},
"peerDependencies": {
"vue": "^2.6.11"
}
},
"node_modules/emoji-mart-vue-fast/node_modules/vue-virtual-scroller/node_modules/vue-resize": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
"peerDependencies": {
"vue": "^2.3.0"
}
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@ -7787,6 +7839,11 @@
"resolved": "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz",
"integrity": "sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg=="
},
"node_modules/markdown-it-emoji": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz",
"integrity": "sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="
},
"node_modules/markdown-it-highlightjs": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/markdown-it-highlightjs/-/markdown-it-highlightjs-3.6.0.tgz",
@ -9887,9 +9944,9 @@
}
},
"node_modules/quasar": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.4.tgz",
"integrity": "sha512-W53vn99KKeJI+xHT7ah1qOGCqEDG2+x7G47se8lf93wFTXQAyBw+O0TbuOdZqoKpguwT4T2yo4dTMz7WRmRqGA==",
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.5.5.tgz",
"integrity": "sha512-7UntzqIBih+xZLCB/f9pxuvNP3EBgexfQDbf8r9p58DHWAiSQwamLjcRHKqmujjp0uX1QChtp6oUxEkK+sFKtA==",
"engines": {
"node": ">= 10.18.1",
"npm": ">= 6.13.4",
@ -10008,8 +10065,7 @@
"node_modules/regenerator-runtime": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"dev": true
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
},
"node_modules/regenerator-transform": {
"version": "0.14.5",
@ -10107,11 +10163,6 @@
"node": ">= 0.10"
}
},
"node_modules/relative-date": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz",
"integrity": "sha1-EgkDBAWI7HpKOZxlR/0B0OPS3GM="
},
"node_modules/relative-time-format": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/relative-time-format/-/relative-time-format-1.0.8.tgz",
@ -10478,6 +10529,11 @@
"url": "https://opencollective.com/webpack"
}
},
"node_modules/scrollparent": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz",
"integrity": "sha1-cV1bnMV3YPsivczDvvtb/gaxoxc="
},
"node_modules/select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -11981,6 +12037,11 @@
"node": ">=8"
}
},
"node_modules/vue-observe-visibility": {
"version": "0.4.6",
"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
},
"node_modules/vue-router": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz",
@ -13840,6 +13901,22 @@
"@babel/helper-plugin-utils": "^7.16.7"
}
},
"@babel/polyfill": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
"integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
"requires": {
"core-js": "^2.6.5",
"regenerator-runtime": "^0.13.4"
},
"dependencies": {
"core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
}
}
},
"@babel/preset-env": {
"version": "7.16.11",
"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
@ -13939,7 +14016,6 @@
"version": "7.17.8",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
"integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
"dev": true,
"requires": {
"regenerator-runtime": "^0.13.4"
}
@ -16395,6 +16471,36 @@
"resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz",
"integrity": "sha1-Bl4tvtaVm/RwZ57avq95gdEAOrY="
},
"emoji-mart-vue-fast": {
"version": "10.2.2",
"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-10.2.2.tgz",
"integrity": "sha512-SO37LI60Oksog3RhNpEUoQjfceBXfZ3yW9ALhlQgyut7hE6MghHsBJrGPeI6KKK8bQfTMBYlci/RWKsUsmbkPw==",
"requires": {
"@babel/polyfill": "^7.12.1",
"@babel/runtime": "^7.16.3",
"vue-virtual-scroller": "^1.0.10"
},
"dependencies": {
"vue-virtual-scroller": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/vue-virtual-scroller/-/vue-virtual-scroller-1.0.10.tgz",
"integrity": "sha512-Hn4qSBDhRY4XdngPioYy/ykDjrLX/NMm1fQXm/4UQQ/Xv1x8JbHGFZNftQowTcfICgN7yc31AKnUk1UGLJ2ndA==",
"requires": {
"scrollparent": "^2.0.1",
"vue-observe-visibility": "^0.4.4",
"vue-resize": "^0.4.5"
},
"dependencies": {
"vue-resize": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg==",
"requires": {}
}
}
}
}
},
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@ -18617,6 +18723,11 @@
"resolved": "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz",
"integrity": "sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg=="
},
"markdown-it-emoji": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz",
"integrity": "sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="
},
"markdown-it-highlightjs": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/markdown-it-highlightjs/-/markdown-it-highlightjs-3.6.0.tgz",
@ -20189,9 +20300,9 @@
"dev": true
},
"quasar": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.4.tgz",
"integrity": "sha512-W53vn99KKeJI+xHT7ah1qOGCqEDG2+x7G47se8lf93wFTXQAyBw+O0TbuOdZqoKpguwT4T2yo4dTMz7WRmRqGA=="
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.5.5.tgz",
"integrity": "sha512-7UntzqIBih+xZLCB/f9pxuvNP3EBgexfQDbf8r9p58DHWAiSQwamLjcRHKqmujjp0uX1QChtp6oUxEkK+sFKtA=="
},
"queue-microtask": {
"version": "1.2.3",
@ -20272,8 +20383,7 @@
"regenerator-runtime": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"dev": true
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
},
"regenerator-transform": {
"version": "0.14.5",
@ -20349,11 +20459,6 @@
"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
"dev": true
},
"relative-date": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz",
"integrity": "sha1-EgkDBAWI7HpKOZxlR/0B0OPS3GM="
},
"relative-time-format": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/relative-time-format/-/relative-time-format-1.0.8.tgz",
@ -20601,6 +20706,11 @@
"ajv-keywords": "^3.5.2"
}
},
"scrollparent": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz",
"integrity": "sha1-cV1bnMV3YPsivczDvvtb/gaxoxc="
},
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@ -21744,6 +21854,11 @@
}
}
},
"vue-observe-visibility": {
"version": "0.4.6",
"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
"integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
},
"vue-router": {
"version": "4.0.14",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz",

View File

@ -29,8 +29,8 @@
"pouchdb-core": "^6.4.3",
"pouchdb-mapreduce": "^6.4.3",
"pouchdb-upsert": "^2.2.0",
"quasar": "2.0",
"readable-stream": "3.6",
"quasar": "2.5.5",
"readable-stream": "3.6.0",
"stream": "^0.0.2",
"tributejs": "^5.1.3",
"vue": "^3.0.0",

View File

@ -146,7 +146,6 @@ export default {
this.$store.commit('haveReadMessage', this.$route.params.pubkey)
this.$store.dispatch('useProfile', {pubkey: this.$route.params.pubkey})
this.listener = onNewMessage(this.$route.params.pubkey, async event => {
if (this.messagesSet.has(event.id)) return
this.messagesSet.add(event.id)

10885
yarn.lock

File diff suppressed because it is too large Load Diff