Open source personal finance application
update 3.30.2
ilkome0df774a641cf
diff --git a/assets/css/tailwind.css b/assets/css/tailwind.cssindex b5c61c95..e6661a11 100644--- a/assets/css/tailwind.css+++ b/assets/css/tailwind.css@@ -1,3 +1,27 @@@tailwind base;@tailwind components;@tailwind utilities;++* {+ -webkit-tap-highlight-color: transparent+}++*:focus {+ outline: 0+}++html,+body {+ overscroll-behavior-y: none+}++body {+ background: #171717+}++html,+body,+#__nuxt,+#__layout {+ height: 100%+}diff --git a/assets/stylus/colors-dark.styl b/assets/stylus/colors-dark.stylindex c184b652..239a14d4 100644--- a/assets/stylus/colors-dark.styl+++ b/assets/stylus/colors-dark.styl@@ -1,15 +1,15 @@html.dark// colors--c-red-1 rgba(184,20,20,1)- --c-blue-1 rgba(58,125,255,1)- --c-blue-3 rgba(44,116,255,1)+ --c-blue-1 #3a7dff+ --c-blue-3 #2c74ff--c-incomes-1 rgba(44,173,34,1)--c-expenses-1 rgba(249,33,52,1)--c-bg-1 rgba(10,10,10,.99)--c-bg-2 rgba(17,17,17,1)- --c-bg-3 rgba(23,23,23,1)- --c-bg-4 rgba(28,28,28,1)+ --c-bg-3 #171717+ --c-bg-4 #1c1c1c--c-bg-5 rgba(35,35,35,1)--c-bg-6 rgba(39,39,39,1)--c-bg-7 rgba(46,46,46,1)@@ -24,7 +24,7 @@ html.dark--c-font-4 rgba(150,150,150,1)--c-font-5 rgba(100,100,100,1)- --color-text-link rgba(88,166,255,1)+ --color-text-link #58a6ff--color-link-bg rgba(28,31,36,1)--c-item-bg-main #1e1e1ediff --git a/assets/stylus/reset.styl b/assets/stylus/reset.styldeleted file mode 100644index 69aea405..00000000--- a/assets/stylus/reset.styl+++ /dev/null@@ -1,28 +0,0 @@-*- box-sizing border-box- -webkit-tap-highlight-color transparent-- &:focus- outline 0--html-body-#__nuxt-#__layout- height 100%--html- font-size 16px- overscroll-behavior-y none--body- overflow hidden- overscroll-behavior-y none- margin 0- color var(--c-font-2)- font-primary()- font-size 14px- line-height 1- letter-spacing 0- background var(--c-bg-3)- user-select nonediff --git a/components/amount/Amount2.vue b/components/amount/Amount2.vueindex 09e8f0d6..de157dc9 100644--- a/components/amount/Amount2.vue+++ b/components/amount/Amount2.vue@@ -1,5 +1,4 @@<script lang="ts">-import { defineComponent } from '#app'import useAmount from '~/components/amount/useAmount'export default defineComponent({diff --git a/components/categories/Form.vue b/components/categories/Form.vueindex c2cd1ab7..c14461c3 100644--- a/components/categories/Form.vue+++ b/components/categories/Form.vue@@ -294,7 +294,7 @@ export default {.header__title {{ $t('colors') }}template(#default="{ close }")- .p-3.bg-3+ .p-3.bg-white(class="dark:bg-dark3").inputText.inputText__colors.colors@@ -322,7 +322,7 @@ export default {.header__title {{ $t('categories.form.icons.label') }}template(#default="{ close }")- .p-3.bg-3+ .p-3.bg-white(class="dark:bg-dark3").icons.icons__group(v-for="iconGroup in icons"diff --git a/components/layout/MenuModal.vue b/components/layout/MenuModal.vueindex ec804a35..38f48f8d 100644--- a/components/layout/MenuModal.vue+++ b/components/layout/MenuModal.vue@@ -24,10 +24,21 @@ Portal(to="modal")BaseBottomSheetClose(@onClick="close").content(class="!overflow-hidden !pt-8 !pb-2")- .mb-2.mx-6.pb-6.flex.items-center.justify-between.border-b.border-neutral-800- .text-neutral-400- .text-lg {{ $store.state.user.user.displayName }}- .text-sm {{ $store.state.user.user.email }}+ .mb-4.pb-4.border-b(+ class="border-neutral-300 dark:border-neutral-800"+ )+ .mx-6.mb-2(+ class="dark:text-neutral-300"+ )+ .text-xl.font-nunito.font-semibold {{ $store.state.user.user.displayName }}+ .text-sm.text-gray-900(class="dark:text-neutral-500") {{ $store.state.user.user.email }}++ .py-3.px-6.space-x-5.flex.items-center(+ class="hocus:bg-white2 dark:hocus:bg-custom1"+ @click="$store.dispatch('user/signOut')"+ )+ .text-xl.mdi.mdi-logout+ .text-sm {{ $t('userLogout') }}LayoutMenuModalItems</template>diff --git a/components/layout/MenuModalItems.vue b/components/layout/MenuModalItems.vueindex d064022f..1a9de258 100644--- a/components/layout/MenuModalItems.vue+++ b/components/layout/MenuModalItems.vue@@ -20,18 +20,18 @@ export default defineComponent({div.flex.items-center.py-3.px-6.space-x-5(v-for="(item, menuId) in items"- :key="menuId"v-if="checkIsShow(item)"- class="hocus:bg-neutral-800"+ :key="menuId"+ :class="['hocus:bg-zinc-100 dark:hocus:bg-neutral-800', { 'text-slate-900 dark:text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark:text-neutral-400': !checkIsActive(menuId) }]"@click="onClick(menuId)")- .text-xl.text-neutral-400(:class="[item.icon, { 'text-neutral-200': checkIsActive(menuId) }]")- .text-sm.text-neutral-400(:class="{'text-neutral-200': checkIsActive(menuId)}") {{ item.name }}+ .text-xl(:class="item.icon")+ .text-sm {{ item.name }}.flex.items-center.py-3.px-6.space-x-5(- class="hocus:bg-neutral-800"+ class="text-slate-600 dark:text-neutral-400 hocus:bg-zinc-100 dark:hocus:bg-neutral-800"@click="$store.dispatch('ui/changeTheme')")- .text-xl.text-neutral-400.mdi.mdi-palette- .text-sm.text-neutral-400 {{ $t('theme.change') }}+ .text-xl.mdi.mdi-palette+ .text-sm {{ $t('theme.change') }}</template>diff --git a/components/layout/Sidebar.vue b/components/layout/Sidebar.vueindex 98aae13c..40c62da6 100644--- a/components/layout/Sidebar.vue+++ b/components/layout/Sidebar.vue@@ -1,19 +1,28 @@-<script>-export default {- name: 'LayoutSidebar',-+<script lang="ts">+export default defineComponent({methods: {handleShowWalletsModalWalletModal (id) {this.$store.commit('wallets/showWalletsModalWalletModal')this.$store.commit('wallets/setWalletsModalWalletModalId', id)}}-}+})</script><template lang="pug" scoped>-.sidebar+.sidebar.bg-white2(+ class="dark:bg-custom5"+).sidebar__content+ .p-4.px-5.flex.items-center.justify-between+ .font-nunito.text-xl.font-bold.text-neutral-500(+ class="dark:text-neutral-200"+ ) {{ $t('appName') }}++ .text-xl.mdi.mdi-palette(+ @click="$store.dispatch('ui/changeTheme')"+ )+.pt-2.pb-8LayoutSidebarMenu@@ -37,8 +46,6 @@ export default {grid-template-rows minmax(auto, auto) 1frheight 100vhmin-width 280px- background var(--c-bg-4)- border-right 1px solid var(--c-bg-2)&__contentscrollbar()diff --git a/components/layout/SidebarMenu.vue b/components/layout/SidebarMenu.vueindex 6efdbb0c..b64cf3b7 100644--- a/components/layout/SidebarMenu.vue+++ b/components/layout/SidebarMenu.vue@@ -22,9 +22,9 @@ divv-for="(item, menuId) in items"v-if="checkIsShow(item)":key="menuId"- :class="['hocus:bg-neutral-800', { 'border-r-2 border-neutral-600': checkIsActive(menuId) }]"+ :class="['hocus:bg-zinc-100 dark:hocus:bg-neutral-800', { 'text-slate-900 dark:text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark:text-neutral-400': !checkIsActive(menuId) }]"@click="onClick(menuId)")- .text-xl.text-neutral-400(:class="[item.icon, { 'text-neutral-200': checkIsActive(menuId) }]")- .text-sm.text-neutral-400(:class="{'text-neutral-200': checkIsActive(menuId)}") {{ item.name }}+ .text-xl(:class="item.icon")+ .text-sm {{ item.name }}</template>diff --git a/components/shared/appName/AppName.vue b/components/shared/appName/AppName.vueindex 45a2a38a..5c00b6ec 100644--- a/components/shared/appName/AppName.vue+++ b/components/shared/appName/AppName.vue@@ -1,5 +1,7 @@<template lang="pug">-.appName {{ $t('appName') }}+.appName.text-gray-600.font-nunito(+ class="dark:text-neutral-200"+) {{ $t('appName') }}</template><style lang="stylus" scoped>@@ -8,8 +10,6 @@.appNamemargin-bottom 20px- color var(--c-font-2)- fontFamilyNunito()font-size 66pxfont-weight 800letter-spacing 2pxdiff --git a/components/shared/copyright/Copyright.vue b/components/shared/copyright/Copyright.vueindex e31e842c..6ec224f6 100644--- a/components/shared/copyright/Copyright.vue+++ b/components/shared/copyright/Copyright.vue@@ -5,7 +5,10 @@ export default {</script><template lang="pug">-a(href="https://ilko.me").copyright+a.copyright.py-1.px-5.rounded-md(+ href="https://ilko.me"+ class="hocus:bg-white2 dark:hocus:bg-custom1"+)| {{ $t('app.madeBy.text') }}.copyright__heart.mdi.mdi-heart| {{ $t('app.madeBy.name') }}@@ -21,13 +24,7 @@ a(href="https://ilko.me").copyrightdisplay flexalign-items centerjustify-content center- padding 10px $m6- color var(--c-font-4)text-decoration none- anim()-- +media-hover()- color var(--c-font-2)&__heartdisplay inline-flexdiff --git a/components/stat/Date.vue b/components/stat/Date.vueindex aa03464a..b4073fe7 100644--- a/components/stat/Date.vue+++ b/components/stat/Date.vue@@ -39,8 +39,7 @@ export default {</script><template lang="pug">-//- .sticky.top-0.z-10.bg-3-.z-10.bg-3+.z-10.bg-white(class="dark:bg-dark3")//- Date.menuDots.flex.items-center.p-4.cursor-pointer(@click="visiblePeriodMenu = true"diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vueindex b98a2f91..70964291 100644--- a/components/stat/StatItem.vue+++ b/components/stat/StatItem.vue@@ -89,8 +89,8 @@ export default {:class="{ _active: isShowInside }"@click="toogleShowInside")- .ins.py-2.px-3.space-x-3.rounded-md.justify-between.items-center.flex.border(- :class="['z-[9]', { _active: isShowInside }, { 'dark:border-neutral-800 cursor-n-resize shadow-xl': isShowInside }, { 'border-transparent cursor-s-resize shadow': !isShowInside }]"+ .ins.py-2.px-3.space-x-3.rounded-md.justify-between.items-center.flex.border.bg-white2(+ :class="['z-[9] dark:bg-dark4 hocus:bg-neutral-100 dark:hocus:bg-neutral-800', { _active: isShowInside }, { 'dark:border-neutral-800 cursor-n-resize shadow-xl': isShowInside }, { 'border-transparent cursor-s-resize shadow-sm': !isShowInside }]").cursor-pointer.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(:style="{ background: category.color }"@@ -154,10 +154,6 @@ export default {.insposition relative- background var(--c-item2-bg-hover)-- +media-hover()- background var(--c-item-bg-hover).statItem&__graphdiff --git a/components/stat/SummaryRowItemView.vue b/components/stat/SummaryRowItemView.vueindex 19bb1bae..f48ed828 100644--- a/components/stat/SummaryRowItemView.vue+++ b/components/stat/SummaryRowItemView.vue@@ -57,7 +57,6 @@ export default {color var(--c-incomes-1)&__title- padding-bottom $m4color var(--c-font-4)font-size 10pxwhite-space nowrapdiff --git a/components/stat/group/Sum.vue b/components/stat/group/Sum.vueindex 895275b4..b01f3650 100644--- a/components/stat/group/Sum.vue+++ b/components/stat/group/Sum.vue@@ -23,7 +23,7 @@ export default defineComponent({</script><template lang="pug">-.sticky.top-0.z-10.bg-3+.sticky.top-0.z-10.bg-white(class="dark:bg-dark3").py-3.statTitle.pb-2(v-if="statPage.activeTab !== typeText") {{ $t(`money.${typeText}`) }}.overflow-hidden.overflow-x-auto.scrollbardiff --git a/components/stat/sum/Total.vue b/components/stat/sum/Total.vueindex d1a2f7db..accd3b85 100644--- a/components/stat/sum/Total.vue+++ b/components/stat/sum/Total.vue@@ -19,7 +19,7 @@ export default defineComponent({.py-6.px-3.statTitle {{ $t('money.total') }}.overflow-hidden.overflow-x-auto.scrollbar- .flex+ .flex.items-center.pr-6Amount(:currency="$store.state.currencies.base"diff --git a/components/trnForm/TrnFormCategories.vue b/components/trnForm/TrnFormCategories.vueindex 66d46983..71756553 100644--- a/components/trnForm/TrnFormCategories.vue+++ b/components/trnForm/TrnFormCategories.vue@@ -83,7 +83,7 @@ export default {).pt-2.pb-0.px-3.justify-center.flex(v-if="slider")- .overflow-hidden.bg-4.rounded-md.justify-center.items-center.flex+ .overflow-hidden.bg-dark4.rounded-md.justify-center.items-center.flex.barItem.px-6.py-3.font5(:class="{ _active: slider.activeIndex === 0 }"@click="slider.slideTo(0)"diff --git a/components/trnForm/TrnFormTrns.vue b/components/trnForm/TrnFormTrns.vueindex 1846018b..cd190b70 100644--- a/components/trnForm/TrnFormTrns.vue+++ b/components/trnForm/TrnFormTrns.vue@@ -23,6 +23,7 @@ export default defineComponent({event.stopPropagation()const { setExpression } = useCalculator()setExpression($store.state.trns.items[trnItem.id].amount)+ $store.commit('trnForm/setTrnFormModalTrnId', trnItem.id)slider.slideTo(1)},@@ -135,7 +136,7 @@ export default defineComponent({.containerWrap(v-if="trnsIds.length === 0") No transactions.scrollBlock- .m-3.overflow-hidden.rounded-md.bg-4(+ .m-3.overflow-hidden.rounded-md.bg-dark4(v-for="(trnsIds, date) in groupedTrns":key="date")@@ -144,7 +145,7 @@ export default defineComponent({TrnsListDate(:date="date").overflow-hidden.rounded-md- TrnsItemHistory.py-3.px-2.rounded-md.cursor-pointer(+ TrnsItemHistory.py-3.px-2.rounded-md(v-for="trnId in trnsIds":key="trnId":actions="actions"@@ -155,7 +156,7 @@ export default defineComponent({.button(@click="showMoreTrns") {{ $t('trns.more') }}.pt-2.pb-5.px-3.justify-center.flex- .overflow-hidden.bg-4.rounded-md.justify-center.items-center.flex+ .overflow-hidden.bg-dark4.rounded-md.justify-center.items-center.flex.barItem.px-6.py-3.font5.text-xs(@click="changeFilter('wallet')" :class="{ _active: filterBy === 'wallet' }") {{ $t('trnForm.filterWallet') }}.barItem.px-6.py-3.font5.text-xs(@click="changeFilter('walletAndCategory')" :class="{ _active: filterBy === 'walletAndCategory' }") {{ $t('trnForm.filterWalletAndCategory') }}.barItem.px-6.py-3.font5.text-xs(@click="changeFilter('all')" :class="{ _active: filterBy === 'all' }") {{ $t('trnForm.filterAll') }}diff --git a/components/trnForm/TrnFormTypes.vue b/components/trnForm/TrnFormTypes.vueindex e60e3930..04c46cef 100644--- a/components/trnForm/TrnFormTypes.vue+++ b/components/trnForm/TrnFormTypes.vue@@ -25,7 +25,7 @@ export default {<template lang="pug">.flex.justify-center- .overflow-hidden.flex.items-center.bg-4.rounded-md+ .overflow-hidden.flex.items-center.bg-dark4.rounded-md.barItem.px-6.py-2.font5.text-sm(@click="() => setAmountType(0)":class="{ _active: amountType === 0 }"diff --git a/components/trns/item/History.vue b/components/trns/item/History.vueindex 115746d6..af836628 100644--- a/components/trns/item/History.vue+++ b/components/trns/item/History.vue@@ -10,9 +10,9 @@ export default defineComponent({setup ({ trnId, actions }) {const { formatTrnItem } = useTrn()- const trnItem = formatTrnItem(trnId)+ const trnItem = computed(() => formatTrnItem(trnId))// @ts-ignore- const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem)+ const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem.value)return {trnItem,diff --git a/components/trns/item/WithoutCat.vue b/components/trns/item/WithoutCat.vueindex 8dbc3c1e..19b1b673 100644--- a/components/trns/item/WithoutCat.vue+++ b/components/trns/item/WithoutCat.vue@@ -11,9 +11,9 @@ export default defineComponent({setup ({ trnId, actions }) {const { formatTrnItem, formatDate } = useTrn()- const trnItem = formatTrnItem(trnId)+ const trnItem = computed(() => formatTrnItem(trnId))// @ts-ignore- const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem)+ const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem.value)return {trnItem,@@ -32,7 +32,9 @@ export default defineComponent({class="dark:text-neutral-400 hocus:bg-neutral-100 dark:hocus:bg-neutral-800"@click="onOpenDetails")- .truncate.shrink-0.text-xs.leading-none(class="pt-[1px] min-w-[32px]") {{ $t(formatDate(trnItem.date, 'trnItem')) }}+ .truncate.shrink-0.text-xs.leading-none(+ class="pt-[1px] min-w-[32px]"+ ) {{ $t(formatDate(trnItem.date, 'trnItem')) }}.grow.items-center.flexdiff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vueindex 5255588c..b178761c 100644--- a/components/trns/list/TrnsList.vue+++ b/components/trns/list/TrnsList.vue@@ -146,9 +146,10 @@ divclass="md:grid-cols-2 md:gap-x-20":class="classNames")- .overflow-hidden.rounded-md.bg-4(+ .overflow-hidden.rounded-md.bg-white2.shadow-sm(v-for="(trnsIds, date) in groupedTrns":key="date"+ class="dark:bg-dark4").pt-4.pb-2.px-3diff --git a/components/trns/list/TrnsListHistory.vue b/components/trns/list/TrnsListHistory.vueindex ef70c279..8d84700d 100644--- a/components/trns/list/TrnsListHistory.vue+++ b/components/trns/list/TrnsListHistory.vue@@ -131,9 +131,10 @@ div.grid.grid-cols-1.gap-2(class="md:grid-cols-2 md:gap-6 lg:grid-cols-3")- .overflow-hidden.rounded-md.bg-4(+ .overflow-hidden.rounded-md.bg-white2(v-for="(trnsIds, date) in groupedTrns":key="date"+ class="dark:bg-dark4").pt-4.pb-2.px-3diff --git a/components/wallets/item/Simple.vue b/components/wallets/item/Simple.vueindex b770c246..ccef761f 100644--- a/components/wallets/item/Simple.vue+++ b/components/wallets/item/Simple.vue@@ -29,7 +29,7 @@ export default defineComponent({</script><template lang="pug">-.bg-main.py-2.px-3.gap-x-3.items-center.flex(+.bg-main.py-2.px-5.gap-x-3.items-center.flex(:class="{ _active: activeItemId === id }"@click="handleClick")@@ -39,7 +39,7 @@ export default defineComponent({.grow.py-1.items-center.flex- .grow.text-neutral-500(class="dark:text-neutral-400") {{ wallet.name }}+ .grow.text-xs.text-neutral-500(class="dark:text-neutral-400") {{ wallet.name }}Amount(:alwaysShowSymbol="true"diff --git a/layouts/default.vue b/layouts/default.vueindex 9e8b9a15..5a06c042 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -14,9 +14,6 @@ export default defineComponent({await initUI()})- // metrica- const isShowMetrica = process.env.NODE_ENV === 'production' && !$store.getters['user/isTester']-const keepAliveInclude = ['IndexPage2']// Layout@@ -56,7 +53,7 @@ export default defineComponent({$store.dispatch('ui/setAppDimensions', { width, height })}- const className = computed(() => ({+ const touchClassNames = computed(() => ({isNotTouchDevice: !isTouchDevice.value,isTouchDevice: isTouchDevice.value}))@@ -71,7 +68,7 @@ export default defineComponent({isShowPeriodsNamesModal,ui,statCurrentPeriod,- className,+ touchClassNames,isShowUpdateApp}}@@ -79,7 +76,9 @@ export default defineComponent({</script><template lang="pug">-.overflow-hidden.relative.flex.h-full.min-w-base(:class="className")+.font-roboto.text-gray-500.leading-none.antialiased.overflow-hidden.relative.h-full.min-w-base.flex(+ :class="[{ ...touchClassNames }, 'dark:text-gray-400']"+)LayoutModalsPortalTarget(@@ -92,10 +91,7 @@ export default defineComponent({@onClose="isShowUpdateApp = false")- .layout__wrap.overflow-hidden.flex-grow.h-full.grid(- class=""- )- //- .div hello+ .layout__wrap.overflow-hidden.flex-grow.h-full.grid.layout__sidebarLayoutSidebar@@ -108,8 +104,8 @@ export default defineComponent({</template><style lang="stylus">+@import '~assets/stylus/base/animations'@import '~assets/stylus/index'-@import '~assets/stylus/reset'@import '~assets/stylus/colors-dark'@import '~assets/stylus/colors-light'</style>diff --git a/layouts/empty.vue b/layouts/empty.vuedeleted file mode 100644index a06bad41..00000000--- a/layouts/empty.vue+++ /dev/null@@ -1,14 +0,0 @@-<script>-export default {}-</script>--<template lang="pug">-.grid.grid-cols-2- .item- h1 left- div Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vero laborum sint accusamus impedit veniam porro, quisquam illum, excepturi qui provident quibusdam, quod tenetur atque reiciendis incidunt. Similique eveniet ad labore repellat ipsam laboriosam facere, quod repellendus autem aut illo aliquam, soluta quis fugiat recusandae sunt accusantium ut esse molestias rem a quas quos ullam eligendi. Pariatur, illum eligendi dolorem adipisci inventore mollitia! Quo veniam odio ullam. Eaque doloremque nam vero aliquid, beatae blanditiis et modi rem cumque, explicabo qui obcaecati quasi aut officiis quaerat iste. Excepturi exercitationem eveniet ipsum placeat, consequuntur velit et dolore fugiat officiis amet itaque laborum nesciunt?- .item- h1 right- div Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vero laborum sint accusamus impedit veniam porro, quisquam illum, excepturi qui provident quibusdam, quod tenetur atque reiciendis incidunt. Similique eveniet ad labore repellat ipsam laboriosam facere, quod repellendus autem aut illo aliquam, soluta quis fugiat recusandae sunt accusantium ut esse molestias rem a quas quos ullam eligendi. Pariatur, illum eligendi dolorem adipisci inventore mollitia! Quo veniam odio ullam. Eaque doloremque nam vero aliquid, beatae blanditiis et modi rem cumque, explicabo qui obcaecati quasi aut officiis quaerat iste. Excepturi exercitationem eveniet ipsum placeat, consequuntur velit et dolore fugiat officiis amet itaque laborum nesciunt?--</template>diff --git a/layouts/error.vue b/layouts/error.vueindex 2226fd57..dbc68066 100644--- a/layouts/error.vue+++ b/layouts/error.vue@@ -1,7 +1,5 @@-<script>-export default {- name: 'ErrorLayout',-+<script lang="ts">+export default defineComponent({// eslint-disable-next-line vue/require-prop-typesprops: ['error'],@@ -15,19 +13,15 @@ export default {return (this.error && this.error.statusCode) || 500}}-}+})</script><template lang="pug">-.containerWrap+.p-4h1 Errorpre {{ error }}h1(@click="$router.push('/')") Go to home</template><style lang="stylus">-@import "~assets/stylus/variables"--.containerWrap- padding $m9</style>diff --git a/layouts/login.vue b/layouts/login.vueindex b6328d4f..6da93e01 100644--- a/layouts/login.vue+++ b/layouts/login.vue@@ -1,29 +1,28 @@-<script>-import { ref, computed, onMounted } from '#app'+<script lang="ts">import detectTouch from '~/assets/js/isTouchDevice'-export default {- name: 'DefaultLayout',-+export default defineComponent({setup () {// Detect touch deviceconst isTouchDevice = ref(false)onMounted(() => { isTouchDevice.value = detectTouch() })- const className = computed(() => ({+ const touchClassNames = computed(() => ({isNotTouchDevice: !isTouchDevice.value,isTouchDevice: isTouchDevice.value}))return {- className+ touchClassNames}}-}+})</script><template lang="pug">-.flex.h-full.min-w-base(:class="className")+.font-roboto.text-gray-600.antialiased.leading-none.bg-neutral-100.flex.h-full.min-w-base(+ :class="[{ ...touchClassNames }, 'dark:text-gray-400 dark:bg-dark3']"+)template(v-if="!$store.state.app.status.ready")LoaderSharedLoader@@ -45,6 +44,7 @@ export default {</style><style lang="stylus">+@import '~assets/stylus/base/animations'@import '~assets/stylus/colors-light'@import '~assets/stylus/colors-dark'</style>diff --git a/package.json b/package.jsonindex 45fd416a..9abb4b09 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.20.1",+ "version": "3.30.2","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxi dev","build": "nuxi generate",diff --git a/pages/login.vue b/pages/login.vueindex 4479bfd9..09c5b01a 100644--- a/pages/login.vue+++ b/pages/login.vue@@ -59,19 +59,20 @@ export default defineComponent({.flex.gap-1.top-3.left-5(class="lg:top-7 lg:left-7")- .linkItem.py-2.px-3.rounded(- :class="{ _active: $store.state.lang.lang === 'ru' }"+ .linkItem.py-2.px-4.rounded-md(+ :class="[{ 'text-blue2 dark:text-blue1': $store.state.lang.lang === 'ru' }, 'hocus:bg-white2 dark:hocus:bg-custom1']"@click="onSetLocale('ru')") Русский- .linkItem.py-2.px-3.rounded(- :class="{ _active: $store.state.lang.lang === 'en' }"+ .linkItem.py-2.px-4.rounded-md(+ :class="[{ 'text-blue2 dark:text-blue1': $store.state.lang.lang === 'en' }, 'hocus:bg-white2 dark:hocus:bg-custom1']"@click="onSetLocale('en')") English.flex.gap-3.top-3.right-5(class="lg:top-7 lg:right-7")- .linkItem.py-2.px-3.rounded(+ .linkItem.py-2.px-4.rounded-md(+ class="hocus:bg-white2 dark:hocus:bg-custom1"@click="$store.dispatch('ui/changeTheme')") {{ $t('changeTheme') }}@@ -86,7 +87,7 @@ export default defineComponent({)transition(name="fadeIn").loginButton__spiner(v-if="isLoading"): SharedSpiner- .loginButton__text {{ $t('loginWithGoogle') }}+ .loginButton__text.text-white {{ $t('loginWithGoogle') }}</template><style lang="stylus" scoped>@@ -112,17 +113,11 @@ export default defineComponent({flex-flow column.linkItem- cursor pointer- color var(--color-text-link-active)text-decoration none+media-hover()&:not(._active)- background var(--color-link-bg)-- &._active- cursor default- color var(--color-text-link)+ cursor pointer.loginButtonoverflow hidden@@ -130,7 +125,6 @@ export default defineComponent({position relativemin-width 260pxpadding $m7 $mb1- color var(--c-font-1)font-size 16pxtext-align centerbackground var(--c-blue-3)@@ -145,7 +139,6 @@ export default defineComponent({cursor default&__text- font-weight 300anim()^[0]._loading &diff --git a/store/trnForm/mutations.js b/store/trnForm/mutations.jsindex 053d8a13..4ab4e995 100644--- a/store/trnForm/mutations.js+++ b/store/trnForm/mutations.js@@ -1,5 +1,3 @@-import { baseModalState } from './'-export default {setTrnFormValues (state, values) {state.values = {@@ -9,9 +7,8 @@ export default {},setTrnFormTransfer (state, { tranferType, walletId }) {- if (tranferType) {+ if (tranferType)state.transfer[tranferType] = walletId- }},setTrnFormHeight (state, height) {@@ -19,21 +16,15 @@ export default {},setTrnFormModalCategoryId (state, id) {- if (state.showModalCategoryId === id) {- state.showModalCategoryId = null- }- else {- state.showModalCategoryId = id- }+ state.showModalCategoryId === id+ ? state.showModalCategoryId = null+ : state.showModalCategoryId = id},setTrnFormModalTrnId (state, id) {- if (state.showModalTrnId === id) {- state.showModalTrnId = null- }- else {- state.showModalTrnId = id- }+ state.showModalTrnId === id+ ? state.showModalTrnId = null+ : state.showModalTrnId = id},closeTrnFormModal (state, modalName) {diff --git a/tailwind.config.js b/tailwind.config.jsindex b3b42e10..29bcfdae 100644--- a/tailwind.config.js+++ b/tailwind.config.js@@ -12,10 +12,23 @@ module.exports = {theme: {extend: {+ colors: {+ custom1: '#212121',+ dark3: '#171717',+ dark4: '#1c1c1c',+ custom4: '#1c1c1c',+ custom5: '#1b1b1c',+ white1: '#fdfdfd',+ white2: '#fcfcfd',+ blue1: '#58a6ff',+ blue2: '#0366d6'+ },fontSize: {'2xs': '10px'},fontFamily: {+ nunito: ['Nunito', 'Roboto', 'sans-serif'],+ roboto: ['Roboto', 'sans-serif'],unica: ['"Unica One"', '"Roboto Condensed"', 'sans-serif']},minWidth: {