Open source personal finance application
drop: load demo data
ilkome0426045a432f
diff --git a/components/stat/NoStatActions.vue b/components/stat/NoStatActions.vueindex 32222e3e..09b237dd 100644--- a/components/stat/NoStatActions.vue+++ b/components/stat/NoStatActions.vue@@ -19,17 +19,6 @@ export default {:title="$t('welcome.firstRun.btn')"@onClick="$router.push('/welcome')")-- .options__item(v-if="$store.state.demo.hasDemo")- .options__or- .options__or__border- .options__or__text {{ $t('welcome.or') }}-- .options__text {{ $t('welcome.demo.text') }}- SharedButton._text-center._blue2(- :title="$t('welcome.demo.btn')"- @onClick="$store.dispatch('demo/createDemo')"- )</template><style lang="stylus" scoped>diff --git a/locales/en-US.js b/locales/en-US.jsindex 4bc6405f..c684daf8 100644--- a/locales/en-US.js+++ b/locales/en-US.js@@ -103,11 +103,6 @@ export default {text: 'Start creating your own wallets, categories',btn: 'Let\'s go'},- or: 'or',- demo: {- text: 'Load app in demo mode with created wallets, categories and transactions',- btn: 'Start demo'- },createFirstWallet: {text: "Let's start with create first Wallet",btn: 'Create wallet'@@ -126,9 +121,7 @@ export default {customize: 'Сustomize',app: 'Application',caution: 'With caution',- demo: 'Demo',- deleteButton: 'Delete my data',- loadDemoButton: 'Load demo data'+ deleteButton: 'Delete my data'},wallets: {diff --git a/locales/ru-RU.js b/locales/ru-RU.jsindex 4c68b0ed..96100525 100644--- a/locales/ru-RU.js+++ b/locales/ru-RU.js@@ -105,11 +105,6 @@ export default {text: 'Начнем с создания первого кошелька и категории',btn: 'Погнали'},- or: 'или',- demo: {- text: 'Загрузить приложение с заранее созданными кошельками и категориями',- btn: 'Открыть демо режим'- },createFirstWallet: {text: 'Создадим первый кошелек',btn: 'Создать'@@ -128,9 +123,7 @@ export default {customize: 'Внешний вид',app: 'Приложение',caution: 'C осторожностью',- demo: 'Демо режим',- deleteButton: 'Удалить все мои данные',- loadDemoButton: 'Загрузить демо данные'+ deleteButton: 'Удалить все мои данные'},wallets: {diff --git a/package-lock.json b/package-lock.jsonindex 0b48daad..bd1aab5d 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,17 +1,17 @@{"name": "finapp",- "version": "3.30.3",+ "version": "3.30.5","lockfileVersion": 2,"requires": true,"packages": {"": {"name": "finapp",- "version": "3.30.3",+ "version": "3.30.5","dependencies": {"@nuxtjs/i18n": "^7.2.0","@simonwep/pickr": "1.8.2",- "@vueuse/core": "5.3.0",- "axios": "0.24.0",+ "@vueuse/core": "^7.5.3",+ "axios": "0.25.0","core-js": "3.20.3","currency.js": "2.0.4","dayjs": "1.10.7",@@ -54,7 +54,7 @@"stylus-loader": "3.0.2","tailwindcss": "^3.0.15","typescript": "4.5.4",- "unplugin-vue2-script-setup": "^0.9.0",+ "unplugin-vue2-script-setup": "^0.9.1","vinyl-ftp": "0.6.1"}},@@ -6748,26 +6748,50 @@"dev": true},"node_modules/@vueuse/core": {- "version": "5.3.0",- "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-5.3.0.tgz",- "integrity": "sha512-bBL1/JMRHFWmbgQzUZHF4WOwlqfenR1B8+elriXsbnHlogQM5foSz9++WyDBR0YPIVgCJq7fvNLqd4T7+cjc5w==",+ "version": "7.5.3",+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.5.3.tgz",+ "integrity": "sha512-D9j5ymHFMFRXQqCp0yZJkf/bvBGiz0MrKUa364p+L8dMyd5zyq2K1JmHyvoBd4xbTFRfmQ1h878u6YE5LCkDVQ==","dependencies": {- "@vueuse/shared": "5.3.0",+ "@vueuse/shared": "7.5.3","vue-demi": "*"},"funding": {"url": "https://github.com/sponsors/antfu"+ },+ "peerDependencies": {+ "@vue/composition-api": "^1.1.0",+ "vue": "^2.6.0 || ^3.2.0"+ },+ "peerDependenciesMeta": {+ "@vue/composition-api": {+ "optional": true+ },+ "vue": {+ "optional": true+ }}},"node_modules/@vueuse/shared": {- "version": "5.3.0",- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-5.3.0.tgz",- "integrity": "sha512-qZfkPFH0qTScFpYiPOFpTcxWriRhlM3bgSzl3DFTgr/U0eZg3w2EFWaRZHdWeSvAUdNQyjOC4Toa8S0zJyEjHw==",+ "version": "7.5.3",+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.5.3.tgz",+ "integrity": "sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==","dependencies": {"vue-demi": "*"},"funding": {"url": "https://github.com/sponsors/antfu"+ },+ "peerDependencies": {+ "@vue/composition-api": "^1.1.0",+ "vue": "^2.6.0 || ^3.2.0"+ },+ "peerDependenciesMeta": {+ "@vue/composition-api": {+ "optional": true+ },+ "vue": {+ "optional": true+ }}},"node_modules/@webassemblyjs/ast": {@@ -7730,11 +7754,11 @@}},"node_modules/axios": {- "version": "0.24.0",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",- "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",+ "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==","dependencies": {- "follow-redirects": "^1.14.4"+ "follow-redirects": "^1.14.7"}},"node_modules/babel-code-frame": {@@ -13672,9 +13696,9 @@}},"node_modules/follow-redirects": {- "version": "1.14.6",- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",- "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==",+ "version": "1.14.7",+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",+ "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==","funding": [{"type": "individual",@@ -28175,9 +28199,9 @@}},"node_modules/unplugin-vue2-script-setup": {- "version": "0.9.0",- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.0.tgz",- "integrity": "sha512-BvQV0mBwKoYioppCMJr6HPowrv7m4IHdXjYZYwGxXh03b2JWbuX8g//OSy119TB8cgb+vWmLG+K+OTmk+ybUCg==",+ "version": "0.9.1",+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.1.tgz",+ "integrity": "sha512-1+I300JJ8SBajD3EYQI4Ee7RReLvPS3cL5Rio12e54Vv6e4cd8rPwTNogpskHtt5DNdYA31Cr+DGAf2MmPpsFw==","dev": true,"dependencies": {"@antfu/utils": "^0.4.0",@@ -28201,6 +28225,8 @@"url": "https://github.com/sponsors/antfu"},"peerDependencies": {+ "@vue/composition-api": "^1.4.3",+ "@vue/runtime-dom": "^3.2.26","pug": "^3.0.2"},"peerDependenciesMeta": {@@ -35769,18 +35795,18 @@"dev": true},"@vueuse/core": {- "version": "5.3.0",- "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-5.3.0.tgz",- "integrity": "sha512-bBL1/JMRHFWmbgQzUZHF4WOwlqfenR1B8+elriXsbnHlogQM5foSz9++WyDBR0YPIVgCJq7fvNLqd4T7+cjc5w==",+ "version": "7.5.3",+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.5.3.tgz",+ "integrity": "sha512-D9j5ymHFMFRXQqCp0yZJkf/bvBGiz0MrKUa364p+L8dMyd5zyq2K1JmHyvoBd4xbTFRfmQ1h878u6YE5LCkDVQ==","requires": {- "@vueuse/shared": "5.3.0",+ "@vueuse/shared": "7.5.3","vue-demi": "*"}},"@vueuse/shared": {- "version": "5.3.0",- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-5.3.0.tgz",- "integrity": "sha512-qZfkPFH0qTScFpYiPOFpTcxWriRhlM3bgSzl3DFTgr/U0eZg3w2EFWaRZHdWeSvAUdNQyjOC4Toa8S0zJyEjHw==",+ "version": "7.5.3",+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.5.3.tgz",+ "integrity": "sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==","requires": {"vue-demi": "*"}@@ -36549,11 +36575,11 @@"dev": true},"axios": {- "version": "0.24.0",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",- "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",+ "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==","requires": {- "follow-redirects": "^1.14.4"+ "follow-redirects": "^1.14.7"}},"babel-code-frame": {@@ -41258,9 +41284,9 @@}},"follow-redirects": {- "version": "1.14.6",- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",- "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="+ "version": "1.14.7",+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",+ "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="},"for-in": {"version": "1.0.2",@@ -52526,9 +52552,9 @@}},"unplugin-vue2-script-setup": {- "version": "0.9.0",- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.0.tgz",- "integrity": "sha512-BvQV0mBwKoYioppCMJr6HPowrv7m4IHdXjYZYwGxXh03b2JWbuX8g//OSy119TB8cgb+vWmLG+K+OTmk+ybUCg==",+ "version": "0.9.1",+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.1.tgz",+ "integrity": "sha512-1+I300JJ8SBajD3EYQI4Ee7RReLvPS3cL5Rio12e54Vv6e4cd8rPwTNogpskHtt5DNdYA31Cr+DGAf2MmPpsFw==","dev": true,"requires": {"@antfu/utils": "^0.4.0",diff --git a/package.json b/package.jsonindex 78b751fe..bbc2491c 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.30.4",+ "version": "3.30.5","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxi dev","build": "nuxi generate",diff --git a/pages/settings.vue b/pages/settings.vueindex 8f78f451..d4a432f8 100644--- a/pages/settings.vue+++ b/pages/settings.vue@@ -6,7 +6,6 @@ export default {data () {return {- confirmCreateDemo: false,confirmRemoveUserData: false,version: pkg.version}@@ -19,14 +18,6 @@ export default {},methods: {- async generateDemo () {- this.confirmCreateDemo = false- await this.$store.dispatch('demo/createDemo')-- if (this.$route.name !== 'index')- this.$router.push('/')- },-removeUserData () {this.confirmRemoveUserData = falsethis.$store.dispatch('user/removeUserData')@@ -87,24 +78,12 @@ LayoutBaseWrap(:contentPadding="false")icon="mdi mdi-delete-empty-outline"@onClick="confirmRemoveUserData = true")- .settings__item(v-if="$store.state.demo.hasDemo")- SharedButton._bdb(- :title="$t('settings.loadDemoButton')"- icon="mdi mdi-gamepad-variant-outline"- @onClick="confirmCreateDemo = true"- )+.settings__column.settings__groupAbout.appVersion {{ $t('app.version') }} {{ version }}- ModalBottomConfirm(- :description="$t('alerts.willDeleteEverything')"- :show="confirmCreateDemo"- @onClose="confirmCreateDemo = false"- @onConfirm="generateDemo"- )-ModalBottomConfirm(:description="$t('alerts.willDeleteEverything')":show="confirmRemoveUserData"diff --git a/pages/welcome.vue b/pages/welcome.vueindex 6073e53c..0ae3ad27 100644--- a/pages/welcome.vue+++ b/pages/welcome.vue@@ -127,17 +127,6 @@ export default {@onClick="step = 3")- template(v-if="$store.state.demo.hasDemo")- .options__or- .options__or__border- .options__or__text {{ $t('welcome.or') }}- .options__item- .options__desc {{ $t('welcome.demo.text') }}- SharedButton._blue2._center(- :title="$t('welcome.demo.btn')"- @onClick="$store.dispatch('demo/createDemo')"- )-//- wallettransition(name="fadeIn")template(v-if="(step !== 1 && step !== 2) && !showWalletForm && !$store.getters['wallets/hasWallets']")diff --git a/store/app/actions.js b/store/app/actions.jsindex ce82e11e..6075a9da 100644--- a/store/app/actions.js+++ b/store/app/actions.js@@ -20,7 +20,6 @@ export default {if (rootGetters['user/userUid'] !== user.uid)dispatch('clearUserData')- await dispatch('demo/getDemoDataStatus', null, { root: true })await dispatch('user/initUser', user, { root: true })await dispatch('currencies/initCurrencies', null, { root: true })await dispatch('categories/initCategories', null, { root: true })diff --git a/store/demo/actions.js b/store/demo/actions.jsdeleted file mode 100644index 05264018..00000000--- a/store/demo/actions.js+++ /dev/null@@ -1,26 +0,0 @@-import dayjs from 'dayjs'-import { saveData, getDataOnce } from '~/services/firebaseHelpers'--export default {- async getDemoDataStatus ({ commit }) {- 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')-- saveData(`users/${uid}/accounts`, demo.accounts)- saveData(`users/${uid}/categories`, demo.categories)- saveData(`users/${uid}/trns`, demo.trns)-- 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 })- }-}diff --git a/store/demo/index.js b/store/demo/index.jsdeleted file mode 100644index f8a399b1..00000000--- a/store/demo/index.js+++ /dev/null@@ -1,12 +0,0 @@-import actions from './actions'-import mutations from './mutations'--const state = () => ({- hasDemo: false-})--export default {- state,- actions,- mutations-}diff --git a/store/demo/mutations.js b/store/demo/mutations.jsdeleted file mode 100644index fdcea638..00000000--- a/store/demo/mutations.js+++ /dev/null@@ -1,5 +0,0 @@-export default {- setDemoDataStatus (state, status) {- state.hasDemo = status- }-}