Skip to content

Open source personal finance application

Update demo login, welcome. Add demo creation by copy data from demo user

Ilya Komichev385d0cf5ccf1
diff --git a/src/components/app/store/actions.js b/src/components/app/store/actions.js
index 5d664165..9331be18 100644
--- a/src/components/app/store/actions.js
+++ b/src/components/app/store/actions.js
@@ -12,6 +12,7 @@ export default {
if (rootState.user.user && rootState.user.user.uid && rootState.user.user.uid !== user.uid) {
dispatch('clearUserData')
}
+ await dispatch('getDemoDataStatus')
await dispatch('initUser', user)
await dispatch('initCurrencies')
await dispatch('initCategories')
diff --git a/src/components/demo/store/actions.js b/src/components/demo/store/actions.js
new file mode 100644
index 00000000..46020846
--- /dev/null
+++ b/src/components/demo/store/actions.js
@@ -0,0 +1,35 @@
+import moment from 'moment'
+import { db } from '@/firebase'
+
+const demoUid = '9yrjuIeeOKNj5TxwoPhQobxbE153'
+
+export default {
+ async getDemoDataStatus ({ commit }) {
+ await db.ref(`users/${demoUid}/isDemo`).once('value').then((isDemo) => {
+ isDemo.val()
+ ? commit('setDemoDataStatus', true)
+ : commit('setDemoDataStatus', false)
+ },
+ () => { commit('setDemoDataStatus', false) })
+ },
+
+ async createDemo ({ rootState, commit, dispatch }) {
+ commit('setAppStatus', 'loading')
+ dispatch('setActiveTab', 'stat')
+ const uid = rootState.user.user.uid
+
+ await db.ref(`users/${demoUid}/isDemo`).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)
+
+ db.ref(`users/${uid}/settings/baseCurrency`).set('USD')
+ db.ref(`users/${uid}/settings/demo/${moment().format()}`).set(true)
+
+ dispatch('initCurrencies')
+ commit('setAppStatus', 'ready')
+ })
+ }
+}
diff --git a/src/components/demo/store/index.js b/src/components/demo/store/index.js
new file mode 100644
index 00000000..8866475e
--- /dev/null
+++ b/src/components/demo/store/index.js
@@ -0,0 +1,12 @@
+import actions from './actions'
+import mutations from './mutations'
+
+const state = {
+ hasDemo: false
+}
+
+export default {
+ state,
+ actions,
+ mutations
+}
diff --git a/src/components/demo/store/mutations.js b/src/components/demo/store/mutations.js
new file mode 100644
index 00000000..fdcea638
--- /dev/null
+++ b/src/components/demo/store/mutations.js
@@ -0,0 +1,5 @@
+export default {
+ setDemoDataStatus (state, status) {
+ state.hasDemo = status
+ }
+}
diff --git a/src/components/login/Login.vue b/src/components/login/Login.vue
index 546ec4f2..f76b4baa 100644
--- a/src/components/login/Login.vue
+++ b/src/components/login/Login.vue
@@ -30,15 +30,6 @@ export default {
.catch(e => this.notifyAboutError(e, 'google'))
},
- async signInDemo () {
- this.error = null
- this.loading.demo = true
- const email = '[email protected]'
- const password = 'demothemerise'
- auth().signInWithEmailAndPassword(email, password)
- .catch(e => this.notifyAboutError(e, 'demo'))
- },
-
notifyAboutError (e, loginType) {
this.$notify({
group: 'main',
@@ -57,7 +48,7 @@ export default {
<template lang="pug">
.tab
.themeChanger
- Button(
+ Button._grey(
icon="mdi mdi-palette"
title="Change theme"
v-on:onClick="$store.dispatch('changeTheme')")
@@ -74,12 +65,12 @@ export default {
.loginButton__text Login with Google
.loginButton._grey(
- @click.prevent="signInDemo"
+ @click.prevent="signInWithGoogle"
:class="{ _loading: loading.demo }")
transition(name="fadeIn")
.loginButton__spiner(v-if="loading.demo")
Spiner
- .loginButton__text Login demo
+ .loginButton__text Open demo
.copyright
Copyright
@@ -129,8 +120,11 @@ export default {
background var(--c-red-1)
border-radius 3px
text-align center
+ anim()
@media $media-laptop
margin-top $mb2
+ &:hover
+ background var(--c-red-2)
&._loading
cursor default
background var(--c-red-2)
diff --git a/src/components/settings/Settings.vue b/src/components/settings/Settings.vue
index f2996c1b..bcb4ddd8 100644
--- a/src/components/settings/Settings.vue
+++ b/src/components/settings/Settings.vue
@@ -1,9 +1,30 @@
<script>
import Button from '@/components/shared/button/Button'
+import ModalBottomConfirm from '@/components/modal/ModalBottomConfirm'
export default {
components: {
- Button
+ Button,
+ ModalBottomConfirm
+ },
+
+ data () {
+ return {
+ confirmCreateDemo: false,
+ confirmRemoveUserData: false
+ }
+ },
+
+ methods: {
+ generateDemo () {
+ this.confirmCreateDemo = false
+ this.$store.dispatch('createDemo')
+ },
+
+ removeUserData () {
+ this.confirmRemoveUserData = false
+ this.$store.dispatch('removeUserData')
+ }
}
}
</script>
@@ -12,30 +33,82 @@ export default {
.settings
.settings__header Settings
- .settings__item
- Button._grey._inline(
- icon="mdi mdi-palette"
- title="Change theme"
- v-on:onClick="$store.dispatch('changeTheme')")
-
- .settings__item
- Button._grey._inline(
- icon="mdi mdi-logout"
- title="Sign Out"
- v-on:onClick="$store.dispatch('signOut')")
+ .settings__group(v-if="$store.state.ui.mobile")
+ .settings__subHeader Transaction form
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-chart-bubble"
+ :title="$store.state.ui.lastUsedCatsInTrnForm === 'visible' ? 'Show last used categories' : 'Hide last used categories'"
+ v-on:onClick="$store.dispatch('toogleLastUsedCatsInTrnForm')")
+
+ .settings__group
+ .settings__subHeader Application
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-palette"
+ title="Change theme"
+ v-on:onClick="$store.dispatch('changeTheme')")
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-logout"
+ title="Sign Out"
+ v-on:onClick="$store.dispatch('signOut')")
+
+ .settings__group
+ .settings__subHeader Delete
+ .settings__desc This will delete all your wallets, categories and trns
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-delete"
+ title="Delete my data"
+ v-on:onClick="confirmRemoveUserData = true")
+
+ .settings__group(v-if="$store.state.demo.hasDemo")
+ .settings__subHeader Demo
+ .settings__desc This will delete all your wallets, categories and trns
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-test-tube"
+ title="Load demo"
+ v-on:onClick="confirmCreateDemo = true")
+
+ ModalBottomConfirm(
+ description="This will delete all your wallets, categories and trns"
+ :show="confirmCreateDemo"
+ v-on:onClose="confirmCreateDemo = false"
+ v-on:onConfirm="generateDemo")
+ ModalBottomConfirm(
+ description="This will delete all your wallets, categories and trns"
+ :show="confirmRemoveUserData"
+ v-on:onClose="confirmRemoveUserData = false"
+ v-on:onConfirm="removeUserData")
</template>
<style lang="stylus" scoped>
@import "~@/stylus/variables/fonts"
@import "~@/stylus/variables/margins"
+@import "~@/stylus/variables/media"
.settings
- padding-top $m6
+ @media $media-phone
+ padding $m7
+
+ @media $media-laptop
+ max-width 380px
+
+ &__group
+ padding-bottom $m10
+
+ &__desc
+ padding-bottom $m5
+ font-size 14px
+ color var(--c-red-1)
&__header
font-header-4()
- padding-bottom $m9
+ padding-bottom $mn2
- &__item
- padding-bottom $m8
+ &__subHeader
+ font-header-1()
+ padding-bottom $m7
</style>
diff --git a/src/components/welcome/Welcome.vue b/src/components/welcome/Welcome.vue
index 7e7205f9..e8ea924f 100644
--- a/src/components/welcome/Welcome.vue
+++ b/src/components/welcome/Welcome.vue
@@ -14,6 +14,7 @@ export default {
data () {
return {
+ step: 1,
showCategoryForm: false,
showWalletForm: false
}
@@ -30,19 +31,45 @@ export default {
<template lang="pug">
.tabs
- //- wallet
+ //- welcome
transition(name="fadeInSlow")
- template(v-if="!showWalletForm && !$store.getters.hasWallets")
+ template(v-if="step === 1")
.tab
.tab__content
- .header
+ .header(@click="$store.dispatch('changeTheme')")
.header__title Welcome to Finapp
.header__desc Powerfull personal finance application
- .text Let's start with create first Wallet
- .button
- Button._blue(
- title="Create wallet"
- v-on:onClick="showWalletForm = true")
+ .options
+ .options__item
+ .options__desc Start creating your own wallets, categories
+ Button._blue(
+ title="Start"
+ v-on:onClick="step = 2")
+
+ template(v-if="$store.state.demo.hasDemo")
+ .options__or
+ .options__or__border
+ .options__or__text or
+ .options__item
+ .options__desc Load app with created wallets, categories and transactions
+ Button._grey._center(
+ title="Open demo"
+ v-on:onClick="$store.dispatch('createDemo')")
+
+ //- wallet
+ transition(name="fadeInSlow")
+ template(v-if="step !== 1 && !showWalletForm && !$store.getters.hasWallets")
+ .tab
+ .tab__content
+ .tab__wrap
+ .header
+ .header__title Welcome to Finapp
+ .header__desc Powerfull personal finance application
+ .text Let's start with create first Wallet
+ .button
+ Button._blue(
+ title="Create wallet"
+ v-on:onClick="showWalletForm = true")
//- category
transition(name="fadeInSlow")
@@ -101,6 +128,10 @@ export default {
margin 0 auto
padding $m9
padding-bottom 100px
+
+ @media $media-laptop
+ width 400px
+
.component
padding 0
@@ -123,10 +154,37 @@ export default {
padding-top $m7
font-size 14px
+.options
+ &__or
+ display flex
+ align-items center
+ justify-content center
+ position relative
+ padding $m9 0
+ text-align center
+ color var(--c-font-4)
+ &__text
+ position relative
+ padding $m7
+ background var(--c-bg-1)
+ &__border
+ position absolute
+ left 0
+ top 50%
+ width 100%
+ height 1px
+ background var(--c-bg-6)
+
+ &__desc
+ padding-bottom $m7
+ color var(--c-font-4)
+ line-height 20px
+
.text
- padding-bottom $m9
+ line-height 20px
+ padding-bottom $m8
@media $media-laptop
- padding-bottom $m10
+ padding-bottom $m9
.icon
padding-bottom $m5
diff --git a/src/store/index.js b/src/store/index.js
index 2f73a258..7dc1e458 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,6 +6,7 @@ import categories from '@/components/categories/store'
import chart from '@/components/chart/store'
import currencies from '@/components/currencies/store'
import dashboard from '@/components/dashboard/store'
+import demo from '@/components/demo/store'
import filter from '@/components/filter/store'
import stat from '@/components/stat/store'
import trnForm from '@/components/trnForm/store'
@@ -23,6 +24,7 @@ export default new Vuex.Store({
chart,
currencies,
dashboard,
+ demo,
filter,
stat,
trnForm,