Open source personal finance application
refactor code
ilkome7e28a5c48ac2
diff --git a/assets/stylus/variables/animations.styl b/assets/stylus/variables/animations.stylindex 58b6b16c..63e300cb 100644--- a/assets/stylus/variables/animations.styl+++ b/assets/stylus/variables/animations.styl@@ -1,5 +1,5 @@$transition-time = 300ms-$transition-style = cubic-bezier(0.17, 0.04, 0.03, 1)+$transition-style = cubic-bezier(.17, .04, .03, 1)anim()transition $transition-time $transition-stylediff --git a/components/categories/item/CategoryItem.vue b/components/categories/item/CategoryItem.vueindex b4ef3496..23d2ff90 100644--- a/components/categories/item/CategoryItem.vue+++ b/components/categories/item/CategoryItem.vue@@ -24,6 +24,10 @@ export default {computed: {childCategoriesIds () {return this.$store.getters['categories/getChildCategoriesIds'](this.id)+ },++ parentCategory () {+ return this.$store.state.categories.items[this.category.parentId]}},@@ -57,13 +61,16 @@ export default {:category="true")- .categoryItem__name {{ category.name }}+ .categoryItem__name+ .parent(v-if="ui === '_flat' && parentCategory") {{ parentCategory.name }}+ .child {{ category.name }}.categoryItem__childNum(v-if="childCategoriesIds.length > 0") {{ childCategoriesIds.length }}</template><style lang="stylus" scoped>@import "~assets/stylus/variables/margins"@import "~assets/stylus/variables/media"+@import "~assets/stylus/variables/fonts".categoryItemoverflow hidden@@ -110,6 +117,14 @@ export default {padding-top 1pxcolor var(--c-font-3)font-size 12px+ text-align left++ .parent+ padding-bottom $m1+ font-size 10px++ .child+ font-size 12px&:last-childpadding-bottom 0@@ -121,6 +136,8 @@ export default {display flexalign-items centerjustify-content center+ font-secondary()+ color var(--c-font-4)font-size 18pxfont-weight 500</style>diff --git a/components/settings/Settings.vue b/components/settings/Settings.vueindex 68be4339..87a9fb53 100644--- a/components/settings/Settings.vue+++ b/components/settings/Settings.vue@@ -1,4 +1,5 @@<script>+import pkg from '~/package'import Button from '~/components/shared/button/Button'import ComponentWrap from '~/components/layout/component/Component'import ModalBottomConfirm from '~/components/modal/ModalBottomConfirm'@@ -15,7 +16,8 @@ export default {data () {return {confirmCreateDemo: false,- confirmRemoveUserData: false+ confirmRemoveUserData: false,+ version: pkg.version}},@@ -47,7 +49,8 @@ ComponentWrap(:contentPadding="false"):showCheckbox="true":title="$lang.trnForm.lastUsedCats"icon="mdi mdi-folder-star"- v-on:onClick="$store.dispatch('ui/toogleLastUsedCatsInTrnForm')")+ @onClick="$store.dispatch('ui/toogleLastUsedCatsInTrnForm')"+ ).settings__group.settings__subHeader {{ $lang.settings.lang }}@@ -60,12 +63,12 @@ ComponentWrap(:contentPadding="false")Button._bdb(icon="mdi mdi-palette"title="Change theme"- v-on:onClick="$store.dispatch('ui/changeTheme')")+ @onClick="$store.dispatch('ui/changeTheme')").settings__itemButton._bdb(icon="mdi mdi-logout"title="Sign Out"- v-on:onClick="$store.dispatch('user/signOut')")+ @onClick="$store.dispatch('user/signOut')").settings__group._paddingTop.settings__subHeader {{ $lang.settings.delete }}@@ -74,7 +77,7 @@ ComponentWrap(:contentPadding="false")Button._bdb(icon="mdi mdi-delete"title="Delete my data"- v-on:onClick="confirmRemoveUserData = true")+ @onClick="confirmRemoveUserData = true").settings__group(v-if="$store.state.demo.hasDemo").settings__subHeader {{ $lang.settings.demo }}@@ -83,19 +86,22 @@ ComponentWrap(:contentPadding="false")Button._bdb(icon="mdi mdi-test-tube"title="Load demo"- v-on:onClick="confirmCreateDemo = true")+ @onClick="confirmCreateDemo = true")++ .settings__group+ .appVersion Version {{ version }}ModalBottomConfirm(description="This will delete all your wallets, categories and trns":show="confirmCreateDemo"- v-on:onClose="confirmCreateDemo = false"- v-on:onConfirm="generateDemo")+ @onClose="confirmCreateDemo = false"+ @onConfirm="generateDemo")ModalBottomConfirm(description="This will delete all your wallets, categories and trns":show="confirmRemoveUserData"- v-on:onClose="confirmRemoveUserData = false"- v-on:onConfirm="removeUserData"+ @onClose="confirmRemoveUserData = false"+ @onConfirm="removeUserData")</template>@@ -137,4 +143,8 @@ ComponentWrap(:contentPadding="false")font-size 16pxfont-weight 500padding-bottom 16px++.appVersion+ color var(--c-font-3)+ font-size 14px</style>diff --git a/components/shared/appName/AppName.vue b/components/shared/appName/AppName.vueindex 201460b3..3d79053a 100644--- a/components/shared/appName/AppName.vue+++ b/components/shared/appName/AppName.vue@@ -8,7 +8,7 @@.appNamecolor var(--c-font-3)- font-family "Nunito", "Roboto", sans-serif+ fontFamilyNunito()font-size 66pxfont-weight 800letter-spacing 2pxdiff --git a/layouts/default.vue b/layouts/default.vueindex a87167d3..f75415d5 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -113,6 +113,8 @@ export default {*box-sizing border-box+ -webkit-tap-highlight-color transparent+&:focusoutline 0diff --git a/store/categories/getters.js b/store/categories/getters.jsindex 95422218..f2cb24c0 100644--- a/store/categories/getters.js+++ b/store/categories/getters.js@@ -1,7 +1,7 @@export default {- hasCategories (state, getters, rootState) {- if (rootState.categories.items) {- if (Object.keys(rootState.categories.items).length > 0) {+ hasCategories (state) {+ if (state.items) {+ if (Object.keys(state.items).length > 0) {return true}}@@ -11,17 +11,16 @@ export default {categoriesRootIds (state, getters, rootState) {if (!getters.hasCategories) { return [] }- const categories = rootState.categories.items- return Object.keys(categories)- .filter(key => categories[key].parentId === 0)+ return Object.keys(state.items)+ .filter(key => state.items[key].parentId === 0).sort((a, b) => {- if (categories[a].order < categories[b].order) { return -1 }- if (categories[a].order > categories[b].order) { return 1 }+ if (state.items[a].order < state.items[b].order) { return -1 }+ if (state.items[a].order > state.items[b].order) { return 1 }return 0})},- categoriesForBeParent (state, getters, rootState, rootGetters) {+ categoriesForBeParent (state, getters, rootState) {const categoriesRootIds = getters.categoriesRootIdsconst trns = rootState.trns.itemsconst categoriesForBeParent = []@@ -57,16 +56,15 @@ export default {getChildCategoriesIds: (state, getters, rootState) => (categoryId) => {if (!getters.hasCategories) { return [] }- const categories = rootState.categories.items- const category = categories[categoryId]+ const category = state.items[categoryId]let childIds = []- if (category && categories[categoryId].parentId === 0) {- childIds = Object.keys(categories)- .filter(key => categories[key].parentId === categoryId)+ if (category && state.items[categoryId].parentId === 0) {+ childIds = Object.keys(state.items)+ .filter(key => state.items[key].parentId === categoryId).sort((a, b) => {- if (categories[a].order < categories[b].order) { return -1 }- if (categories[a].order > categories[b].order) { return 1 }+ if (state.items[a].order < state.items[b].order) { return -1 }+ if (state.items[a].order > state.items[b].order) { return 1 }return 0})}@@ -74,17 +72,16 @@ export default {},lastUsedCategoriesIdsByDate (state, getters, rootState, rootGetters) {- const categories = rootState.categories.itemsconst trns = rootState.trns.itemsconst sortedTrnsIds = rootGetters['trns/sortedTrnsIds']const transferCategoryId = getters.transferCategoryIdconst lastCategoriesIds = []- if (categories && rootGetters['trns/hasTrns']) {+ if (state.items && rootGetters['trns/hasTrns']) {for (const trnId of sortedTrnsIds.slice(0, 50)) {if (lastCategoriesIds.length < 12) {const categoryId = trns[trnId].categoryId- const category = categories[categoryId]+ const category = state.items[categoryId]if (category && (category.showInLastUsed || category.showInLastUsed === undefined)) {if (categoryId !== transferCategoryId) {if (!lastCategoriesIds.includes(categoryId)) { lastCategoriesIds.push(categoryId) }@@ -94,34 +91,32 @@ export default {}return lastCategoriesIds.sort((a, b) => {- if (categories[a] && categories[b]) {- if (categories[a].order < categories[b].order) { return -1 }- if (categories[a].order > categories[b].order) { return 1 }+ if (state.items[a] && state.items[b]) {+ if (state.items[a].order < state.items[b].order) { return -1 }+ if (state.items[a].order > state.items[b].order) { return 1 }return 0}})}},- quickSelectorCategoriesIds (state, getters, rootState) {+ quickSelectorCategoriesIds (state, getters) {if (!getters.hasCategories) { return [] }- const categories = rootState.categories.items- return Object.keys(categories)- .filter(key => categories[key].showInQuickSelector)+ return Object.keys(state.items)+ .filter(key => state.items[key].showInQuickSelector).sort((a, b) => {- if (categories[a].order < categories[b].order) { return -1 }- if (categories[a].order > categories[b].order) { return 1 }+ if (state.items[a].order < state.items[b].order) { return -1 }+ if (state.items[a].order > state.items[b].order) { return 1 }return 0})},- transferCategoryId (state, getters, rootState) {+ transferCategoryId (state, getters,) {if (!getters.hasCategories) { return null }- const categories = rootState.categories.items- return Object.keys(categories)- .find(id => categories[id].name === 'Перевод' ||- categories[id].name === 'Transfer')+ return Object.keys(state.items)+ .find(id => state.items[id].name === 'Перевод' ||+ state.items[id].name === 'Transfer')}}