Skip to content

Open source personal finance application

add undone project functionality

Ilya Komichevbab66c52ae7d
diff --git a/package-lock.json b/package-lock.json
index 3218af4e..d2f56d33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "2.0.0",
+ "version": "2.1.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/src/components/app/store/actions.js b/src/components/app/store/actions.js
index 43230eef..453104b6 100644
--- a/src/components/app/store/actions.js
+++ b/src/components/app/store/actions.js
@@ -21,6 +21,7 @@ export default {
await dispatch('initGroups')
await dispatch('initBudgets')
await dispatch('initDbLang')
+ await dispatch('initProjects')
} catch (e) {
console.error(e)
}
diff --git a/src/components/budgets/Budgets.vue b/src/components/budgets/Budgets.vue
index 31e6812c..9d682f94 100644
--- a/src/components/budgets/Budgets.vue
+++ b/src/components/budgets/Budgets.vue
@@ -31,8 +31,8 @@ export default {
styles () {
return {
- width: '60%'
- // width: `${Math.abs(this.gotAmount) / Math.abs(this.budget.amount) * 100}%`
+ // width: '60%'
+ width: `${Math.abs(this.gotAmount) / Math.abs(this.budget.amount) * 100}%`
}
}
},
diff --git a/src/components/groups/BudgetItem.vue b/src/components/groups/BudgetItem.vue
index 75439cc8..7ab4359c 100644
--- a/src/components/groups/BudgetItem.vue
+++ b/src/components/groups/BudgetItem.vue
@@ -37,8 +37,8 @@ export default {
if (this.budget.trnsIds) {
return Object.keys(this.budget.trnsIds)
.sort((a, b) => {
- if (this.$store.state.trns.items[a].date > this.$store.state.trns.items[b].date) return -1
- if (this.$store.state.trns.items[a].date < this.$store.state.trns.items[b].date) return 1
+ if (this.$store.state.trns.items[a].date > this.$store.state.trns.items[b].date) { return -1 }
+ if (this.$store.state.trns.items[a].date < this.$store.state.trns.items[b].date) { return 1 }
return 0
})
}
diff --git a/src/components/layout/LayoutMobile.vue b/src/components/layout/LayoutMobile.vue
index 6d31bacc..cad739cd 100644
--- a/src/components/layout/LayoutMobile.vue
+++ b/src/components/layout/LayoutMobile.vue
@@ -13,16 +13,16 @@ import Groups from '@/components/groups/Groups'
import LayoutMobileMenu from '@/components/layout/LayoutMobileMenu'
import LayoutMobileStat from '@/components/layout/LayoutMobileStat'
import Menu from '@/components/layout/sidebar/Menu'
+import Projects from '@/components/projects/Projects'
import Settings from '@/components/settings/Settings'
-import StatNew from '@/components/stat/StatNew'
import TrnForm from '@/components/trnForm/TrnForm'
import TrnModal from '@/components/trns/modal/TrnModal'
import TrnsList from '@/components/trns/list/TrnsList'
import WalletForm from '@/components/wallets/form/WalletForm'
import WalletModal from '@/components/wallets/modal/WalletModal'
import WalletsList from '@/components/wallets/list/WalletsList'
-import WalletsTotal from '@/components/wallets/total/WalletsTotal'
import WalletsSort from '@/components/wallets/sort/WalletsSort'
+import WalletsTotal from '@/components/wallets/total/WalletsTotal'
export default {
components: {
@@ -37,8 +37,8 @@ export default {
LayoutMobileMenu,
LayoutMobileStat,
Menu,
+ Projects,
Settings,
- StatNew,
TrnForm,
TrnModal,
TrnsList,
@@ -185,8 +185,8 @@ export default {
Budgets
transition(name="animation-tab")
- .tab(v-if="activeTab === 'statNew'")
- StatNew
+ .tab(v-if="activeTab === 'projects'")
+ Projects
//------------------------------------------------
//- menu
diff --git a/src/components/layout/LayoutPc.vue b/src/components/layout/LayoutPc.vue
index 10e41416..11634a0a 100644
--- a/src/components/layout/LayoutPc.vue
+++ b/src/components/layout/LayoutPc.vue
@@ -11,6 +11,7 @@ import DashboardNav from '@/components/dashboard/DashboardNav'
import Groups from '@/components/groups/Groups'
import LayoutPcSidebar from '@/components/layout/LayoutPcSidebar'
import LayoutPcTab from '@/components/layout/LayoutPcTab'
+import Projects from '@/components/projects/Projects'
import Settings from '@/components/settings/Settings'
import TrnForm from '@/components/trnForm/TrnForm'
import TrnModal from '@/components/trns/modal/TrnModal'
@@ -33,6 +34,7 @@ export default {
Groups,
LayoutPcSidebar,
LayoutPcTab,
+ Projects,
Settings,
TrnForm,
TrnModal,
@@ -86,6 +88,11 @@ export default {
LayoutPcTab(:show="activeTab === 'groups'")
Groups
+ //- Projects
+ //------------------------------------------------
+ LayoutPcTab(:show="activeTab === 'projects'")
+ Projects
+
//- categories
//------------------------------------------------
LayoutPcTab(:show="activeTab === 'categories'")
diff --git a/src/components/layout/sidebar/Menu.vue b/src/components/layout/sidebar/Menu.vue
index 8d9914e1..3fae3f74 100644
--- a/src/components/layout/sidebar/Menu.vue
+++ b/src/components/layout/sidebar/Menu.vue
@@ -40,6 +40,11 @@ export default {
name: this.$lang.categories.name,
isOpen: false
},
+ projects: {
+ icon: 'mdi mdi-notebook-outline',
+ name: this.$lang.projects.name,
+ isOpen: false
+ },
settings: {
icon: 'mdi mdi-settings',
name: this.$lang.settings.title,
diff --git a/src/components/projects/Projects.vue b/src/components/projects/Projects.vue
new file mode 100644
index 00000000..098a517c
--- /dev/null
+++ b/src/components/projects/Projects.vue
@@ -0,0 +1,57 @@
+<script>
+import ComponentWrap from '@/components/layout/component/Component'
+import Button from '@/components/shared/button/Button'
+
+export default {
+ components: {
+ Button,
+ ComponentWrap
+ },
+
+ data () {
+ return {
+ form: {
+ name: null
+ }
+ }
+ },
+
+ methods: {
+ async handleCreateProject () {
+ await this.$store.dispatch('createProject', this.form)
+ this.form.name = null
+ console.log('handleCreateProject')
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+ComponentWrap(:contentPadding="false")
+ template(slot="headerLeft") {{ $lang.projects.name }}
+
+ template(slot="content")
+ pre {{ $store.state.projects.items }}
+ //- CategoriesList(
+ //- :style="{ paddingTop: '16px' }"
+ //- v-on:onClick="(id) => $store.dispatch('showCategoryModal', id)")
+
+ template(slot="bottom")
+ form(@submit.prevent="handleCreateProject")
+ .inputText
+ input(
+ type="text"
+ :placeholder="$lang.projects.form.name.placeholder"
+ v-model="form.name"
+ ).inputText__value
+ .inputText__label {{ $lang.projects.form.name.label }}
+
+ Button(
+ className="_inline _small"
+ :title="$lang.projects.create"
+ v-on:onClick="handleCreateProject")
+</template>
+
+<style lang="stylus" scoped>
+
+</style>
diff --git a/src/components/projects/store/actions.js b/src/components/projects/store/actions.js
new file mode 100644
index 00000000..9f7625c4
--- /dev/null
+++ b/src/components/projects/store/actions.js
@@ -0,0 +1,34 @@
+import moment from 'moment'
+import { db } from '@/firebase'
+import { generateSimpleId } from '@/utils/id'
+
+export default {
+ initProjects ({ dispatch, rootGetters }) {
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/projects`
+
+ db.ref(path).on('value', snapshot => {
+ const items = Object.freeze(snapshot.val())
+ dispatch('setProjects', items)
+ }, e => console.error(e))
+ },
+
+ setProjects ({ commit }, items) {
+ commit('setProjects', items)
+ },
+
+ async createProject ({ rootGetters }, values) {
+ const id = generateSimpleId()
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/projects/${id}`
+
+ await db.ref(path)
+ .set({
+ name: values.name,
+ editDate: moment().valueOf()
+ })
+ .then(() => { return true })
+
+ return false
+ }
+}
diff --git a/src/components/projects/store/getters.js b/src/components/projects/store/getters.js
new file mode 100644
index 00000000..146a17ff
--- /dev/null
+++ b/src/components/projects/store/getters.js
@@ -0,0 +1,8 @@
+export default {
+ hasProjects (state, getters, rootState) {
+ if (rootState.projects.items) {
+ if (Object.keys(rootState.projects.items).length > 0) return true
+ }
+ return false
+ }
+}
diff --git a/src/components/projects/store/index.js b/src/components/projects/store/index.js
new file mode 100644
index 00000000..a782a4df
--- /dev/null
+++ b/src/components/projects/store/index.js
@@ -0,0 +1,14 @@
+import actions from './actions'
+import mutations from './mutations'
+import getters from './getters'
+
+const state = {
+ items: {}
+}
+
+export default {
+ state,
+ actions,
+ mutations,
+ getters
+}
diff --git a/src/components/projects/store/mutations.js b/src/components/projects/store/mutations.js
new file mode 100644
index 00000000..5e89b052
--- /dev/null
+++ b/src/components/projects/store/mutations.js
@@ -0,0 +1,5 @@
+export default {
+ setProjects (state, items) {
+ state.items = items
+ }
+}
diff --git a/src/components/stat/StatMobile.vue b/src/components/stat/StatMobile.vue
index 9b3272ba..53ae80a3 100644
--- a/src/components/stat/StatMobile.vue
+++ b/src/components/stat/StatMobile.vue
@@ -55,9 +55,7 @@ export default {
},
mounted () {
- this.slider = new Swiper(this.$refs.slider, {
- // autoHeight: true
- })
+ this.slider = new Swiper(this.$refs.slider, {})
},
methods: {
diff --git a/src/lang/en.json b/src/lang/en.json
index da6d9ad1..e53e1a2b 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -129,6 +129,20 @@
}
},
+ "projects": {
+ "title": "Projects",
+ "name": "Projects",
+ "create": "Save project",
+ "form": {
+ "name": {
+ "label": "Name",
+ "placeholder": "Write name...",
+ "error": "Write name",
+ "exist": "Project with same name is exist"
+ }
+ }
+ },
+
"stat": {
"shortTitle": "Stat",
"empty": "No stat for this period"
diff --git a/src/lang/ru.json b/src/lang/ru.json
index 9442eda1..2d091d77 100644
--- a/src/lang/ru.json
+++ b/src/lang/ru.json
@@ -129,6 +129,20 @@
}
},
+ "projects": {
+ "title": "Проекты",
+ "name": "Проекты",
+ "create": "Сохранить проект",
+ "form": {
+ "name": {
+ "label": "Имя",
+ "placeholder": "Напишите имя...",
+ "error": "Напишите имя",
+ "exist": "Проект с таким именем уже существует"
+ }
+ }
+ },
+
"stat": {
"shortTitle": "Статистика",
"empty": "Статистики за выбранный период нетю :)"
diff --git a/src/store/index.js b/src/store/index.js
index f62b1f63..3c4559d7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,6 +11,7 @@ import demo from '@/components/demo/store'
import filter from '@/components/filter/store'
import groups from '@/components/groups/store'
import lang from '@/components/lang/store'
+import projects from '@/components/projects/store'
import stat from '@/components/stat/store'
import trnForm from '@/components/trnForm/store'
import trns from '@/components/trns/store'
@@ -32,6 +33,7 @@ export default new Vuex.Store({
filter,
groups,
lang,
+ projects,
stat,
trnForm,
trns,