Open source personal finance application
ui: update
ilkomed82f2d3468d5
diff --git a/assets/js/icons.js b/assets/js/icons.jsindex 69c9f65d..d2711d07 100644--- a/assets/js/icons.js+++ b/assets/js/icons.js@@ -1,21 +1,29 @@export default [[+ // food'mdi mdi-food-fork-drink','mdi mdi-silverware-variant','mdi mdi-food','mdi mdi-food-variant','mdi mdi-glass-cocktail','mdi mdi-chef-hat',+ 'mdi mdi-cake','mdi mdi-cake-variant','mdi mdi-cupcake','mdi mdi-food-apple','mdi mdi-fruit-watermelon','mdi mdi-food-croissant','mdi mdi-pizza',+ 'mdi mdi-fruit-cherries',+ 'mdi mdi-fruit-pineapple','mdi mdi-corn',- 'mdi mdi-mushroom',- 'mdi mdi-rocket'+ 'mdi mdi-hamburger',+ 'mdi mdi-egg',+ 'mdi mdi-egg-outline',+ 'mdi mdi-baguette',+ 'mdi mdi-mushroom'], [+ 'mdi mdi-dump-truck','mdi mdi-car-sports','mdi mdi-car-hatchback','mdi mdi-car',@@ -35,6 +43,7 @@ export default ['mdi mdi-gauge-full'], ['mdi mdi-airplane',+ 'mdi mdi-rocket','mdi mdi-concourse-ci','mdi mdi-airballoon','mdi mdi-parachute',@@ -181,7 +190,11 @@ export default ['mdi mdi-gamepad-variant-outline','mdi mdi-microsoft-xbox-controller','mdi mdi-tshirt-crew',+ 'mdi mdi-tshirt-crew-outline',+ 'mdi mdi-wizard-hat',+ 'mdi mdi-sunglasses','mdi mdi-shoe-heel',+ 'mdi mdi-shoe-sneaker','mdi mdi-lipstick','mdi mdi-creation','mdi mdi-content-cut',diff --git a/assets/stylus/common/inputText.styl b/assets/stylus/common/inputText.stylindex 13e21394..3d6e3107 100644--- a/assets/stylus/common/inputText.styl+++ b/assets/stylus/common/inputText.styl@@ -1,4 +1,5 @@-input, textarea+input+textareafont-primary()font-size 16px@@ -10,11 +11,17 @@ input, textarea&__valuewidth 100% !important- padding-bottom $m5+ padding $m7+ color var(--c-font-1)font-size 18px- color var(--c-font-2)background transparent- border 0+ border 1px solid var(--c-bg-8)+ border-radius $m5+ anim()+ &:hover+ border 1px solid var(--c-bg-9)+ &:focus+ border-color var(--c-blue-1)+media-laptop()font-size 14px@@ -24,23 +31,19 @@ input, textareamin-height 60px&__label- text-align leftopacity .6- padding-top $m5+ padding-bottom $m5+ color var(--c-font-3)font-size 10pxfont-weight 500- color var(--c-font-4)+ text-align lefttext-transform uppercase- border-top 1px solid var(--c-bg-6).colorsdisplay gridgrid-template-columns repeat(10, 1fr)- // margin-bottom $m5.colorItem- // flex 0 1 40px- // width 45pxheight 45pxborder 2px solid transparentdiff --git a/assets/stylus/variables/colors-dark.styl b/assets/stylus/variables/colors-dark.stylindex cd4ceca9..f94799e6 100644--- a/assets/stylus/variables/colors-dark.styl+++ b/assets/stylus/variables/colors-dark.styl@@ -48,8 +48,5 @@ html.dark-mode--c-item-bg-hover #232323--c-item-bd-hover #3f3f3f-// background #111111-// background #171717-// background #131313-// background #2C2C2C-// background #2A2A2A+ --c-item2-bg-hover #1c1c1c+ --c-item2-bd-hover #3f3f3fdiff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.stylindex 82d12ed2..3b99e2c6 100644--- a/assets/stylus/variables/colors-light.styl+++ b/assets/stylus/variables/colors-light.styl@@ -51,3 +51,6 @@ html--c-item-bg-main #f2f2f2--c-item-bg-hover #ebebeb--c-item-bd-hover #bebebe++ --c-item2-bg-hover #fafafa+ --c-item2-bd-hover #bebebediff --git a/assets/stylus/variables/margins.styl b/assets/stylus/variables/margins.stylindex 9f43dfd7..90500358 100644--- a/assets/stylus/variables/margins.styl+++ b/assets/stylus/variables/margins.styl@@ -24,3 +24,5 @@ $mn2 = 36px// extra big$mb1 = 50px$mb2 = 64px++$borderRadiusMd = 6pxdiff --git a/components/about/About.vue b/components/about/About.vueindex b8aecd34..7b6bf0d4 100644--- a/components/about/About.vue+++ b/components/about/About.vue@@ -14,8 +14,8 @@ export default {.aboutPerson__name ilkome.aboutPerson- .aboutPerson__title {{ $t('about.creators.ideas') }}- .aboutPerson__name TheCarolissy <br/>TihomirovPro+ .aboutPerson__title {{ $t('about.creators.thanks') }}+ .aboutPerson__name TheCarolissy, TihomirovPro</template><style lang="stylus" scoped>diff --git a/components/base/BottomSheet.vue b/components/base/BottomSheet.vueindex 9aeacae7..b9b6aa5a 100644--- a/components/base/BottomSheet.vue+++ b/components/base/BottomSheet.vue@@ -5,7 +5,8 @@ import { useEventListener } from '@vueuse/core'export default defineComponent({props: {keepAlive: { type: Boolean, default: false },- show: { type: Boolean, default: false }+ show: { type: Boolean, default: false },+ maxHeight: { type: Number, default: null }},setup (props, { emit }) {@@ -17,6 +18,7 @@ export default defineComponent({// elementsconst drug = ref<Element | null>(null)+ const drugHeader = ref<Element | null>(null)const container = ref<HTMLElement | null>(null)const handler = ref<HTMLElement | null>(null)@@ -39,6 +41,13 @@ export default defineComponent({nextCurrentY: computed(() => nextCurrentY.value)})+ const maxHeightScroll = computed(() => {+ if (!props.maxHeight || !drugHeader.value)+ return false++ return `${props.maxHeight - drugHeader.value?.clientHeight - 40}px`+ })+/*** Next current y*/@@ -317,6 +326,7 @@ export default defineComponent({return {container,drug,+ drugHeader,handler,opened,@@ -325,7 +335,8 @@ export default defineComponent({open,close,overlayStyles,- drugStyles+ drugStyles,+ maxHeightScroll}}})@@ -347,20 +358,22 @@ export default defineComponent({:class="{ _anim: !isDraging && opened, _drug: isDraging && drugStyles.transform }":style="drugStyles")- .handler(ref="handler")- slot(name="handler" :close="close")-- slot(name="header" :close="close")-- .scroll- slot(:close="close")- .info- .info__item Status: {{ debug.status }}- .info__item Direction: {{ debug.direction }}- .info__item DiffHeight: {{ debug.diffHeight }}- .info__item DiffHeightWithDebounce: {{ debug.diffHeightWithDebounce }}- .info__item NextCurrentY: {{ debug.nextCurrentY }}- .info__item drugStyles: {{ drugStyles.transform }}+ .drug__header(ref="drugHeader")+ slot(name="header" :close="close")++ .drug__inside(:class="{ _scroll: !!maxHeightScroll }" :style="{ maxHeight: maxHeightScroll }")+ .handler(ref="handler")+ slot(name="handler" :close="close")++ .scroll+ slot(:close="close")+ .info+ .info__item Status: {{ debug.status }}+ .info__item Direction: {{ debug.direction }}+ .info__item DiffHeight: {{ debug.diffHeight }}+ .info__item DiffHeightWithDebounce: {{ debug.diffHeightWithDebounce }}+ .info__item NextCurrentY: {{ debug.nextCurrentY }}+ .info__item drugStyles: {{ drugStyles.transform }}</template><style lang="stylus" scoped>@@ -431,6 +444,11 @@ export default defineComponent({user-select nonepointer-events none+ &__inside+ &._scroll+ overflow hidden+ overflowScrollY()+.scrolloverflow hiddendisplay griddiff --git a/components/base/BottomSheetClose.vue b/components/base/BottomSheetClose.vuenew file mode 100644index 00000000..7fbc2f60--- /dev/null+++ b/components/base/BottomSheetClose.vue@@ -0,0 +1,52 @@+<script>+export default {+ name: 'BaseBottomSheetClose'+}+</script>++<template lang="pug">+.handlerClose(@click="$emit('onClick')")+ svg(+ viewBox='0 0 24 24'+ fill='none'+ stroke='#000'+ stroke-linecap='round'+ stroke-linejoin='round'+ stroke-width='3'+ )+ path(d='M.75 23.249l22.5-22.5')+ path(d='M23.25 23.249L.75.749')+</template>++<style lang="stylus" scoped>+@import '~assets/stylus/variables'++.handlerClose+ z-index 3+ cursor pointer+ position absolute+ top 4px+ right 4px+ display flex+ align-items center+ justify-content center+ width 40px+ height 40px+ border-radius 50%+ anim()++ +media-hover()+ background var(--c-blue-1)++ svg+ anim()+ width 12px+ height 12px+ stroke var(--c-font-4)++ +media-hover()+ svg+ width 12px+ height 12px+ stroke var(--c-font-1)+</style>diff --git a/components/categories/EditModal.vue b/components/categories/EditModal.vuenew file mode 100644index 00000000..1ca80e9c--- /dev/null+++ b/components/categories/EditModal.vue@@ -0,0 +1,469 @@+<script>+import { db } from '~/services/firebaseConfig'+import generateId from '~/utils/id'+import colors from '~/assets/js/colors'+import icons from '~/assets/js/icons'++function random (icons) {+ return icons[Math.floor(Math.random() * icons.length)]+}++export default {+ setup (_props, { emit }) {+ const closed = () => {+ emit('onClose')+ }++ return {+ closed+ }+ },++ data () {+ return {+ originalParentId: null,+ showParents: false,+ showColors: false,+ showIcons: false,+ applyChildColor: true,+ category: {+ color: '',+ icon: '',+ name: null,+ parentId: 0,+ showInLastUsed: true,+ showInQuickSelector: false,+ showStat: true+ }+ }+ },++ computed: {+ categoryId () {+ return this.$store.state.categories.editId+ }+ },++ watch: {+ categoryId: {+ handler (categoryId) {+ if (categoryId) {+ this.category = {+ ...this.category,+ ...this.$store.state.categories.items[this.categoryId]+ }++ this.originalParentId = this.category.parentId+ }+ },+ immediate: true+ }+ },++ created () {+ this.colors = colors+ this.icons = icons+ if (!this.$store.state.categories.editId) {+ this.category.icon = random(random(icons))+ this.category.color = colors[Math.floor(Math.random() * colors.length)]+ }+ },++ beforeDestroy () {+ this.$store.commit('categories/setCategoryEditId', null)+ },++ methods: {+ handleColorSelect (color) {+ this.category.color = color+ this.showColors = false+ },++ handleIconSelect (icon) {+ this.category.icon = icon+ this.showIcons = false+ },++ handleParenCategorySelect (categoryId) {+ const parentCategory = this.$store.state.categories.items[categoryId]+ if (parentCategory)+ this.category.color = parentCategory.color++ this.category.parentId = categoryId+ this.showParents = false+ },++ handleSubmit () {+ if (this.validateForm()) {+ const uid = this.$store.state.user.user.uid+ const id = this.categoryId || generateId()+ const categories = this.$store.state.categories.items++ const categoriesValues = {+ order: this.category.order || null,+ color: this.category.color,+ icon: this.category.icon,+ name: this.category.name,+ childIds: this.category.childIds || [],+ parentId: this.category.parentId,+ showInLastUsed: this.category.showInLastUsed,+ showInQuickSelector: this.category.showInQuickSelector,+ showStat: true+ }++ // ad or remove from parent+ if (this.originalParentId !== this.category.parentId) {+ // remove from old parent+ if (this.originalParentId !== 0) {+ const originalParent = categories[this.originalParentId]+ if (originalParent) {+ db.ref(`users/${uid}/categories/${this.originalParentId}`).set({+ ...originalParent,+ childIds: originalParent.childIds.filter(cId => cId !== id)+ })+ }+ }++ // add to new parent+ if (this.category.parentId !== 0) {+ const parenCategory = categories[this.category.parentId]+ const childIds = parenCategory.childIds+ ? [...parenCategory.childIds.filter(cId => cId !== id), id]+ : [id]++ db.ref(`users/${uid}/categories/${this.category.parentId}`).set({+ ...parenCategory,+ childIds+ })+ }+ }++ const childIds = this.$store.getters['categories/getChildCategoriesIds'](id)++ // update category+ db.ref(`users/${uid}/categories/${id}`).set({+ ...categoriesValues,+ childIds+ })++ // update child categories colors+ if (this.applyChildColor) {+ for (const childId of childIds) {+ const category = categories[childId]+ db.ref(`users/${uid}/categories/${childId}`).set({+ ...category,+ color: categoriesValues.color+ })+ }+ }++ this.$store.commit('categories/setCategoryEditId', null)+ this.$store.dispatch('ui/setActiveTab', 'categories')++ if (this.$listeners.callback)+ this.$listeners.callback()+ }+ },++ validateForm () {+ const categories = this.$store.state.categories.items+ if (!this.category.name) {+ this.$notify({+ title: '😮',+ text: this.$t('categories.form.name.error')+ })+ return false+ }++ for (const categoryId in categories) {+ if (categories[categoryId].name === this.category.name && categories[categoryId].parentId === this.category.parentId) {+ if (this.categoryId) {+ if (this.categoryId !== categoryId) {+ this.$notify({+ title: '😮',+ text: this.$t('categories.form.name.exist')+ })+ return false+ }+ }+ else {+ this.$notify({+ title: '😮',+ text: this.$t('categories.form.name.exist')+ })+ return false+ }+ }+ }++ return true+ }+ }+}+</script>++<template lang="pug">+Portal(+ key="categoryFormModal"+ to="modal"+)+ BaseBottomSheet(+ :show="true"+ :maxHeight="$store.state.ui.height"+ @closed="closed()"+ )+ template(#handler="{ close }")+ BaseBottomSheetClose(@onClick="close")++ template(#header)+ .header+ template(v-if="!categoryId") {{ $t('categories.createNewTitle') }}+ template(v-else) {{ $t('categories.editTitle') }}++ template(#default="{ close }")+ .content+ .form-line._text+ .inputText+ .inputText__label {{ $t('categories.form.name.label') }}+ input(+ type="text"+ :placeholder="$t('categories.form.name.placeholder')"+ v-model="category.name"+ ).inputText__value++ //- can not change root category if inside this category already has some categories+ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0 && $store.getters['categories/hasCategories']")+ .form__btns__i._full+ .form-line(@click="showParents = true")+ .inputModal._flex+ .inputModal__content+ template(v-if="category.parentId !== 0")+ .inputModal__icon+ div(+ :class="$store.state.categories.items[category.parentId].icon"+ :style="{ color: $store.state.categories.items[category.parentId].color }"+ )+ .inputModal__name {{ $store.state.categories.items[category.parentId].name }}+ template(v-else)+ .inputModal__icon: .mdi.mdi-folder-star+ .inputModal__name {{ $t('categories.form.parent.no') }}+ .inputModal__label {{ $t('categories.form.parent.label') }}++ .form__btns+ .form__btns__i+ .form-line(@click="showColors = true")+ .inputModal._flex+ .inputModal__value: .inputModal__color(:style="{ background: category.color }")+ .inputModal__label {{ $t('categories.form.color.label') }}++ .form__btns__i+ .form-line(@click="showIcons = true")+ .inputModal._flex+ .inputModal__icon: div(:class="category.icon", :style="{ color: category.color }")+ .inputModal__label {{ $t('categories.form.icon.label') }}++ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="applyChildColor"+ :title="$t('categories.form.childColor')"+ :alt="true"+ )++ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="category.showInLastUsed"+ :title="$t('categories.form.lastUsed')"+ :alt="true")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="category.showInQuickSelector"+ :title="$t('categories.form.quickSelector')"+ :alt="true")+ template(slot="bottom")++ .col+ SharedButton(+ :class="['_text-center _blue2 _ml-big', { _inline: $store.state.ui.pc }]"+ :title="$t('categories.form.save')"+ @onClick="handleSubmit"+ )++ //- colors+ Portal(+ v-if="showColors"+ to="modal"+ )+ ModalBottom(+ :center="true"+ :title="$t('categories.form.color.placeholder')"+ @onClose="showColors = false"+ )+ .inputText+ .inputText__colors+ .colors+ .colorItem(+ :class="{ _active: category.color === color }"+ :style="{ background: color }"+ v-for="color in colors"+ @click="handleColorSelect(color)"+ )+ .customColor+ .customColor__title {{ $t('categories.form.color.custom') }}+ input.customColor__value(v-model="category.color" type="color")++ //- parent+ Portal(+ v-if="showParents"+ to="modal"+ )+ ModalBottom(+ key="parent"+ :center="true"+ :title="$t('categories.form.parent.label')"+ @onClose="showParents = false"+ )+ .padding-bottom+ ModalButton(+ :name="$t('categories.form.parent.no')"+ icon="mdi mdi-folder-star"+ @onClick="() => handleParenCategorySelect(0)")+ CategoriesView(+ :noPadding="true"+ :ids="$store.getters['categories/categoriesForBeParent'].filter(cId => cId !== categoryId)"+ @onClick="handleParenCategorySelect")++ //- icons+ Portal(+ v-if="showIcons"+ to="modal"+ )+ ModalBottom(+ :center="true"+ :title="$t('categories.form.icon.placeholder')"+ @onClose="showIcons = false"+ )+ .icons+ .icons__group(+ v-for="iconGroup in icons"+ )+ .iconItem(+ v-for="icon in iconGroup"+ :class="{ _active: category.icon === icon }"+ :style="{ color: category.color }"+ @click="handleIconSelect(icon)"+ )+ div(:class="icon")+</template>++<style lang="stylus" scoped>+@import '~assets/stylus/variables'++.header+ padding $m8+ flex-grow 1+ fontFamilyNunito()+ color var(--c-font-2)+ font-size 28px+ font-weight 700+ text-align center+ background var(--c-bg-3)+ border-radius $m7 $m7 0 0++.icons+ &__group+ display grid+ grid-template-columns repeat(auto-fill, minmax(50px, 1fr))+ padding-bottom 20px++.iconItem+ display flex+ align-items center+ justify-content center+ min-height 50px+ padding 8px+ font-size 30px++ &._active+ background var(--c-bg-2)+ border-radius 4px+ box-shadow 0 2px 10px 0 var(--shaddow)++.customColor+ margin (- $m7)+ margin-top 0+ padding $m7+ background var(--c-bg-3)++ @media $media-laptop+ margin (- $m9)+ margin-top 0+ padding $m9++ &__title+ padding-bottom $m6+ color var(--c-font-4)++ &__value+ width 100%+ height 40px+ margin 0+ padding 0+ border 0++.padding-bottom+ padding-bottom $m8++.content+ padding $m8+ background var(--c-bg-3)+ +media(600px)+ border-radius 0 0 $m7 $m7++.form__actions+ @media $media-phone+ text-align center++.form__btns+ display grid+ grid-template-columns repeat(2, 1fr)+ grid-column-gap $m9+ grid-row-gap $m9+ padding-bottom $m9++ @media $media-laptop+ grid-column-gap $m10+ grid-row-gap $m10+ padding-bottom $m10++ &__i._full+ grid-column 1 / -1++ .form-line+ display flex+ align-items center+ justify-content center+ height 100%+ height 56px+ margin-bottom 0++.inputModal+ &._flex+ flex 1+ display flex+ align-items center+ justify-content space-between++ &__content+ display flex++ &__label+ margin 0+ padding 0+ font-size 10px+</style>++<style lang="stylus">+@import '~assets/stylus/variables'+</style>diff --git a/components/categories/Form.vue b/components/categories/Form.vueindex 3e6ceae9..3d11dc7d 100644--- a/components/categories/Form.vue+++ b/components/categories/Form.vue@@ -9,6 +9,16 @@ function random (icons) {}export default {+ setup (_props, { emit }) {+ const closed = () => {+ emit('onClose')+ }++ return {+ closed+ }+ },+data () {return {originalParentId: null,@@ -193,152 +203,160 @@ export default {</script><template lang="pug">-LayoutComponentWrap- template(slot="headerLeft")- template(v-if="!categoryId")- div {{ $t('categories.createNewTitle') }}+.form+ .header+ template(v-if="!categoryId") {{ $t('categories.createNewTitle') }}template(v-else) {{ $t('categories.editTitle') }}- template(slot="content")- .form- .form-line._text- .inputText- input(- type="text"- :placeholder="$t('categories.form.name.placeholder')"- v-model="category.name"- ).inputText__value- .inputText__label {{ $t('categories.form.name.label') }}-- //- can not change root category if inside this category already has some categories- template(v-if="this.$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0 && $store.getters['categories/hasCategories']")- .form__btns__i._full- .form-line(@click="showParents = true")- .inputModal._flex- .inputModal__content- template(v-if="category.parentId !== 0")- .inputModal__icon- div(- :class="$store.state.categories.items[category.parentId].icon"- :style="{ color: $store.state.categories.items[category.parentId].color }"- )- .inputModal__name {{ $store.state.categories.items[category.parentId].name }}- template(v-else)- .inputModal__icon: .mdi.mdi-folder-star- .inputModal__name {{ $t('categories.form.parent.no') }}- .inputModal__label {{ $t('categories.form.parent.label') }}-- .form__btns- .form__btns__i- .form-line(@click="showColors = true")- .inputModal._flex- .inputModal__value: .inputModal__color(:style="{ background: category.color }")- .inputModal__label {{ $t('categories.form.color.label') }}-- .form__btns__i- .form-line(@click="showIcons = true")- .inputModal._flex- .inputModal__icon: div(:class="category.icon", :style="{ color: category.color }")- .inputModal__label {{ $t('categories.form.icon.label') }}-- template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length")- .form-line._p0._clean- SharedInputsCheckbox(- v-model="applyChildColor"- :title="$t('categories.form.childColor')"- :alt="true"- )-- template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0")- .form-line._p0._clean- SharedInputsCheckbox(- v-model="category.showInLastUsed"- :title="$t('categories.form.lastUsed')"- :alt="true")- .form-line._p0._clean- SharedInputsCheckbox(- v-model="category.showInQuickSelector"- :title="$t('categories.form.quickSelector')"- :alt="true")-- //- colors- Portal(- v-if="showColors"- to="modal"- )- ModalBottom(- :center="true"- :title="$t('categories.form.color.placeholder')"- @onClose="showColors = false"- )- .inputText- .inputText__colors- .colors- .colorItem(- :class="{ _active: category.color === color }"- :style="{ background: color }"- v-for="color in colors"- @click="handleColorSelect(color)"- )- .customColor- .customColor__title {{ $t('categories.form.color.custom') }}- input.customColor__value(v-model="category.color" type="color")-- //- parent- Portal(- v-if="showParents"- to="modal"- )- ModalBottom(- key="parent"- :center="true"- :title="$t('categories.form.parent.label')"- @onClose="showParents = false"- )- .padding-bottom- ModalButton(- :name="$t('categories.form.parent.no')"- icon="mdi mdi-folder-star"- @onClick="() => handleParenCategorySelect(0)")- CategoriesView(- :noPadding="true"- :ids="$store.getters['categories/categoriesForBeParent'].filter(cId => cId !== categoryId)"- @onClick="handleParenCategorySelect")-- //- icons- Portal(- v-if="showIcons"- to="modal"- )- ModalBottom(- :center="true"- :title="$t('categories.form.icon.placeholder')"- @onClose="showIcons = false"- )- .icons- .icons__group(- v-for="iconGroup in icons"- )- .iconItem(- v-for="icon in iconGroup"- :class="{ _active: category.icon === icon }"- :style="{ color: category.color }"- @click="handleIconSelect(icon)"- )- div(:class="icon")+ .content+ .form-line._text+ .inputText+ .inputText__label {{ $t('categories.form.name.label') }}+ input(+ type="text"+ :placeholder="$t('categories.form.name.placeholder')"+ v-model="category.name"+ ).inputText__value++ //- can not change root category if inside this category already has some categories+ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0 && $store.getters['categories/hasCategories']")+ .form__btns__i._full+ .form-line(@click="showParents = true")+ .inputModal._flex+ .inputModal__content+ template(v-if="category.parentId !== 0")+ .inputModal__icon+ div(+ :class="$store.state.categories.items[category.parentId].icon"+ :style="{ color: $store.state.categories.items[category.parentId].color }"+ )+ .inputModal__name {{ $store.state.categories.items[category.parentId].name }}+ template(v-else)+ .inputModal__icon: .mdi.mdi-folder-star+ .inputModal__name {{ $t('categories.form.parent.no') }}+ .inputModal__label {{ $t('categories.form.parent.label') }}++ .form__btns+ .form__btns__i+ .form-line(@click="showColors = true")+ .inputModal._flex+ .inputModal__value: .inputModal__color(:style="{ background: category.color }")+ .inputModal__label {{ $t('categories.form.color.label') }}++ .form__btns__i+ .form-line(@click="showIcons = true")+ .inputModal._flex+ .inputModal__icon: div(:class="category.icon", :style="{ color: category.color }")+ .inputModal__label {{ $t('categories.form.icon.label') }}++ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="applyChildColor"+ :title="$t('categories.form.childColor')"+ :alt="true"+ )++ template(v-if="$store.getters['categories/getChildCategoriesIds'](categoryId).length === 0")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="category.showInLastUsed"+ :title="$t('categories.form.lastUsed')"+ :alt="true")+ .form-line._p0._clean+ SharedInputsCheckbox(+ v-model="category.showInQuickSelector"+ :title="$t('categories.form.quickSelector')"+ :alt="true")+ template(slot="bottom")- template(slot="bottom").colSharedButton(:class="['_text-center _blue2 _ml-big', { _inline: $store.state.ui.pc }]":title="$t('categories.form.save')"@onClick="handleSubmit")++ //- colors+ Portal(+ v-if="showColors"+ to="modal"+ )+ ModalBottom(+ :center="true"+ :title="$t('categories.form.color.placeholder')"+ @onClose="showColors = false"+ )+ .inputText+ .inputText__colors+ .colors+ .colorItem(+ :class="{ _active: category.color === color }"+ :style="{ background: color }"+ v-for="color in colors"+ @click="handleColorSelect(color)"+ )+ .customColor+ .customColor__title {{ $t('categories.form.color.custom') }}+ input.customColor__value(v-model="category.color" type="color")++ //- parent+ Portal(+ v-if="showParents"+ to="modal"+ )+ ModalBottom(+ key="parent"+ :center="true"+ :title="$t('categories.form.parent.label')"+ @onClose="showParents = false"+ )+ .padding-bottom+ ModalButton(+ :name="$t('categories.form.parent.no')"+ icon="mdi mdi-folder-star"+ @onClick="() => handleParenCategorySelect(0)")+ CategoriesView(+ :noPadding="true"+ :ids="$store.getters['categories/categoriesForBeParent'].filter(cId => cId !== categoryId)"+ @onClick="handleParenCategorySelect")++ //- icons+ Portal(+ v-if="showIcons"+ to="modal"+ )+ ModalBottom(+ :center="true"+ :title="$t('categories.form.icon.placeholder')"+ @onClose="showIcons = false"+ )+ .icons+ .icons__group(+ v-for="iconGroup in icons"+ )+ .iconItem(+ v-for="icon in iconGroup"+ :class="{ _active: category.icon === icon }"+ :style="{ color: category.color }"+ @click="handleIconSelect(icon)"+ )+ div(:class="icon")</template><style lang="stylus" scoped>-@import '~assets/stylus/variables/margins'-@import '~assets/stylus/variables/media'+@import '~assets/stylus/variables'++.header+ padding $m8+ flex-grow 1+ fontFamilyNunito()+ color var(--c-font-2)+ font-size 28px+ font-weight 700+ text-align center+ background var(--c-bg-3)+ border-radius $m7 $m7 0 0.icons&__group@@ -384,9 +402,11 @@ LayoutComponentWrap.padding-bottompadding-bottom $m8-.form- @media $media-laptop- max-width 380px+.content+ padding $m8+ background var(--c-bg-3)+ +media(600px)+ border-radius 0 0 $m7 $m7.form__actions@media $media-phone@@ -432,10 +452,5 @@ LayoutComponentWrap</style><style lang="stylus">-@import '~assets/stylus/variables/media'--// .dashboard .component-// .categories__list-// @media $media-laptop-// grid-template-columns repeat(3, 1fr)+@import '~assets/stylus/variables'</style>diff --git a/components/categories/Modal.vue b/components/categories/Modal.vueindex d72c7992..1692c96e 100644--- a/components/categories/Modal.vue+++ b/components/categories/Modal.vue@@ -122,21 +122,12 @@ Portal()LazyBaseBottomSheet(v-if="$store.state.categories.modal.id"+ :maxHeight="$store.state.ui.height"key="categoriesModal"@closed="closed()")template(#handler="{ close }")- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='3'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')+ BaseBottomSheetClose(@onClick="close")template(#header).header@@ -183,12 +174,12 @@ Portal().wrap- .buttonBack(+ .button(v-if="category.parentId"@click="$store.dispatch('categories/showCategoryModal', category.parentId)") {{ $t('backTo') }} {{ $store.state.categories.items[category.parentId].name }}- .buttonBack(+ .button(v-if="category.parentId === 0"@click="close()") {{ $t('close') }}@@ -205,12 +196,14 @@ Portal(@import '~assets/stylus/variables'.content+ padding 0+ padding-bottom $m6background var(--c-bg-3)+media(600px)border-radius 0 0 $m7 $m7.tools- padding-top $m6+ padding-top 0.categoriesTitlemargin-bottom (- $m5)@@ -229,12 +222,17 @@ Portal(.wrappadding 0 $m8+.button+ button-base-1()+ margin $m8 auto $m5 auto+.headerflex-grow 1position relativedisplay flexalign-items centerpadding $m7+ padding-bottom $m8color var(--c-font-2)fontFamilyNunito()background var(--c-bg-3)@@ -255,17 +253,12 @@ Portal(align-items centerjustify-content centerflex-flow column- margin-bottom -10px&__iconflex-grow 1display flexalign-items centerjustify-content center- margin-top -38px+ margin-top -36pxpadding-bottom 12px--.buttonBack- button-base-1()- margin $m8 auto $m5 auto</style>diff --git a/components/date/MobilePrevNextArrow.vue b/components/date/MobilePrevNextArrow.vueindex cbaa812e..c8d20297 100644--- a/components/date/MobilePrevNextArrow.vue+++ b/components/date/MobilePrevNextArrow.vue@@ -25,7 +25,7 @@ div@import '~assets/stylus/variables'.tabItem- z-index 10+ z-index 50cursor pointerposition absolutetop 60%diff --git a/components/layout/mobile/BottomMenu.vue b/components/layout/mobile/BottomMenu.vueindex 669956a2..f2f387c5 100644--- a/components/layout/mobile/BottomMenu.vue+++ b/components/layout/mobile/BottomMenu.vue@@ -45,25 +45,14 @@ export default {}))function handleSetActiveTab (tabName) {- if (tabName === 'wallets') {- router.push('/wallets')+ if (tabName === 'menu') {+ store.dispatch('ui/setActiveTab', 'menu')return}- if (tabName === 'categories') {- router.push('/categories')- store.dispatch('ui/setActiveTab', 'categories')- store.dispatch('ui/setActiveTabViewName', 'categories')- return- }- if (tabName === 'stat') {- store.dispatch('ui/setActiveTab', 'stat')- store.dispatch('ui/setActiveTabViewName', 'stat')- router.push('/')- return- }-- store.dispatch('ui/setActiveTab', 'menu')+ router.push(tabName)+ store.dispatch('ui/setActiveTab', tabName)+ store.dispatch('ui/setActiveTabViewName', tabName)}function getClassName (tabName) {@@ -170,9 +159,6 @@ export default {.menubackground var(--c-bg-3)- +media(600px)- background var(--c-bg-2)-&__wrapdisplay gridmax-width 680pxdiff --git a/components/layout/mobile/MenuModal.vue b/components/layout/mobile/MenuModal.vueindex c62036b8..2cadec2d 100644--- a/components/layout/mobile/MenuModal.vue+++ b/components/layout/mobile/MenuModal.vue@@ -25,18 +25,7 @@ Portal()template(#handler="{ close }").handler-- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='3'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')+ BaseBottomSheetClose(@onClick="close")template(#header)template(v-if="walletId")@@ -82,35 +71,8 @@ Portal(background var(--c-bg-8)border-radius 4px- &__close- z-index 3- cursor pointer- position absolute- top 4px- right 4px- display flex- align-items center- justify-content center- width 40px- height 40px- border-radius 50%- anim()-- +media-hover()- background var(--c-blue-1)-- svg- anim()- width 12px- height 12px- stroke var(--c-font-4)-- +media-hover()- svg- width 12px- height 12px- stroke var(--c-font-1)-.contentborder-radius $m7 $m7 0 0+ +media(600px)+ border-radius $m7</style>diff --git a/components/layout/sidebar/BaseMenu.vue b/components/layout/sidebar/BaseMenu.vueindex bc31b7fa..1af20086 100644--- a/components/layout/sidebar/BaseMenu.vue+++ b/components/layout/sidebar/BaseMenu.vue@@ -103,7 +103,7 @@ export default {template(v-for="(menuItem, menuId) in menu").menuItem(v-if="$store.getters['user/isTester'] || !menuItem.private"- :class="{ _active: $route.name === menuId || ($route.name === 'index' && menuId === 'stat') || (activeTab !== 'categories' && activeTab === menuId), [`_${menuId}`]: true }"+ :class="{ _active: $route.name === menuId || ($route.name === 'index' && menuId === 'stat'), [`_${menuId}`]: true }"@click="handleClickMenu(menuId)").menuItem__icon: div(:class="menuItem.icon")diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vueindex 9cb4d106..a9501688 100644--- a/components/stat/StatItem.vue+++ b/components/stat/StatItem.vue@@ -1,31 +1,23 @@<script>+import useFilter from '~/modules/filter/useFilter'+export default {name: 'StatItem',props: {- category: {- type: Object,- required: true- },- categoryId: {- type: String,- required: true- },- currency: {- type: String,- required: true- },- total: {- type: Number,- required: true- },- biggest: {- type: Number,- required: true- },- type: {- type: Number,- required: true+ biggest: { type: Number, required: true },+ category: { type: Object, required: true },+ categoryId: { type: String, required: true },+ currency: { type: String, required: true },+ total: { type: Number, required: true },+ type: { type: Number, required: true }+ },++ setup () {+ const { setCategoryFilter } = useFilter()++ return {+ setCategoryFilter}},@@ -45,10 +37,13 @@ export default {categoryId: childCategoryId,type: this.type})- if (trnsIds.length > 0) { childCatsIdsWithTrns.push(childCategoryId) }+ if (trnsIds.length > 0)+ childCatsIdsWithTrns.push(childCategoryId)}- if (childCatsIdsWithTrns.length > 0) { return true }+ if (childCatsIdsWithTrns.length > 0)+ return true+return false},@@ -75,9 +70,10 @@ export default {).statItem__content.statItem__graph: .statItem__graph__in(:style="styles")- .statItem__icon(@click.stop="() => $store.dispatch('filter/handleSetFilterCategory', categoryId)")+ .statItem__icon(@click.stop="setCategoryFilter(categoryId)")Icon(- :background="category.color"+ :background="showInside ? category.color : 'var(--c-bg-5)'"+ :color="showInside ? 'var(--c-font-1)' : category.color":icon="category.icon"round)@@ -111,6 +107,15 @@ export default {@import '~assets/stylus/variables'.statItem+ &__icon+ .icon+ width 36px !important+ height 36px !important+ background var(--c-bg-4)++ .icon__image+ font-size 22px+.trnItem._statpadding-right $m6padding-left $m6@@ -123,27 +128,21 @@ export default {// overflow hiddencursor pointerposition relative- margin 0 (- $m5)padding $m5 $m5border 1px solid transparent- border-radius $m5+ border-radius $borderRadiusMd+media-hover()&:not(._active)z-index 2- margin 0 (- $m5)- padding $m5 $m5- background var(--c-bg-4)- border 1px solid var(--c-bg-5)+ background var(--c-item2-bg-hover)+ border 1px solid var(--c-item2-bd-hover)&._active- margin 0 (- $m5)+ // margin 0 (- $m5)margin-bottom $m7- margin-left (- $m6)padding 0- padding-left $m4border-radius 0- border-left 1px solid var(--c-bg-8)&__contentdisplay griddiff --git a/components/stat/StatItemChildCatsItem.vue b/components/stat/StatItemChildCatsItem.vueindex 2a267895..6f14a6eb 100644--- a/components/stat/StatItemChildCatsItem.vue+++ b/components/stat/StatItemChildCatsItem.vue@@ -1,25 +1,20 @@<script>+import useFilter from '~/modules/filter/useFilter'+export default {props: {- category: {- type: Object,- required: true- },- categoryId: {- type: String,- required: true- },- total: {- type: Number,- required: true- },- type: {- type: Number,- required: true- },- biggest: {- type: Number,- required: true+ biggest: { type: Number, required: true },+ category: { type: Object, required: true },+ categoryId: { type: String, required: true },+ total: { type: Number, required: true },+ type: { type: Number, required: true }+ },++ setup () {+ const { setCategoryFilter } = useFilter()++ return {+ setCategoryFilter}},@@ -55,9 +50,7 @@ export default {.statItemChild__graph.statItemChild__graph__in(:style="styles")- .statItemChild__icon(- @click.stop="() => $store.dispatch('filter/handleSetFilterCategory', categoryId)"- )+ .statItemChild__icon(@click.stop="setCategoryFilter(categoryId)")Icon(:color="category.color":icon="category.icon"@@ -101,15 +94,20 @@ export default {@import '~assets/stylus/variables'.statItemChild- &._active- padding-bottom $m6+ border 1px solid transparent+ border-radius $borderRadiusMd++ +media-hover()+ &:not(._active)+ background var(--c-item2-bg-hover)+ border 1px solid var(--c-item2-bd-hover)&__contentdisplay gridgrid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)grid-template-rows repeat(2, minmax(10px, max-content))grid-column-gap 20px- margin 0 0px+ margin 0padding $m6 $m5&__graph@@ -135,7 +133,6 @@ export default {^[0]._active &color var(--c-font-2)- font-weight 500&__icondisplay flex@@ -151,5 +148,5 @@ export default {padding 0^[0]._active &- padding-bottom $m6+ padding-bottom $m4</style>diff --git a/components/stat/StatItemRound.vue b/components/stat/StatItemRound.vueindex 63897141..e34a9123 100644--- a/components/stat/StatItemRound.vue+++ b/components/stat/StatItemRound.vue@@ -110,13 +110,12 @@ export default {.statItemRound&__icon.icon- width 42px !important- height 42px !important+ width 36px !important+ height 36px !importantbackground var(--c-bg-4) !important- // border 1px solid var(--c-bg-5).icon__image- font-size 24px+ font-size 22px</style><style lang="stylus" scoped>@import '~assets/stylus/variables'@@ -134,7 +133,7 @@ export default {border-radius $m5+media-hover()- background var(--c-bg-4)+ background var(--c-item2-bg-hover)border 1px solid var(--c-item-bd-hover)&._prevStatdiff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vueindex 7d2433a6..3c2e7239 100644--- a/components/trnForm/TrnForm.vue+++ b/components/trnForm/TrnForm.vue@@ -217,7 +217,7 @@ export default {).swiper-slide.getHeight- .modalHeightBase+ .scroll.scrollerBlock(:style="{ maxHeight: `${$store.state.ui.height}px` }").trnForm__title(v-if="$store.state.trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}.trnForm__title(v-if="!$store.state.trnForm.values.trnId") {{ $t('trnForm.titleCreateTrn') }}@@ -402,7 +402,7 @@ export default {align-items centerjustify-content centergap $m8- padding 0 $m8+ padding 0 $m7padding-top $m4padding-bottom $m9diff --git a/components/trnForm/TrnFormCalendar.vue b/components/trnForm/TrnFormCalendar.vueindex 72c2250f..9530c81c 100644--- a/components/trnForm/TrnFormCalendar.vue+++ b/components/trnForm/TrnFormCalendar.vue@@ -31,86 +31,73 @@ export default {</script><template lang="pug">-.trnFormMeta- .trnFormMeta__date- .trnFormDate- .trnFormDate__item._icon(@click="setPrevDay()"): .mdi.mdi-chevron-left- .trnFormDate__item._date(@click="$store.commit('trnForm/showTrnFormModal', 'calendar')") {{ formatedDate }}- .trnFormDate__item._icon(:class="{ _disable: isToday }" @click="setNextDay()"): .mdi.mdi-chevron-right-- .trnFormMeta__desc(- @click="$store.commit('trnForm/showTrnFormModal', 'description')"- )- .mdi.mdi-comment-text-outline- .dot(v-if="$store.state.trnForm.values.description")+.trnFormDate+ .trnFormDate__item._icon(@click="setPrevDay()"): .mdi.mdi-chevron-left+ .trnFormDate__item._date(@click="$store.commit('trnForm/showTrnFormModal', 'calendar')") {{ formatedDate }}+ .flex+ .trnFormDate__item._icon(+ v-if="!isToday" @click="setNextDay()"+ style="marginRight: 16px"+ ): .mdi.mdi-chevron-right+ .trnFormDate__item._icon(+ :class="{ _desc: $store.state.trnForm.values.description }"+ @click="$store.commit('trnForm/showTrnFormModal', 'description')"+ )+ .mdi.mdi-comment-text-outline</template><style lang="stylus" scoped>@import '~assets/stylus/variables'-.trnFormMeta- display grid- grid-template-columns repeat(5, minmax(10px, 1fr))- padding 0 $m6- border-top 1px solid var(--c-bg-3)-- @media $media-laptop- color var(--c-font-4)- border-top 0-- &__date- grid-column 1/5- grid-row 1/-1-- &__desc- position relative- padding $m6- color var(--c-font-4)- font-size 22px- text-align center- border-radius $m7-- +media-hover()- background var(--c-bg-5)-- &._active- color var(--c-font-1)-- .dot- position absolute- top $m7- right $m7- width 6px- height 6px- background var(--c-bg-9)- border-radius 50%-.trnFormDatedisplay gridheight 100%- grid-template-columns repeat(4, minmax(10px, 1fr))+ grid-template-columns auto 1fr auto+ grid-column-gap $m8+ padding 0 $m7font-size 12pxfont-weight 500text-align center&__item+ position relativedisplay flexalign-items centerjustify-content center- flex-grow 1- height 100%- border-radius $m7+ width 44px+ height 44px+ padding $m7+ border 1px solid transparent+ border-radius $borderRadiusMd+ user-select none+ anim()++ +media(400px)+ width 58px+ height 58px++ +media-hover()+ background var(--c-item-bg-hover)+ border 1px solid var(--c-item-bd-hover)&._date- grid-column 2/4+ width 100%+ height auto+ flex-grow 1color var(--c-font-3)+ font-size 12px- +media-hover()- background var(--c-bg-5)+ &._desc .mdi+ color var(--c-blue-1)&._iconcolor var(--c-font-4)font-size 28px+ background var(--c-bg-4)+ border-radius 50%++ .mdi+ font-size 18px&._disableopacity .4diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vueindex b9df4c41..6d1f2f36 100644--- a/components/trnForm/calculator/TrnFormCalculator.vue+++ b/components/trnForm/calculator/TrnFormCalculator.vue@@ -100,7 +100,6 @@ export default {<style lang="stylus" scoped>@import '~assets/stylus/variables'-.trnFormButtonpadding $m7@@ -142,6 +141,9 @@ export default {justify-content centerfont-secondary()+ &._sum+ max-width 61px+&__indisplay flexalign-items centerdiff --git a/components/trnForm/modal/TrnFormModal.vue b/components/trnForm/modal/TrnFormModal.vueindex f9f5dc27..c775f45c 100644--- a/components/trnForm/modal/TrnFormModal.vue+++ b/components/trnForm/modal/TrnFormModal.vue@@ -22,18 +22,7 @@ Portal(to="modal"))template(#handler="{ close }").handler-- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='1.5'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')+ BaseBottomSheetClose(@onClick="close")template(#default="{ close }").content(:style="{ maxHeight: documentHeight }")@@ -65,35 +54,6 @@ Portal(to="modal")background var(--c-bg-8)border-radius 4px- &__close- z-index 3- cursor pointer- position absolute- top 4px- right 4px- display flex- align-items center- justify-content center- width 40px- height 40px- border-radius 50%- anim()-- +media-hover()- background var(--c-blue-1)-- svg- anim()- width 12px- height 12px- stroke var(--c-font-4)-- +media-hover()- svg- width 12px- height 12px- stroke var(--c-font-1)-.contentoverflow hiddendisplay griddiff --git a/components/trnForm/modal/TrnFormModalDescription.vue b/components/trnForm/modal/TrnFormModalDescription.vueindex f4104e78..967c8e99 100644--- a/components/trnForm/modal/TrnFormModalDescription.vue+++ b/components/trnForm/modal/TrnFormModalDescription.vue@@ -69,8 +69,7 @@ TrnFormModal(@closed="afterClose")</template><style lang="stylus" scoped>-@import "~assets/stylus/variables/margins"-@import "~assets/stylus/variables/media"+@import '~assets/stylus/variables'.descriptionpadding 0 $m7@@ -98,6 +97,8 @@ TrnFormModal(@closed="afterClose")font-size 16pxbackground var(--c-bg-2)border 1px solid var(--c-bg-5)+ border-radius $borderRadiusMd+ anim()&:focusborder-color var(--c-blue-1)diff --git a/components/trns/Modal.vue b/components/trns/Modal.vueindex 07f39bf2..157fdcb9 100644--- a/components/trns/Modal.vue+++ b/components/trns/Modal.vue@@ -113,17 +113,7 @@ Portal(@closed="closed()")template(#handler="{ close }")- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='3'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')+ BaseBottomSheetClose(@onClick="close")template(#header).header@@ -136,7 +126,7 @@ Portal(ui="detailed")- template+ template(#default="{ close }").content.tools.modalLinks@@ -186,6 +176,11 @@ Portal(@onClick="showModalGroups = true")+ .wrap+ .button(+ @click="close()"+ ) {{ $t('close') }}+template(v-if="groups && $store.getters['user/isTester']")Portal(v-if="showModalGroups"@@ -229,9 +224,6 @@ Portal(background var(--c-bg-3)border-radius $m7 $m7 0 0-.marginBottom- margin-bottom $m7-.itemcursor pointerdisplay flex@@ -245,8 +237,6 @@ Portal(&:hoverbackground var(--c-bg-5)- /.light-mode &- background var(--c-bg-5)&__activeflex-grow 0@@ -258,7 +248,11 @@ Portal(.content+media(600px)border-radius 0 0 $m7 $m7- // padding-top $m6- // padding-bottom $m6- // background var(--c-bg-3)++.wrap+ padding 0 $m8++.button+ button-base-1()+ margin $m8 auto $m5 auto</style>diff --git a/components/wallets/Modal.vue b/components/wallets/Modal.vueindex 9e77b11d..d9e734ab 100644--- a/components/wallets/Modal.vue+++ b/components/wallets/Modal.vue@@ -105,17 +105,7 @@ Portal(@closed="closed()")template(#handler="{ close }")- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='3'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')+ BaseBottomSheetClose(@onClick="close")template(#header)template(v-if="walletId")@@ -216,35 +206,6 @@ Portal(width 100%height 16px- &__close- z-index 3- cursor pointer- position absolute- top 4px- right 4px- display flex- align-items center- justify-content center- width 40px- height 40px- border-radius 50%- anim()-- +media-hover()- background var(--c-blue-1)-- svg- anim()- width 12px- height 12px- stroke var(--c-font-4)-- +media-hover()- svg- width 12px- height 12px- stroke var(--c-font-1)-.buttonBackbutton-base-1()margin $m8 auto $m5 autodiff --git a/components/wallets/form/WalletForm.vue b/components/wallets/form/WalletForm.vueindex e728b8fa..3c42e237 100644--- a/components/wallets/form/WalletForm.vue+++ b/components/wallets/form/WalletForm.vue@@ -134,12 +134,12 @@ LayoutComponentWrap.form.form-line._text.inputText+ .inputText__label {{ $t('wallets.form.name.label') }}input(type="text":placeholder="$t('wallets.form.name.placeholder')"v-model="wallet.name").inputText__value- .inputText__label {{ $t('wallets.form.name.label') }}.form__btns.form__btns__idiff --git a/layouts/default.vue b/layouts/default.vueindex ffd2feca..85757e89 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -98,103 +98,106 @@ export default {<template lang="pug">.layoutNew(:class="className")- //- Modals- //------------------------------------ CategoriesModal- CurrenciesCurrencyModal-- BaseBottomSheet(- keepAlive- :show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show"- @closed="$store.dispatch('trnForm/closeTrnForm')"- )- template(#handler="{ close }")- .handler-- .handler__close(@click="close")- svg(- viewBox='0 0 24 24'- fill='none'- stroke='#000'- stroke-linecap='round'- stroke-linejoin='round'- stroke-width='3'- )- path(d='M.75 23.249l22.5-22.5')- path(d='M23.25 23.249L.75.749')-- TrnForm(:show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show")-- TrnsModal- WalletsModal-- //- Base Menu- LazyLayoutMobileMenuModal(v-if="activeTab === 'menu'")-- ModalBottom(- v-if="activeTab === 'createCategory'"- key="createCategory"- @onClose="$store.dispatch('ui/setActiveTab', 'stat')"- ): CategoriesForm-- //- Settings- Portal(- v-if="activeTab === 'settings'"- to="modal"- )- ModalBottom(@onClose="$store.dispatch('ui/setActiveTab', 'stat')")- Settings(v-if="activeTab === 'settings'")-- //- Wallet Form: create or edit- Portal(- v-if="activeTab === 'createWallet'"- to="modal"- )- ModalBottom(- :key="$store.state.wallets.editId"+ .layoutNew__modals+ //- Modals+ //-----------------------------------+ CategoriesModal+ CurrenciesCurrencyModal++ BaseBottomSheet(+ keepAlive+ :show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show"+ @closed="$store.dispatch('trnForm/closeTrnForm')"+ )+ template(#handler="{ close }")+ .handler+ BaseBottomSheetClose(@onClick="close")++ TrnForm(:show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show")++ TrnsModal+ WalletsModal++ //- Base Menu+ LazyLayoutMobileMenuModal(v-if="activeTab === 'menu'")++ //- category+ LazyCategoriesEditModal(+ v-if="activeTab === 'createCategory'"@onClose="$store.dispatch('ui/setActiveTab', 'stat')")- WalletsFormWalletForm-- //- Wallet Sort- Portal(- v-if="activeTab === 'walletsSort'"- to="modal"- key="walletsSort"- )- ModalBottom(- isShow++ //- Settings+ Portal(+ v-if="activeTab === 'settings'"+ to="modal"+ )+ ModalBottom(@onClose="$store.dispatch('ui/setActiveTab', 'stat')")+ Settings(v-if="activeTab === 'settings'")++ //- Wallet Form: create or edit+ Portal(+ v-if="activeTab === 'createWallet'"+ to="modal"+ )+ ModalBottom(+ :key="$store.state.wallets.editId"+ @onClose="$store.dispatch('ui/setActiveTab', 'stat')"+ )+ WalletsFormWalletForm++ //- Wallet Sort+ Portal(+ v-if="activeTab === 'walletsSort'"+ to="modal"key="walletsSort"- @onClose="$store.dispatch('ui/setActiveTab', 'stat')")- template(#default="{ closeModal }")- WalletsSort(- v-if="activeTab === 'walletsSort'"- @closeModal="closeModal"- )-- //- Loading- template(v-if="!$store.state.app.status.ready")- LoaderSharedLoader-- //- Notifications- Notifications(- :position="$store.state.ui.mobile ? 'top center' : 'top left'"- :width="$store.state.ui.mobile ? '94%' : '380px'"- classes="notifications"- )-- //- Modals- PortalTarget(- multiple- name="modal"- )-- //- Update modal- LazyAppUpdateAppModal(- v-if="isShowUpdateApp"- @onClose="isShowUpdateApp = false"- )+ ModalBottom(+ isShow+ key="walletsSort"+ @onClose="$store.dispatch('ui/setActiveTab', 'stat')"+ )+ template(#default="{ closeModal }")+ WalletsSort(+ v-if="activeTab === 'walletsSort'"+ @closeModal="closeModal"+ )++ //- Loading+ template(v-if="!$store.state.app.status.ready")+ LoaderSharedLoader++ //- Notifications+ Notifications(+ :position="$store.state.ui.mobile ? 'top center' : 'top left'"+ :width="$store.state.ui.mobile ? '94%' : '380px'"+ classes="notifications"+ )++ //- Modals+ PortalTarget(+ multiple+ name="modal"+ )++ //- Update modal+ LazyAppUpdateAppModal(+ v-if="isShowUpdateApp"+ @onClose="isShowUpdateApp = false"+ )++ //- wrap+ //-----------------------------------+ .layoutNew__wrap+ .layoutNew__sidebar+ LayoutPcSidebar++ .layoutNew__content+ .page2+ Nuxt(keep-alive :keep-alive-props="{ include: keepAliveInclude }")++ .layoutNew__menu+ LayoutMobileBottomMenu</template><style lang="stylus">@@ -207,11 +210,15 @@ export default {.layoutNewoverflow hiddenposition relative- display grid+ display flexheight 100%background var(--c-bg-3)+ &__modals+ height 0+&__wrap+ flex-grow 1overflow hiddendisplay gridgrid-template-columns 1fr@@ -237,9 +244,8 @@ export default {&__menubackground var(--c-bg-3)- +media(600px)+ +media(1100px)display none- background var(--c-bg-2).handlerz-index 2@@ -260,35 +266,6 @@ export default {background var(--c-bg-8)border-radius 4px- &__close- z-index 3- cursor pointer- position absolute- top 4px- right 4px- display flex- align-items center- justify-content center- width 40px- height 40px- border-radius 50%- anim()-- +media-hover()- background var(--c-blue-1)-- svg- anim()- width 12px- height 12px- stroke var(--c-font-4)-- +media-hover()- svg- width 12px- height 12px- stroke var(--c-font-1)-.page2overflow hiddenoverflowScrollY()diff --git a/locales/en-US.js b/locales/en-US.jsindex 001e84b7..92035c93 100644--- a/locales/en-US.js+++ b/locales/en-US.js@@ -50,7 +50,7 @@ export default {creators: {title: 'Creators',author: 'Author',- ideas: 'Ideas & testing'+ thanks: 'Thanks for support'}},@@ -214,7 +214,7 @@ export default {placeholder: 'Select icon'},lastUsed: 'Show in last used categories',- quickSelector: 'Show in trnForm quick selector',+ quickSelector: 'Favorite category',childColor: 'Apply color to all child categories',save: 'Save'}diff --git a/locales/ru-RU.js b/locales/ru-RU.jsindex 4072a3d0..2498136c 100644--- a/locales/ru-RU.js+++ b/locales/ru-RU.js@@ -51,7 +51,7 @@ export default {creators: {title: 'Создатели',author: 'Автор',- ideas: 'Идеи и тестирование'+ thanks: 'Спасибо за поддержку'}},@@ -215,9 +215,9 @@ export default {label: 'Иконка',placeholder: 'Выберите иконку'},- lastUsed: 'Показывать в списке последних использованных категорий',- quickSelector: 'Добавить в быстрый выбор при создании транзакции',- childColor: 'Применить цвет ко всем дочерних категориям',+ lastUsed: 'Показывать в списке недавних категорий',+ quickSelector: 'Любимая категория',+ childColor: 'Применить цвет ко всем дочерним категориям',save: 'Сохранить'}},diff --git a/nuxt.config.js b/nuxt.config.jsindex 2910b160..389451e2 100644--- a/nuxt.config.js+++ b/nuxt.config.js@@ -39,7 +39,7 @@ export default {href: 'https://fonts.googleapis.com/css?family=Roboto:400,500,600,700|Roboto+Condensed:400,500,600,700|Unica+One|Nunito:400,700,800&display=swap&subset=cyrillic'}, {rel: 'stylesheet',- href: 'https://cdn.materialdesignicons.com/5.0.45/css/materialdesignicons.min.css'+ href: 'https://cdn.materialdesignicons.com/5.9.55/css/materialdesignicons.min.css'}],noscript: [{ innerHTML: 'This website requires JavaScript.' }]diff --git a/pages/login.vue b/pages/login.vueindex fc052bd0..b5e7ff35 100644--- a/pages/login.vue+++ b/pages/login.vue@@ -127,6 +127,7 @@ export default {top $m7left $m7display flex+ gap $m5@media $media-laptoptop $mn1@@ -145,7 +146,7 @@ export default {.linkItemcursor pointerpadding 8px 10px- color var(--color-text-link)+ color var(--color-text-link-active)text-decoration none+media-hover()@@ -155,7 +156,7 @@ export default {&._activecursor default- color var(--color-text-link-active)+ color var(--color-text-link)+media-hover()text-decoration nonediff --git a/pages/settings.vue b/pages/settings.vueindex 51f51784..011e5510 100644--- a/pages/settings.vue+++ b/pages/settings.vue@@ -23,11 +23,17 @@ export default {generateDemo () {this.confirmCreateDemo = falsethis.$store.dispatch('demo/createDemo')++ if (this.$route.name !== 'index')+ this.$router.push('/')},removeUserData () {this.confirmRemoveUserData = falsethis.$store.dispatch('user/removeUserData')++ if (this.$route.name !== 'index')+ this.$router.push('/')}}}diff --git a/pages/users.vue b/pages/users.vueindex c51493a4..8bad38e7 100644--- a/pages/users.vue+++ b/pages/users.vue@@ -99,84 +99,80 @@ export default {<template lang="pug">LayoutComponentWrap(:contentPadding="false")template(slot="content")- .wrapper- .header Users-- template(v-if="$store.getters['user/isTester']")- .items- .item(- v-for="(userName, userUid) in usersUid"- @click="getCustomUserData(userUid)"- ) {{ userName }}-- .pb_baseOneAndHalf- SharedButton(- @click="getUsers"- title="Update users"- )-- .usersWrap- .item(- v-for="user in users"- )- .tags- .tagItem._one(v-if="$day(user.creationDate).isSame(user.loginDate, 'day')") once- .tagItem._one(v-if="$day(user.creationDate).isSame($day(), 'week')") new- .tagItem._one(v-if="!$day(user.creationDate).isSame(user.loginDate, 'day')") {{ $day(user.loginDate).from(user.creationDate, true) }}-- h2(@click="getCustomUserData(user.uid)") {{ user.name }}- .pb_base {{ user.uid }}- .pb_base(v-if="user.theme")- .item__info._noPad- .item__title Theme- .item__date {{ user.theme }}-- .div- .item__info._noPad- .item__title Last login- .item__date {{ $day(user.loginDate).format('D MMMM YYYY HH:mm') }}-- .pb_base- .item__info._noPad(v-if="user.creationDate")- .item__title Creation- .item__date {{ $day(user.creationDate).format('D MMMM YYYY HH:mm') }}-- .pb_base(v-if="user.opensApp")- .item__info._noPad Opened- .item__info._noPad(- v-for="(date, version) in user.opensApp"- @click="deleteUserOpened(version, user.uid)"- )- .item__title {{ version }}- .item__date {{ $day(date).format('D MMMM YYYY HH:mm') }}-- .pb_base(v-if="user.actions")- .item__info._noPad Actions- .item__info._noPad(- v-for="(action, date) in user.actions"- @click="deleteUserAction(date, user.uid)"- )- .item__title {{ action }}- .item__date {{ $day(date).format('D MMMM YYYY HH:mm') }}-- .item__links- a.item__link(- :href="`https://finapp-17474.firebaseio.com/users/${user.uid}`"- target="_blank"- ) User Data-- a.item__link(- :href="`https://finapp-17474.firebaseio.com/users-info/${user.uid}`"- target="_blank"- ) User Info+ .header Users++ template(v-if="$store.getters['user/isTester']")+ .items+ .item(+ v-for="(userName, userUid) in usersUid"+ @click="getCustomUserData(userUid)"+ ) {{ userName }}++ .pb_baseOneAndHalf+ SharedButton(+ @click="getUsers"+ title="Update users"+ )++ .usersWrap+ .item(+ v-for="user in users"+ )+ .tags+ .tagItem._one(v-if="$day(user.creationDate).isSame(user.loginDate, 'day')") once+ .tagItem._one(v-if="$day(user.creationDate).isSame($day(), 'week')") new+ .tagItem._one(v-if="!$day(user.creationDate).isSame(user.loginDate, 'day')") {{ $day(user.loginDate).from(user.creationDate, true) }}++ h2(@click="getCustomUserData(user.uid)") {{ user.name }}+ .pb_base {{ user.uid }}+ .pb_base(v-if="user.theme")+ .item__info._noPad+ .item__title Theme+ .item__date {{ user.theme }}++ .div+ .item__info._noPad+ .item__title Last login+ .item__date {{ $day(user.loginDate).format('D MMMM YYYY HH:mm') }}++ .pb_base+ .item__info._noPad(v-if="user.creationDate")+ .item__title Creation+ .item__date {{ $day(user.creationDate).format('D MMMM YYYY HH:mm') }}++ .pb_base(v-if="user.opensApp")+ .item__info._noPad Opened+ .item__info._noPad(+ v-for="(date, version) in user.opensApp"+ @click="deleteUserOpened(version, user.uid)"+ )+ .item__title {{ version }}+ .item__date {{ $day(date).format('D MMMM YYYY HH:mm') }}++ .pb_base(v-if="user.actions")+ .item__info._noPad Actions+ .item__info._noPad(+ v-for="(action, date) in user.actions"+ @click="deleteUserAction(date, user.uid)"+ )+ .item__title {{ action }}+ .item__date {{ $day(date).format('D MMMM YYYY HH:mm') }}++ .item__links+ a.item__link(+ :href="`https://finapp-17474.firebaseio.com/users/${user.uid}`"+ target="_blank"+ ) User Data++ a.item__link(+ :href="`https://finapp-17474.firebaseio.com/users-info/${user.uid}`"+ target="_blank"+ ) User Info</template><style lang="stylus" scoped>@import '~assets/stylus/variables'-.wrapper- padding 0 $m7-.headerheader-title()@@ -199,11 +195,10 @@ LayoutComponentWrap(:contentPadding="false")display gridwidth 100%height 100%- padding 16px- padding-bottom 0+ padding 0 16px+media-tablet()- padding 32px+ padding 0 32px.pageHeaderposition relative@@ -243,7 +238,7 @@ LayoutComponentWrap(:contentPadding="false")position relativewidth 100%padding $m8- background var(--c-bg-4)+ background var(--c-item-bg-main)border 1px solid transparentborder-radius $m7flex-grow 1@@ -251,8 +246,8 @@ LayoutComponentWrap(:contentPadding="false")+media-hover()color var(--c-text-1)- background var(--c-bg-2)- border 1px solid var(--c-blue-1)+ background var(--c-item-bg-hover)+ border 1px solid var(--c-item-bd-hover)h2padding-right 40pxdiff --git a/pages/welcome.vue b/pages/welcome.vueindex 1cc9ee03..ea6cf18d 100644--- a/pages/welcome.vue+++ b/pages/welcome.vue@@ -173,7 +173,9 @@ export default {transition(name="fadeIn").tab(v-if="showCategoryForm").tab__content- CategoriesFormCategoryForm(@callback="categoryCreatedCallback")+ LazyCategoriesForm(+ @callback="categoryCreatedCallback"+ ).copyrightSharedCopyrightdiff --git a/store/ui/icons.js b/store/ui/icons.jsdeleted file mode 100644index 69c9f65d..00000000--- a/store/ui/icons.js+++ /dev/null@@ -1,270 +0,0 @@-export default [- [- 'mdi mdi-food-fork-drink',- 'mdi mdi-silverware-variant',- 'mdi mdi-food',- 'mdi mdi-food-variant',- 'mdi mdi-glass-cocktail',- 'mdi mdi-chef-hat',- 'mdi mdi-cake-variant',- 'mdi mdi-cupcake',- 'mdi mdi-food-apple',- 'mdi mdi-fruit-watermelon',- 'mdi mdi-food-croissant',- 'mdi mdi-pizza',- 'mdi mdi-corn',- 'mdi mdi-mushroom',- 'mdi mdi-rocket'- ], [- 'mdi mdi-car-sports',- 'mdi mdi-car-hatchback',- 'mdi mdi-car',- 'mdi mdi-car-connected',- 'mdi mdi-car-wash',- 'mdi mdi-train-car',- 'mdi mdi-bus-side',- 'mdi mdi-bus-double-decker',- 'mdi mdi-truck-delivery',- 'mdi mdi-golf-cart',- 'mdi mdi-excavator',- 'mdi mdi-bulldozer',- 'mdi mdi-parking',- 'mdi mdi-vlc',- 'mdi mdi-road-variant',- 'mdi mdi-gas-station',- 'mdi mdi-gauge-full'- ], [- 'mdi mdi-airplane',- 'mdi mdi-concourse-ci',- 'mdi mdi-airballoon',- 'mdi mdi-parachute',- 'mdi mdi-ferry',- 'mdi mdi-cloud',- 'mdi mdi-sail-boat',- 'mdi mdi-map-search',- 'mdi mdi-ferris-wheel'- ], [- 'mdi mdi-bike',- 'mdi mdi-scooter',- 'mdi mdi-rollerblade',- 'mdi mdi-skate',- 'mdi mdi-snowboard',- 'mdi mdi-ski-water',- 'mdi mdi-hiking',- 'mdi mdi-biathlon',- 'mdi mdi-swim',- 'mdi mdi-human-handsup',- 'mdi mdi-yoga',- 'mdi mdi-karate',- 'mdi mdi-kabaddi',- 'mdi mdi-weight-lifter',- 'mdi mdi-dumbbell',- 'mdi mdi-kettlebell',- 'mdi mdi-trophy-outline',- 'mdi mdi-racing-helmet',- 'mdi mdi-badminton',- 'mdi mdi-basketball',- 'mdi mdi-soccer',- 'mdi mdi-diving-helmet',- 'mdi mdi-diving-flippers',- 'mdi mdi-diving-snorkel'- ], [- 'mdi mdi-shape',- 'mdi mdi-telescope',- 'mdi mdi-school',- 'mdi mdi-book-open-page-variant',- 'mdi mdi-certificate-outline',- 'mdi mdi-electron-framework',- 'mdi mdi-palette-outline',- 'mdi mdi-format-color-fill',- 'mdi mdi-debian',- 'mdi mdi-feather',- 'mdi mdi-guitar-electric',- 'mdi mdi-bugle',- 'mdi mdi-music-clef-treble',- 'mdi mdi-music',- 'mdi mdi-theater',- 'mdi mdi-movie-roll'- ], [- 'mdi mdi-palm-tree',- 'mdi mdi-island',- 'mdi mdi-beach',- 'mdi mdi-cactus',- 'mdi mdi-barley',- 'mdi mdi-leaf',- 'mdi mdi-clover',- 'mdi mdi-flower-tulip-outline',- 'mdi mdi-flower'- ], [- // animals- 'mdi mdi-space-invaders',- 'mdi mdi-google-downasaur',- 'mdi mdi-cow',- 'mdi mdi-cat',- 'mdi mdi-dog-side',- 'mdi mdi-jellyfish-outline',- 'mdi mdi-fish',- 'mdi mdi-fishbowl-outline',- 'mdi mdi-duck',- 'mdi mdi-penguin',- 'mdi mdi-ladybug',- 'mdi mdi-language-swift',- 'mdi mdi-bat',- 'mdi mdi-paw',- 'mdi mdi-gnome'- ], [- // people- 'mdi mdi-account-tie',- 'mdi mdi-account-search-outline',- 'mdi mdi-account',- 'mdi mdi-account-heart',- 'mdi mdi-human-male-female',- 'mdi mdi-account-group',- 'mdi mdi-face-woman-outline',- 'mdi mdi-face',- 'mdi mdi-alien',- 'mdi mdi-emoticon-happy-outline',- 'mdi mdi-drama-masks',- 'mdi mdi-guy-fawkes-mask',- 'mdi mdi-gender-female'- ], [- // medicine- 'mdi mdi-emoticon-poop',- 'mdi mdi-star-face',- 'mdi mdi-baby-carriage',- 'mdi mdi-baby-bottle-outline',- 'mdi mdi-cards-heart',- 'mdi mdi-heart-pulse',- 'mdi mdi-doctor',- 'mdi mdi-tooth-outline',- 'mdi mdi-hospital',- 'mdi mdi-pill',- 'mdi mdi-folder-heart-outline'- ], [- // home- 'mdi mdi-home-heart',- 'mdi mdi-home',- 'mdi mdi-garage',- 'mdi mdi-water-well-outline',- 'mdi mdi-mailbox-open',- 'mdi mdi-gate',- 'mdi mdi-stove',- 'mdi mdi-radiator',- 'mdi mdi-washing-machine',- 'mdi mdi-kettle-outline',- 'mdi mdi-blender',- 'mdi mdi-shower',- 'mdi mdi-paper-roll-outline',- 'mdi mdi-toilet',- 'mdi mdi-water-pump',- 'mdi mdi-water-outline',- 'mdi mdi-campfire',- 'mdi mdi-fire',- 'mdi mdi-smoking',- 'mdi mdi-wind-turbine',- 'mdi mdi-spray',- 'mdi mdi-air-filter',- 'mdi mdi-waves'- ], [- // staf- 'mdi mdi-gift',- 'mdi mdi-diamond-stone',- 'mdi mdi-diamond',- 'mdi mdi-laptop-mac',- 'mdi mdi-monitor-cellphone',- 'mdi mdi-devices',- 'mdi mdi-television-guide',- 'mdi mdi-cellphone-android',- 'mdi mdi-phone-classic',- 'mdi mdi-phone-ring-outline',- 'mdi mdi-camera-gopro',- 'mdi mdi-gamepad-variant-outline',- 'mdi mdi-microsoft-xbox-controller',- 'mdi mdi-tshirt-crew',- 'mdi mdi-shoe-heel',- 'mdi mdi-lipstick',- 'mdi mdi-creation',- 'mdi mdi-content-cut',- 'mdi mdi-floor-lamp',- 'mdi mdi-sofa',- 'mdi mdi-bed',- 'mdi mdi-dresser-outline',- 'mdi mdi-dolly',- 'mdi mdi-axe',- 'mdi mdi-hammer',- 'mdi mdi-screwdriver',- 'mdi mdi-cogs',- 'mdi mdi-format-paint',- 'mdi mdi-magnify-close',- 'mdi mdi-basket-fill',- 'mdi mdi-metronome'- ], [- 'mdi mdi-folder-star',- 'mdi mdi-chart-donut',- 'mdi mdi-chart-bell-curve',- 'mdi mdi-chart-bell-curve-cumulative',- 'mdi mdi-chart-timeline-variant',- 'mdi mdi-finance',- 'mdi mdi-currency-usd',- 'mdi mdi-sack-percent',- 'mdi mdi-database',- 'mdi mdi-credit-card-multiple-outline',- 'mdi mdi-credit-card',- 'mdi mdi-card-account-details-outline',- 'mdi mdi-cash-multiple',- 'mdi mdi-cash-100',- 'mdi mdi-repeat',- 'mdi mdi-bank'- ], [- 'mdi mdi-auto-fix',- 'mdi mdi-wifi',- 'mdi mdi-android',- 'mdi mdi-apple-ios',- 'mdi mdi-microsoft-windows',- 'mdi mdi-microsoft-internet-explorer',- 'mdi mdi-email-outline',- 'mdi mdi-instagram',- 'mdi mdi-telegram',- 'mdi mdi-vk',- 'mdi mdi-alpha-y-circle',- 'mdi mdi-google-ads',- 'mdi mdi-google-play',- 'mdi mdi-vuejs',- 'mdi mdi-github',- 'mdi mdi-minecraft',- 'mdi mdi-web',- 'mdi mdi-disqus',- 'mdi mdi-white-balance-auto'- ], [- // rotate- 'mdi mdi-bullseye',- 'mdi mdi-chemical-weapon',- 'mdi mdi-battlenet',- 'mdi mdi-rotate-orbit',- 'mdi mdi-adobe-acrobat',- 'mdi mdi-blur',- 'mdi mdi-arrow-down-bold-circle-outline',- 'mdi mdi-progress-download',- 'mdi mdi-box-shadow',- 'mdi mdi-vector-difference-ab',- 'mdi mdi-alpha-i-circle-outline',- 'mdi mdi-alpha-m-circle-outline',- 'mdi mdi-all-inclusive'- ], [- 'mdi mdi-clippy',- 'mdi mdi-attachment',- 'mdi mdi-google-drive',- 'mdi mdi-file-chart',- 'mdi mdi-text-box-check-outline',- 'mdi mdi-file-document-outline',- 'mdi mdi-file-document',- 'mdi mdi-file-excel',- 'mdi mdi-file-export',- 'mdi mdi-file-multiple',- 'mdi mdi-asterisk',- 'mdi mdi-script',- 'mdi mdi-dev-to',- 'mdi mdi-code-not-equal-variant',- 'mdi mdi-code-braces'- ]-]