Skip to content

Open source personal finance application

Update TrnForm

ilkome660eb7011ef3
diff --git a/src/components/trnForm/TrnForm.vue b/src/components/trnForm/TrnForm.vue
index 3e19c5bb..0893c86a 100644
--- a/src/components/trnForm/TrnForm.vue
+++ b/src/components/trnForm/TrnForm.vue
@@ -297,7 +297,7 @@ export default {
v-on:onClick="walletId => $store.commit('setTrnFormValues', { walletId })")
.formCategories(v-if="$store.getters.quickSelectorCategoriesIds && $store.getters.quickSelectorCategoriesIds.length > 0")
- .formTitle(@click="$store.commit('toogleTrnFormModal', 'categories')") Categories
+ .formTitle(@click="$store.commit('toogleTrnFormModal', 'categories')") Favorite Categories
CategoriesView(
:ids="$store.getters.quickSelectorCategoriesIds"
:noPaddingBottom="true"
diff --git a/src/components/trnForm/TrnFormAmount.vue b/src/components/trnForm/TrnFormAmount.vue
index 0e4feb16..d5d11f75 100644
--- a/src/components/trnForm/TrnFormAmount.vue
+++ b/src/components/trnForm/TrnFormAmount.vue
@@ -157,7 +157,7 @@ export default {
.action
template(v-if="!amountValue")
Button(
- className="_blue"
+ className="_grey _center"
title="Write amount"
v-on:onClick="handleMath")
template(v-else-if="amounIsNumber")
diff --git a/src/components/trnForm/TrnFormCalendar.vue b/src/components/trnForm/TrnFormCalendar.vue
index f100cdbb..b660c50a 100644
--- a/src/components/trnForm/TrnFormCalendar.vue
+++ b/src/components/trnForm/TrnFormCalendar.vue
@@ -5,7 +5,7 @@ export default {
computed: {
formatedDate () {
const date = formatDate(this.$store.state.trnForm.values.date, 'full')
- return `${date.weekDay}, ${date.day} ${date.month}`
+ return `${date.weekday}, ${date.day} ${date.month}`
}
},
diff --git a/src/components/trnForm/TrnFormModalCats.vue b/src/components/trnForm/TrnFormModalCats.vue
index 8aef8c26..9d446d84 100644
--- a/src/components/trnForm/TrnFormModalCats.vue
+++ b/src/components/trnForm/TrnFormModalCats.vue
@@ -62,6 +62,17 @@ TrnFormModal(
//- pc
template(v-if="$store.state.ui.pc")
+ template(v-if="$store.state.ui.lastUsedCatsInTrnForm === 'visible'")
+ .marginBottom
+ .formTitle Last used categories
+ CategoriesView(
+ :ids="$store.getters.lastUsedCategoriesIdsByDate"
+ :noPaddingBottom="true"
+ v-on:onClick="handleCategoryClick"
+ )
+
+ template(v-if="$store.state.ui.lastUsedCatsInTrnForm === 'visible'")
+ .formTitle All categories
CategoriesView(
:ids="$store.getters.categoriesRootIds"
:noPaddingBottom="true"
@@ -94,3 +105,8 @@ TrnFormModal(
.categories__desc Slide left or right
</template>
+
+<style lang="stylus" scoped>
+.marginBottom
+ margin-bottom 30px
+</style>
diff --git a/src/components/trnForm/styles/trnForm.styl b/src/components/trnForm/styles/trnForm.styl
index 9774b611..a6bd2425 100644
--- a/src/components/trnForm/styles/trnForm.styl
+++ b/src/components/trnForm/styles/trnForm.styl
@@ -12,7 +12,7 @@
right 10%
top 10%
bottom inherit
- height 100%
+ height calc(100% - 20%)
&__overflow
position fixed
@@ -31,6 +31,8 @@
flex-grow 1
flex-flow column nowrap
background var(--c-bg-4)
+ max-width 400px
+ margin 0 auto
/.theme-light &
background var(--c-bg-2)
@@ -42,12 +44,14 @@
@media $media-laptop
width 400px
max-height calc(100vh - 100px)
- border 1px solid var(--c-bg-1)
+ background 0
&__scroll
overflow hidden
overflow-y auto
scrollbar()
+ @media $media-laptop
+ background var(--c-bg-4)
&__calendar
padding $m7 0