Skip to content

Open source personal finance application

chore: refactor

ilkome2a4be470f5ca
diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css
index 618bf3a3..8b07d2a4 100644
--- a/assets/css/tailwind.css
+++ b/assets/css/tailwind.css
@@ -42,9 +42,6 @@ body,
.flex-center {
@apply flex items-center justify-center;
}
-.flex-center-col {
- @apply flex flex-col items-center justify-center;
-}
.absolute-center {
position: absolute;
diff --git a/assets/js/isTouchDevice.js b/assets/js/isTouchDevice.js
index 4d2aff17..7f3f4ad7 100644
--- a/assets/js/isTouchDevice.js
+++ b/assets/js/isTouchDevice.js
@@ -1,3 +1,4 @@
export default function isTouchDevice() {
+ // eslint-disable-next-line no-undef
return !!(('ontouchstart' in window) || (window.DocumentTouch && document instanceof DocumentTouch))
}
diff --git a/components/date/TrnsDay.vue b/components/date/TrnsDay.vue
index 5193dc5e..08dd31df 100644
--- a/components/date/TrnsDay.vue
+++ b/components/date/TrnsDay.vue
@@ -9,42 +9,13 @@ const formattedDate = computed(() => formatDate(props.date, 'full'))
</script>
<template lang="pug">
-.trnsListDate
- .trnsListDate__day {{ formattedDate.day }}
- .trnsListDate__weekday {{ formattedDate.weekday }}
- .trnsListDate__details
- .trnsListDate__month {{ formattedDate.month }}
- .trnsListDate__year {{ formattedDate.year }}
-</template>
-
-<style lang="stylus" scoped>
-.trnsListDate
- display grid
- grid-template-columns minmax(0, max-content) minmax(0, max-content)
- grid-template-rows repeat(2, minmax(0, max-content))
-
- &__day
- grid-column 1 / 2
- grid-row 1 / 3
- padding-right 10px
- align-self center
- font-secondary()
- font-size 32px
- font-weight 400
+.flex.items-center.gap-2
+ .text-3xl.font-unica {{ formattedDate.day }}
- &__weekday
- padding-top 2px
- grid-column 2 / 3
- grid-row 1 / 2
- font-size 13px
+ .text-xs.leading-none
+ div(class="pb-[2px]") {{ formattedDate.weekday }}
- &__details
- grid-column 2 / 3
- grid-row 2 / 3
- display flex
- color var(--c-font-4)
- font-size 12px
-
- &__month
- margin-right $m4
-</style>
+ .flex.gap-1
+ div {{ formattedDate.month }}
+ div {{ formattedDate.year }}
+</template>
diff --git a/components/lang/LangDropdown.vue b/components/lang/LangDropdown.vue
index 9a9fe408..4a36400b 100644
--- a/components/lang/LangDropdown.vue
+++ b/components/lang/LangDropdown.vue
@@ -34,14 +34,15 @@ export default {
SharedContextMenu(
:position="{ left: true, top: true }"
:visible="visibleDropdown"
- @onClickOpener="onClickOpener"
)
template(slot="opener")
- SharedDropdown(
- :active="visibleDropdown"
+ SharedButton._bdb(
:title="currentLanguageName"
+ isShowDots
+ @onClick="visibleDropdown = !visibleDropdown"
)
+
template(slot="content")
SharedContextMenuItem(
title="🇷🇺 Русский - Russian"
diff --git a/components/shared/button/Button.vue b/components/shared/button/Button.vue
index b35f2b0c..0c2cc136 100644
--- a/components/shared/button/Button.vue
+++ b/components/shared/button/Button.vue
@@ -47,7 +47,7 @@ export default defineComponent({
@import '~assets/stylus/variables/animations'
@import '~assets/stylus/variables/media'
-.d-button-cirle
+.d-button-circle
display flex
align-items center
justify-content center
diff --git a/components/shared/dropdown/Dropdown.vue b/components/shared/dropdown/Dropdown.vue
deleted file mode 100644
index 0d459a06..00000000
--- a/components/shared/dropdown/Dropdown.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<script>
-export default {
- props: {
- active: {
- type: Boolean,
- default: false,
- },
- icon: {
- type: String,
- default: null,
- },
- title: {
- type: String,
- default: null,
- },
- },
-}
-</script>
-
-<template lang="pug">
-.dropdown.d-button-cirle(:class="{ _active: active }")
- .dropdown__icon(v-if="icon"): div(:class="icon")
- .dropdown__title
- template(v-if="$slots.title"): slot(name="title")
- template(v-else) {{ title }}
- .dropdown__toggle: .mdi.mdi-dots-vertical
-</template>
-
-<style lang="stylus" scoped>
-@import '~assets/stylus/variables/margins'
-@import '~assets/stylus/variables/media'
-
-.dropdown
-.dropdown.d-button-cirle
- cursor pointer
- display flex
- align-items stretch
- width auto
- min-height 48px
- margin-left auto
- padding $m6 $m7
- color var(--c-font-2)
- font-size 13px
- background var(--c-bg-4)
- border 1px solid var(--c-bg-5)
- border-radius $m6
-
- &:active:not(._disable)
- color var(--c-font-3)
-
- +media-hover()
- color var(--c-font-1)
- background var(--c-item-bg-hover)
- border 1px solid var(--c-item-bd-hover)
-
- &._noBd
- margin 0 -12px
- padding 0 12px
- font-size 16px
- background transparent
- box-shadow none
- border-color transparent
-
- &:hover:not(._disable)
- @media $media-laptop
- color var(--c-font-3)
- background var(--c-bg-1)
- border-color var(--c-bg-8)
-
- &._inline
- display inline-flex
-
- > div
- display flex
- align-items center
-
- &__icon
- opacity .6
- display flex
- align-items center
- justify-content center
- margin-right $m7
- font-size 22px
-
- &__title
- justify-content flex-start
- padding-right 12px
- flex-grow 1
- white-space nowrap
-
- &__toggle
- opacity .8
- justify-content center
- width 2px
- font-size 15px
- transform translateY(1px)
- flex-grow 0
-
- div
- anim-all()
-
- ^[0]._active &
- transform rotate(-180deg)
-</style>
diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vue
index e77140cc..c68ac085 100644
--- a/components/trnForm/calculator/TrnFormCalculator.vue
+++ b/components/trnForm/calculator/TrnFormCalculator.vue
@@ -108,9 +108,6 @@ export default {
</template>
<style lang="stylus" scoped>
-.trnFormButton
- padding $m7
-
.trnFormCalculator
display grid
grid-template-columns auto 1fr auto
diff --git a/components/welcome/page/Welcome.vue b/components/welcome/page/Welcome.vue
index cd36b4ab..e77eeb62 100644
--- a/components/welcome/page/Welcome.vue
+++ b/components/welcome/page/Welcome.vue
@@ -170,22 +170,6 @@ export default {
/.light &
background theme('colors.white') !important
-.steps
- display flex
- width 100%
- padding-bottom $m10
- border-radius $m4
-
-.stepItem
- flex-grow 1
- padding $m6
- text-align center
- background var(--c-bg-2)
-
- &._active
- background var(--c-bg-5)
- border-radius $m4
-
.tabs
overflow hidden
position absolute
diff --git a/utils/debounce.js b/utils/debounce.js
index 7f63f37a..822ed7d6 100755
--- a/utils/debounce.js
+++ b/utils/debounce.js
@@ -1,7 +1,8 @@
export default function debounce(func, interval) {
let timeout
return function () {
- const context = this; const args = arguments
+ const context = this
+ const args = arguments
const later = function () {
timeout = null
func.apply(context, args)
diff --git a/utils/formatDate.js b/utils/formatDate.js
index f8b7b302..789ed4ca 100644
--- a/utils/formatDate.js
+++ b/utils/formatDate.js
@@ -16,10 +16,10 @@ export const formatDate = (value, type) => {
return {
day: dayjs(+value).format('D'),
weekday: dayjs(+value).calendar(null, {
- sameDay: `[${currentLocale === 'ru' ? 'Сегодня' : 'Today'}] dddd`,
- nextDay: `[${currentLocale === 'ru' ? 'Завтра' : 'Tomorrow'}] dddd`,
+ sameDay: `dddd, [${currentLocale === 'ru' ? 'Сегодня' : 'Today'}]`,
+ nextDay: `dddd, [${currentLocale === 'ru' ? 'Завтра' : 'Tomorrow'}]`,
nextWeek: 'dddd',
- lastDay: `[${currentLocale === 'ru' ? 'Вчера' : 'Yesterday'}] dddd`,
+ lastDay: `dddd, [${currentLocale === 'ru' ? 'Вчера' : 'Yesterday'}]`,
lastWeek: 'dddd',
sameElse: 'dddd',
}),