Open source personal finance application
refactor nuxt-components
ilkome247d4b38d7ea
diff --git a/components/budgets/BudgetForm.vue b/components/budgets/BudgetForm.vueindex 485a42be..c74397b6 100644--- a/components/budgets/BudgetForm.vue+++ b/components/budgets/BudgetForm.vue@@ -1,15 +1,9 @@<script>import Cleave from 'vue-cleave-component'-import Button from '~/components/shared/button/Button'-import TrnItem from '~/components/budgets/BudgetFormTrn'-import TrnsList from '~/components/trns/list/TrnsList2'export default {components: {- Button,- Cleave,- TrnItem,- TrnsList+ Cleave},data () {@@ -37,7 +31,7 @@ export default {trnsIds: this.budgetTrnsIds}- await this.$store.dispatch('createBudget', values)+ await this.$store.dispatch('budgets/createBudget', values)this.budgetName = nullthis.budgetAmount = null}diff --git a/components/budgets/BudgetFormTrn.vue b/components/budgets/BudgetFormTrn.vueindex 260089c5..e012d8e7 100644--- a/components/budgets/BudgetFormTrn.vue+++ b/components/budgets/BudgetFormTrn.vue@@ -1,14 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/budgets/BudgetItem.vue b/components/budgets/BudgetItem.vueindex ba0e5b6a..6dc68b82 100644--- a/components/budgets/BudgetItem.vue+++ b/components/budgets/BudgetItem.vue@@ -1,16 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import TrnItem from '~/components/budgets/BudgetItemTrn'-import TrnsList from '~/components/trns/list/TrnsList2'export default {- components: {- Amount,- TrnItem,- TrnsList- },-props: {id: {type: String,@@ -108,8 +99,8 @@ export default {.budgetItem__graph: .budgetItem__graph__in(:style="styles").budgetItem__trns(v-if="budget.trnsIds" v-show="isTrnsVisible")- TrnsList(:ids="trnsIds" v-slot="{ trns }")- TrnItem(+ TrnsList2(:ids="trnsIds" v-slot="{ trns }")+ BudgetItemTrn(v-for="trnItem in trns":category="trnItem.category":id="trnItem.id"diff --git a/components/budgets/BudgetItemTrn.vue b/components/budgets/BudgetItemTrn.vueindex d289a855..c1484b7c 100644--- a/components/budgets/BudgetItemTrn.vue+++ b/components/budgets/BudgetItemTrn.vue@@ -1,14 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/budgets/Budgets.vue b/components/budgets/Budgets.vueindex 9b20e9c0..9d13f222 100644--- a/components/budgets/Budgets.vue+++ b/components/budgets/Budgets.vue@@ -1,19 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import BudgetForm from '~/components/budgets/BudgetForm'-import BudgetItem from '~/components/budgets/BudgetItem'-import Button from '~/components/shared/button/Button'-import ComponentWrap from '~/components/layout/component/Component'-export default {- components: {- Amount,- BudgetForm,- BudgetItem,- Button,- ComponentWrap- },-data () {return {isShowForm: false@@ -27,13 +13,6 @@ export default {budgetsCount () {return Object.keys(this.$store.getters['budgets/budgets']).length- },-- styles () {- return {- // width: '60%'- width: `${Math.abs(this.gotAmount) / Math.abs(this.budget.amount) * 100}%`- }}},@@ -78,7 +57,7 @@ ComponentWrap:type="1":value="$store.getters['budgets/budgetsTotal'].incomes")- .budgetItem__graph: .budgetItem__graph__in(:style="styles")+ .budgetItem__graph: .budgetItem__graph__intemplate(v-if="budgetsCount").listdiff --git a/components/categories/form/CategoryForm.vue b/components/categories/form/CategoryForm.vueindex e86a2179..8e302d34 100644--- a/components/categories/form/CategoryForm.vue+++ b/components/categories/form/CategoryForm.vue@@ -4,27 +4,11 @@ import generateId from '~/utils/id'import colors from '~/assets/js/colors'import icons from '~/assets/js/icons'-import Button from '~/components/shared/button/Button'-import CategoriesView from '~/components/categories/list/CategoriesView'-import Checkbox from '~/components/shared/inputs/Checkbox'-import ComponentWrap from '~/components/layout/component/Component'-import ModalBottom from '~/components/modal/ModalBottom'-import ModalButton from '~/components/modal/ModalButton'-function random (icons) {return icons[Math.floor(Math.random() * icons.length)]}export default {- components: {- Button,- CategoriesView,- Checkbox,- ComponentWrap,- ModalBottom,- ModalButton- },-data () {return {showParents: false,diff --git a/components/categories/item/CategoryItem.vue b/components/categories/item/CategoryItem.vueindex 23d2ff90..af7d22c6 100644--- a/components/categories/item/CategoryItem.vue+++ b/components/categories/item/CategoryItem.vue@@ -1,11 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-export default {- components: {- Icon- },-props: {id: {type: String,diff --git a/components/categories/list/CategoriesList.vue b/components/categories/list/CategoriesList.vueindex 30680077..305acb2e 100644--- a/components/categories/list/CategoriesList.vue+++ b/components/categories/list/CategoriesList.vue@@ -1,9 +1,5 @@<script>-import CategoriesView from '~/components/categories/list/CategoriesView'export default {- components: {- CategoriesView- }}</script>diff --git a/components/categories/list/CategoriesListSlot.vue b/components/categories/list/CategoriesListSlot.vueindex 90ace404..dc18acdc 100644--- a/components/categories/list/CategoriesListSlot.vue+++ b/components/categories/list/CategoriesListSlot.vue@@ -1,11 +1,5 @@<script>-import CategoryItem from '~/components/categories/item/CategoryItem'-export default {- components: {- CategoryItem- },-props: {ids: {type: Array,diff --git a/components/categories/list/CategoriesView.vue b/components/categories/list/CategoriesView.vueindex d8837eb6..26cc4392 100644--- a/components/categories/list/CategoriesView.vue+++ b/components/categories/list/CategoriesView.vue@@ -1,11 +1,5 @@<script>-import CategoryItem from '~/components/categories/item/CategoryItem'-export default {- components: {- CategoryItem- },-props: {ids: {type: Array,diff --git a/components/categories/modal/CategoryModal.vue b/components/categories/modal/CategoryModal.vueindex 8ca99af5..089edf21 100644--- a/components/categories/modal/CategoryModal.vue+++ b/components/categories/modal/CategoryModal.vue@@ -1,21 +1,7 @@<script>import { db } from '~/services/firebaseConfig'-import CategoriesView from '~/components/categories/list/CategoriesView'-import Icon from '~/components/icon/Icon'-import ModalBottom from '~/components/modal/ModalBottom'-import ModalBottomConfirm from '~/components/modal/ModalBottomConfirm'-import ModalButton from '~/components/modal/ModalButton'-export default {- components: {- CategoriesView,- Icon,- ModalBottom,- ModalBottomConfirm,- ModalButton- },-data () {return {showModalConfirm: falsediff --git a/components/currencies/CurrencyModal.vue b/components/currencies/CurrencyModal.vueindex 03efdd58..d1056ce0 100644--- a/components/currencies/CurrencyModal.vue+++ b/components/currencies/CurrencyModal.vue@@ -1,11 +1,5 @@<script>-import ModalBottom from '~/components/modal/ModalBottom'-export default {- components: {- ModalBottom- },-methods: {handleCurrencySelect (currency) {this.$store.commit('currencies/hideBaseCurrenciesModal')diff --git a/components/dashboard/Dashboard.vue b/components/dashboard/Dashboard.vueindex 2d310dbf..5fc05667 100644--- a/components/dashboard/Dashboard.vue+++ b/components/dashboard/Dashboard.vue@@ -1,29 +1,5 @@<script>-import Button from '~/components/shared/button/Button'-import DashboardFilter from '~/components/dashboard/DashboardFilter'-import DashboardNav from '~/components/dashboard/DashboardNav'-import DashboardStatControl from '~/components/dashboard/DashboardStatControl'-import EmptyData from '~/components/shared/emptyData/EmptyData'-import StatChartDonut from '~/components/stat/StatChartDonut'-import StatChartsLine from '~/components/stat/StatChartsLine'-import StatPc from '~/components/stat/StatPc'-import StatSummaryPc from '~/components/stat/StatSummaryPc'-import TrnsList from '~/components/trns/list/TrnsList'-export default {- components: {- Button,- DashboardFilter,- DashboardNav,- DashboardStatControl,- EmptyData,- StatChartDonut,- StatChartsLine,- StatPc,- StatSummaryPc,- TrnsList- },-data () {return {visiblePeriodMenu: falsediff --git a/components/dashboard/DashboardFilter.vue b/components/dashboard/DashboardFilter.vueindex aeeee39b..239096ca 100644--- a/components/dashboard/DashboardFilter.vue+++ b/components/dashboard/DashboardFilter.vue@@ -1,11 +1,5 @@<script>-import FilterItem from '~/components/filter/FilterItem'-export default {- components: {- FilterItem- },-props: {showTittle: {type: Boolean,diff --git a/components/dashboard/DashboardNav.vue b/components/dashboard/DashboardNav.vueindex 85bd4ab0..eeb2bde5 100644--- a/components/dashboard/DashboardNav.vue+++ b/components/dashboard/DashboardNav.vue@@ -1,19 +1,5 @@<script>-import ChartMenu from '~/components/stat/chart/ChartMenu'-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Date from '~/components/shared/date/Date'-import Dropdown from '~/components/shared/dropdown/Dropdown'-export default {- components: {- ChartMenu,- ContextMenu,- ContextMenuItem,- Date,- Dropdown- },-data () {return {visibleContextMenu: false,diff --git a/components/filter/FilterItem.vue b/components/filter/FilterItem.vueindex f5ba506e..d1989ef9 100644--- a/components/filter/FilterItem.vue+++ b/components/filter/FilterItem.vue@@ -1,13 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-import ModalButton from '~/components/modal/ModalButton'-export default {- components: {- Icon,- ModalButton- },-props: {color: {type: String,diff --git a/components/groups/BudgetForm.vue b/components/groups/GroupForm.vuesimilarity index 58%rename from components/groups/BudgetForm.vuerename to components/groups/GroupForm.vueindex 151ae0ba..17bf5a30 100644--- a/components/groups/BudgetForm.vue+++ b/components/groups/GroupForm.vue@@ -1,22 +1,16 @@<script>import Cleave from 'vue-cleave-component'-import Button from '~/components/shared/button/Button'-import TrnItem from '~/components/budgets/BudgetFormTrn'-import TrnsList from '~/components/trns/list/TrnsList2'export default {components: {- Button,- Cleave,- TrnItem,- TrnsList+ Cleave},data () {return {- budgetName: '',- budgetAmount: null,- budgetTrnsIds: []+ groupName: '',+ groupAmount: null,+ groupTrnsIds: []}},@@ -25,24 +19,24 @@ export default {const isFormValid = this.validateForm()if (isFormValid) {const values = {- amount: this.budgetAmount,+ amount: this.groupAmount,currency: this.$store.state.currencies.base,- name: this.budgetName,- trnsIds: this.budgetTrnsIds+ name: this.groupName,+ trnsIds: this.groupTrnsIds}- await this.$store.dispatch('createGroup', values)- this.budgetName = null- this.budgetAmount = null+ await this.$store.dispatch('groups/createGroup', values)+ this.groupName = null+ this.groupAmount = null}},validateForm () {- if (!this.budgetName) {- const budgetNameRef = this.$refs.budgetNameRef- this.focusInputName(budgetNameRef)- budgetNameRef.classList.remove('_error')- setTimeout(() => { budgetNameRef.classList.add('_error') }, 10)+ if (!this.groupName) {+ const groupNameRef = this.$refs.groupNameRef+ this.focusInputName(groupNameRef)+ groupNameRef.classList.remove('_error')+ setTimeout(() => { groupNameRef.classList.add('_error') }, 10)return false}@@ -54,15 +48,15 @@ export default {},isSelectedTrn (trnId) {- return this.budgetTrnsIds.includes(trnId)+ return this.groupTrnsIds.includes(trnId)},handleSelectTrn (trnId) {- if (this.budgetTrnsIds.includes(trnId)) {- this.budgetTrnsIds = this.budgetTrnsIds.filter(item => item !== trnId)+ if (this.groupTrnsIds.includes(trnId)) {+ this.groupTrnsIds = this.groupTrnsIds.filter(item => item !== trnId)}else {- this.budgetTrnsIds.push(trnId)+ this.groupTrnsIds.push(trnId)}}}@@ -71,18 +65,18 @@ export default {<template lang="pug">.form- .form__title {{ $lang.budgets.form.title }}- .form__group(ref="budgetNameRef")- .inputText__label {{ $lang.budgets.form.name }}+ .form__title {{ $lang.groups.form.title }}+ .form__group(ref="groupNameRef")+ .inputText__label {{ $lang.groups.form.name }}.inputTextinput.inputText__value(type="text"- :placeholder="`${$lang.budgets.form.name}...`"- v-model="budgetName")+ :placeholder="`${$lang.groups.form.name}...`"+ v-model="groupName")Button(className="_new"- :title="$lang.budgets.form.button"+ :title="$lang.groups.form.button"@onClick="handleCreateGroup")</template>diff --git a/components/groups/BudgetFormTrn.vue b/components/groups/GroupFormTrn.vuesimilarity index 94%rename from components/groups/BudgetFormTrn.vuerename to components/groups/GroupFormTrn.vueindex a6aa15dd..d8a70434 100644--- a/components/groups/BudgetFormTrn.vue+++ b/components/groups/GroupFormTrn.vue@@ -1,14 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/groups/BudgetItem.vue b/components/groups/GroupItem.vuesimilarity index 69%rename from components/groups/BudgetItem.vuerename to components/groups/GroupItem.vueindex 9ec3ef6f..96081968 100644--- a/components/groups/BudgetItem.vue+++ b/components/groups/GroupItem.vue@@ -1,18 +1,10 @@<script>-import Amount from '~/components/amount/Amount'-import TrnItem from '~/components/groups/BudgetItemTrn'-import TrnsList from '~/components/trns/list/TrnsList2'import { formatDate } from '~/utils/formatDate'+import { db } from '~/services/firebaseConfig'export default {- components: {- Amount,- TrnItem,- TrnsList- },-props: {- budget: {+ group: {type: Object,required: true}@@ -26,7 +18,7 @@ export default {computed: {formatedDate () {- return formatDate(this.budget.date, 'number')+ return formatDate(this.group.date, 'number')},totalAmount () {@@ -34,8 +26,8 @@ export default {},trnsIds () {- if (this.budget.trnsIds) {- return Object.keys(this.budget.trnsIds)+ if (this.group.trnsIds) {+ return Object.keys(this.group.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 }@@ -60,11 +52,14 @@ export default {},async mounted () {- if (this.budget.trnsIds) {- for (const trnId of Object.keys(this.budget.trnsIds)) {+ if (this.group.trnsIds) {+ for (const trnId of Object.keys(this.group.trnsIds)) {if (!this.$store.state.trns.items[trnId]) {- console.log('remove', this.budget.id, trnId)- await this.$store.dispatch('groups/removeTrnFromGroup', { groupId: this.budget.id, trnId })+ await this.$store.dispatch('groups/removeTrnFromGroup', { groupId: this.group.id, trnId })+ }++ if (!this.$store.state.trns.items[trnId].groups) {+ db.ref(`users/${this.$store.state.user.user.uid}/trns/${trnId}/groups/${this.group.id}`).set(this.group.id)}}}@@ -81,52 +76,53 @@ export default {</script><template lang="pug">-.budgetItem- .budgetItem__top- .budgetItem__meta- .budgetItem__name {{ budget.name }}- .budgetItem__description(v-if="budget.description") {{ budget.description }}+.groupItem+ .groupItem__top+ .groupItem__meta+ .groupItem__name {{ group.name }}+ .groupItem__description(v-if="group.description") {{ group.description }}//- total- .budgetItem__total+ .groupItem__total.sum._right.sum__title {{ $lang.groups.stat.total }}.sum__amount- Amount(:currency="budget.currency" :value="totalAmount")+ Amount(:currency="group.currency" :value="totalAmount")//- info- .budgetItem__info(@click="isTrnsVisible = !isTrnsVisible")- .budgetItem__amounts+ .groupItem__info(@click="isTrnsVisible = !isTrnsVisible")+ .groupItem__amounts//- expenses.sum.sum__title {{ $lang.groups.stat.expenses }}.sum__amount- Amount(:currency="budget.currency" :type="0" :value="gotAmount.expenses")+ Amount(:currency="group.currency" :type="0" :value="gotAmount.expenses")//- incomes.sum._right.sum__title {{ $lang.groups.stat.incomes }}.sum__amount- Amount(:currency="budget.currency" :type="1" :value="gotAmount.incomes")+ Amount(:currency="group.currency" :type="1" :value="gotAmount.incomes")- .budgetItem__graph: .budgetItem__graph__in(:style="styles")+ .groupItem__graph: .groupItem__graph__in(:style="styles")- .budgetItem__trns(v-if="budget.trnsIds" v-show="isTrnsVisible")- TrnsList(:ids="trnsIds" v-slot="{ trns }")- TrnItem(+ .groupItem__trns(v-if="group.trnsIds" v-show="isTrnsVisible")+ TrnsList2(:ids="trnsIds" v-slot="{ trns }")+ GroupItemTrn(v-for="trnId in trnsIds"@onClick="handleTrnItemClick":category="trns[trnId].category":id="trns[trnId].id":key="trns[trnId].id":trn="trns[trnId].trn"- :wallet="trns[trnId].wallet")+ :wallet="trns[trnId].wallet"+ )</template><style lang="stylus" scoped>@import "~assets/stylus/variables/media"-.budgetItem+.groupItemoverflow hiddenfont-size 14pxbackground var(--c-bg-4)diff --git a/components/groups/BudgetItemTrn.vue b/components/groups/GroupItemTrn.vuesimilarity index 94%rename from components/groups/BudgetItemTrn.vuerename to components/groups/GroupItemTrn.vueindex 51787537..9cf90933 100644--- a/components/groups/BudgetItemTrn.vue+++ b/components/groups/GroupItemTrn.vue@@ -1,14 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/groups/Groups.vue b/components/groups/Groups.vueindex 9a645cc9..5dc464ba 100644--- a/components/groups/Groups.vue+++ b/components/groups/Groups.vue@@ -1,17 +1,5 @@<script>-import BudgetForm from '~/components/groups/BudgetForm'-import BudgetItem from '~/components/groups/BudgetItem'-import Button from '~/components/shared/button/Button'-import ComponentWrap from '~/components/layout/component/Component'-export default {- components: {- BudgetForm,- BudgetItem,- Button,- ComponentWrap- },-data () {return {isShowForm: false@@ -44,14 +32,16 @@ ComponentWrapdiv {{ $lang.groups.name }}template(slot="contentLeft")+ //- pre {{ groups }}.list- BudgetItem(+ GroupItem(v-for="group in groups"- :budget="group"- :key="group.id")+ :group="group"+ :key="group.id"+ )template(slot="contentRight")- BudgetForm+ GroupForm</template><style lang="stylus" scoped>diff --git a/components/lang/LangDropdown.vue b/components/lang/LangDropdown.vueindex 3414017b..95426c4d 100644--- a/components/lang/LangDropdown.vue+++ b/components/lang/LangDropdown.vue@@ -1,15 +1,5 @@<script>-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Dropdown from '~/components/shared/dropdown/Dropdown'-export default {- components: {- ContextMenu,- ContextMenuItem,- Dropdown- },-data () {return {visibleDropdown: falsediff --git a/components/layout/Layout.vue b/components/layout/Layout.vueindex b070c902..80f8bfa5 100644--- a/components/layout/Layout.vue+++ b/components/layout/Layout.vue@@ -1,12 +1,5 @@<script>-import LayoutMobile from '~/components/layout/LayoutMobile'-import LayoutPc from '~/components/layout/LayoutPc'-export default {- components: {- LayoutMobile,- LayoutPc- }}</script>diff --git a/components/layout/LayoutMobile.vue b/components/layout/LayoutMobile.vueindex 52e9b1c3..d6b802c5 100644--- a/components/layout/LayoutMobile.vue+++ b/components/layout/LayoutMobile.vue@@ -2,51 +2,7 @@import Swiper from 'swiper'import 'swiper/css/swiper.min.css'-import Budgets from '~/components/budgets/Budgets'-import Button from '~/components/shared/button/Button'-import CategoriesList from '~/components/categories/list/CategoriesList'-import CategoryForm from '~/components/categories/form/CategoryForm'-import CategoryModal from '~/components/categories/modal/CategoryModal'-import ComponentWrap from '~/components/layout/component/Component'-import CurrencyModal from '~/components/currencies/CurrencyModal'-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 Settings from '~/components/settings/Settings'-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 WalletsSort from '~/components/wallets/sort/WalletsSort'-import WalletsTotal from '~/components/wallets/total/WalletsTotal'-export default {- components: {- Budgets,- Button,- CategoriesList,- CategoryForm,- CategoryModal,- ComponentWrap,- CurrencyModal,- Groups,- LayoutMobileMenu,- LayoutMobileStat,- Menu,- Settings,- TrnForm,- TrnModal,- TrnsList,- WalletForm,- WalletModal,- WalletsList,- WalletsSort,- WalletsTotal- },-data () {return {slider: nulldiff --git a/components/layout/LayoutMobileMenu.vue b/components/layout/LayoutMobileMenu.vueindex 8fa09902..cdf781ac 100644--- a/components/layout/LayoutMobileMenu.vue+++ b/components/layout/LayoutMobileMenu.vue@@ -1,13 +1,5 @@<script>-import Button from '~/components/shared/button/Button'-import PeriodNavMobile from '~/components/layout/PeriodNavMobile'-export default {- components: {- Button,- PeriodNavMobile- },-computed: {activeTab () {return this.$store.state.ui.activeTabdiff --git a/components/layout/LayoutMobileStat.vue b/components/layout/LayoutMobileStat.vueindex 0b0df7b8..2bb591b1 100644--- a/components/layout/LayoutMobileStat.vue+++ b/components/layout/LayoutMobileStat.vue@@ -1,15 +1,5 @@<script>-import StatChartsLine from '~/components/stat/StatChartsLine'-import StatMobile from '~/components/stat/StatMobile'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- StatChartsLine,- StatMobile,- WalletsList- },-methods: {handleShowWalletModal (id) {this.$store.commit('wallets/showWalletModal')@@ -36,7 +26,7 @@ export default {<style lang="stylus" scoped>.layoutStat- height 100%overflow hidden+ height 100%overflow-y auto</style>diff --git a/components/layout/LayoutPc.vue b/components/layout/LayoutPc.vueindex e5ee4e2b..c58e93ad 100644--- a/components/layout/LayoutPc.vue+++ b/components/layout/LayoutPc.vue@@ -1,47 +1,5 @@<script>-import Budgets from '~/components/budgets/Budgets'-import Button from '~/components/shared/button/Button'-import CategoriesList from '~/components/categories/list/CategoriesList'-import CategoryForm from '~/components/categories/form/CategoryForm'-import CategoryModal from '~/components/categories/modal/CategoryModal'-import ComponentWrap from '~/components/layout/component/Component'-import CurrencyModal from '~/components/currencies/CurrencyModal'-import Dashboard from '~/components/dashboard/Dashboard'-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 Settings from '~/components/settings/Settings'-import TrnForm from '~/components/trnForm/TrnForm'-import TrnModal from '~/components/trns/modal/TrnModal'-import WalletForm from '~/components/wallets/form/WalletForm'-import WalletModal from '~/components/wallets/modal/WalletModal'-import WalletsList from '~/components/wallets/list/WalletsList'-import WalletsSort from '~/components/wallets/sort/WalletsSort'-export default {- components: {- Budgets,- Button,- CategoriesList,- CategoryForm,- CategoryModal,- ComponentWrap,- CurrencyModal,- Dashboard,- DashboardNav,- Groups,- LayoutPcSidebar,- LayoutPcTab,- Settings,- TrnForm,- TrnModal,- WalletForm,- WalletModal,- WalletsList,- WalletsSort- },-computed: {activeTab () {return this.$store.state.ui.activeTab@@ -79,12 +37,12 @@ export default {//- Budgets//------------------------------------------------LayoutPcTab(:show="activeTab === 'budgets'")- Budgets+ LazyBudgets(v-if="activeTab === 'budgets'")//- Groups//------------------------------------------------LayoutPcTab(:show="activeTab === 'groups'")- Groups+ LazyGroups(v-if="activeTab === 'groups'")//- categories//------------------------------------------------diff --git a/components/layout/LayoutPcSidebar.vue b/components/layout/LayoutPcSidebar.vueindex 8c05eda2..4309d904 100644--- a/components/layout/LayoutPcSidebar.vue+++ b/components/layout/LayoutPcSidebar.vue@@ -1,19 +1,5 @@<script>-import ContextMenu from '@/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '@/components/shared/contextMenu/ContextMenuItem'-import WalletsList from '@/components/wallets/list/WalletsList'-import WalletsTotal from '@/components/wallets/total/WalletsTotal'-import Menu from '@/components/layout/sidebar/Menu'-export default {- components: {- Menu,- ContextMenu,- ContextMenuItem,- WalletsList,- WalletsTotal- },-data () {return {visibleSettingsMenu: falsediff --git a/components/layout/PeriodNavMobile.vue b/components/layout/PeriodNavMobile.vueindex dab7a2dc..e301090e 100644--- a/components/layout/PeriodNavMobile.vue+++ b/components/layout/PeriodNavMobile.vue@@ -1,19 +1,5 @@<script>-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Date from '~/components/shared/date/Date'-import Dropdown from '~/components/shared/dropdown/Dropdown'-import StatCustomizeMenuMobile from '~/components/stat/StatCustomizeMenuMobile'-export default {- components: {- ContextMenu,- ContextMenuItem,- Date,- Dropdown,- StatCustomizeMenuMobile- },-data () {return {visiblePeriodMenu: falsediff --git a/components/layout/component/Component.vue b/components/layout/component/ComponentWrap.vuesimilarity index 100%rename from components/layout/component/Component.vuerename to components/layout/component/ComponentWrap.vuediff --git a/components/layout/sidebar/Menu.vue b/components/layout/sidebar/Menu.vueindex df02b4e6..7a183bc8 100644--- a/components/layout/sidebar/Menu.vue+++ b/components/layout/sidebar/Menu.vue@@ -1,13 +1,5 @@<script>-import Button from '~/components/shared/button/Button'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- Button,- WalletsList- },-data () {return {menu: {diff --git a/components/login/Login.vue b/components/login/Login.vuedeleted file mode 100644index 74836959..00000000--- a/components/login/Login.vue+++ /dev/null@@ -1,178 +0,0 @@-<script>-import { auth } from 'firebase/app'-import AppName from '~/components/shared/appName/AppName'-import Button from '~/components/shared/button/Button'-import Copyright from '~/components/shared/copyright/Copyright'-import Spiner from '~/components/shared/spiner/Spiner'--export default {- components: {- AppName,- Button,- Copyright,- Spiner- },-- data () {- return {- loading: false- }- },-- methods: {- signInWithGoogle () {- this.loading = true- const provider = new auth.GoogleAuthProvider()- auth()- .signInWithRedirect(provider)- .catch(e => this.notifyAboutError(e))- },-- notifyAboutError (e) {- this.$notify({- duration: 6000,- text: e.message,- title: 'Error',- type: 'error'- })- this.loading = false- },-- changeLang (lang) {- this.$store.dispatch('lang/setLang', lang)- this.$setLang(lang)- }- }-}-</script>--<template lang="pug">-.tab- .tab__top- .langChanger- .langChanger__item(- @click="changeLang('ru')"- :class="{ _active: $store.state.lang.lang === 'ru' }"- ) RU- .langChanger__item(- @click="changeLang('en')"- :class="{ _active: $store.state.lang.lang === 'en' }"- ) EN-- .themeChanger(@click="$store.dispatch('ui/changeTheme')") {{ $lang.changeTheme }}-- .tab__content- AppName- Copyright-- .tab__bottom- .loginButton(- :class="{ _loading: loading }"- @click.prevent="signInWithGoogle"- )- transition(name="fadeIn")- .loginButton__spiner(v-if="loading"): Spiner- .loginButton__text {{ $lang.loginWithGoogle }}-</template>--<style lang="stylus" scoped>-@import "~assets/stylus/variables/animations"-@import "~assets/stylus/variables/fonts"-@import "~assets/stylus/variables/margins"-@import "~assets/stylus/variables/media"-@import "~assets/stylus/variables/scroll"--.tab- overflow-x hidden- overflow-y scroll- position relative- display grid- grid-template-rows auto 1fr auto- scrollbar()- width 100%- height 100%- max-width 1000px- margin 0 auto-- &__content- display flex- align-items center- justify-content center- flex-flow column- padding-top 100px-- &__bottom- display flex- align-items center- justify-content center- padding $mn1-- @media $media-laptop- padding $mb2--.langChanger- position absolute- top $m7- left $m7- display flex-- @media $media-laptop- top $mn1- left $m9-- &__item- cursor pointer- opacity .6- padding 10px- color var(--c-font-4)-- &._active- color var(--c-font-1)--.themeChanger- cursor pointer- position absolute- top $m7- right $m7- padding 10px-- @media $media-laptop- top $mn1- right $m9--.loginButton- overflow hidden- cursor pointer- position relative- min-width 260px- padding $m8 $mb1- color var(--c-font-1)- font-size 16px- text-align center- background #0094FF- border-radius 36px- anim()-- &:hover- background #067ab4-- &._loading- cursor default-- &__text- font-weight 300- anim()-- ^[0]._loading &- opacity 0-- &__spiner- position absolute- top 0- left 0- display flex- align-items center- justify-content center- width 100%- height 100%-</style>diff --git a/components/modal/ModalBottomConfirm.vue b/components/modal/ModalBottomConfirm.vueindex c672cc65..0027a31a 100644--- a/components/modal/ModalBottomConfirm.vue+++ b/components/modal/ModalBottomConfirm.vue@@ -1,13 +1,5 @@<script>-import ModalBottom from '~/components/modal/ModalBottom'-import ModalButton from '~/components/modal/ModalButton'-export default {- components: {- ModalBottom,- ModalButton- },-props: {description: {type: String,diff --git a/components/modal/ModalButton.vue b/components/modal/ModalButton.vueindex 59988d6b..203489e4 100644--- a/components/modal/ModalButton.vue+++ b/components/modal/ModalButton.vue@@ -1,11 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-export default {- components: {- Icon- },-props: {icon: {type: String,diff --git a/components/settings/Settings.vue b/components/settings/Settings.vueindex 87a9fb53..a312ca59 100644--- a/components/settings/Settings.vue+++ b/components/settings/Settings.vue@@ -1,18 +1,7 @@<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'-import LangDropdown from '~/components/lang/LangDropdown'export default {- components: {- Button,- ComponentWrap,- ModalBottomConfirm,- LangDropdown- },-data () {return {confirmCreateDemo: false,diff --git a/components/shared/button/Button.vue b/components/shared/button/Button.vueindex bac06b2d..ca90d26d 100644--- a/components/shared/button/Button.vue+++ b/components/shared/button/Button.vue@@ -1,13 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-import Checkbox from '~/components/shared/inputs/Checkbox'-export default {- components: {- Icon,- Checkbox- },-props: {background: {type: String,diff --git a/components/shared/contextMenu/ContextMenu.vue b/components/shared/contextMenu/ContextMenu.vueindex eaa147ba..f951c58d 100644--- a/components/shared/contextMenu/ContextMenu.vue+++ b/components/shared/contextMenu/ContextMenu.vue@@ -1,11 +1,5 @@<script>-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-export default {- components: {- ContextMenuItem- },-props: {visible: {type: Boolean,diff --git a/components/shared/contextMenu/ContextMenuItem.vue b/components/shared/contextMenu/ContextMenuItem.vueindex 3053f41c..0f29b50f 100644--- a/components/shared/contextMenu/ContextMenuItem.vue+++ b/components/shared/contextMenu/ContextMenuItem.vue@@ -1,11 +1,5 @@<script>-import Checkbox from '~/components/shared/inputs/Checkbox'-export default {- components: {- Checkbox- },-props: {icon: {type: String,diff --git a/components/shared/loader/Loader.vue b/components/shared/loader/Loader.vueindex 1f80a8a4..a840345f 100644--- a/components/shared/loader/Loader.vue+++ b/components/shared/loader/Loader.vue@@ -1,12 +1,5 @@<script>-import AppName from '~/components/shared/appName/AppName'-import Spiner from '~/components/shared/spiner/Spiner'-export default {- components: {- AppName,- Spiner- }}</script>diff --git a/components/stat/StatChartDonut.vue b/components/stat/StatChartDonut.vueindex fe4211bc..c9245c9b 100644--- a/components/stat/StatChartDonut.vue+++ b/components/stat/StatChartDonut.vue@@ -2,16 +2,10 @@import dayjs from 'dayjs'import { Chart } from 'highcharts-vue'import chartOptions from './chartOptions'-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Dropdown from '~/components/shared/dropdown/Dropdown'export default {components: {- Chart,- ContextMenu,- ContextMenuItem,- Dropdown+ Chart},data () {diff --git a/components/stat/StatChartsLine.vue b/components/stat/StatChartsLine.vueindex 918133c9..e6b979f7 100644--- a/components/stat/StatChartsLine.vue+++ b/components/stat/StatChartsLine.vue@@ -1,19 +1,7 @@<script>import dayjs from 'dayjs'-import Amount from '~/components/amount/Amount'-import ChartItem from '~/components/stat/chart/ChartItem'-import ChartMenu from '~/components/stat/chart/ChartMenu'-import ChartPopup from '~/components/stat/chart/ChartPopup'-export default {- components: {- Amount,- ChartItem,- ChartMenu,- ChartPopup- },-computed: {periods () {return this.$store.state.chart.periodsdiff --git a/components/stat/StatCustomizeMenuMobile.vue b/components/stat/StatCustomizeMenuMobile.vueindex a95cb664..0c510789 100644--- a/components/stat/StatCustomizeMenuMobile.vue+++ b/components/stat/StatCustomizeMenuMobile.vue@@ -1,17 +1,5 @@<script>-import Button from '~/components/shared/button/Button'-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Dropdown from '~/components/shared/dropdown/Dropdown'-export default {- components: {- Button,- ContextMenu,- ContextMenuItem,- Dropdown- },-props: {icon: {type: String,diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vueindex a9bee549..e3f665be 100644--- a/components/stat/StatItem.vue+++ b/components/stat/StatItem.vue@@ -1,17 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-import TrnsList from '~/components/trns/list/TrnsList'-import StatItemChildCats from '~/components/stat/StatItemChildCats'-export default {- components: {- Amount,- Icon,- StatItemChildCats,- TrnsList- },-props: {category: {type: Object,diff --git a/components/stat/StatItemChildCats.vue b/components/stat/StatItemChildCats.vueindex 8fab5d65..fd0c5649 100644--- a/components/stat/StatItemChildCats.vue+++ b/components/stat/StatItemChildCats.vue@@ -1,12 +1,6 @@<script>-import StatItemChildCatsItem from '~/components/stat/StatItemChildCatsItem'-export default {- components: {- StatItemChildCatsItem- },-props: {categoryId: {type: String,diff --git a/components/stat/StatItemChildCatsItem.vue b/components/stat/StatItemChildCatsItem.vueindex da4449f5..5e31c9a0 100644--- a/components/stat/StatItemChildCatsItem.vue+++ b/components/stat/StatItemChildCatsItem.vue@@ -1,17 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-import TrnsList from '~/components/trns/list/TrnsList'-import StatItemChildCats from '~/components/stat/StatItemChildCats'-export default {- components: {- Amount,- Icon,- StatItemChildCats,- TrnsList- },-props: {category: {type: Object,diff --git a/components/stat/StatMobile.vue b/components/stat/StatMobile.vueindex 49e1ccc9..a2994970 100644--- a/components/stat/StatMobile.vue+++ b/components/stat/StatMobile.vue@@ -1,29 +1,5 @@<script>-import Button from '~/components/shared/button/Button'-import Amount from '~/components/amount/Amount'-import EmptyData from '~/components/shared/emptyData/EmptyData'-import FilterItem from '~/components/filter/FilterItem'-import Icon from '~/components/icon/Icon'-import PeriodCatsChart from '~/components/stat/cats/PeriodCatsChart'-import StatCustomizeMenuMobile from '~/components/stat/StatCustomizeMenuMobile'-import StatItem from '~/components/stat/StatItem'-import StatSummaryMobile from '~/components/stat/StatSummaryMobile'-import TrnsList from '~/components/trns/list/TrnsList'-export default {- components: {- Button,- Amount,- EmptyData,- FilterItem,- Icon,- PeriodCatsChart,- StatCustomizeMenuMobile,- StatItem,- StatSummaryMobile,- TrnsList- },-computed: {activeTabStat () {return this.$store.state.ui.stat.activeTab@@ -38,12 +14,15 @@ export default {this.statCurrentPeriod.expenses.categoriesIds.length === 0 &&this.$store.getters['trns/selectedTrnsIdsWithDate'].length === 0},+filterCategory () {return this.$store.state.categories.items[this.$store.state.filter.categoryId]},+filterCategoryParent () {return this.$store.state.categories.items[this.filterCategory.parentId]},+filterWallet () {return this.$store.state.wallets.items[this.$store.state.filter.walletId]}@@ -54,9 +33,11 @@ export default {const nextCategory = this.filterCategory.parentId !== 0 ? this.filterCategory.parentId : nullthis.$store.dispatch('filter/setFilterCategoryId', nextCategory)},+clearParentCategoryFilter () {this.$store.dispatch('filter/setFilterCategoryId', null)},+clearWalletFilter () {this.$store.dispatch('filter/setFilterWalletId', null)}diff --git a/components/stat/StatPc.vue b/components/stat/StatPc.vueindex a7fc5fbb..f8c713ef 100644--- a/components/stat/StatPc.vue+++ b/components/stat/StatPc.vue@@ -1,13 +1,5 @@<script>-import StatItem from '~/components/stat/StatItem'-import PeriodCatsChart from '~/components/stat/cats/PeriodCatsChart'-export default {- components: {- PeriodCatsChart,- StatItem- },-computed: {statCurrentPeriod () {return this.$store.getters['stat/statCurrentPeriod']diff --git a/components/stat/StatSummaryMobile.vue b/components/stat/StatSummaryMobile.vueindex 09128baa..1aab368a 100644--- a/components/stat/StatSummaryMobile.vue+++ b/components/stat/StatSummaryMobile.vue@@ -1,11 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-export default {- components: {- Amount- },-computed: {stat () {return this.$store.getters['stat/statCurrentPeriod']diff --git a/components/stat/StatSummaryPc.vue b/components/stat/StatSummaryPc.vueindex 2e8dcc9f..f94ee381 100644--- a/components/stat/StatSummaryPc.vue+++ b/components/stat/StatSummaryPc.vue@@ -1,18 +1,14 @@<script>-import Amount from '~/components/amount/Amount'-export default {- components: {- Amount- },-computed: {statCurrentPeriod () {return this.$store.getters['stat/statCurrentPeriod']},+statAverage () {return this.$store.getters['stat/statAverage']},+period () {return this.$store.state.filter.period}diff --git a/components/stat/cats/PeriodCatsChart.vue b/components/stat/cats/PeriodCatsChart.vueindex be1e698d..2fb13a6d 100644--- a/components/stat/cats/PeriodCatsChart.vue+++ b/components/stat/cats/PeriodCatsChart.vue@@ -1,13 +1,5 @@<script>-import PeriodCatsChartItem from '~/components/stat/cats/PeriodCatsChartItem'-import PeriodCatsChartPopup from '~/components/stat/cats/PeriodCatsChartPopup'-export default {- components: {- PeriodCatsChartItem,- PeriodCatsChartPopup- },-props: {type: {type: String,diff --git a/components/stat/cats/PeriodCatsChartItem.vue b/components/stat/cats/PeriodCatsChartItem.vueindex 7df2beaa..3b537e01 100644--- a/components/stat/cats/PeriodCatsChartItem.vue+++ b/components/stat/cats/PeriodCatsChartItem.vue@@ -1,13 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/stat/cats/PeriodCatsChartPopup.vue b/components/stat/cats/PeriodCatsChartPopup.vueindex fdc9ad50..3e9e85ae 100644--- a/components/stat/cats/PeriodCatsChartPopup.vue+++ b/components/stat/cats/PeriodCatsChartPopup.vue@@ -1,11 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-export default {- components: {- Amount- },-props: {categoryId: {type: String,@@ -26,11 +20,14 @@ export default {if (this.$store.getters['stat/statCurrentPeriod'].categories[this.categoryId]) {return this.$store.getters['stat/statCurrentPeriod'].categories[this.categoryId][this.type]}+ return null},+categoryName () {if (this.$store.state.categories.items[this.categoryId]) {return this.$store.state.categories.items[this.categoryId].name}+ return null}}}diff --git a/components/stat/chart/ChartMenu.vue b/components/stat/chart/ChartMenu.vueindex 92a272ae..b5feaf24 100644--- a/components/stat/chart/ChartMenu.vue+++ b/components/stat/chart/ChartMenu.vue@@ -1,16 +1,7 @@<script>import localforage from 'localforage'-import ContextMenu from '~/components/shared/contextMenu/ContextMenu'-import ContextMenuItem from '~/components/shared/contextMenu/ContextMenuItem'-import Dropdown from '~/components/shared/dropdown/Dropdown'export default {- components: {- ContextMenu,- ContextMenuItem,- Dropdown- },-props: {showDropdown: {type: Boolean,diff --git a/components/stat/chart/ChartPopup.vue b/components/stat/chart/ChartPopup.vueindex f884319a..815d50f4 100644--- a/components/stat/chart/ChartPopup.vue+++ b/components/stat/chart/ChartPopup.vue@@ -1,10 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-export default {- components: {- Amount- }}</script>diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vueindex 55ac824b..3dedc3ca 100644--- a/components/trnForm/TrnForm.vue+++ b/components/trnForm/TrnForm.vue@@ -3,45 +3,7 @@ import dayjs from 'dayjs'import generateId from '~/utils/id'import { successEmo, random } from '~/assets/js/emo'-import Amount from '~/components/amount/Amount'-import CategoriesView from '~/components/categories/list/CategoriesView'-import Icon from '~/components/icon/Icon'-import TrnFormAmount from '~/components/trnForm/TrnFormAmount'-import TrnFormAmountInput from '~/components/trnForm/TrnFormAmountInput'-import TrnFormCalculator from '~/components/trnForm/TrnFormCalculator'-import TrnFormCalendar from '~/components/trnForm/TrnFormCalendar'-import TrnFormHeader from '~/components/trnForm/TrnFormHeader'-import TrnFormHeaderTransfer from '~/components/trnForm/TrnFormHeaderTransfer'-import TrnFormModalCalendar from '~/components/trnForm/TrnFormModalCalendar'-import TrnFormModalCats from '~/components/trnForm/TrnFormModalCats'-import TrnFormModalCatsChild from '~/components/trnForm/TrnFormModalCatsChild'-import TrnFormModalDescription from '~/components/trnForm/TrnFormModalDescription'-import TrnFormModalTransferFrom from '~/components/trnForm/TrnFormModalTransferFrom'-import TrnFormModalTransferTo from '~/components/trnForm/TrnFormModalTransferTo'-import TrnFormModalWallets from '~/components/trnForm/TrnFormModalWallets'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- Amount,- CategoriesView,- Icon,- TrnFormAmount,- TrnFormAmountInput,- TrnFormCalculator,- TrnFormCalendar,- TrnFormHeader,- TrnFormHeaderTransfer,- TrnFormModalCalendar,- TrnFormModalCats,- TrnFormModalCatsChild,- TrnFormModalDescription,- TrnFormModalTransferFrom,- TrnFormModalTransferTo,- TrnFormModalWallets,- WalletsList- },-data () {return {initialY: 0,diff --git a/components/trnForm/TrnFormAmountInput.vue b/components/trnForm/TrnFormAmountInput.vueindex 6ecfc164..23ceafb4 100644--- a/components/trnForm/TrnFormAmountInput.vue+++ b/components/trnForm/TrnFormAmountInput.vue@@ -1,14 +1,9 @@<script>import { evaluate } from 'mathjs'-import Button from '~/components/shared/button/Button'export default {name: 'TrnFormAmountInput',- components: {- Button- },-computed: {amountString () {return this.$store.state.trnForm.values.amountdiff --git a/components/trnForm/TrnFormHeader.vue b/components/trnForm/TrnFormHeader.vueindex 26ccd51a..14beaa2f 100644--- a/components/trnForm/TrnFormHeader.vue+++ b/components/trnForm/TrnFormHeader.vue@@ -1,13 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-export default {- components: {- Amount,- Icon- },-computed: {category () {const categoryId = this.$store.state.trnForm.values.categoryIddiff --git a/components/trnForm/TrnFormHeaderTransfer.vue b/components/trnForm/TrnFormHeaderTransfer.vueindex 64b01499..681a101b 100644--- a/components/trnForm/TrnFormHeaderTransfer.vue+++ b/components/trnForm/TrnFormHeaderTransfer.vue@@ -1,11 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-export default {- components: {- Amount- },-computed: {walletFromId () {return this.$store.state.trnForm.transfer.from || this.$store.getters['wallets/walletsSortedIds'][0]diff --git a/components/trnForm/TrnFormModalCalendar.vue b/components/trnForm/TrnFormModalCalendar.vueindex 58d0b9d1..f134e34b 100644--- a/components/trnForm/TrnFormModalCalendar.vue+++ b/components/trnForm/TrnFormModalCalendar.vue@@ -2,8 +2,6 @@import dayjs from 'dayjs'import Datepicker from 'vuejs-datepicker'-import ModalButton from '~/components/modal/ModalButton'-import TrnFormModal from '~/components/trnForm/TrnFormModal'const calendarOptions = {'use-utc': true,@@ -14,9 +12,7 @@ const calendarOptions = {export default {components: {- Datepicker,- ModalButton,- TrnFormModal+ Datepicker},computed: {diff --git a/components/trnForm/TrnFormModalCats.vue b/components/trnForm/TrnFormModalCats.vueindex 94c1b08c..54123ba1 100644--- a/components/trnForm/TrnFormModalCats.vue+++ b/components/trnForm/TrnFormModalCats.vue@@ -1,17 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-import CategoriesView from '~/components/categories/list/CategoriesView'-import TrnFormModal from '~/components/trnForm/TrnFormModal'-import Slider from '~/components/slider/Slider'-export default {- components: {- Icon,- CategoriesView,- TrnFormModal,- Slider- },-methods: {handleCategoryClick (categoryId) {if (this.$store.getters['categories/getChildCategoriesIds'](categoryId).length > 0) {@@ -29,7 +17,7 @@ export default {</script><template lang="pug">-TrnFormModal(+LazyTrnFormModal(v-if="$store.state.trnForm.modal.categories":show="$store.state.trnForm.modal.categories":title="$lang.categories.name"diff --git a/components/trnForm/TrnFormModalCatsChild.vue b/components/trnForm/TrnFormModalCatsChild.vueindex 846d04b2..3eca1f9d 100644--- a/components/trnForm/TrnFormModalCatsChild.vue+++ b/components/trnForm/TrnFormModalCatsChild.vue@@ -1,15 +1,5 @@<script>-import CategoriesView from '~/components/categories/list/CategoriesView'-import Icon from '~/components/icon/Icon'-import TrnFormModal from '~/components/trnForm/TrnFormModal'-export default {- components: {- Icon,- CategoriesView,- TrnFormModal- },-computed: {id () {return this.$store.state.trnForm.showModalCategoryIddiff --git a/components/trnForm/TrnFormModalDescription.vue b/components/trnForm/TrnFormModalDescription.vueindex 0751d0cc..874c79ba 100644--- a/components/trnForm/TrnFormModalDescription.vue+++ b/components/trnForm/TrnFormModalDescription.vue@@ -1,15 +1,7 @@<script>import { focus } from 'vue-focus'-import Button from '~/components/shared/button/Button'-import TrnFormModal from '~/components/trnForm/TrnFormModal'-export default {- components: {- Button,- TrnFormModal- },-directives: { focus },data () {diff --git a/components/trnForm/TrnFormModalTransferFrom.vue b/components/trnForm/TrnFormModalTransferFrom.vueindex fb67a5b0..1dc9d28b 100644--- a/components/trnForm/TrnFormModalTransferFrom.vue+++ b/components/trnForm/TrnFormModalTransferFrom.vue@@ -1,13 +1,5 @@<script>-import TrnFormModal from '~/components/trnForm/TrnFormModal'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- TrnFormModal,- WalletsList- },-methods: {handleSetWallet (walletId) {this.$store.commit('trnForm/toogleTrnFormModal', 'transferFrom')diff --git a/components/trnForm/TrnFormModalTransferTo.vue b/components/trnForm/TrnFormModalTransferTo.vueindex f93ef90b..681cb14e 100644--- a/components/trnForm/TrnFormModalTransferTo.vue+++ b/components/trnForm/TrnFormModalTransferTo.vue@@ -1,13 +1,5 @@<script>-import TrnFormModal from '~/components/trnForm/TrnFormModal'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- TrnFormModal,- WalletsList- },-methods: {handleSetWallet (walletId) {this.$store.commit('trnForm/toogleTrnFormModal', 'transferTo')diff --git a/components/trnForm/TrnFormModalWallets.vue b/components/trnForm/TrnFormModalWallets.vueindex 74d65340..0ad3c4e6 100644--- a/components/trnForm/TrnFormModalWallets.vue+++ b/components/trnForm/TrnFormModalWallets.vue@@ -1,15 +1,5 @@<script>-import Icon from '~/components/icon/Icon'-import TrnFormModal from '~/components/trnForm/TrnFormModal'-import WalletsList from '~/components/wallets/list/WalletsList'-export default {- components: {- Icon,- TrnFormModal,- WalletsList- },-methods: {handleSetWallet (walletId) {this.$store.commit('trnForm/toogleTrnFormModal', 'wallets')diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vueindex 229b6844..a7b7fd83 100644--- a/components/trns/item/TrnItem.vue+++ b/components/trns/item/TrnItem.vue@@ -1,14 +1,7 @@<script>import { formatDate } from '~/utils/formatDate'-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {- components: {- Amount,- Icon- },-props: {category: {type: Object,diff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vueindex 00e7446d..ad24668e 100644--- a/components/trns/list/TrnsList.vue+++ b/components/trns/list/TrnsList.vue@@ -1,17 +1,7 @@<script>import dayjs from 'dayjs'-import Button from '~/components/shared/button/Button'-import TrnItem from '~/components/trns/item/TrnItem'-import TrnsListDate from '~/components/trns/list/TrnsListDate'-export default {- components: {- Button,- TrnItem,- TrnsListDate- },-props: {ui: {type: String,diff --git a/components/trns/modal/TrnModal.vue b/components/trns/modal/TrnModal.vueindex 4874b9b6..9a03da1f 100644--- a/components/trns/modal/TrnModal.vue+++ b/components/trns/modal/TrnModal.vue@@ -1,21 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import ModalBottom from '~/components/modal/ModalBottom'-import ModalBottomConfirm from '~/components/modal/ModalBottomConfirm'-import ModalButton from '~/components/modal/ModalButton'-import TrnItem from '~/components/trns/item/TrnItem'-import Button from '~/components/shared/button/Button'-export default {- components: {- Amount,- Button,- ModalBottom,- ModalBottomConfirm,- ModalButton,- TrnItem- },-data () {return {showModalConfirm: false,diff --git a/components/wallets/form/WalletForm.vue b/components/wallets/form/WalletForm.vueindex baa44532..d045f364 100644--- a/components/wallets/form/WalletForm.vue+++ b/components/wallets/form/WalletForm.vue@@ -3,19 +3,7 @@ import { focus } from 'vue-focus'import generateId from '~/utils/id'import colors from '~/assets/js/colors'-import Button from '~/components/shared/button/Button'-import Checkbox from '~/components/shared/inputs/Checkbox'-import ComponentWrap from '~/components/layout/component/Component'-import ModalBottom from '~/components/modal/ModalBottom'-export default {- components: {- Button,- Checkbox,- ComponentWrap,- ModalBottom- },-directives: { focus },data () {diff --git a/components/wallets/item/WalletItem.vue b/components/wallets/item/WalletItem.vueindex 08b162f7..11c90319 100644--- a/components/wallets/item/WalletItem.vue+++ b/components/wallets/item/WalletItem.vue@@ -1,10 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-export default {- components: { Amount, Icon },-props: {ui: {type: String,diff --git a/components/wallets/list/WalletsList.vue b/components/wallets/list/WalletsList.vueindex 7d9b376b..d3c2ba9b 100644--- a/components/wallets/list/WalletsList.vue+++ b/components/wallets/list/WalletsList.vue@@ -1,11 +1,6 @@<script>-import WalletItem from '~/components/wallets/item/WalletItem'export default {- components: {- WalletItem- },-props: {ui: {type: String,diff --git a/components/wallets/modal/WalletModal.vue b/components/wallets/modal/WalletModal.vueindex 1d5ec094..7953dc16 100644--- a/components/wallets/modal/WalletModal.vue+++ b/components/wallets/modal/WalletModal.vue@@ -1,19 +1,7 @@<script>import { db } from '~/services/firebaseConfig'-import ModalBottom from '~/components/modal/ModalBottom'-import ModalBottomConfirm from '~/components/modal/ModalBottomConfirm'-import ModalButton from '~/components/modal/ModalButton'-import WalletItem from '~/components/wallets/item/WalletItem'-export default {- components: {- ModalBottom,- ModalBottomConfirm,- ModalButton,- WalletItem- },-data () {return {showModalConfirm: falsediff --git a/components/wallets/sort/WalletsSort.vue b/components/wallets/sort/WalletsSort.vueindex f8012fea..b038219e 100644--- a/components/wallets/sort/WalletsSort.vue+++ b/components/wallets/sort/WalletsSort.vue@@ -1,22 +1,9 @@<script>import draggable from 'vuedraggable'-import Button from '~/components/shared/button/Button'-import ComponentWrap from '~/components/layout/component/Component'-import WalletsList from '~/components/wallets/list/WalletsList2'-import WalletsTotal from '~/components/wallets/total/WalletsTotal'--import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'export default {components: {- Amount,- draggable,- Button,- Icon,- ComponentWrap,- WalletsList,- WalletsTotal+ draggable},data () {diff --git a/components/wallets/total/WalletsTotal.vue b/components/wallets/total/WalletsTotal.vueindex 70c5ab28..1d0f42be 100644--- a/components/wallets/total/WalletsTotal.vue+++ b/components/wallets/total/WalletsTotal.vue@@ -1,10 +1,5 @@<script>-import Amount from '~/components/amount/Amount'-import Icon from '~/components/icon/Icon'-export default {- components: { Amount, Icon },-computed: {totalInWallets () {const walletsItems = this.$store.state.wallets.itemsdiff --git a/layouts/default.vue b/layouts/default.vueindex 78770618..65d52476 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -1,17 +1,9 @@<script>import debounce from '~/utils/debounce'-import Loader from '~/components/shared/loader/Loader'-import Metrica from '~/components/Metrica'-export default {name: 'DefaultLayout',- components: {- Loader,- Metrica- },-async fetch () {try {await this.$store.dispatch('app/initApp')@@ -78,17 +70,10 @@ export default {template(v-if="!$fetchState.pending && $store.state.app.status.ready")Nuxt- //- //- app- //- transition(name="fadeInSlow")- //- template(v-if="$store.state.app.status.ready")- //- template(v-if="$store.getters.hasWallets && $store.getters.hasCategories")- //- Layout- //- Welcome(v-else)-- //- notifications+ //- NotificationsNotifications(:position="$store.state.ui.mobile ? 'top center' : 'top left'"- :width="$store.state.ui.mobile ? '94%' : '380px'"+ :width="$store.state.ui.mobile ? '94%' : '380px'"classes="notifications")diff --git a/locales/en.json b/locales/en.jsonindex 0ea41530..329b3665 100644--- a/locales/en.json+++ b/locales/en.json@@ -225,13 +225,13 @@"id": "groups","name": "Groups","form": {- "title": "Create new budget",- "name": "Budget name",- "amount": "Budget amount",+ "title": "Create new group",+ "name": "Group name",+ "amount": "Group amount","button": "Create"},"trns": {- "name": "Budget transactions"+ "name": "Group transactions"},"stat": {"expenses": "Epenses",diff --git a/locales/ru.json b/locales/ru.jsonindex 5a4eb868..b96fccb3 100644--- a/locales/ru.json+++ b/locales/ru.json@@ -224,13 +224,13 @@"id": "groups","name": "Группы","form": {- "title": "Create new budget",- "name": "Budget name",- "amount": "Budget amount",+ "title": "Create new group",+ "name": "Group name",+ "amount": "Group amount","button": "Create"},"trns": {- "name": "Budget transactions"+ "name": "Group transactions"},"stat": {"expenses": "Рассход",diff --git a/nuxt.config.js b/nuxt.config.jsindex 9ba06df2..e091f1fa 100644--- a/nuxt.config.js+++ b/nuxt.config.js@@ -39,6 +39,12 @@ export default {{ src: '~/assets/stylus/index.styl' }],+ /**+ * Auto import components+ * See https://nuxtjs.org/api/configuration-components+ */+ components: true,+/*** Plugins to load before mounting the App* https://nuxtjs.org/guide/pluginsdiff --git a/package.json b/package.jsonindex 8c17db07..b1e6acd3 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.0.4",+ "version": "3.0.5","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt","build": "nuxt build --modern",diff --git a/pages/index.vue b/pages/index.vueindex cb9e9270..3bb8db3d 100644--- a/pages/index.vue+++ b/pages/index.vue@@ -1,12 +1,6 @@<script>-import Layout from '~/components/layout/Layout'-export default {- name: 'IndexPage',-- components: {- Layout- }+ name: 'IndexPage'}</script>diff --git a/pages/login.vue b/pages/login.vueindex 51978308..15ea8ddd 100644--- a/pages/login.vue+++ b/pages/login.vue@@ -1,19 +1,169 @@<script>-import Login from '~/components/login/Login'+import { auth } from 'firebase/app'export default {name: 'LoginPage',- components: {- Login+ data () {+ return {+ loading: false+ }+ },++ methods: {+ signInWithGoogle () {+ this.loading = true+ const provider = new auth.GoogleAuthProvider()+ auth()+ .signInWithRedirect(provider)+ .catch(e => this.notifyAboutError(e))+ },++ notifyAboutError (e) {+ this.$notify({+ duration: 6000,+ text: e.message,+ title: 'Error',+ type: 'error'+ })+ this.loading = false+ },++ changeLang (lang) {+ this.$store.dispatch('lang/setLang', lang)+ this.$setLang(lang)+ }}}</script><template lang="pug">-Login+.tab+ .tab__top+ .langChanger+ .langChanger__item(+ @click="changeLang('ru')"+ :class="{ _active: $store.state.lang.lang === 'ru' }"+ ) RU+ .langChanger__item(+ @click="changeLang('en')"+ :class="{ _active: $store.state.lang.lang === 'en' }"+ ) EN++ .themeChanger(@click="$store.dispatch('ui/changeTheme')") {{ $lang.changeTheme }}++ .tab__content+ AppName+ Copyright++ .tab__bottom+ .loginButton(+ :class="{ _loading: loading }"+ @click.prevent="signInWithGoogle"+ )+ transition(name="fadeIn")+ .loginButton__spiner(v-if="loading"): Spiner+ .loginButton__text {{ $lang.loginWithGoogle }}</template><style lang="stylus" scoped>-// styles here+@import "~assets/stylus/variables/animations"+@import "~assets/stylus/variables/fonts"+@import "~assets/stylus/variables/margins"+@import "~assets/stylus/variables/media"+@import "~assets/stylus/variables/scroll"++.tab+ overflow-x hidden+ overflow-y scroll+ position relative+ display grid+ grid-template-rows auto 1fr auto+ scrollbar()+ width 100%+ height 100%+ max-width 1000px+ margin 0 auto++ &__content+ display flex+ align-items center+ justify-content center+ flex-flow column+ padding-top 100px++ &__bottom+ display flex+ align-items center+ justify-content center+ padding $mn1++ @media $media-laptop+ padding $mb2++.langChanger+ position absolute+ top $m7+ left $m7+ display flex++ @media $media-laptop+ top $mn1+ left $m9++ &__item+ cursor pointer+ opacity .6+ padding 10px+ color var(--c-font-4)++ &._active+ color var(--c-font-1)++.themeChanger+ cursor pointer+ position absolute+ top $m7+ right $m7+ padding 10px++ @media $media-laptop+ top $mn1+ right $m9++.loginButton+ overflow hidden+ cursor pointer+ position relative+ min-width 260px+ padding $m8 $mb1+ color var(--c-font-1)+ font-size 16px+ text-align center+ background #0094FF+ border-radius 36px+ anim()++ &:hover+ background #067ab4++ &._loading+ cursor default++ &__text+ font-weight 300+ anim()++ ^[0]._loading &+ opacity 0++ &__spiner+ position absolute+ top 0+ left 0+ display flex+ align-items center+ justify-content center+ width 100%+ height 100%</style>diff --git a/pages/users.vue b/pages/users.vueindex 7dd8d012..9b6f23ca 100644--- a/pages/users.vue+++ b/pages/users.vue@@ -1,12 +1,7 @@<script>import { db } from '~/services/firebaseConfig'-import Button from '~/components/shared/button/Button'export default {- components: {- Button- },-data () {return {users: null,@@ -71,8 +66,6 @@ export default {await this.$store.dispatch('categories/initCategories', null, { root: true })await this.$store.dispatch('wallets/initWallets', null, { root: true })await this.$store.dispatch('trns/initTrns', null, { root: true })- await this.$store.dispatch('groups/initGroups', null, { root: true })- await this.$store.dispatch('budgets/initBudgets', null, { root: true })await this.$store.dispatch('lang/initDbLang', null, { root: true })this.$router.push('/')@@ -165,6 +158,7 @@ export default {</template><style lang="stylus" scoped>+@import "~assets/stylus/variables/fonts"@import "~assets/stylus/variables/media"@import "~assets/stylus/variables/scroll"diff --git a/store/groups/actions.js b/store/groups/actions.jsindex 245d2d10..2e3d1fe5 100644--- a/store/groups/actions.js+++ b/store/groups/actions.js@@ -61,7 +61,6 @@ export default {const uid = rootGetters['user/userUid']// remove from group- console.log(`users/${uid}/groups/${groupId}/trnsIds/${trnId}`)db.ref(`users/${uid}/groups/${groupId}/trnsIds/${trnId}`).set(null).then(() => { return true })diff --git a/store/trns/actions.js b/store/trns/actions.jsindex 5bdc54f8..3a10654a 100644--- a/store/trns/actions.js+++ b/store/trns/actions.js@@ -94,6 +94,7 @@ export default {description: trn.description || null,edited: dayjs().valueOf(),groups: trn.groups || null,+ budgets: trn.budgets || null,type: Number(trn.type),walletId: trn.accountId || trn.walletId})