Skip to content

Open source personal finance application

update 3.5.0

ilkomedc98a7654ad9
diff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.styl
index d7f17c65..e422dc19 100644
--- a/assets/stylus/variables/colors-light.styl
+++ b/assets/stylus/variables/colors-light.styl
@@ -19,7 +19,8 @@ html
--c-bg-3 #f5f5f5
--c-bg-4 #fafafa
--c-bg-5 rgba(220, 220, 220, 1)
- --c-bg-6 rgba(210, 210, 210, 1)
+ // --c-bg-6 rgba(210, 210, 210, 1)
+ --c-bg-6 rgba(235, 235, 235, 1)
--c-bg-7 rgba(215, 215, 215, 1)
--c-bg-14 rgba(250, 250, 250, 1)
--c-bg-8 rgba(190, 190, 190, 1)
diff --git a/components/amount/Amount.vue b/components/amount/Amount.vue
index 725ef681..6c7df064 100644
--- a/components/amount/Amount.vue
+++ b/components/amount/Amount.vue
@@ -39,12 +39,18 @@ export default {
isColorize: {
type: Boolean,
default: true
+ },
+
+ isAltColor: {
+ type: Boolean,
+ default: false
}
},
computed: {
className () {
return {
+ _altColor: this.isAltColor,
_expenses: this.isColorize && this.type === 0,
_incomes: this.isColorize && this.type === 1,
[`_${this.vertical}`]: this.vertical,
@@ -107,6 +113,11 @@ export default {
.amount
color var(--c-font-base)
+ typo-money()
+
+ &._altColor
+ /.light-mode &
+ color var(--c-font-1)
&._incomes
color var(--c-incomes-1)
@@ -114,8 +125,6 @@ export default {
&._expenses
color var(--c-expenses-1)
- typo-money()
-
@media $media-laptop
font-size 16px
diff --git a/components/categories/item/CategoryItem.vue b/components/categories/item/CategoryItem.vue
index 26a241ee..5825a767 100644
--- a/components/categories/item/CategoryItem.vue
+++ b/components/categories/item/CategoryItem.vue
@@ -77,7 +77,7 @@ export default {
justify-content center
padding $m6
color var(--c-font-1)
- background var(--c-bg-5)
+ background var(--c-bg-6)
border-radius $m5
&._flat
diff --git a/components/stat/StatChartBalance.vue b/components/stat/StatChartBalance.vue
index 28051340..bba45655 100644
--- a/components/stat/StatChartBalance.vue
+++ b/components/stat/StatChartBalance.vue
@@ -19,7 +19,6 @@ export default {
dateEnd: null,
chartOptions: {
...chartOptions,
- tooltip: false,
chart: {
events: {
click (e) {
@@ -32,20 +31,6 @@ export default {
}
},
- computed: {
- activeTab () {
- return this.$store.state.dashboard.activeTab === 'balance'
- }
- },
-
- watch: {
- activeTab (isShow) {
- if (isShow) {
- // this.chartOptions.chart.redraw()
- }
- }
- },
-
mounted () {
const data = this.generateData(this.periodName)
const handlePerioSelect = date => this.$store.dispatch('filter/setDate', parseInt(date))
@@ -144,7 +129,7 @@ export default {
return {
series: [{
- visible: true,
+ visible: false,
type: 'spline',
name: 'Incomes',
color: 'var(--c-incomes-1)',
@@ -153,7 +138,7 @@ export default {
lineColor: 'var(--c-incomes-1)'
}
}, {
- visible: true,
+ visible: false,
type: 'spline',
name: 'Expenses',
color: 'var(--c-expenses-1)',
diff --git a/components/trnForm/TrnFormHeaderItemCategory.vue b/components/trnForm/TrnFormHeaderItemCategory.vue
index 4fbefe69..26395002 100644
--- a/components/trnForm/TrnFormHeaderItemCategory.vue
+++ b/components/trnForm/TrnFormHeaderItemCategory.vue
@@ -55,8 +55,9 @@ export default {
text-align left
.parent
+ opacity .8
padding-bottom $m2
- color var(--c-font-2)
+ color var(--c-font-1)
font-size 12px
.child
diff --git a/components/trnForm/TrnFormHeaderItemWallet.vue b/components/trnForm/TrnFormHeaderItemWallet.vue
index 642371b8..1509a62d 100644
--- a/components/trnForm/TrnFormHeaderItemWallet.vue
+++ b/components/trnForm/TrnFormHeaderItemWallet.vue
@@ -18,9 +18,10 @@ export default {
@click="$store.commit('trnForm/toogleTrnFormModal', 'wallets')"
)
WalletItem(
- ui="tile"
:id="$store.state.trnForm.values.walletId"
:showBase="false"
+ :isAltColor="true"
+ ui="tile"
)
.trnFormHeaderItem__dots: .mdi.mdi-dots-vertical
diff --git a/components/trnForm/TrnFormTrns.vue b/components/trnForm/TrnFormTrns.vue
index fb3c2fca..b4eabd51 100644
--- a/components/trnForm/TrnFormTrns.vue
+++ b/components/trnForm/TrnFormTrns.vue
@@ -264,11 +264,15 @@ export default {
display flex
align-items center
justify-content space-between
- padding 0 12px
- padding-bottom 12px
+ padding 0 $m7
+ padding-bottom $m7
+
+ &__trns
+ padding 0 $m7
&__pages
padding 16px 8px
+ padding-top 0
+media-laptop()
padding 0
diff --git a/components/wallets/item/WalletItem.vue b/components/wallets/item/WalletItem.vue
index a2caaef1..30a8361b 100644
--- a/components/wallets/item/WalletItem.vue
+++ b/components/wallets/item/WalletItem.vue
@@ -58,13 +58,13 @@ div(
:style="styles"
@click="handleClick"
)
-
//- tile
template(v-if="ui === 'tile' || ui === 'line'")
.walletItemTile__name {{ wallet.name }}
.walletItemTile__amount
Amount(
:currency="wallet.currency"
+ :isAltColor="$attrs.isAltColor"
:showBase="showBase"
:value="wallet.total"
alwaysShowSymbol
@@ -84,6 +84,7 @@ div(
.walletItem__amount
Amount(
:currency="wallet.currency"
+ :isAltColor="$attrs.isAltColor"
:value="wallet.total"
alwaysShowSymbol
)
diff --git a/package.json b/package.json
index bd9cdda7..e48e21d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "3.4.0",
+ "version": "3.5.0",
"scripts": {
"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt",
"build": "nuxt build",
diff --git a/pages/login.vue b/pages/login.vue
index 0853def4..23eee0e0 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -21,7 +21,7 @@ export default {
this.loading = true
const provider = new firebase.auth.GoogleAuthProvider()
firebase.auth()
- .signInWithRedirect(provider)
+ .signInWithPopup(provider)
.catch(e => this.notifyAboutError(e))
},