Skip to content

Open source personal finance application

update 3.0.13

ilkome27f1f56a89cf
diff --git a/components/amount/Amount.vue b/components/amount/Amount.vue
index 3e85a93e..013596f4 100644
--- a/components/amount/Amount.vue
+++ b/components/amount/Amount.vue
@@ -127,9 +127,8 @@ export default {
font-size 12px
^[0]._size_md &
- font-size 15px
+ font-size 16px
font-weight 600
- background red
&__symbol
padding-bottom 0px
diff --git a/components/shared/date/Date.vue b/components/shared/date/Date.vue
index 7382782f..9fe534d1 100644
--- a/components/shared/date/Date.vue
+++ b/components/shared/date/Date.vue
@@ -17,7 +17,12 @@ export default {
else if (today.subtract(1, filterPeriod).isSame(filterDate, 'day')) {
return 'Yesterday'
}
- format = 'DD MMMM YYYY'
+ if (today.isSame(filterDate, 'year')) {
+ format = 'DD MMMM'
+ }
+ else {
+ format = 'DD MMMM YYYY'
+ }
break
case 'week':
diff --git a/components/stat/StatChartDonut.vue b/components/stat/StatChartDonut.vue
index e559fdc6..a439e3ab 100644
--- a/components/stat/StatChartDonut.vue
+++ b/components/stat/StatChartDonut.vue
@@ -9,13 +9,24 @@ export default {
},
data () {
+ const vm = this
return {
date: dayjs().valueOf(),
periodName: 'month',
visiblePeriodMenu: false,
dateStart: null,
dateEnd: null,
- chartOptions
+ chartOptions: {
+ ...chartOptions,
+ chart: {
+ events: {
+ click (e) {
+ const date = this.series[0].searchPoint(e, true).date
+ vm.$store.dispatch('filter/setDate', parseInt(date))
+ }
+ }
+ }
+ }
}
},
@@ -51,26 +62,18 @@ export default {
this.chartOptions = {
...this.chartOptions,
xAxis: {
- categories: data.categories,
-
- clickOnCrosshair (e, p) {
- console.log(this, e, p)
- }
+ categories: data.categories
},
chart: {
- events: {
- click (e) {
- console.log('kci')
- // alert(this.series[0].searchPoint(e, true).category)
- }
- }
- },
- events: {
- click (e) {
- console.log('kci')
- // alert(this.series[0].searchPoint(e, true).category)
- }
+ backgroundColor: 'transparent',
+ with: '100%',
+ height: '40%',
+ spacing: [5, 0, 0, 0],
+ type: 'column',
+ zoomType: 'x',
+ panning: true,
+ panKey: 'shift'
}
}
},
@@ -173,115 +176,8 @@ export default {
.chart__navItem(
@click="changePeriod('year')"
) Years
-
.chart__content
Chart(:options="chartOptions")
- .summary(
- v-if="chartOptions.series[0] && chartOptions.series[0].data"
- )
- .summaryBlock(
- v-for="(data, dataIdx) in chartOptions.series[0].data"
- )
- h2 {{ $day(data.date).format('MMMM YYYY') }}
- .summary__wrap
- .summary__item._incomes
- .summary__row
- .summary__title {{ $lang.money.incomes }}
- .summary__amount
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :value="chartOptions.series[1].data[dataIdx].y"
- )
-
- .summary__row(
- v-if="chartOptions.series[1].data[dataIdx + 1]"
- )
- .summary__average
- .summary__average__icon: .mdi.mdi-chart-timeline
- .summary__average__title Difference
- .summary__amount._average
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :type="chartOptions.series[1].data[dataIdx].y - chartOptions.series[1].data[dataIdx + 1].y < 0 ? 0 : 3"
- :value="chartOptions.series[1].data[dataIdx].y - chartOptions.series[1].data[dataIdx + 1].y"
- )
-
- .summary__item._total
- .summary__row
- .summary__title Balance
- .summary__amount
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :value="chartOptions.series[0].data[dataIdx].y"
- )
-
- .summary__row(
- v-if="chartOptions.series[0].data[dataIdx + 1]"
- )
- .summary__average
- .summary__average__icon: .mdi.mdi-chart-timeline
- .summary__average__title Difference
- .summary__amount._average
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :type="chartOptions.series[0].data[dataIdx].y - chartOptions.series[0].data[dataIdx + 1].y < 0 ? 0 : 1"
- :value="chartOptions.series[0].data[dataIdx].y - chartOptions.series[0].data[dataIdx + 1].y"
- )
-
- .summary__item._expenses
- .summary__row
- .summary__title {{ $lang.money.expenses }}
- .summary__amount
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :value="chartOptions.series[2].data[dataIdx].y"
- )
-
- .summary__row(
- v-if="chartOptions.series[2].data[dataIdx + 2]"
- )
- .summary__average
- .summary__average__icon: .mdi.mdi-chart-timeline
- .summary__average__title Difference
- .summary__amount._average
- Amount(
- :big="true"
- :currency="$store.state.currencies.base"
- :type="chartOptions.series[2].data[dataIdx].y - chartOptions.series[2].data[dataIdx + 1].y < 0 ? 0 : 3"
- :value="chartOptions.series[2].data[dataIdx].y - chartOptions.series[2].data[dataIdx + 1].y"
- )
-
-
- //- .chartLine
- //- .chartLine__date {{ }}
- //- .chartLine__info
- //- .chartLine__amount
-
- //- .chartLine__amount
- //- Amount(
- //- :currency="$store.state.currencies.base"
- //- :type="0"
- //- :value="chartOptions.series[2].data[dataIdx].y"
- //- )
- //- .chartLine__amount
- //- Amount(
- //- :currency="$store.state.currencies.base"
- //- :value="data.y"
- //- )
-
- //- .chartLine__amount
- //- Amount(
- //- v-if="chartOptions.series[0].data[dataIdx + 1]"
- //- :currency="$store.state.currencies.base"
- //- size="lg"
- //- :value="chartOptions.series[0].data[dataIdx].y - chartOptions.series[0].data[dataIdx + 1].y"
- //- :type="chartOptions.series[0].data[dataIdx].y - chartOptions.series[0].data[dataIdx + 1].y > 0 ? 1 : 0"
- //- )
</template>
<style lang="stylus" scoped>
@@ -293,17 +189,6 @@ export default {
$background = var(--c-bg-4)
$border = var(--c-bg-1)
-.summaryBlock
- margin-bottom $m8
- padding 20px 20px
- background var(--c-bg-3)
- border-top 1px solid var(--c-bg-2)
- border-bottom 1px solid var(--c-bg-2)
- border-radius $m6
-
- h2
- padding-bottom $m7
-
.chart
z-index 3
position relative
@@ -329,91 +214,4 @@ $border = var(--c-bg-1)
&__content
padding 30px 60px
- &._modal
- z-index 5
- position fixed
- left 0
- top 0
- width 100%
- height 100%
-
-.summary
- overflow hidden
-
- &__wrap
- display flex
- flex-flow row
- justify-content space-between
- max-width 1100px
-
- &__item
- flex-grow 0
- display flex
- flex-flow column
- justify-content center
- margin $m5 $m7
- padding $m3 $m9
- padding-right 0
-
- @media $media-phone
- border-bottom 1px solid var(--c-bg-5)
-
- @media $media-laptop
- flex 0 1 250px
- padding 0
- margin 0
-
- @media $media-pc
- padding $m3 $m9
- padding-right 0
-
- &._expenses
- @media $media-pc
- border-left 2px solid rgba(200, 30, 50, .5)
- &._total
- align-self center
- @media $media-pc
- border-left 2px solid var(--c-bg-7)
-
- &._incomes
- align-self end
- @media $media-pc
- border-left 2px solid rgba(44, 173, 34, .8)
-
- &__row
- flex-grow 0
- display flex
- align-items center
- justify-content space-between
- padding-bottom $m6
- &:last-child
- padding-bottom 0
-
- &__title
- font-header-4()
- color var(--c-font-3)
- padding-right $m8
- &._incomes
- color var(--c-incomes-1)
- &._expenses
- color var(--c-expenses-1)
-
- &__amount
- &._average
- opacity .7
- .amount
- font-size 15px
-
- &__average
- display flex
- opacity .7
-
- &__icon
- font-size 15px
- margin-right $m5
-
- &__title
- font-header-4()
- font-size 16px
- padding-right $m8
</style>
diff --git a/components/stat/StatPc.vue b/components/stat/StatPc.vue
index ea4da889..00301311 100644
--- a/components/stat/StatPc.vue
+++ b/components/stat/StatPc.vue
@@ -62,7 +62,7 @@ export default {
&__content
display grid
- grid-template-columns repeat(2, 1fr)
+ grid-template-columns repeat(2,minmax(280px, 50%))
grid-column-gap $m10
&__chart
diff --git a/components/stat/StatSummaryMobile.vue b/components/stat/StatSummaryMobile.vue
index 0784ada1..aae7bec6 100644
--- a/components/stat/StatSummaryMobile.vue
+++ b/components/stat/StatSummaryMobile.vue
@@ -24,7 +24,8 @@ export default {
:center="true"
:currency="$store.state.currencies.base"
:type="1"
- :value="stat.incomes.total")
+ :value="stat.incomes.total"
+ )
template(v-else) .
.summary__item._total(@click="$store.dispatch('ui/setActiveTabStat', 'stat')")
@@ -35,7 +36,8 @@ export default {
Amount(
:center="true"
:currency="$store.state.currencies.base"
- :value="stat.incomes.total - stat.expenses.total")
+ :value="stat.incomes.total - stat.expenses.total"
+ )
template(v-else) .
.summary__item._expenses(@click="$store.dispatch('ui/setActiveTabStat', 'expenses')")
@@ -46,7 +48,8 @@ export default {
:center="true"
:currency="$store.state.currencies.base"
:value="stat.expenses.total"
- :type="0")
+ :type="0"
+ )
template(v-else) .
</template>
diff --git a/components/stat/cats/PeriodCatsChart.vue b/components/stat/cats/PeriodCatsChart.vue
index 2fb13a6d..447ecc1e 100644
--- a/components/stat/cats/PeriodCatsChart.vue
+++ b/components/stat/cats/PeriodCatsChart.vue
@@ -20,8 +20,6 @@ export default {
computed: {
className () {
return {
- _mobile: this.$store.state.ui.mobile,
- _pc: this.$store.state.ui.pc,
_incomes: this.type === 'incomes',
_expenses: this.type === 'expenses'
}
@@ -78,6 +76,8 @@ export default {
.cats-chart
position relative
+ width 100%
+
@media $media-laptop
opacity .7
anim-all(100)
diff --git a/components/stat/chartOptions.js b/components/stat/chartOptions.js
index 1d0ce21c..5351a515 100644
--- a/components/stat/chartOptions.js
+++ b/components/stat/chartOptions.js
@@ -7,7 +7,12 @@ export default {
type: 'column',
zoomType: 'x',
panning: true,
- panKey: 'shift'
+ panKey: 'shift',
+ events: {
+ click (e) {
+ console.log(this.series[0].searchPoint(e, true))
+ }
+ }
},
credits: { enabled: false },
legend: {
diff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vue
index c8ba7ea5..e6b0be16 100644
--- a/components/trns/list/TrnsList.vue
+++ b/components/trns/list/TrnsList.vue
@@ -171,15 +171,19 @@ export default {
margin-bottom 16px
padding-bottom 16px
- &:first-child
- margin-top $m9
-
+media-laptop()
- margin 0
+ padding 16px 0px
+ background var(--c-bg-4)
+ border-bottom 1px solid var(--c-bg-2)
+ border-radius 12px
&:first-child
+ margin-top $m9
border-top 0
+ +media-laptop()
+ margin 0
+
&__header
display flex
align-items center
diff --git a/middleware/auth.js b/middleware/auth.js
index 90790e08..45481032 100755
--- a/middleware/auth.js
+++ b/middleware/auth.js
@@ -1,6 +1,5 @@
export default function ({ store, redirect, route, app }) {
const routeName = app.getRouteBaseName(route)
- console.log('auth', store.state.user.user)
if (store.state.user.user !== null && routeName === 'login') {
redirect(app.localePath('/'))
diff --git a/nuxt.config.js b/nuxt.config.js
index 0ec46046..8cd3a009 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -4,34 +4,34 @@ export default {
},
/**
- * Nuxt rendering mode
- * https://nuxtjs.org/guides/features/rendering-modes
+ * https://nuxtjs.org/guides/configuration-glossary/configuration-ssr
*/
ssr: false,
/**
- * Nuxt rendering mode
- * https://nuxtjs.org/guides/configuration-glossary/configuration-target
+ * https://nuxtjs.org/guides/configuration-glossary/configuration-modern
*/
modern: 'client',
/**
* https://nuxtjs.org/guides/configuration-glossary/configuration-target
*/
- // target: 'static',
+ target: 'server',
/**
- * Nuxt rendering mode
* https://nuxtjs.org/guides/configuration-glossary/configuration-telemetry
*/
telemetry: false,
+ /**
+ * https://nuxtjs.org/guides/configuration-glossary/configuration-vue-config
+ */
vue: {
config: {
silent: true,
performance: false,
productionTip: false,
- devtools: false
+ devtools: true
}
},
diff --git a/package-lock.json b/package-lock.json
index 0355267f..db904cba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "3.0.11",
+ "version": "3.0.13",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 45a81dd5..0b0f957e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "3.0.12",
+ "version": "3.0.13",
"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 97ec5c04..886dfa0b 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -5,9 +5,7 @@ export default {
name: 'LoginPage',
fetch ({ store, redirect }) {
- console.log('fetch', store.state.user)
if (store.state.user && store.state.user.user) {
- console.log('store.state.user.user', store.state.user.user)
redirect('/')
}
},
@@ -23,7 +21,7 @@ export default {
this.loading = true
const provider = new auth.GoogleAuthProvider()
auth()
- .signInWithRedirect(provider)
+ .signInWithPopup(provider)
.catch(e => this.notifyAboutError(e))
},
diff --git a/store/app/actions.js b/store/app/actions.js
index a46c5e22..005ff2b8 100644
--- a/store/app/actions.js
+++ b/store/app/actions.js
@@ -75,7 +75,7 @@ export default {
this.app.context.redirect('/')
}
resolve()
- console.log('resolve')
+ // console.log('resolve')
}
else {
if (this.$router.currentRoute.name !== 'login') {
@@ -83,7 +83,7 @@ export default {
}
// commit('setAppStatus', 'ready')
resolve()
- console.log('resolve')
+ // console.log('resolve')
}
},
diff --git a/store/categories/mutations.js b/store/categories/mutations.js
index 56543079..77c46680 100644
--- a/store/categories/mutations.js
+++ b/store/categories/mutations.js
@@ -1,8 +1,10 @@
export default {
setCategories (state, items) {
const freezedItems = {}
- for (const itemId of Object.keys(items)) {
- freezedItems[itemId] = Object.freeze(items[itemId])
+ if (items) {
+ for (const itemId of Object.keys(items)) {
+ freezedItems[itemId] = Object.freeze(items[itemId])
+ }
}
state.items = freezedItems
},
diff --git a/store/trns/mutations.js b/store/trns/mutations.js
index e3b6e3da..51b59247 100644
--- a/store/trns/mutations.js
+++ b/store/trns/mutations.js
@@ -1,8 +1,10 @@
export default {
setTrns (state, items) {
const freezedItems = {}
- for (const itemId of Object.keys(items)) {
- freezedItems[itemId] = Object.freeze(items[itemId])
+ if (items) {
+ for (const itemId of Object.keys(items)) {
+ freezedItems[itemId] = Object.freeze(items[itemId])
+ }
}
state.items = freezedItems
},
diff --git a/store/wallets/mutations.js b/store/wallets/mutations.js
index 591be72b..9b4a74bf 100644
--- a/store/wallets/mutations.js
+++ b/store/wallets/mutations.js
@@ -1,8 +1,10 @@
export default {
setWallets (state, items) {
const freezedItems = {}
- for (const itemId of Object.keys(items)) {
- freezedItems[itemId] = Object.freeze(items[itemId])
+ if (items) {
+ for (const itemId of Object.keys(items)) {
+ freezedItems[itemId] = Object.freeze(items[itemId])
+ }
}
state.items = freezedItems
},