Open source personal finance application
feat (firebase): update to 9.0.0
ilkome3e7c84d3df48
diff --git a/components/categories/EditModal.vue b/components/categories/EditModal.vueindex 86033ce1..3f540fce 100644--- a/components/categories/EditModal.vue+++ b/components/categories/EditModal.vue@@ -1,5 +1,5 @@<script>-import { db } from '~/services/firebaseConfig'+import { saveData } from '~/services/firebaseHelpers'import generateId from '~/utils/id'import colors from '~/assets/js/colors'import icons from '~/assets/js/icons'@@ -112,7 +112,7 @@ export default {if (this.originalParentId !== 0) {const originalParent = categories[this.originalParentId]if (originalParent) {- db.ref(`users/${uid}/categories/${this.originalParentId}`).set({+ saveData(`users/${uid}/categories/${this.originalParentId}`, {...originalParent,childIds: originalParent.childIds.filter(cId => cId !== id)})@@ -126,7 +126,7 @@ export default {? [...parenCategory.childIds.filter(cId => cId !== id), id]: [id]- db.ref(`users/${uid}/categories/${this.category.parentId}`).set({+ saveData(`users/${uid}/categories/${this.category.parentId}`, {...parenCategory,childIds})@@ -136,7 +136,7 @@ export default {const childIds = this.$store.getters['categories/getChildCategoriesIds'](id)// update category- db.ref(`users/${uid}/categories/${id}`).set({+ saveData(`users/${uid}/categories/${id}`, {...categoriesValues,childIds})@@ -145,7 +145,7 @@ export default {if (this.applyChildColor) {for (const childId of childIds) {const category = categories[childId]- db.ref(`users/${uid}/categories/${childId}`).set({+ saveData(`users/${uid}/categories/${childId}`, {...category,color: categoriesValues.color})diff --git a/components/categories/Form.vue b/components/categories/Form.vueindex 8f7117cd..361b4c3e 100644--- a/components/categories/Form.vue+++ b/components/categories/Form.vue@@ -1,5 +1,5 @@<script>-import { db } from '~/services/firebaseConfig'+import { saveData } from '~/services/firebaseHelpers'import generateId from '~/utils/id'import colors from '~/assets/js/colors'import icons from '~/assets/js/icons'@@ -117,7 +117,7 @@ export default {if (this.originalParentId !== 0) {const originalParent = categories[this.originalParentId]if (originalParent) {- db.ref(`users/${uid}/categories/${this.originalParentId}`).set({+ saveData(`users/${uid}/categories/${this.originalParentId}`, {...originalParent,childIds: originalParent.childIds.filter(cId => cId !== id)})@@ -131,7 +131,7 @@ export default {? [...parenCategory.childIds.filter(cId => cId !== id), id]: [id]- db.ref(`users/${uid}/categories/${this.category.parentId}`).set({+ saveData(`users/${uid}/categories/${this.category.parentId}`, {...parenCategory,childIds})@@ -141,7 +141,7 @@ export default {const childIds = this.$store.getters['categories/getChildCategoriesIds'](id)// update category- db.ref(`users/${uid}/categories/${id}`).set({+ saveData(`users/${uid}/categories/${id}`, {...categoriesValues,childIds})@@ -150,7 +150,7 @@ export default {if (this.applyChildColor) {for (const childId of childIds) {const category = categories[childId]- db.ref(`users/${uid}/categories/${childId}`).set({+ saveData(`users/${uid}/categories/${childId}`, {...category,color: categoriesValues.color})diff --git a/components/categories/Modal.vue b/components/categories/Modal.vueindex df086fc5..e069aa94 100644--- a/components/categories/Modal.vue+++ b/components/categories/Modal.vue@@ -1,6 +1,6 @@<script>import { useContext } from '@nuxtjs/composition-api'-import { db } from '~/services/firebaseConfig'+import { removeData } from '~/services/firebaseHelpers'import useFilter from '~/modules/filter/useFilter'export default {@@ -103,9 +103,7 @@ export default {setTimeout(async () => {await this.$store.dispatch('trns/deleteTrnsByIds', trnsIds)- db.ref(`users/${uid}/categories/${id}`)- .remove()- // .then(() => { console.log('category deleted') })+ removeData(`users/${uid}/categories/${id}`)}, 200)}}diff --git a/components/wallets/Modal.vue b/components/wallets/Modal.vueindex 67b4662b..43f539ca 100644--- a/components/wallets/Modal.vue+++ b/components/wallets/Modal.vue@@ -1,6 +1,6 @@<script>import { useContext } from '@nuxtjs/composition-api'-import { db } from '~/services/firebaseConfig'+import { removeData } from '~/services/firebaseHelpers'import useFilter from '~/modules/filter/useFilter'export default {@@ -83,8 +83,7 @@ export default {setTimeout(async () => {await this.$store.dispatch('trns/deleteTrnsByIds', trnsIds)- db.ref(`users/${uid}/accounts/${id}`)- .remove()+ removeData(`users/${uid}/accounts/${id}`).then(() => console.log('wallet deleted'))}, 200)}diff --git a/components/wallets/sort/WalletsSort.vue b/components/wallets/sort/WalletsSort.vueindex 8d08ca36..e99b7dae 100644--- a/components/wallets/sort/WalletsSort.vue+++ b/components/wallets/sort/WalletsSort.vue@@ -24,13 +24,12 @@ export default {async saveWalletsOrder () {const sortedWallets = {}- for (const [idx, walletId] of this.sortedWalletsIds.entries()) {+ for (const [idx, walletId] of this.sortedWalletsIds.entries())sortedWallets[walletId] = idx- }const result = await this.$store.dispatch('wallets/saveWalletsOrder', sortedWallets)if (result.succsess) {- if (this.$listeners.closeModal) { this.$listeners.closeModal() }+ if (this.$listeners.closeModal) this.$listeners.closeModal()// this.$store.dispatch('ui/setActiveTab', 'wallets')this.$notify({type: 'success',diff --git a/package-lock.json b/package-lock.jsonindex 018e1e63..90df99ce 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,11 +1,11 @@{"name": "finapp",- "version": "3.17.0",+ "version": "3.17.1","lockfileVersion": 2,"requires": true,"packages": {"": {- "version": "3.17.0",+ "version": "3.17.1","dependencies": {"@nuxtjs/i18n": "^7.0.1","@simonwep/pickr": "1.8.1",@@ -14,7 +14,7 @@"core-js": "3.16.1","currency.js": "2.0.4","dayjs": "1.10.6",- "firebase": "8.9.0",+ "firebase": "9.0.0","highcharts": "9.1.2","highcharts-vue": "1.4.0","localforage": "1.9.0",@@ -1764,56 +1764,78 @@}},"node_modules/@firebase/analytics": {- "version": "0.6.17",- "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.17.tgz",- "integrity": "sha512-Iiip24vQw7p+dBxoGWP2WvVqV2tOdLPjWw6OP6a+8vgss9PRsjKE2AAskruqveMUO4Ox5uPW65wdgeJxoFoMvQ==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.0.tgz",+ "integrity": "sha512-YEPyeW6CV8xbIvWaJMvfRdWUPKe/xchJ1bjV6GpLfkYRX+ZE1/YSNU14pX292M4bZ6Qg+bbu2DuWp8fEpa/YQg==","dependencies": {- "@firebase/analytics-types": "0.6.0",- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/analytics-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.0.tgz",+ "integrity": "sha512-oaf1FEF7cKci5tO7f52dH63/ZwkBqbdSLLpgo6kyoYoYDuY+on4yAc1CIHh3sNj/L8T4Ni81IQvVs9lE/9oOpg==",+ "dependencies": {+ "@firebase/analytics": "0.7.0",+ "@firebase/analytics-types": "0.7.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/analytics-types": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.6.0.tgz",- "integrity": "sha512-kbMawY0WRPyL/lbknBkme4CNLl+Gw+E9G4OpNeXAauqoQiNkBgpIvZYy7BRT4sNGhZbxdxXxXbruqUwDzLmvTw=="+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.7.0.tgz",+ "integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="},"node_modules/@firebase/app": {- "version": "0.6.29",- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.29.tgz",- "integrity": "sha512-duCzk9/BSVVsb5Y9b0rnvGSuD5zQA/JghiQsccRl+lA4xiUYjFudTU4cVFftkw+0zzeYBHn4KiVxchsva1O9dA==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.0.tgz",+ "integrity": "sha512-l4Pd69re6JyjumQrl719dnY5JSKROSYda/0N2wzOhSzqg8DsZOIErr8+xj6QAE6BtNsoIEk7ma9WMS/2r02MhA==","dependencies": {- "@firebase/app-types": "0.6.3",- "@firebase/component": "0.5.5",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",- "dom-storage": "2.1.0",- "tslib": "^2.1.0",- "xmlhttprequest": "1.8.0"+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"}},"node_modules/@firebase/app-check": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.3.0.tgz",- "integrity": "sha512-L+lwN4ECHBPLI2yreXU5qVmQjLlL9g96JrC0vWAQJZQKXP4zU0e4B8B9e4NO0KmHBoWR4BSgZrWdBljqGNhbeQ==",+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.4.0.tgz",+ "integrity": "sha512-KQ/k8cukzZbH/LC9Iu5/Dbhr7w6byu8bYjfCA38B6v8aISgASYfP/nirxRD+hSuDoxXtAnPGEuv+v0YU3D1R2w==","dependencies": {- "@firebase/app-check-interop-types": "0.1.0",- "@firebase/app-check-types": "0.3.0",- "@firebase/component": "0.5.5",+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/app-check-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.1.0.tgz",+ "integrity": "sha512-T1M2d1oroaHUa448fgx3BdfWg4WXP64yybIWxvmVBuh7YnyMuegJK1sS9zipKBKLkstcQK8vivXYh3+/AnbGFw==",+ "dependencies": {+ "@firebase/app-check": "0.4.0",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/app-check-interop-types": {@@ -1821,27 +1843,81 @@"resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.0.tgz","integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="},- "node_modules/@firebase/app-check-types": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.3.0.tgz",- "integrity": "sha512-+NYD7wbbHF8dU+DCw4uOwxKE4VCwYKYnSuaiTnKmWJFZahrGdXZCqaBmhl0RnvuKb7RW06y2QJ5fJq1m5oQYDA=="+ "node_modules/@firebase/app-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.0.tgz",+ "integrity": "sha512-jnAeFM1ihY5klqg2dvdA4EOk7co8ffSHUj/efqaSwTrMkKTcG/WZKF9WAuXdl+5jEu1BhsGGHveWzGliTFH5Hg==",+ "dependencies": {+ "@firebase/app": "0.7.0",+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }},"node_modules/@firebase/app-types": {- "version": "0.6.3",- "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz",- "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw=="+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz",+ "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="},"node_modules/@firebase/auth": {- "version": "0.16.8",- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.16.8.tgz",- "integrity": "sha512-mR0UXG4LirWIfOiCWxVmvz1o23BuKGxeItQ2cCUgXLTjNtWJXdcky/356iTUsd7ZV5A78s2NHeN5tIDDG6H4rg==",+ "version": "0.17.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.17.0.tgz",+ "integrity": "sha512-4zOGTLGzMjBX96KEyBNYpjOD87c2efCZvUjaJ53QslleW9Xp8kSsSHLRhr8hOkcRXO17CmBKSRx/LnG2vTZWQQ==","dependencies": {- "@firebase/auth-types": "0.10.3"+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "node-fetch": "2.6.1",+ "selenium-webdriver": "4.0.0-beta.1",+ "tslib": "^2.1.0"},"peerDependencies": {"@firebase/app": "0.x"}},+ "node_modules/@firebase/auth-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.1.0.tgz",+ "integrity": "sha512-OfAt3c5ham07xvmYyJp02v8mUa+HaSEwilvgD2M1JaWqLAtqH66bdBhLBE9N0pq8xtRdXZIF1vSd20a0ulQfQg==",+ "dependencies": {+ "@firebase/auth": "0.17.0",+ "@firebase/auth-types": "0.11.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0",+ "node-fetch": "2.6.1",+ "selenium-webdriver": "^4.0.0-beta.2",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"+ }+ },+ "node_modules/@firebase/auth-compat/node_modules/selenium-webdriver": {+ "version": "4.0.0-beta.4",+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.4.tgz",+ "integrity": "sha512-+s/CIYkWzmnC9WASBxxVj7Lm0dcyl6OaFxwIJaFCT5WCuACiimEEr4lUnOOFP/QlKfkDQ56m+aRczaq2EvJEJg==",+ "dependencies": {+ "jszip": "^3.6.0",+ "rimraf": "^3.0.2",+ "tmp": "^0.2.1",+ "ws": ">=7.4.6"+ },+ "engines": {+ "node": ">= 10.15.0"+ }+ },+ "node_modules/@firebase/auth-compat/node_modules/tmp": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",+ "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",+ "dependencies": {+ "rimraf": "^3.0.0"+ },+ "engines": {+ "node": ">=8.17.0"+ }+ },"node_modules/@firebase/auth-interop-types": {"version": "0.1.6","resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz",@@ -1852,54 +1928,69 @@}},"node_modules/@firebase/auth-types": {- "version": "0.10.3",- "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.10.3.tgz",- "integrity": "sha512-zExrThRqyqGUbXOFrH/sowuh2rRtfKHp9SBVY2vOqKWdCX1Ztn682n9WLtlUDsiYVIbBcwautYWk2HyCGFv0OA==",+ "version": "0.11.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.11.0.tgz",+ "integrity": "sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==","peerDependencies": {"@firebase/app-types": "0.x","@firebase/util": "1.x"}},"node_modules/@firebase/component": {- "version": "0.5.5",- "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.5.tgz",- "integrity": "sha512-L41SdS/4a164jx2iGfakJgaBUPPBI3DI+RrUlmh3oHSUljTeCwfj/Nhcv3S7e2lyXsGFJtAyepfPUx4IQ05crw==",+ "version": "0.5.6",+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.6.tgz",+ "integrity": "sha512-GyQJ+2lrhsDqeGgd1VdS7W+Y6gNYyI0B51ovNTxeZVG/W8I7t9MwEiCWsCvfm5wQgfsKp9dkzOcJrL5k8oVO/Q==","dependencies": {- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},"node_modules/@firebase/database": {- "version": "0.10.9",- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.9.tgz",- "integrity": "sha512-Jxi9SiE4cNOftO9YKlG71ccyWFw4kSM9AG/xYu6vWXUGBr39Uw1TvYougANOcU21Q0TP4J08VPGnOnpXk/FGbQ==",+ "version": "0.12.0",+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.0.tgz",+ "integrity": "sha512-/gl6z6fAxAAFAdDllzidzweGpuXJu0b9AusSLrdW4LpP6KCuxJbhonMJuSGpHLzAHzx6Q9uitbvqHqBb17sttQ==","dependencies": {"@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.5",- "@firebase/database-types": "0.7.3",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","faye-websocket": "0.11.3","tslib": "^2.1.0"}},+ "node_modules/@firebase/database-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.0.tgz",+ "integrity": "sha512-jLN0JMYnYijg8f3QFtSuPGNuKAt3yYVRsHHlR8sADgx8MptByRRwVmMOk7QPc/DY7qscZIJow3hXFwvbeApFLA==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/database": "0.12.0",+ "@firebase/database-types": "0.9.0",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"+ }+ },"node_modules/@firebase/database-types": {- "version": "0.7.3",- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz",- "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.0.tgz",+ "integrity": "sha512-x2TeTVnMZGPvT3y4Nayio4WprQA/zGwqMrPMQwSdF+PFnaFJAhA/eLgUB6cmWFzFYO9VvmuRkFzDzo6ezTo1Zw==","dependencies": {- "@firebase/app-types": "0.6.3"+ "@firebase/app-types": "0.7.0",+ "@firebase/util": "1.3.0"}},"node_modules/@firebase/firestore": {- "version": "2.3.10",- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-2.3.10.tgz",- "integrity": "sha512-O+XpaZVhDIBK2fMwBUBR2BuhaXF6zTmz+afAuXAx18DK+2rFfLefbALZLaUYw0Aabe9pryy0c7OenzRbHA8n4Q==",+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.0.0.tgz",+ "integrity": "sha512-rbs5EbU/01f7NKHDtedBowpBlqnkVnQlpIuSX5wwGMiPgH8f9pMhh59JMk0cTaSqsJXsq3KvafWAD9SqWIqe2w==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/firestore-types": "2.3.0",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","@firebase/webchannel-wrapper": "0.5.1","@grpc/grpc-js": "^1.3.2","@grpc/proto-loader": "^0.6.0",@@ -1910,62 +2001,82 @@"node": "^8.13.0 || >=10.10.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/firestore-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.0.tgz",+ "integrity": "sha512-25r1jGpnnx7vXSPVLmHNkuz+EGpZDU5Luro5/MFCMmoV4a+Rmg2n9FRlxRyPn4XOCkc5nrBpT6ESAKAPSNHcpw==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/firestore": "3.0.0",+ "@firebase/firestore-types": "2.5.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/firestore-types": {- "version": "2.3.0",- "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.3.0.tgz",- "integrity": "sha512-QTW7NP7nDL0pgT/X53lyj+mIMh4nRQBBTBlRNQBt7eSyeqBf3ag3bxdQhCg358+5KbjYTC2/O6QtX9DlJZmh1A==",+ "version": "2.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.0.tgz",+ "integrity": "sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==","peerDependencies": {"@firebase/app-types": "0.x","@firebase/util": "1.x"}},"node_modules/@firebase/functions": {- "version": "0.6.14",- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.6.14.tgz",- "integrity": "sha512-Gthru/wHPQqkn651MenVM+qKVFFqIyFcNT3qfJUacibqrKlvDtYtaCMjFGAkChuGnYzNVnXJIaNrIHkEIII4Hg==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.0.tgz",+ "integrity": "sha512-H0krTllYh5eK7utKoUoNoVvoSdZqaPdqGSdIK7ltr1yWX9UhbRWYZv5B/tWTjQFfDfRQwpn9Q6svoJzYZQiusA==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/functions-types": "0.4.0",- "@firebase/messaging-types": "0.5.0",+ "@firebase/app-check-interop-types": "0.1.0",+ "@firebase/auth-interop-types": "0.1.6",+ "@firebase/component": "0.5.6",+ "@firebase/messaging-interop-types": "0.1.0",+ "@firebase/util": "1.3.0","node-fetch": "2.6.1","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/functions-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.0.tgz",+ "integrity": "sha512-uNwHdGYqgIXzF7aTZBeUe00K/sadRg5EeSDuJ6VNo3Gh3ZceX4eRnL5p7l2bEJBh8hBl0brb82+TRYjGHtjtFQ==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/functions": "0.7.0",+ "@firebase/functions-types": "0.5.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/functions-types": {- "version": "0.4.0",- "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.4.0.tgz",- "integrity": "sha512-3KElyO3887HNxtxNF1ytGFrNmqD+hheqjwmT3sI09FaDCuaxGbOnsXAXH2eQ049XRXw9YQpHMgYws/aUNgXVyQ=="+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.5.0.tgz",+ "integrity": "sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA=="},"node_modules/@firebase/installations": {- "version": "0.4.31",- "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.31.tgz",- "integrity": "sha512-qWolhAgMHvD3avsNCl+K8+untzoDDFQIRR8At8kyWMKKosy0vttdWTWzjvDoZbyKU6r0RNlxDUWAgV88Q8EudQ==",+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.0.tgz",+ "integrity": "sha512-wF1CKIx+SoiEbtNdutulxW4z80B5lGXW+8JdAtcKQwgKxF0VtlCaDFsd9AEB3aTtzIve5UkGak8hQOMvvOpydg==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/installations-types": "0.3.4",- "@firebase/util": "1.2.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","idb": "3.0.2","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"- }- },- "node_modules/@firebase/installations-types": {- "version": "0.3.4",- "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.3.4.tgz",- "integrity": "sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q==",- "peerDependencies": {- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"}},"node_modules/@firebase/logger": {@@ -1974,51 +2085,75 @@"integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw=="},"node_modules/@firebase/messaging": {- "version": "0.7.15",- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.7.15.tgz",- "integrity": "sha512-81t6iJtqMBJF5LHTjDhlHUpbPZOV6dKhW0TueAoON4omc0SaDXgf4nnk6JkvZRfdcuOaP8848Cv53tvZPFFAYQ==",- "dependencies": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",- "@firebase/messaging-types": "0.5.0",- "@firebase/util": "1.2.0",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.0.tgz",+ "integrity": "sha512-NTUB+gVJsgL/f6wqwUlgadaNuLZvyk1IlTcRvR3391t8jDSWOT2efwzNqcI7Xv4nhzaiPhzAQ4ncH/m8kfUUXQ==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0",+ "@firebase/messaging-interop-types": "0.1.0",+ "@firebase/util": "1.3.0","idb": "3.0.2","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"}},- "node_modules/@firebase/messaging-types": {- "version": "0.5.0",- "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.5.0.tgz",- "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg==",+ "node_modules/@firebase/messaging-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.0.tgz",+ "integrity": "sha512-58qQmKwOiXhxZwrRwwjQDbjlRx1uMVVuV/DNbDzqilDJDdoYXMdK6RBTF9Bs51qy/Z1BI2Q9B1JX01QYlgZpxQ==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/messaging": "0.9.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },"peerDependencies": {- "@firebase/app-types": "0.x"+ "@firebase/app-compat": "0.x"}},+ "node_modules/@firebase/messaging-interop-types": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz",+ "integrity": "sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ=="+ },"node_modules/@firebase/performance": {- "version": "0.4.17",- "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.4.17.tgz",- "integrity": "sha512-uhDs9rhdMrGraYHcd3CTRkGtcNap4hp6rAHTwJNIX56Z3RzQ1VW2ea9vvesl7EjFtEIPU0jfdrS32wV+qer5DQ==",+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.0.tgz",+ "integrity": "sha512-E+L18eJKshr/ijnWZMexEEddwkp2T4Ye2dJSK4TcOKRYfrmfZJ95RRZ+MPNp1ES7RH2JYiyym1NIQKPcNNvhug==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/performance-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.0.tgz",+ "integrity": "sha512-H+/A5+y/15hFn5FHRP8lcogDzO6qm9YoACNEXn71UN4PiGQ+/BbHkQafDEXxD6wLfqfqR8u8oclHPFIYxMBF7Q==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/performance-types": "0.0.13",- "@firebase/util": "1.2.0",+ "@firebase/performance": "0.5.0",+ "@firebase/performance-types": "0.1.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/performance-types": {- "version": "0.0.13",- "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.0.13.tgz",- "integrity": "sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA=="+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.1.0.tgz",+ "integrity": "sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w=="},"node_modules/@firebase/polyfill": {"version": "0.3.36",@@ -2041,56 +2176,83 @@}},"node_modules/@firebase/remote-config": {- "version": "0.1.42",- "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.42.tgz",- "integrity": "sha512-hWwtAZmYLB274bxjV2cdMYhyBCUUqbYErihGx3rMyab76D+VbIxOuKJb2z0DS67jQG+SA3pr9/MtWsTPHV/l9g==",+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.2.0.tgz",+ "integrity": "sha512-hNZ+BqsTmfe8ogpeow95NSwQmKIeetKdPxKpyC6RZBeFUae782+2HrUx4/Quep6OZjOHQF6xZ5d3VOxu2ZKEfg==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0","@firebase/logger": "0.2.6",- "@firebase/remote-config-types": "0.1.9",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/remote-config-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.0.tgz",+ "integrity": "sha512-PpCh5f5hUUaDCmiJsuu/u9a0g0G5WH3YSbfH1jPejVOaJ1lS82615E7WOzco4zMllLYfX62VaUYD2vvcLyXE/w==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/remote-config": "0.2.0",+ "@firebase/remote-config-types": "0.2.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/remote-config-types": {- "version": "0.1.9",- "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.1.9.tgz",- "integrity": "sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA=="+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz",+ "integrity": "sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw=="},"node_modules/@firebase/storage": {- "version": "0.6.2",- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.6.2.tgz",- "integrity": "sha512-qbYx+KOxnD5andWAtVPgMHFa/62jdLCgPGdfIRQIEgBoYibk3KigRYVdnfKRLcCO3Vip63BRUvyeqfiUHNNu2g==",+ "version": "0.8.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.8.0.tgz",+ "integrity": "sha512-D0HH+y3DLH0+8eOt6h19RffFMpdzPNr7Yv7XpeeM3+VLE4TbQnDie/OAQWOuWLrYoW7MsPQnLkx+zDb3DxOXxw==","dependencies": {- "@firebase/component": "0.5.5",- "@firebase/storage-types": "0.4.1",- "@firebase/util": "1.2.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","node-fetch": "2.6.1","tslib": "^2.1.0"},"peerDependencies": {- "@firebase/app": "0.x",- "@firebase/app-types": "0.x"+ "@firebase/app": "0.x"+ }+ },+ "node_modules/@firebase/storage-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.0.tgz",+ "integrity": "sha512-DJstR2vidnyNSRp14LQhd9QO0PxhMm/xsXrPQ2IEmQ7EWDT4rxGd+pkqXTG6IO+k9ZKMc0BnWIYwlMqkGEJoDg==",+ "dependencies": {+ "@firebase/component": "0.5.6",+ "@firebase/storage": "0.8.0",+ "@firebase/storage-types": "0.6.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ },+ "peerDependencies": {+ "@firebase/app-compat": "0.x"}},"node_modules/@firebase/storage-types": {- "version": "0.4.1",- "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.4.1.tgz",- "integrity": "sha512-IM4cRzAnQ6QZoaxVZ5MatBzqXVcp47hOlE28jd9xXw1M9V7gfjhmW0PALGFQx58tPVmuUwIKyoEbHZjV4qRJwQ==",+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.6.0.tgz",+ "integrity": "sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==","peerDependencies": {"@firebase/app-types": "0.x","@firebase/util": "1.x"}},"node_modules/@firebase/util": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.2.0.tgz",- "integrity": "sha512-8W9TTGImXr9cu+oyjBJ7yjoEd/IVAv0pBZA4c1uIuKrpGZi2ee38m+8xlZOBRmsAaOU/tR9DXz1WF/oeM6Fb7Q==",+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.3.0.tgz",+ "integrity": "sha512-SESvmYwuKOVCZ1ZxLbberbx+9cnbxpCa4CG2FUSQYqN6Ab8KyltegMDIsqMw5KyIBZ4n1phfHoOa22xo5NzAlQ==","dependencies": {"tslib": "^2.1.0"}@@ -2101,9 +2263,9 @@"integrity": "sha512-dZMzN0uAjwJXWYYAcnxIwXqRTZw3o14hGe7O6uhwjD1ZQWPVYA5lASgnNskEBra0knVBsOXB4KXg+HnlKewN/A=="},"node_modules/@grpc/grpc-js": {- "version": "1.3.6",- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz",- "integrity": "sha512-v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg==",+ "version": "1.3.7",+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz",+ "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==","dependencies": {"@types/node": ">=12.12.47"},@@ -6797,14 +6959,6 @@"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"}},- "node_modules/dom-storage": {- "version": "2.1.0",- "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz",- "integrity": "sha512-g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==",- "engines": {- "node": "*"- }- },"node_modules/dom7": {"version": "3.0.0","resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",@@ -8765,28 +8919,36 @@}},"node_modules/firebase": {- "version": "8.9.0",- "resolved": "https://registry.npmjs.org/firebase/-/firebase-8.9.0.tgz",- "integrity": "sha512-pjswkdqBzL03T3keqKOgar8Le2Xj+Fk9cIZA/VSuAQI26SOhsQMKQUiy+xEKJwKFe76NStz8pBae3DdPTZ0p3w==",- "dependencies": {- "@firebase/analytics": "0.6.17",- "@firebase/app": "0.6.29",- "@firebase/app-check": "0.3.0",- "@firebase/app-types": "0.6.3",- "@firebase/auth": "0.16.8",- "@firebase/database": "0.10.9",- "@firebase/firestore": "2.3.10",- "@firebase/functions": "0.6.14",- "@firebase/installations": "0.4.31",- "@firebase/messaging": "0.7.15",- "@firebase/performance": "0.4.17",+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.0.0.tgz",+ "integrity": "sha512-atgnuvELhU9D5w9moChnyCb6GRbOCqk54/kHN0J4kdLJBncpcb2culIJ7nlSHILMcW9MNMiNKDJ07RwXVyqFFA==",+ "dependencies": {+ "@firebase/analytics": "0.7.0",+ "@firebase/analytics-compat": "0.1.0",+ "@firebase/app": "0.7.0",+ "@firebase/app-check": "0.4.0",+ "@firebase/app-check-compat": "0.1.0",+ "@firebase/app-compat": "0.1.0",+ "@firebase/app-types": "0.7.0",+ "@firebase/auth": "0.17.0",+ "@firebase/auth-compat": "0.1.0",+ "@firebase/database": "0.12.0",+ "@firebase/database-compat": "0.1.0",+ "@firebase/firestore": "3.0.0",+ "@firebase/firestore-compat": "0.1.0",+ "@firebase/functions": "0.7.0",+ "@firebase/functions-compat": "0.1.0",+ "@firebase/installations": "0.5.0",+ "@firebase/messaging": "0.9.0",+ "@firebase/messaging-compat": "0.1.0",+ "@firebase/performance": "0.5.0",+ "@firebase/performance-compat": "0.1.0","@firebase/polyfill": "0.3.36",- "@firebase/remote-config": "0.1.42",- "@firebase/storage": "0.6.2",- "@firebase/util": "1.2.0"- },- "engines": {- "node": "^8.13.0 || >=10.10.0"+ "@firebase/remote-config": "0.2.0",+ "@firebase/remote-config-compat": "0.1.0",+ "@firebase/storage": "0.8.0",+ "@firebase/storage-compat": "0.1.0",+ "@firebase/util": "1.3.0"}},"node_modules/flagged-respawn": {@@ -11914,6 +12076,25 @@"promise": "^7.0.1"}},+ "node_modules/jszip": {+ "version": "3.7.1",+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",+ "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",+ "dependencies": {+ "lie": "~3.3.0",+ "pako": "~1.0.2",+ "readable-stream": "~2.3.6",+ "set-immediate-shim": "~1.0.1"+ }+ },+ "node_modules/jszip/node_modules/lie": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",+ "dependencies": {+ "immediate": "~3.0.5"+ }+ },"node_modules/just-debounce": {"version": "1.1.0","resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",@@ -15985,9 +16166,9 @@}},"node_modules/protobufjs/node_modules/@types/node": {- "version": "16.4.7",- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.7.tgz",- "integrity": "sha512-aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA=="+ "version": "16.7.4",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.4.tgz",+ "integrity": "sha512-25QXpDsTiDnl2rZGUenagVMwO46way8dOUdvoC3R3p+6TrbpxeJBo/v87BEG1IHI31Jhaa8lPeSHcqwxsVBeYQ=="},"node_modules/protocols": {"version": "1.4.8",@@ -17043,6 +17224,56 @@"resolved": "https://registry.npmjs.org/scule/-/scule-0.2.1.tgz","integrity": "sha512-M9gnWtn3J0W+UhJOHmBxBTwv8mZCan5i1Himp60t6vvZcor0wr+IM0URKmIglsWJ7bRujNAVVN77fp+uZaWoKg=="},+ "node_modules/selenium-webdriver": {+ "version": "4.0.0-beta.1",+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.1.tgz",+ "integrity": "sha512-DJ10z6Yk+ZBaLrt1CLElytQ/FOayx29ANKDtmtyW1A6kCJx3+dsc5fFMOZxwzukDniyYsC3OObT5pUAsgkjpxQ==",+ "dependencies": {+ "jszip": "^3.5.0",+ "rimraf": "^2.7.1",+ "tmp": "^0.2.1",+ "ws": "^7.3.1"+ },+ "engines": {+ "node": ">= 10.15.0"+ }+ },+ "node_modules/selenium-webdriver/node_modules/rimraf": {+ "version": "2.7.1",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",+ "dependencies": {+ "glob": "^7.1.3"+ },+ "bin": {+ "rimraf": "bin.js"+ }+ },+ "node_modules/selenium-webdriver/node_modules/tmp": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",+ "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",+ "dependencies": {+ "rimraf": "^3.0.0"+ },+ "engines": {+ "node": ">=8.17.0"+ }+ },+ "node_modules/selenium-webdriver/node_modules/tmp/node_modules/rimraf": {+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",+ "dependencies": {+ "glob": "^7.1.3"+ },+ "bin": {+ "rimraf": "bin.js"+ },+ "funding": {+ "url": "https://github.com/sponsors/isaacs"+ }+ },"node_modules/semver": {"version": "7.3.5","resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",@@ -17178,6 +17409,14 @@"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=","dev": true},+ "node_modules/set-immediate-shim": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",+ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/set-value": {"version": "2.0.1","resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",@@ -21508,14 +21747,6 @@}}},- "node_modules/xmlhttprequest": {- "version": "1.8.0",- "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",- "engines": {- "node": ">=0.4.0"- }- },"node_modules/xregexp": {"version": "2.0.0","resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",@@ -22816,47 +23047,65 @@}},"@firebase/analytics": {- "version": "0.6.17",- "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.17.tgz",- "integrity": "sha512-Iiip24vQw7p+dBxoGWP2WvVqV2tOdLPjWw6OP6a+8vgss9PRsjKE2AAskruqveMUO4Ox5uPW65wdgeJxoFoMvQ==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.0.tgz",+ "integrity": "sha512-YEPyeW6CV8xbIvWaJMvfRdWUPKe/xchJ1bjV6GpLfkYRX+ZE1/YSNU14pX292M4bZ6Qg+bbu2DuWp8fEpa/YQg==","requires": {- "@firebase/analytics-types": "0.6.0",- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/analytics-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.0.tgz",+ "integrity": "sha512-oaf1FEF7cKci5tO7f52dH63/ZwkBqbdSLLpgo6kyoYoYDuY+on4yAc1CIHh3sNj/L8T4Ni81IQvVs9lE/9oOpg==",+ "requires": {+ "@firebase/analytics": "0.7.0",+ "@firebase/analytics-types": "0.7.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},"@firebase/analytics-types": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.6.0.tgz",- "integrity": "sha512-kbMawY0WRPyL/lbknBkme4CNLl+Gw+E9G4OpNeXAauqoQiNkBgpIvZYy7BRT4sNGhZbxdxXxXbruqUwDzLmvTw=="+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-types/-/analytics-types-0.7.0.tgz",+ "integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="},"@firebase/app": {- "version": "0.6.29",- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.29.tgz",- "integrity": "sha512-duCzk9/BSVVsb5Y9b0rnvGSuD5zQA/JghiQsccRl+lA4xiUYjFudTU4cVFftkw+0zzeYBHn4KiVxchsva1O9dA==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.0.tgz",+ "integrity": "sha512-l4Pd69re6JyjumQrl719dnY5JSKROSYda/0N2wzOhSzqg8DsZOIErr8+xj6QAE6BtNsoIEk7ma9WMS/2r02MhA==","requires": {- "@firebase/app-types": "0.6.3",- "@firebase/component": "0.5.5",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",- "dom-storage": "2.1.0",- "tslib": "^2.1.0",- "xmlhttprequest": "1.8.0"+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"}},"@firebase/app-check": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.3.0.tgz",- "integrity": "sha512-L+lwN4ECHBPLI2yreXU5qVmQjLlL9g96JrC0vWAQJZQKXP4zU0e4B8B9e4NO0KmHBoWR4BSgZrWdBljqGNhbeQ==",+ "version": "0.4.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.4.0.tgz",+ "integrity": "sha512-KQ/k8cukzZbH/LC9Iu5/Dbhr7w6byu8bYjfCA38B6v8aISgASYfP/nirxRD+hSuDoxXtAnPGEuv+v0YU3D1R2w==","requires": {- "@firebase/app-check-interop-types": "0.1.0",- "@firebase/app-check-types": "0.3.0",- "@firebase/component": "0.5.5",+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/app-check-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.1.0.tgz",+ "integrity": "sha512-T1M2d1oroaHUa448fgx3BdfWg4WXP64yybIWxvmVBuh7YnyMuegJK1sS9zipKBKLkstcQK8vivXYh3+/AnbGFw==",+ "requires": {+ "@firebase/app-check": "0.4.0",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},@@ -22865,22 +23114,69 @@"resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.1.0.tgz","integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="},- "@firebase/app-check-types": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/app-check-types/-/app-check-types-0.3.0.tgz",- "integrity": "sha512-+NYD7wbbHF8dU+DCw4uOwxKE4VCwYKYnSuaiTnKmWJFZahrGdXZCqaBmhl0RnvuKb7RW06y2QJ5fJq1m5oQYDA=="+ "@firebase/app-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.0.tgz",+ "integrity": "sha512-jnAeFM1ihY5klqg2dvdA4EOk7co8ffSHUj/efqaSwTrMkKTcG/WZKF9WAuXdl+5jEu1BhsGGHveWzGliTFH5Hg==",+ "requires": {+ "@firebase/app": "0.7.0",+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }},"@firebase/app-types": {- "version": "0.6.3",- "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.6.3.tgz",- "integrity": "sha512-/M13DPPati7FQHEQ9Minjk1HGLm/4K4gs9bR4rzLCWJg64yGtVC0zNg9gDpkw9yc2cvol/mNFxqTtd4geGrwdw=="+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz",+ "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="},"@firebase/auth": {- "version": "0.16.8",- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.16.8.tgz",- "integrity": "sha512-mR0UXG4LirWIfOiCWxVmvz1o23BuKGxeItQ2cCUgXLTjNtWJXdcky/356iTUsd7ZV5A78s2NHeN5tIDDG6H4rg==",+ "version": "0.17.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.17.0.tgz",+ "integrity": "sha512-4zOGTLGzMjBX96KEyBNYpjOD87c2efCZvUjaJ53QslleW9Xp8kSsSHLRhr8hOkcRXO17CmBKSRx/LnG2vTZWQQ==","requires": {- "@firebase/auth-types": "0.10.3"+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "node-fetch": "2.6.1",+ "selenium-webdriver": "4.0.0-beta.1",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/auth-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.1.0.tgz",+ "integrity": "sha512-OfAt3c5ham07xvmYyJp02v8mUa+HaSEwilvgD2M1JaWqLAtqH66bdBhLBE9N0pq8xtRdXZIF1vSd20a0ulQfQg==",+ "requires": {+ "@firebase/auth": "0.17.0",+ "@firebase/auth-types": "0.11.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0",+ "node-fetch": "2.6.1",+ "selenium-webdriver": "^4.0.0-beta.2",+ "tslib": "^2.1.0"+ },+ "dependencies": {+ "selenium-webdriver": {+ "version": "4.0.0-beta.4",+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.4.tgz",+ "integrity": "sha512-+s/CIYkWzmnC9WASBxxVj7Lm0dcyl6OaFxwIJaFCT5WCuACiimEEr4lUnOOFP/QlKfkDQ56m+aRczaq2EvJEJg==",+ "requires": {+ "jszip": "^3.6.0",+ "rimraf": "^3.0.2",+ "tmp": "^0.2.1",+ "ws": ">=7.4.6"+ }+ },+ "tmp": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",+ "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",+ "requires": {+ "rimraf": "^3.0.0"+ }+ }}},"@firebase/auth-interop-types": {@@ -22890,51 +23186,63 @@"requires": {}},"@firebase/auth-types": {- "version": "0.10.3",- "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.10.3.tgz",- "integrity": "sha512-zExrThRqyqGUbXOFrH/sowuh2rRtfKHp9SBVY2vOqKWdCX1Ztn682n9WLtlUDsiYVIbBcwautYWk2HyCGFv0OA==",+ "version": "0.11.0",+ "resolved": "https://registry.npmjs.org/@firebase/auth-types/-/auth-types-0.11.0.tgz",+ "integrity": "sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==","requires": {}},"@firebase/component": {- "version": "0.5.5",- "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.5.tgz",- "integrity": "sha512-L41SdS/4a164jx2iGfakJgaBUPPBI3DI+RrUlmh3oHSUljTeCwfj/Nhcv3S7e2lyXsGFJtAyepfPUx4IQ05crw==",+ "version": "0.5.6",+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.6.tgz",+ "integrity": "sha512-GyQJ+2lrhsDqeGgd1VdS7W+Y6gNYyI0B51ovNTxeZVG/W8I7t9MwEiCWsCvfm5wQgfsKp9dkzOcJrL5k8oVO/Q==","requires": {- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},"@firebase/database": {- "version": "0.10.9",- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.10.9.tgz",- "integrity": "sha512-Jxi9SiE4cNOftO9YKlG71ccyWFw4kSM9AG/xYu6vWXUGBr39Uw1TvYougANOcU21Q0TP4J08VPGnOnpXk/FGbQ==",+ "version": "0.12.0",+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.0.tgz",+ "integrity": "sha512-/gl6z6fAxAAFAdDllzidzweGpuXJu0b9AusSLrdW4LpP6KCuxJbhonMJuSGpHLzAHzx6Q9uitbvqHqBb17sttQ==","requires": {"@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.5",- "@firebase/database-types": "0.7.3",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","faye-websocket": "0.11.3","tslib": "^2.1.0"}},+ "@firebase/database-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.0.tgz",+ "integrity": "sha512-jLN0JMYnYijg8f3QFtSuPGNuKAt3yYVRsHHlR8sADgx8MptByRRwVmMOk7QPc/DY7qscZIJow3hXFwvbeApFLA==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/database": "0.12.0",+ "@firebase/database-types": "0.9.0",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },"@firebase/database-types": {- "version": "0.7.3",- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.7.3.tgz",- "integrity": "sha512-dSOJmhKQ0nL8O4EQMRNGpSExWCXeHtH57gGg0BfNAdWcKhC8/4Y+qfKLfWXzyHvrSecpLmO0SmAi/iK2D5fp5A==",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.0.tgz",+ "integrity": "sha512-x2TeTVnMZGPvT3y4Nayio4WprQA/zGwqMrPMQwSdF+PFnaFJAhA/eLgUB6cmWFzFYO9VvmuRkFzDzo6ezTo1Zw==","requires": {- "@firebase/app-types": "0.6.3"+ "@firebase/app-types": "0.7.0",+ "@firebase/util": "1.3.0"}},"@firebase/firestore": {- "version": "2.3.10",- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-2.3.10.tgz",- "integrity": "sha512-O+XpaZVhDIBK2fMwBUBR2BuhaXF6zTmz+afAuXAx18DK+2rFfLefbALZLaUYw0Aabe9pryy0c7OenzRbHA8n4Q==",+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.0.0.tgz",+ "integrity": "sha512-rbs5EbU/01f7NKHDtedBowpBlqnkVnQlpIuSX5wwGMiPgH8f9pMhh59JMk0cTaSqsJXsq3KvafWAD9SqWIqe2w==","requires": {- "@firebase/component": "0.5.5",- "@firebase/firestore-types": "2.3.0",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0","@firebase/webchannel-wrapper": "0.5.1","@grpc/grpc-js": "^1.3.2","@grpc/proto-loader": "^0.6.0",@@ -22942,88 +23250,129 @@"tslib": "^2.1.0"}},+ "@firebase/firestore-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.0.tgz",+ "integrity": "sha512-25r1jGpnnx7vXSPVLmHNkuz+EGpZDU5Luro5/MFCMmoV4a+Rmg2n9FRlxRyPn4XOCkc5nrBpT6ESAKAPSNHcpw==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/firestore": "3.0.0",+ "@firebase/firestore-types": "2.5.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },"@firebase/firestore-types": {- "version": "2.3.0",- "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.3.0.tgz",- "integrity": "sha512-QTW7NP7nDL0pgT/X53lyj+mIMh4nRQBBTBlRNQBt7eSyeqBf3ag3bxdQhCg358+5KbjYTC2/O6QtX9DlJZmh1A==",+ "version": "2.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.0.tgz",+ "integrity": "sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==","requires": {}},"@firebase/functions": {- "version": "0.6.14",- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.6.14.tgz",- "integrity": "sha512-Gthru/wHPQqkn651MenVM+qKVFFqIyFcNT3qfJUacibqrKlvDtYtaCMjFGAkChuGnYzNVnXJIaNrIHkEIII4Hg==",+ "version": "0.7.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.0.tgz",+ "integrity": "sha512-H0krTllYh5eK7utKoUoNoVvoSdZqaPdqGSdIK7ltr1yWX9UhbRWYZv5B/tWTjQFfDfRQwpn9Q6svoJzYZQiusA==","requires": {- "@firebase/component": "0.5.5",- "@firebase/functions-types": "0.4.0",- "@firebase/messaging-types": "0.5.0",+ "@firebase/app-check-interop-types": "0.1.0",+ "@firebase/auth-interop-types": "0.1.6",+ "@firebase/component": "0.5.6",+ "@firebase/messaging-interop-types": "0.1.0",+ "@firebase/util": "1.3.0","node-fetch": "2.6.1","tslib": "^2.1.0"}},+ "@firebase/functions-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.0.tgz",+ "integrity": "sha512-uNwHdGYqgIXzF7aTZBeUe00K/sadRg5EeSDuJ6VNo3Gh3ZceX4eRnL5p7l2bEJBh8hBl0brb82+TRYjGHtjtFQ==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/functions": "0.7.0",+ "@firebase/functions-types": "0.5.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },"@firebase/functions-types": {- "version": "0.4.0",- "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.4.0.tgz",- "integrity": "sha512-3KElyO3887HNxtxNF1ytGFrNmqD+hheqjwmT3sI09FaDCuaxGbOnsXAXH2eQ049XRXw9YQpHMgYws/aUNgXVyQ=="+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.5.0.tgz",+ "integrity": "sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA=="},"@firebase/installations": {- "version": "0.4.31",- "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.31.tgz",- "integrity": "sha512-qWolhAgMHvD3avsNCl+K8+untzoDDFQIRR8At8kyWMKKosy0vttdWTWzjvDoZbyKU6r0RNlxDUWAgV88Q8EudQ==",+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.0.tgz",+ "integrity": "sha512-wF1CKIx+SoiEbtNdutulxW4z80B5lGXW+8JdAtcKQwgKxF0VtlCaDFsd9AEB3aTtzIve5UkGak8hQOMvvOpydg==","requires": {- "@firebase/component": "0.5.5",- "@firebase/installations-types": "0.3.4",- "@firebase/util": "1.2.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","idb": "3.0.2","tslib": "^2.1.0"}},- "@firebase/installations-types": {- "version": "0.3.4",- "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.3.4.tgz",- "integrity": "sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q==",- "requires": {}- },"@firebase/logger": {"version": "0.2.6","resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.2.6.tgz","integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw=="},"@firebase/messaging": {- "version": "0.7.15",- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.7.15.tgz",- "integrity": "sha512-81t6iJtqMBJF5LHTjDhlHUpbPZOV6dKhW0TueAoON4omc0SaDXgf4nnk6JkvZRfdcuOaP8848Cv53tvZPFFAYQ==",- "requires": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",- "@firebase/messaging-types": "0.5.0",- "@firebase/util": "1.2.0",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.0.tgz",+ "integrity": "sha512-NTUB+gVJsgL/f6wqwUlgadaNuLZvyk1IlTcRvR3391t8jDSWOT2efwzNqcI7Xv4nhzaiPhzAQ4ncH/m8kfUUXQ==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0",+ "@firebase/messaging-interop-types": "0.1.0",+ "@firebase/util": "1.3.0","idb": "3.0.2","tslib": "^2.1.0"}},- "@firebase/messaging-types": {- "version": "0.5.0",- "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.5.0.tgz",- "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg==",- "requires": {}+ "@firebase/messaging-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.0.tgz",+ "integrity": "sha512-58qQmKwOiXhxZwrRwwjQDbjlRx1uMVVuV/DNbDzqilDJDdoYXMdK6RBTF9Bs51qy/Z1BI2Q9B1JX01QYlgZpxQ==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/messaging": "0.9.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/messaging-interop-types": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz",+ "integrity": "sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ=="},"@firebase/performance": {- "version": "0.4.17",- "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.4.17.tgz",- "integrity": "sha512-uhDs9rhdMrGraYHcd3CTRkGtcNap4hp6rAHTwJNIX56Z3RzQ1VW2ea9vvesl7EjFtEIPU0jfdrS32wV+qer5DQ==",+ "version": "0.5.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.0.tgz",+ "integrity": "sha512-E+L18eJKshr/ijnWZMexEEddwkp2T4Ye2dJSK4TcOKRYfrmfZJ95RRZ+MPNp1ES7RH2JYiyym1NIQKPcNNvhug==","requires": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0","@firebase/logger": "0.2.6",- "@firebase/performance-types": "0.0.13",- "@firebase/util": "1.2.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/performance-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.0.tgz",+ "integrity": "sha512-H+/A5+y/15hFn5FHRP8lcogDzO6qm9YoACNEXn71UN4PiGQ+/BbHkQafDEXxD6wLfqfqR8u8oclHPFIYxMBF7Q==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/logger": "0.2.6",+ "@firebase/performance": "0.5.0",+ "@firebase/performance-types": "0.1.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},"@firebase/performance-types": {- "version": "0.0.13",- "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.0.13.tgz",- "integrity": "sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA=="+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/performance-types/-/performance-types-0.1.0.tgz",+ "integrity": "sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w=="},"@firebase/polyfill": {"version": "0.3.36",@@ -23043,45 +23392,68 @@}},"@firebase/remote-config": {- "version": "0.1.42",- "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.42.tgz",- "integrity": "sha512-hWwtAZmYLB274bxjV2cdMYhyBCUUqbYErihGx3rMyab76D+VbIxOuKJb2z0DS67jQG+SA3pr9/MtWsTPHV/l9g==",+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.2.0.tgz",+ "integrity": "sha512-hNZ+BqsTmfe8ogpeow95NSwQmKIeetKdPxKpyC6RZBeFUae782+2HrUx4/Quep6OZjOHQF6xZ5d3VOxu2ZKEfg==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/installations": "0.5.0",+ "@firebase/logger": "0.2.6",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },+ "@firebase/remote-config-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.0.tgz",+ "integrity": "sha512-PpCh5f5hUUaDCmiJsuu/u9a0g0G5WH3YSbfH1jPejVOaJ1lS82615E7WOzco4zMllLYfX62VaUYD2vvcLyXE/w==","requires": {- "@firebase/component": "0.5.5",- "@firebase/installations": "0.4.31",+ "@firebase/component": "0.5.6","@firebase/logger": "0.2.6",- "@firebase/remote-config-types": "0.1.9",- "@firebase/util": "1.2.0",+ "@firebase/remote-config": "0.2.0",+ "@firebase/remote-config-types": "0.2.0",+ "@firebase/util": "1.3.0","tslib": "^2.1.0"}},"@firebase/remote-config-types": {- "version": "0.1.9",- "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.1.9.tgz",- "integrity": "sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA=="+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz",+ "integrity": "sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw=="},"@firebase/storage": {- "version": "0.6.2",- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.6.2.tgz",- "integrity": "sha512-qbYx+KOxnD5andWAtVPgMHFa/62jdLCgPGdfIRQIEgBoYibk3KigRYVdnfKRLcCO3Vip63BRUvyeqfiUHNNu2g==",+ "version": "0.8.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.8.0.tgz",+ "integrity": "sha512-D0HH+y3DLH0+8eOt6h19RffFMpdzPNr7Yv7XpeeM3+VLE4TbQnDie/OAQWOuWLrYoW7MsPQnLkx+zDb3DxOXxw==","requires": {- "@firebase/component": "0.5.5",- "@firebase/storage-types": "0.4.1",- "@firebase/util": "1.2.0",+ "@firebase/component": "0.5.6",+ "@firebase/util": "1.3.0","node-fetch": "2.6.1","tslib": "^2.1.0"}},+ "@firebase/storage-compat": {+ "version": "0.1.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.0.tgz",+ "integrity": "sha512-DJstR2vidnyNSRp14LQhd9QO0PxhMm/xsXrPQ2IEmQ7EWDT4rxGd+pkqXTG6IO+k9ZKMc0BnWIYwlMqkGEJoDg==",+ "requires": {+ "@firebase/component": "0.5.6",+ "@firebase/storage": "0.8.0",+ "@firebase/storage-types": "0.6.0",+ "@firebase/util": "1.3.0",+ "tslib": "^2.1.0"+ }+ },"@firebase/storage-types": {- "version": "0.4.1",- "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.4.1.tgz",- "integrity": "sha512-IM4cRzAnQ6QZoaxVZ5MatBzqXVcp47hOlE28jd9xXw1M9V7gfjhmW0PALGFQx58tPVmuUwIKyoEbHZjV4qRJwQ==",+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.6.0.tgz",+ "integrity": "sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==","requires": {}},"@firebase/util": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.2.0.tgz",- "integrity": "sha512-8W9TTGImXr9cu+oyjBJ7yjoEd/IVAv0pBZA4c1uIuKrpGZi2ee38m+8xlZOBRmsAaOU/tR9DXz1WF/oeM6Fb7Q==",+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.3.0.tgz",+ "integrity": "sha512-SESvmYwuKOVCZ1ZxLbberbx+9cnbxpCa4CG2FUSQYqN6Ab8KyltegMDIsqMw5KyIBZ4n1phfHoOa22xo5NzAlQ==","requires": {"tslib": "^2.1.0"}@@ -23092,9 +23464,9 @@"integrity": "sha512-dZMzN0uAjwJXWYYAcnxIwXqRTZw3o14hGe7O6uhwjD1ZQWPVYA5lASgnNskEBra0knVBsOXB4KXg+HnlKewN/A=="},"@grpc/grpc-js": {- "version": "1.3.6",- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz",- "integrity": "sha512-v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg==",+ "version": "1.3.7",+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz",+ "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==","requires": {"@types/node": ">=12.12.47"}@@ -26945,11 +27317,6 @@"entities": "^2.0.0"}},- "dom-storage": {- "version": "2.1.0",- "resolved": "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz",- "integrity": "sha512-g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q=="- },"dom7": {"version": "3.0.0","resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",@@ -28467,25 +28834,36 @@}},"firebase": {- "version": "8.9.0",- "resolved": "https://registry.npmjs.org/firebase/-/firebase-8.9.0.tgz",- "integrity": "sha512-pjswkdqBzL03T3keqKOgar8Le2Xj+Fk9cIZA/VSuAQI26SOhsQMKQUiy+xEKJwKFe76NStz8pBae3DdPTZ0p3w==",- "requires": {- "@firebase/analytics": "0.6.17",- "@firebase/app": "0.6.29",- "@firebase/app-check": "0.3.0",- "@firebase/app-types": "0.6.3",- "@firebase/auth": "0.16.8",- "@firebase/database": "0.10.9",- "@firebase/firestore": "2.3.10",- "@firebase/functions": "0.6.14",- "@firebase/installations": "0.4.31",- "@firebase/messaging": "0.7.15",- "@firebase/performance": "0.4.17",+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.0.0.tgz",+ "integrity": "sha512-atgnuvELhU9D5w9moChnyCb6GRbOCqk54/kHN0J4kdLJBncpcb2culIJ7nlSHILMcW9MNMiNKDJ07RwXVyqFFA==",+ "requires": {+ "@firebase/analytics": "0.7.0",+ "@firebase/analytics-compat": "0.1.0",+ "@firebase/app": "0.7.0",+ "@firebase/app-check": "0.4.0",+ "@firebase/app-check-compat": "0.1.0",+ "@firebase/app-compat": "0.1.0",+ "@firebase/app-types": "0.7.0",+ "@firebase/auth": "0.17.0",+ "@firebase/auth-compat": "0.1.0",+ "@firebase/database": "0.12.0",+ "@firebase/database-compat": "0.1.0",+ "@firebase/firestore": "3.0.0",+ "@firebase/firestore-compat": "0.1.0",+ "@firebase/functions": "0.7.0",+ "@firebase/functions-compat": "0.1.0",+ "@firebase/installations": "0.5.0",+ "@firebase/messaging": "0.9.0",+ "@firebase/messaging-compat": "0.1.0",+ "@firebase/performance": "0.5.0",+ "@firebase/performance-compat": "0.1.0","@firebase/polyfill": "0.3.36",- "@firebase/remote-config": "0.1.42",- "@firebase/storage": "0.6.2",- "@firebase/util": "1.2.0"+ "@firebase/remote-config": "0.2.0",+ "@firebase/remote-config-compat": "0.1.0",+ "@firebase/storage": "0.8.0",+ "@firebase/storage-compat": "0.1.0",+ "@firebase/util": "1.3.0"}},"flagged-respawn": {@@ -30868,6 +31246,27 @@"promise": "^7.0.1"}},+ "jszip": {+ "version": "3.7.1",+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",+ "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",+ "requires": {+ "lie": "~3.3.0",+ "pako": "~1.0.2",+ "readable-stream": "~2.3.6",+ "set-immediate-shim": "~1.0.1"+ },+ "dependencies": {+ "lie": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",+ "requires": {+ "immediate": "~3.0.5"+ }+ }+ }+ },"just-debounce": {"version": "1.1.0","resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",@@ -34157,9 +34556,9 @@},"dependencies": {"@types/node": {- "version": "16.4.7",- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.7.tgz",- "integrity": "sha512-aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA=="+ "version": "16.7.4",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.4.tgz",+ "integrity": "sha512-25QXpDsTiDnl2rZGUenagVMwO46way8dOUdvoC3R3p+6TrbpxeJBo/v87BEG1IHI31Jhaa8lPeSHcqwxsVBeYQ=="}}},@@ -35006,6 +35405,45 @@"resolved": "https://registry.npmjs.org/scule/-/scule-0.2.1.tgz","integrity": "sha512-M9gnWtn3J0W+UhJOHmBxBTwv8mZCan5i1Himp60t6vvZcor0wr+IM0URKmIglsWJ7bRujNAVVN77fp+uZaWoKg=="},+ "selenium-webdriver": {+ "version": "4.0.0-beta.1",+ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.1.tgz",+ "integrity": "sha512-DJ10z6Yk+ZBaLrt1CLElytQ/FOayx29ANKDtmtyW1A6kCJx3+dsc5fFMOZxwzukDniyYsC3OObT5pUAsgkjpxQ==",+ "requires": {+ "jszip": "^3.5.0",+ "rimraf": "^2.7.1",+ "tmp": "^0.2.1",+ "ws": "^7.3.1"+ },+ "dependencies": {+ "rimraf": {+ "version": "2.7.1",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",+ "requires": {+ "glob": "^7.1.3"+ }+ },+ "tmp": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",+ "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",+ "requires": {+ "rimraf": "^3.0.0"+ },+ "dependencies": {+ "rimraf": {+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",+ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",+ "requires": {+ "glob": "^7.1.3"+ }+ }+ }+ }+ }+ },"semver": {"version": "7.3.5","resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",@@ -35123,6 +35561,11 @@"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=","dev": true},+ "set-immediate-shim": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",+ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="+ },"set-value": {"version": "2.0.1","resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",@@ -38543,11 +38986,6 @@"integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==","requires": {}},- "xmlhttprequest": {- "version": "1.8.0",- "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="- },"xregexp": {"version": "2.0.0","resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",diff --git a/package.json b/package.jsonindex cc2fe5e1..7faefd7e 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.17.1",+ "version": "3.18.0","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt","build": "nuxt build",@@ -20,7 +20,7 @@"core-js": "3.16.1","currency.js": "2.0.4","dayjs": "1.10.6",- "firebase": "8.9.0",+ "firebase": "9.0.0","highcharts": "9.1.2","highcharts-vue": "1.4.0","localforage": "1.9.0",diff --git a/pages/login.vue b/pages/login.vueindex b5e7ff35..230aa68f 100644--- a/pages/login.vue+++ b/pages/login.vue@@ -1,6 +1,7 @@<script>-import firebase from 'firebase/app'import { ref, useContext } from '@nuxtjs/composition-api'+import { signInWithRedirect, GoogleAuthProvider } from 'firebase/auth'+import { auth } from '~/services/firebaseHelpers'export default {name: 'LoginPage',@@ -32,9 +33,8 @@ export default {this.$router.push({ query: { loading: true } })this.isLoading = true- const provider = new firebase.auth.GoogleAuthProvider()- firebase.auth()- .signInWithRedirect(provider)+ const provider = new GoogleAuthProvider()+ signInWithRedirect(auth, provider).catch(e => this.notifyAboutError(e))},diff --git a/pages/settings.vue b/pages/settings.vueindex 466ee329..20c88f6e 100644--- a/pages/settings.vue+++ b/pages/settings.vue@@ -81,7 +81,7 @@ LayoutBaseWrap(:contentPadding="false")icon="mdi mdi-delete-empty-outline"@onClick="confirmRemoveUserData = true")- .settings__item+ .settings__item(v-if="$store.state.demo.hasDemo")SharedButton._bdb(:title="$t('settings.loadDemoButton')"icon="mdi mdi-gamepad-variant-outline"diff --git a/services/firebaseConfig.js b/services/firebaseConfig.jsindex f39f9528..edd85d21 100755--- a/services/firebaseConfig.js+++ b/services/firebaseConfig.js@@ -1,8 +1,4 @@-import firebase from 'firebase/app'-import 'firebase/auth'-import 'firebase/database'--const config = {+export const config = {apiKey: 'AIzaSyAjJG6UrfA1FEzV8qbjmuk8wiUic0uWv-8',authDomain: 'finapp-17474.firebaseapp.com',databaseURL: 'https://finapp-17474.firebaseio.com',@@ -11,10 +7,3 @@ const config = {messagingSenderId: '1057184379213',appId: '1:1057184379213:web:8c728d0b7099f194'}--export const app = firebase.apps.length- ? firebase.app()- : firebase.initializeApp(config)--export const db = app.database()-export const TIMESTAMP = firebase.database.ServerValue.TIMESTAMPdiff --git a/services/firebaseHelpers.js b/services/firebaseHelpers.jsnew file mode 100644index 00000000..da5a962e--- /dev/null+++ b/services/firebaseHelpers.js@@ -0,0 +1,38 @@+import { initializeApp } from 'firebase/app'+import { getDatabase, ref, get, onValue, child, set, update, remove, off } from 'firebase/database'+import { getAuth } from 'firebase/auth'+import { config } from '~/services/firebaseConfig'++export const app = initializeApp(config)+export const db = getDatabase(app)+export const auth = getAuth(app)++export const getDataOnce = (path) => {+ return new Promise((resolve) => {+ get(child(ref(db), path))+ .then((snapshot) => {+ if (snapshot)+ return resolve(snapshot.val())+ resolve(false)+ })+ .catch((error) => {+ console.log(error.message)+ resolve()+ })+ })+}++export const getDataAndWatch = (path, callback) => {+ onValue(ref(db, path), (snapshot) => {+ const data = snapshot.val()+ return callback(data)+ })+}++export const updateData = (path, updates) => update(ref(db, path), updates)++export const removeData = path => remove(ref(db, path))++export const saveData = (path, value) => set(ref(db, path), value)++export const unsubcribeData = path => off(ref(db, path))diff --git a/store/app/actions.js b/store/app/actions.jsindex f15a3cb7..46b2cce1 100644--- a/store/app/actions.js+++ b/store/app/actions.js@@ -1,5 +1,6 @@import localforage from 'localforage'-import { app } from '~/services/firebaseConfig'+import { onAuthStateChanged } from 'firebase/auth'+import { auth } from '~/services/firebaseHelpers'export default {async initApp ({ rootState, commit, dispatch }) {@@ -8,7 +9,7 @@ export default {await dispatch('demo/getDemoDataStatus', null, { root: true })- app.auth().onAuthStateChanged(async (user) => {+ onAuthStateChanged(auth, async (user) => {if (this.$router.currentRoute.name === 'login')commit('setAppStatus', 'loading')diff --git a/store/categories/actions.js b/store/categories/actions.jsindex d9aa5c7a..00013e23 100644--- a/store/categories/actions.js+++ b/store/categories/actions.js@@ -1,13 +1,10 @@import localforage from 'localforage'-import { db } from '~/services/firebaseConfig'+import { getDataAndWatch, unsubcribeData } from '~/services/firebaseHelpers'export default {initCategories ({ dispatch, rootState }) {const uid = rootState.user.user.uid-- db.ref(`users/${uid}/categories`).on('value', (snapshot) => {- const items = snapshot.val()-+ getDataAndWatch(`users/${uid}/categories`, (items) => {// add child categories to root categoriesfor (const categoryId in items) {const parentCategoryId = items[categoryId].parentId@@ -19,7 +16,7 @@ export default {}dispatch('setCategories', items)- }, e => console.error(e))+ })},setCategories ({ commit }, items) {@@ -29,7 +26,7 @@ export default {unsubcribeCategories ({ rootState }) {const uid = rootState.user.user.uid- db.ref(`users/${uid}/categories`).off()+ unsubcribeData(`users/${uid}/categories`)},showCategoryModal ({ commit }, id) {diff --git a/store/currencies/actions.js b/store/currencies/actions.jsindex f6aacf03..82ac94f0 100644--- a/store/currencies/actions.js+++ b/store/currencies/actions.js@@ -1,41 +1,39 @@import localforage from 'localforage'import dayjs from 'dayjs'import { getRatesOf } from './api'-import { db } from '~/services/firebaseConfig'+import { getDataOnce, saveData } from '~/services/firebaseHelpers'export default {async initCurrencies ({ rootState, commit }) {const uid = rootState.user.user.uid- const today = dayjs().valueOf()// user base currency in DB- const userCurrencyReq = await db.ref(`users/${uid}/settings/baseCurrency`).once('value')- const userCurrency = userCurrencyReq.val() || 'RUB'+ const userBaseCurrency = await getDataOnce(`users/${uid}/settings/baseCurrency`) || 'RUB'// rates of base currency- const currencyRateReq = await db.ref(`currencies/${userCurrency}`).once('value')- const currencyRate = currencyRateReq.val() || {}+ const currencyRate = await getDataOnce(`currencies/${userBaseCurrency}`) || {}let rates = currencyRate.rates+ const today = dayjs().valueOf()const isCurrencyUpdatedToday = dayjs(today).isSame(currencyRate.date, 'day')// get new ratesif (!currencyRate.rates || !isCurrencyUpdatedToday) {- rates = await getRatesOf(userCurrency)- db.ref(`currencies/${userCurrency}`).set({+ rates = await getRatesOf(userBaseCurrency)+ saveData(`currencies/${userBaseCurrency}`, {rates,date: today})}- const currencies = { base: userCurrency, rates }+ const currencies = { base: userBaseCurrency, rates }commit('setCurrencies', currencies)localforage.setItem('finapp.currencies', currencies)},setBaseCurrency ({ rootState, dispatch }, baseCurrency) {const uid = rootState.user.user.uid- db.ref(`users/${uid}/settings/baseCurrency`).set(baseCurrency)+ saveData(`users/${uid}/settings/baseCurrency`, baseCurrency)dispatch('initCurrencies')}}diff --git a/store/demo/actions.js b/store/demo/actions.jsindex 0a24b73e..05264018 100644--- a/store/demo/actions.js+++ b/store/demo/actions.js@@ -1,34 +1,26 @@import dayjs from 'dayjs'-import { db } from '~/services/firebaseConfig'+import { saveData, getDataOnce } from '~/services/firebaseHelpers'export default {async getDemoDataStatus ({ commit }) {- try {- const damoReq = await db.ref('demo-data/isDemo').once('value')- if (damoReq.val()) {- commit('setDemoDataStatus', true)- }- }- catch (error) {}+ const isHasDemo = await getDataOnce('demo-data/isDemo')+ isHasDemo && commit('setDemoDataStatus', true)},async createDemo ({ rootState, commit, dispatch }) {commit('app/setAppStatus', 'loading', { root: true })dispatch('ui/setActiveTab', 'stat', { root: true })const uid = rootState.user.user.uid+ const demo = await getDataOnce('demo-data')- await db.ref('demo-data').once('value')- .then((demo) => {- const demoData = demo.val()- db.ref(`users/${uid}/accounts`).set(demoData.accounts)- db.ref(`users/${uid}/categories`).set(demoData.categories)- db.ref(`users/${uid}/trns`).set(demoData.trns)+ saveData(`users/${uid}/accounts`, demo.accounts)+ saveData(`users/${uid}/categories`, demo.categories)+ saveData(`users/${uid}/trns`, demo.trns)- db.ref(`users/${uid}/settings/baseCurrency`).set('USD')- db.ref(`users-info/${uid}/actions/${dayjs().valueOf()}`).set('demo')+ saveData(`users/${uid}/settings/baseCurrency`, 'USD')+ saveData(`users-info/${uid}/actions/${dayjs().valueOf()}`, 'demo')- dispatch('currencies/initCurrencies', null, { root: true })- commit('app/setAppStatus', 'ready', { root: true })- })+ dispatch('currencies/initCurrencies', null, { root: true })+ commit('app/setAppStatus', 'ready', { root: true })}}diff --git a/store/filter/actions.js b/store/filter/actions.jsindex 38477551..03ac3b71 100644--- a/store/filter/actions.js+++ b/store/filter/actions.js@@ -50,11 +50,11 @@ export default {const trns = rootState.trns.itemsconst firstCreatedTrnIdFromSelectedTrns = rootGetters['trns/firstCreatedTrnIdFromSelectedTrns']const firstCreatedTrn = trns[firstCreatedTrnIdFromSelectedTrns]- if (!firstCreatedTrn) { return }+ if (!firstCreatedTrn) returnconst firstCreatedTrnDate = dayjs(firstCreatedTrn.date).startOf(state.period).valueOf()const filterDate = state.dateconst nextDate = dayjs(filterDate).subtract(1, state.period).startOf(state.period).valueOf()- if (nextDate >= firstCreatedTrnDate) { commit('setPeriodNext', nextDate) }+ if (nextDate >= firstCreatedTrnDate) commit('setPeriodNext', nextDate)}},@@ -62,7 +62,7 @@ export default {if (rootGetters['trns/hasTrns']) {const filterDate = state.dateconst nextDate = dayjs(filterDate).add(1, state.period).startOf(state.period).valueOf()- if (nextDate < dayjs().valueOf()) { commit('setPeriodPrev', nextDate) }+ if (nextDate < dayjs().valueOf()) commit('setPeriodPrev', nextDate)}}}diff --git a/store/lang/actions.js b/store/lang/actions.jsindex 5c6ab245..8df9eed4 100644--- a/store/lang/actions.js+++ b/store/lang/actions.js@@ -1,36 +1,30 @@import localforage from 'localforage'-import { db } from '~/services/firebaseConfig'+import { saveData, getDataOnce } from '~/services/firebaseHelpers'export default {- toogleLocale ({ dispatch }) {-- },-setLang ({ commit, rootGetters }, lang) {const uid = rootGetters['user/userUid']- if (uid) {- db.ref(`users/${uid}/settings/lang`).set(lang)- }+ if (uid)+ saveData(`users/${uid}/settings/lang`, lang)+commit('setLang', lang)localforage.setItem('finapp.lang', lang)if (this.$i18n.locales.find(i => i.code !== this.$i18n.locale)) {- if (this.app.i18n.locale !== lang) {+ if (this.app.i18n.locale !== lang)this.app.i18n.setLocale(lang)- }}},async initLocalLang ({ commit }) {const localLang = await localforage.getItem('finapp.lang')- if (localLang) { commit('setLang', localLang) }+ if (localLang) commit('setLang', localLang)},async initDbLang ({ rootState, commit, rootGetters }) {const uid = rootGetters['user/userUid']if (uid) {- const dbLang = await db.ref(`users/${uid}/settings/lang`).once('value')- const lang = dbLang.val()+ const lang = await getDataOnce(`users/${uid}/settings/lang`)if (lang && lang !== rootState.lang.lang) {commit('setLang', lang)localforage.setItem('finapp.lang', lang)diff --git a/store/trns/actions.js b/store/trns/actions.jsindex edf8ff37..3894bff7 100644--- a/store/trns/actions.js+++ b/store/trns/actions.js@@ -7,9 +7,26 @@ import {removeTrnToDeleteLaterLocal} from './helpers'import useCalculator from '~/components/trnForm/calculator/useCalculator'-import { db } from '~/services/firebaseConfig'+import {+ getDataAndWatch,+ removeData,+ saveData,+ unsubcribeData,+ updateData+} from '~/services/firebaseHelpers'export default {+ // init+ initTrns ({ rootGetters, dispatch }) {+ const path = `users/${rootGetters['user/userUid']}/trns`+ getDataAndWatch(path, items => dispatch('setTrns', items || {}))+ },++ setTrns ({ commit }, items) {+ commit('setTrns', items)+ localforage.setItem('finapp.trns', items)+ },+/*** Create new trn* and save it to local storage when Client offline@@ -32,8 +49,7 @@ export default {localforage.setItem('finapp.trns', { ...trns, [id]: valuesWithEditDate })commit('setTrns', Object.freeze({ ...trns, [id]: valuesWithEditDate }))- db.ref(`users/${uid}/trns/${id}`)- .set(valuesWithEditDate)+ saveData(`users/${uid}/trns/${id}`, valuesWithEditDate).then(() => {isTrnSavedOnline = trueremoveTrnToAddLaterLocal(id)@@ -65,52 +81,33 @@ export default {localforage.setItem('finapp.trns', trns)saveTrnIDforDeleteWhenClientOnline(id)- db.ref(`users/${uid}/trns/${id}`)- .remove()+ removeData(`users/${uid}/trns/${id}`).then(() => removeTrnToDeleteLaterLocal(id))},- async deleteTrnsByIds ({ rootState }, trnsIds) {+ deleteTrnsByIds ({ rootState }, trnsIds) {const uid = rootState.user.user.uidconst trnsForDelete = {}for (const trnId of trnsIds)trnsForDelete[trnId] = null- await db.ref(`users/${uid}/trns`)- .update(trnsForDelete)- // .then(() => console.log('trns deleted'))- },-- // init- async initTrns ({ rootState, dispatch }) {- const uid = rootState.user.user.uid-- await db.ref(`users/${uid}/trns`).on('value', (snapshot) => {- const items = Object.freeze(snapshot.val())- dispatch('setTrns', items)- }, e => console.error(e))- },-- setTrns ({ commit }, items) {- commit('setTrns', items)- localforage.setItem('finapp.trns', items)+ updateData(`users/${uid}/trns`, trnsForDelete)},unsubcribeTrns ({ rootState }) {const uid = rootState.user.user.uid- db.ref(`users/${uid}/trns`).off()+ unsubcribeData(`users/${uid}/trns`)},/**- * Add and delete trns with had been created in offline mode+ * Add and delete trns which has been created in offline mode** When user online* get trns from local storage- * and add them to database+ * and add trns to database*/uploadOfflineTrns ({ dispatch, rootState }) {- db.ref('.info/connected').on('value', async (snap) => {- const isConnected = snap.val()+ getDataAndWatch('.info/connected', async (isConnected) => {if (isConnected) {const trnsArrayForDelete = await localforage.getItem('finapp.trns.offline.delete') || []const trnsItemsForUpdate = await localforage.getItem('finapp.trns.offline.update') || {}diff --git a/store/user/actions.js b/store/user/actions.jsindex 8ddf2442..99c8164b 100644--- a/store/user/actions.js+++ b/store/user/actions.js@@ -1,8 +1,8 @@-import firebase from 'firebase/app'import localforage from 'localforage'import dayjs from 'dayjs'-import { db } from '~/services/firebaseConfig'+import { signOut as signOutFirebase } from 'firebase/auth'+import { auth, getDataOnce, saveData } from '~/services/firebaseHelpers'import pkg from '~/package'export default {@@ -22,21 +22,19 @@ export default {localforage.setItem('finapp.user', user)},- async signOut ({ rootState, dispatch }) {- const uid = rootState.user.user ? rootState.user.user.uid : null+ async signOut ({ rootGetters, dispatch }) {+ const uid = rootGetters['user/userUid']- if (uid) {- db.ref(`users-info/${uid}/actions/${dayjs().valueOf()}`).set('signOut')- await dispatch('categories/unsubcribeCategories', null, { root: true })- await dispatch('trns/unsubcribeTrns', null, { root: true })- await dispatch('wallets/unsubcribeWallets', null, { root: true })- await dispatch('app/clearUserData', null, { root: true })- }+ saveData(`users-info/${uid}/actions/${dayjs().valueOf()}`, 'signOut')+ await dispatch('categories/unsubcribeCategories', null, { root: true })+ await dispatch('trns/unsubcribeTrns', null, { root: true })+ await dispatch('wallets/unsubcribeWallets', null, { root: true })+ await dispatch('app/clearUserData', null, { root: true })++ signOutFirebase(auth)if (this.$router.currentRoute.name !== 'login')this.app.context.redirect('/login')-- firebase.auth().signOut()},async saveUserInfo ({ rootState }) {@@ -44,8 +42,7 @@ export default {const todayValueOf = dayjs().valueOf()// add to user list- const usersInfo = await db.ref(`users-info/${user.uid}/`).once('value')- const usersInfoVal = usersInfo.val()+ const usersInfo = await getDataOnce(`users-info/${user.uid}/`) || {}const userData = {displayName: user.displayName,email: user.email,@@ -53,30 +50,30 @@ export default {loginDate: todayValueOf}- db.ref(`users/${user.uid}/user`).set(userData)+ saveData(`users/${user.uid}/user`, userData)- db.ref(`users-info/${user.uid}/name`).set(user.displayName)- db.ref(`users-info/${user.uid}/email`).set(user.email)- db.ref(`users-info/${user.uid}/uid`).set(user.uid)- db.ref(`users-info/${user.uid}/loginDate`).set(todayValueOf)+ saveData(`users-info/${user.uid}/name`, user.displayName)+ saveData(`users-info/${user.uid}/email`, user.email)+ saveData(`users-info/${user.uid}/uid`, user.uid)+ saveData(`users-info/${user.uid}/loginDate`, todayValueOf)// set creation date once- if (!usersInfoVal || (usersInfoVal && !usersInfoVal.creationDate))- db.ref(`users-info/${user.uid}/creationDate`).set(todayValueOf)+ if (!usersInfo || (usersInfo && !usersInfo.creationDate))+ saveData(`users-info/${user.uid}/creationDate`, todayValueOf)// set date of open app- db.ref(`users-info/${user.uid}/opensApp/${pkg.version.split('.').join('')}`).set(dayjs().valueOf())+ saveData(`users-info/${user.uid}/opensApp/${pkg.version.split('.').join('')}`, dayjs().valueOf())},- removeUserData ({ rootState, commit, dispatch }) {+ removeUserData ({ rootGetters, commit, dispatch }) {commit('app/setAppStatus', 'loading', { root: true })dispatch('ui/setActiveTab', null, { root: true })- const uid = rootState.user.user.uid+ const uid = rootGetters['user/userUid']- db.ref(`users/${uid}/accounts/`).set(null)- db.ref(`users/${uid}/categories/`).set(null)- db.ref(`users/${uid}/trns/`).set(null)- db.ref(`users-info/${uid}/actions/${dayjs().valueOf()}`).set('removeUserData')+ saveData(`users/${uid}/accounts/`, null)+ saveData(`users/${uid}/categories/`, null)+ saveData(`users/${uid}/trns/`, null)+ saveData(`users-info/${uid}/actions/${dayjs().valueOf()}`, 'removeUserData')commit('app/setAppStatus', 'ready', { root: true })}}diff --git a/store/wallets/actions.js b/store/wallets/actions.jsindex 54aa394e..259e588b 100644--- a/store/wallets/actions.js+++ b/store/wallets/actions.js@@ -1,7 +1,19 @@import localforage from 'localforage'-import { db } from '~/services/firebaseConfig'+import { saveData, getDataAndWatch, updateData, unsubcribeData } from '~/services/firebaseHelpers'export default {+ initWallets ({ dispatch, rootState }) {+ const uid = rootState.user.user.uid+ getDataAndWatch(`users/${uid}/accounts`, (items) => {+ dispatch('setWallets', Object.freeze(items || {}))+ })+ },++ setWallets ({ commit }, items) {+ commit('setWallets', items)+ localforage.setItem('finapp.wallets', items)+ },+addWallet ({ dispatch, rootState, getters }, { id, values }) {const uid = rootState.user.user.uid@@ -14,30 +26,10 @@ export default {}// set default currency based on first created wallet- if (!getters.hasWallets) {+ if (!getters.hasWallets)dispatch('currencies/setBaseCurrency', values.currency, { root: true })- }-- db.ref(`users/${uid}/accounts/${id}`).set(formatedValues)- },-- initWallets ({ dispatch, rootState }) {- const uid = rootState.user.user.uid- db.ref(`users/${uid}/accounts`).on('value', (snapshot) => {- const items = Object.freeze(snapshot.val())- dispatch('setWallets', items)- }, e => console.error(e))- },-- setWallets ({ commit }, items) {- commit('setWallets', items)- localforage.setItem('finapp.wallets', items)- },-- unsubcribeWallets ({ rootGetters }) {- const uid = rootGetters['user/userUid']- db.ref(`users/${uid}/accounts`).off()+ saveData(`users/${uid}/accounts/${id}`, formatedValues)},/**@@ -50,17 +42,18 @@ export default {const updates = {}const result = {}- for (const walletId in wallets) {+ for (const walletId in wallets)updates[`${walletId}/order`] = wallets[walletId]- }- await db.ref(`users/${rootGetters['user/userUid']}/accounts`)- .update(updates, (error) => {- error- ? result.error = error- : result.succsess = 'Updated'- })+ await updateData(`users/${rootGetters['user/userUid']}/accounts`, updates)+ .then(() => { result.succsess = 'Updated' })+ .catch((error) => { result.error = error })return result+ },++ unsubcribeWallets ({ rootGetters }) {+ const uid = rootGetters['user/userUid']+ unsubcribeData(`users/${uid}/accounts`)}}