Skip to content

Open source personal finance application

Big update with many fixes and new bugs

ilkome4c5987006ab4
diff --git a/package.json b/package.json
index 05e4fc11..56b09d2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "2.0.0",
+ "version": "2.1.0",
"repository": {
"type": "git",
"url": "https://github.com/ilkome/finapp.git"
@@ -9,10 +9,10 @@
"serve": "vue-cli-service serve --modern",
"build": "vue-cli-service build --modern",
"dev": "npm run serve",
- "build-upload": "npm run build && npm run upload-all",
- "build-upload-min": "npm run build && npm run upload-min",
- "upload": "NODE_ENV=production node_modules/gulp/bin/gulp.js uploadAll",
- "upload-min": "NODE_ENV=production node_modules/gulp/bin/gulp.js uploadMin"
+ "upload-all": "NODE_ENV=production node node_modules/gulp/bin/gulp.js uploadAll",
+ "upload-min": "NODE_ENV=production node node_modules/gulp/bin/gulp.js uploadMin",
+ "build-upload-all": "npm run build && npm run upload-all",
+ "build-upload-min": "npm run build && npm run upload-min"
},
"dependencies": {
"@babel/polyfill": "^7.4.4",
diff --git a/src/components/app/store/actions.js b/src/components/app/store/actions.js
index 2fb84f52..43230eef 100644
--- a/src/components/app/store/actions.js
+++ b/src/components/app/store/actions.js
@@ -18,6 +18,8 @@ export default {
await dispatch('initCategories')
await dispatch('initWallets')
await dispatch('initTrns')
+ await dispatch('initGroups')
+ await dispatch('initBudgets')
await dispatch('initDbLang')
} catch (e) {
console.error(e)
diff --git a/src/components/budgets/BudgetForm.vue b/src/components/budgets/BudgetForm.vue
new file mode 100644
index 00000000..2889c610
--- /dev/null
+++ b/src/components/budgets/BudgetForm.vue
@@ -0,0 +1,181 @@
+<script>
+import Button from '@/components/shared/button/Button'
+import Cleave from 'vue-cleave-component'
+import TrnItem from '@/components/budgets/BudgetFormTrn'
+import TrnsList from '@/components/trns/list/TrnsList2'
+
+export default {
+ components: {
+ Button,
+ Cleave,
+ TrnItem,
+ TrnsList
+ },
+
+ data () {
+ return {
+ budgetName: '',
+ budgetAmount: '',
+ budgetTrnsIds: [],
+ amountInputOptions: {
+ numeral: true,
+ numeralPositiveOnly: true,
+ numeralDecimalScale: 0,
+ delimiter: ' '
+ }
+ }
+ },
+
+ methods: {
+ async handleCreateBudget () {
+ const isFormValid = this.validateForm()
+ if (isFormValid) {
+ const values = {
+ amount: this.budgetAmount,
+ currency: this.$store.state.currencies.base,
+ name: this.budgetName,
+ trnsIds: this.budgetTrnsIds
+ }
+
+ await this.$store.dispatch('createBudget', values)
+ this.budgetName = null
+ this.budgetAmount = null
+ }
+ },
+
+ validateForm () {
+ if (!this.budgetName) {
+ const budgetNameRef = this.$refs.budgetNameRef
+ this.focusInputName(budgetNameRef)
+ budgetNameRef.classList.remove('_error')
+ setTimeout(() => { budgetNameRef.classList.add('_error') }, 10)
+ return false
+ }
+
+ if (!this.budgetAmount) {
+ const budgetAmountRef = this.$refs.budgetAmountRef
+ this.focusInputName(budgetAmountRef)
+ budgetAmountRef.classList.remove('_error')
+ setTimeout(() => { budgetAmountRef.classList.add('_error') }, 10)
+ return false
+ }
+
+ return true
+ },
+
+ focusInputName (ref) {
+ ref.querySelector('.inputText__value').focus()
+ },
+
+ isSelectedTrn (trnId) {
+ return this.budgetTrnsIds.includes(trnId)
+ },
+
+ handleSelectTrn (trnId) {
+ console.log(trnId)
+ if (this.budgetTrnsIds.includes(trnId)) {
+ this.budgetTrnsIds = this.budgetTrnsIds.filter(item => item !== trnId)
+ } else {
+ this.budgetTrnsIds.push(trnId)
+ }
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.form
+ .form__title {{ $lang.budgets.form.title }}
+
+ .form__group(ref="budgetNameRef")
+ .inputText__label {{ $lang.budgets.form.name }}
+ .inputText
+ input.inputText__value(
+ type="text"
+ :placeholder="`${$lang.budgets.form.name}...`"
+ v-model="budgetName")
+
+ .form__group(ref="budgetAmountRef")
+ .inputText__label {{ $lang.budgets.form.amount }}
+ .inputText
+ cleave(
+ v-model="budgetAmount"
+ :placeholder="`${$lang.budgets.form.amount} ${$store.state.currencies.base}...`"
+ class="inputText__value _number"
+ :options="amountInputOptions")
+
+ //- .form__group
+ .inputText__label {{ $lang.budgets.trns.name }}
+
+ TrnsList(v-slot="{ trns }")
+ TrnItem(
+ v-for="trnItem in trns"
+ v-on:onClick="handleSelectTrn(trnItem.id)"
+ :category="trnItem.category"
+ :className="{ _selected: isSelectedTrn(trnItem.id) }"
+ :id="trnItem.id"
+ :key="trnItem.id"
+ :trn="trnItem.trn"
+ :wallet="trnItem.wallet")
+
+ Button(
+ className="_blue _inline _text-center"
+ :title="$lang.budgets.form.button"
+ v-on:onClick="handleCreateBudget")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/fonts"
+
+.form
+ overflow hidden
+ padding 25px 20px
+ background var(--c-bg-3)
+ border 1px solid var(--c-bg-4)
+
+ &__title
+ font-header-1()
+ margin-bottom 30px
+
+ &__group
+ padding-bottom 30px
+ &._error
+ animation shake .5s linear
+
+.inputText__value
+ height 40px
+ font-size 16px
+ padding 0 16px
+ background var(--c-bg-1)
+ border 1px solid var(--c-bg-7)
+ border-radius 3px
+
+ &._number
+ font-size 22px
+ font-secondary()
+ &::placeholder
+ font-primary()
+ font-size 16px
+
+ &:focus
+ border-color var(--c-bg-9)
+
+.inputText__label
+ border 0
+ margin 0
+ padding 0
+ padding-bottom 10px
+ font-size 11px
+
+@keyframes shake
+ 8%, 41%
+ transform translateX(-10px)
+ 25%, 58%
+ transform translateX(10px)
+ 75%
+ transform translateX(-5px)
+ 92%
+ transform translateX(5px)
+ 0%, 100%
+ transform translateX(0)
+</style>
diff --git a/src/components/budgets/BudgetFormTrn.vue b/src/components/budgets/BudgetFormTrn.vue
new file mode 100644
index 00000000..dd3f2949
--- /dev/null
+++ b/src/components/budgets/BudgetFormTrn.vue
@@ -0,0 +1,132 @@
+<script>
+import { formatDate } from '@/utils/formatDate'
+import Amount from '@/components/amount/Amount'
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Amount,
+ Icon
+ },
+
+ props: {
+ category: {
+ type: Object,
+ required: true
+ },
+ trn: {
+ type: Object,
+ required: true
+ },
+ id: {
+ type: String,
+ required: true
+ },
+ wallet: {
+ type: Object,
+ required: true
+ },
+ className: {
+ type: Object,
+ default: () => {}
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.trn.date, 'number')
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.trnItem(@click="$emit('onClick')" :class="className")
+
+ .trnItem__date {{ formatedDate }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="wallet.name"
+ :background="wallet.color"
+ :small="true")
+ .walletName {{ wallet.name }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="category.name"
+ :background="category.color"
+ :small="true")
+ .walletName {{ category.name }}
+
+ //- .trnItem__desc(v-if="trn.description") {{ trn.description }}
+
+ .trnItem__amount
+ Amount(
+ :currency="wallet.currency"
+ :value="trn.amount"
+ :type="trn.type")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.trnItem
+ position relative
+ display flex
+ align-items center
+ padding 10px 0
+ border-bottom 1px solid var(--c-bg-6)
+ color var(--c-font-4)
+
+ &:hover
+ @media $media-laptop
+ margin -1px -20px 0 -20px
+ padding 11px 20px 10px 20px
+ background var(--c-bg-5)
+ border-color transparent
+ /.theme-light &
+ background var(--c-bg-5)
+ &:last-child
+ border-color transparent
+
+ &._selected
+ margin -1px -20px 0 -20px
+ padding 10px 20px 10px 20px
+ background var(--c-bg-1)
+ border-bottom 1px solid var(--c-bg-6)
+ border-top 1px solid var(--c-bg-6)
+
+ &__amount
+ align-self center
+ margin-left auto
+
+ &__categoryName
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__date
+ padding-right 20px
+ font-size 13px
+
+ &__desc
+ padding-right 10px
+ color var(--c-font-3)
+ font-size 12px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__wallet
+ display flex
+ align-items center
+ padding-right 20px
+ .walletIcon
+ margin-right 8px
+ .walletName
+ font-size 14px
+ white-space nowrap
+</style>
diff --git a/src/components/budgets/BudgetItem.vue b/src/components/budgets/BudgetItem.vue
new file mode 100644
index 00000000..384f31ad
--- /dev/null
+++ b/src/components/budgets/BudgetItem.vue
@@ -0,0 +1,118 @@
+<script>
+import Amount from '@/components/amount/Amount'
+import TrnItem from '@/components/budgets/BudgetItemTrn'
+import TrnsList from '@/components/trns/list/TrnsList2'
+import { formatDate } from '@/utils/formatDate'
+
+export default {
+ components: {
+ Amount,
+ TrnItem,
+ TrnsList
+ },
+
+ props: {
+ id: {
+ type: String,
+ required: true
+ },
+
+ budget: {
+ type: Object,
+ required: true
+ }
+ },
+
+ data () {
+ return {
+ isTrnsVisible: false
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.budget.date, 'number')
+ },
+
+ trnsIds () {
+ if (this.budget.trnsIds) {
+ return Object.keys(this.budget.trnsIds)
+ .sort((a, b) => {
+ if (this.$store.state.trns.items[a].date > this.$store.state.trns.items[b].date) return -1
+ if (this.$store.state.trns.items[a].date < this.$store.state.trns.items[b].date) return 1
+ return 0
+ })
+ }
+ },
+
+ gotAmount () {
+ if (this.budget.trnsIds) {
+ return Math.abs(this.$store.getters.getTotalOfTrnsIds(this.trnsIds).incomes)
+ }
+ return 0
+ },
+
+ styles () {
+ return {
+ width: `${Math.abs(this.gotAmount) / Math.abs(this.budget.amount) * 100}%`
+ }
+ }
+ },
+
+ methods: {
+ async removeBudgetId (id) {
+ // await this.$store.dispatch('removeBudget', id)
+ },
+
+ handleTrnItemClick (trnId) {
+ this.$store.commit('hideCategoryModal')
+ this.$store.commit('showTrnModal')
+ this.$store.commit('setTrnModalId', trnId)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.budgetItem(@click="removeBudgetId(budget.id)")
+ .budgetItem__countTotal(v-if="budget.countTotal")
+
+ .budgetItem__top(@click="isTrnsVisible = !isTrnsVisible")
+ .budgetItem__meta
+ .budgetItem__name {{ budget.name }}
+ .budgetItem__description(v-if="budget.description") {{ budget.description }}
+
+ .budgetItem__total
+ .sum._right
+ .sum__title {{ $lang.budgets.stat.total }}
+ .sum__amount
+ Amount(:currency="budget.currency" :value="budget.amount")
+
+ //- .budgetItem__hours(v-if="budget.spendHours")
+ div {{ Math.abs(budget.amount / budget.spendHours).toFixed() }} in hour of {{ budget.spendHours }} hours
+
+ .budgetItem__info(@click="isTrnsVisible = !isTrnsVisible")
+ .budgetItem__amounts
+ .sum
+ .sum__title {{ $lang.budgets.stat.left }}
+ .sum__amount
+ Amount(:currency="budget.currency" :value="budget.amount - gotAmount")
+ .sum._right
+ .sum__title {{ $lang.budgets.stat.got }}
+ .sum__amount
+ Amount(:currency="budget.currency" :type="1" :value="gotAmount")
+
+ .budgetItem__graph: .budgetItem__graph__in(:style="styles")
+
+ .budgetItem__trns(v-if="budget.trnsIds" v-show="isTrnsVisible")
+ TrnsList(:ids="trnsIds" v-slot="{ trns }")
+ TrnItem(
+ v-for="trnItem in trns"
+ :category="trnItem.category"
+ :id="trnItem.id"
+ :key="trnItem.id"
+ :trn="trnItem.trn"
+ :wallet="trnItem.wallet")
+ .budgetItem__noTrns(v-else v-show="isTrnsVisible")
+ h1 No trns
+</template>
diff --git a/src/components/budgets/BudgetItemTrn.vue b/src/components/budgets/BudgetItemTrn.vue
new file mode 100644
index 00000000..94432c4c
--- /dev/null
+++ b/src/components/budgets/BudgetItemTrn.vue
@@ -0,0 +1,121 @@
+<script>
+import { formatDate } from '@/utils/formatDate'
+import Amount from '@/components/amount/Amount'
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Amount,
+ Icon
+ },
+
+ props: {
+ category: {
+ type: Object,
+ required: true
+ },
+ trn: {
+ type: Object,
+ required: true
+ },
+ id: {
+ type: String,
+ required: true
+ },
+ wallet: {
+ type: Object,
+ required: true
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.trn.date, 'number')
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.trnItem(@click="$emit('onClick', id)")
+ .trnItem__date {{ formatedDate }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="wallet.name"
+ :background="wallet.color"
+ :small="true")
+ .walletName {{ wallet.name }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="category.name"
+ :background="category.color"
+ :small="true")
+ .walletName {{ category.name }}
+
+ //- .trnItem__desc(v-if="trn.description") {{ trn.description }}
+
+ .trnItem__amount
+ Amount(
+ :currency="wallet.currency"
+ :value="trn.amount"
+ :type="trn.type")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.trnItem
+ position relative
+ display flex
+ flex-flow wrap
+ align-items center
+ padding 10px 0
+ border-bottom 1px solid var(--c-bg-6)
+ color var(--c-font-4)
+
+ &:hover
+ @media $media-laptop
+ margin -1px -20px 0 -20px
+ padding 11px 20px 10px 20px
+ background var(--c-bg-5)
+ border-color transparent
+ /.theme-light &
+ background var(--c-bg-5)
+ &:last-child
+ border-color transparent
+
+ &__amount
+ align-self center
+ margin-left auto
+
+ &__categoryName
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__date
+ padding-right 20px
+ font-size 13px
+
+ &__desc
+ padding-right 10px
+ color var(--c-font-3)
+ font-size 12px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__wallet
+ display flex
+ align-items center
+ padding-right 20px
+ .walletIcon
+ margin-right 8px
+ .walletName
+ font-size 14px
+ white-space nowrap
+</style>
diff --git a/src/components/budgets/Budgets.vue b/src/components/budgets/Budgets.vue
new file mode 100644
index 00000000..31e6812c
--- /dev/null
+++ b/src/components/budgets/Budgets.vue
@@ -0,0 +1,109 @@
+<script>
+import Amount from '@/components/amount/Amount'
+import BudgetForm from '@/components/budgets/BudgetForm'
+import BudgetItem from '@/components/budgets/BudgetItem'
+import Button from '@/components/shared/button/Button'
+import ComponentWrap from '@/components/layout/component/Component'
+
+export default {
+ components: {
+ Amount,
+ BudgetForm,
+ BudgetItem,
+ Button,
+ ComponentWrap
+ },
+
+ data () {
+ return {
+ isShowForm: false
+ }
+ },
+
+ computed: {
+ budgets () {
+ return this.$store.getters.budgets
+ },
+
+ budgetsCount () {
+ return Object.keys(this.$store.getters.budgets).length
+ },
+
+ styles () {
+ return {
+ width: '60%'
+ // width: `${Math.abs(this.gotAmount) / Math.abs(this.budget.amount) * 100}%`
+ }
+ }
+ },
+
+ async created () {
+ await this.$store.dispatch('initBudgets')
+ }
+}
+</script>
+
+<template lang="pug">
+ComponentWrap
+ template(slot="headerLeft") {{ $lang.budgets.name }}
+
+ template(slot="contentLeft" v-if="$store.getters.budgetsTotal")
+ .budgetItem._total
+ .budgetItem__top
+ .budgetItem__meta
+ .budgetItem__name Total budgets {{ $store.getters.budgetsTotal.count }}
+
+ .budgetItem__total
+ .sum._right
+ .sum__title {{ $lang.budgets.stat.total }}
+ .sum__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="$store.getters.budgetsTotal.total")
+
+ .budgetItem__info
+ .budgetItem__amounts
+ .sum
+ .sum__title {{ $lang.budgets.stat.left }}
+ .sum__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="$store.getters.budgetsTotal.total - $store.getters.budgetsTotal.incomes")
+
+ .sum._right
+ .sum__title {{ $lang.budgets.stat.got }}
+ .sum__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="1"
+ :value="$store.getters.budgetsTotal.incomes")
+
+ .budgetItem__graph: .budgetItem__graph__in(:style="styles")
+
+ template(v-if="budgetsCount")
+ .list
+ BudgetItem(
+ v-for="(budget, budgetId) in budgets"
+ :budget="budget"
+ :id="budgetId"
+ :key="budgetId")
+ template(v-else)
+ h1 No budgets
+
+ template(slot="contentRight")
+ BudgetForm
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+.list
+ display grid
+ grid-template-columns repeat(auto-fill, minmax(auto, 1fr))
+ grid-column-gap 12px
+ grid-row-gap 12px
+
+ +media-laptop()
+ grid-column-gap 16px
+ grid-row-gap 16px
+</style>
diff --git a/src/components/budgets/store/actions.js b/src/components/budgets/store/actions.js
new file mode 100644
index 00000000..5dd8e7e0
--- /dev/null
+++ b/src/components/budgets/store/actions.js
@@ -0,0 +1,83 @@
+import moment from 'moment'
+import { db } from '@/firebase'
+import { generateDateId } from '@/utils/id'
+
+export default {
+ initBudgets ({ dispatch, rootGetters }) {
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/budgets`
+
+ db.ref(path).on('value', snapshot => {
+ const items = Object.freeze(snapshot.val())
+ dispatch('setBudgets', items)
+ }, e => console.error(e))
+ },
+
+ setBudgets ({ commit }, items) {
+ commit('setBudgets', items)
+ },
+
+ async createBudget ({ rootGetters }, values) {
+ const id = generateDateId()
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/budgets/${id}`
+
+ await db.ref(path)
+ .set({
+ amount: Number(values.amount),
+ currency: values.currency,
+ name: values.name,
+ trnsIds: values.trnsIds,
+ date: moment().valueOf()
+ })
+ .then(() => { return true })
+
+ return false
+ },
+
+ async removeBudget ({ rootGetters }, id) {
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/budgets/${id}`
+ await db.ref(path)
+ .remove()
+ .then(() => { return true })
+ },
+
+ async addTrnToBudget ({ rootGetters }, { budgetId, trnId }) {
+ const uid = rootGetters.userUid
+
+ // add to budget
+ await db.ref(`users/${uid}/budgets/${budgetId}/trnsIds/${trnId}`)
+ .set(trnId)
+ .then(() => { return true })
+
+ // info in trn
+ await db.ref(`users/${uid}/trns/${trnId}/budgets/${budgetId}`)
+ .set(budgetId)
+ .then(() => { return true })
+ },
+
+ async removeTrnFromBudget ({ rootGetters }, { budgetId, trnId }) {
+ const uid = rootGetters.userUid
+
+ // remove from budget
+ await db.ref(`users/${uid}/budgets/${budgetId}/trnsIds/${trnId}`)
+ .remove()
+ .then(() => { return true })
+
+ // remove from trn
+ await db.ref(`users/${uid}/trns/${trnId}/budgets/${budgetId}`)
+ .remove()
+ .then(() => { return true })
+ },
+
+ toogleAddToBudget ({ dispatch, rootState, rootGetters }, { budgetId, trnId }) {
+ const trn = rootState.trns.items[trnId]
+
+ if (trn.budgets && trn.budgets[budgetId]) {
+ dispatch('removeTrnFromBudget', { budgetId, trnId })
+ } else {
+ dispatch('addTrnToBudget', { budgetId, trnId })
+ }
+ }
+}
diff --git a/src/components/budgets/store/getters.js b/src/components/budgets/store/getters.js
new file mode 100644
index 00000000..02e97f5f
--- /dev/null
+++ b/src/components/budgets/store/getters.js
@@ -0,0 +1,60 @@
+export default {
+ hasBudgets (state, getters, rootState) {
+ if (rootState.budgets.items) {
+ if (Object.keys(rootState.budgets.items).length > 0) return true
+ }
+ return false
+ },
+
+ /**
+ * Return budgets
+ *
+ * @return {Object} Object
+ * @return {String} {}.name
+ */
+ budgets (state, getters, rootState, rootGetters) {
+ if (!rootGetters.hasBudgets) return null
+ const budgets = rootState.budgets.items
+ const formatedBudgets = {}
+
+ for (const key in budgets) {
+ let trnsInBudget = budgets[key].trnsIds || {}
+ const trnsIds = Object.keys(trnsInBudget)
+ const total = rootGetters.getTotalOfTrnsIds(trnsIds)
+
+ formatedBudgets[key] = {
+ ...budgets[key],
+ total
+ }
+ }
+
+ return formatedBudgets
+ },
+
+ /**
+ * Return budgets
+ *
+ * @return {Object} Object
+ * @return {String} {}.name
+ */
+ budgetsTotal (state, getters, rootState, rootGetters) {
+ if (!rootGetters.hasBudgets) return null
+
+ const budgets = rootGetters.budgets
+ const budgetsTotal = {
+ count: Object.keys(rootGetters.budgets).length,
+ incomes: 0,
+ total: 0
+ }
+
+ for (const key in budgets) {
+ const budgetItem = budgets[key]
+ if (budgetItem.countTotal) {
+ budgetsTotal.incomes = budgetsTotal.incomes + budgetItem.total.incomes
+ budgetsTotal.total = budgetsTotal.total + budgetItem.amount
+ }
+ }
+
+ return budgetsTotal
+ }
+}
diff --git a/src/components/budgets/store/index.js b/src/components/budgets/store/index.js
new file mode 100644
index 00000000..a782a4df
--- /dev/null
+++ b/src/components/budgets/store/index.js
@@ -0,0 +1,14 @@
+import actions from './actions'
+import mutations from './mutations'
+import getters from './getters'
+
+const state = {
+ items: {}
+}
+
+export default {
+ state,
+ actions,
+ mutations,
+ getters
+}
diff --git a/src/components/budgets/store/mutations.js b/src/components/budgets/store/mutations.js
new file mode 100644
index 00000000..85a987ac
--- /dev/null
+++ b/src/components/budgets/store/mutations.js
@@ -0,0 +1,5 @@
+export default {
+ setBudgets (state, items) {
+ state.items = items
+ }
+}
diff --git a/src/components/categories/form/CategoryForm.vue b/src/components/categories/form/CategoryForm.vue
index d2ca727d..9c56fa00 100644
--- a/src/components/categories/form/CategoryForm.vue
+++ b/src/components/categories/form/CategoryForm.vue
@@ -6,16 +6,18 @@ import colors from '@/components/ui/store/colors'
import icons from '@/components/ui/store/icons'
import Button from '@/components/shared/button/Button'
-import Checkbox from '@/components/shared/inputs/Checkbox'
import CategoriesView from '@/components/categories/list/CategoriesView'
+import Checkbox from '@/components/shared/inputs/Checkbox'
+import ComponentWrap from '@/components/layout/component/Component'
import ModalBottom from '@/components/modal/ModalBottom'
import ModalButton from '@/components/modal/ModalButton'
export default {
components: {
Button,
- Checkbox,
CategoriesView,
+ Checkbox,
+ ComponentWrap,
ModalBottom,
ModalButton
},
@@ -90,6 +92,10 @@ export default {
},
handleParenCategorySelect (categoryId) {
+ const parentCategory = this.$store.state.categories.items[categoryId]
+ if (parentCategory) {
+ this.category.color = parentCategory.color
+ }
this.category.parentId = categoryId
this.showParents = false
},
@@ -124,7 +130,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Write category name'
+ text: this.$lang.categories.form.name.error
})
return false
}
@@ -136,7 +142,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Category with same name is exist'
+ text: this.$lang.categories.form.name.exist
})
return false
}
@@ -144,7 +150,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Category with same name is exist'
+ text: this.$lang.categories.form.name.exist
})
return false
}
@@ -158,34 +164,24 @@ export default {
</script>
<template lang="pug">
-.component
- .form
- h1.component__title
- template(v-if="!categoryId") Create new category
- template(v-else) Edit category
-
- .form-line._text
- .inputText
- input(
- type="text"
- placeholder="Write category name..."
- v-model="category.name"
- v-focus.lazy="$store.state.ui.pc"
- ).inputText__value
- .inputText__label Category name
-
- .form__btns
- .form__btns__i
- .form-line(@click="showColors = true")
- .inputModal._flex
- .inputModal__value: .inputModal__color(:style="{ background: category.color }")
- .inputModal__label Color
-
- .form__btns__i
- .form-line(@click="showIcons = true")
- .inputModal._flex
- .inputModal__icon: div(:class="category.icon", :style="{ color: category.color }")
- .inputModal__label Icon
+ComponentWrap
+ template(slot="headerLeft")
+ template(v-if="!categoryId")
+ div Categories
+ div {{ $lang.categories.createNewTitle }}
+ template(v-else) Categories __ {{ $lang.categories.editTitle }}
+
+ template(slot="content")
+ .form
+ .form-line._text
+ .inputText
+ input(
+ type="text"
+ :placeholder="$lang.categories.form.name.placeholder"
+ v-model="category.name"
+ v-focus.lazy="$store.state.ui.pc"
+ ).inputText__value
+ .inputText__label {{ $lang.categories.form.name.label }}
//- can not change root category if inside this category already has some categories
template(v-if="$store.getters.getChildCategoriesIds(categoryId).length === 0 && $store.getters.hasCategories")
@@ -202,83 +198,96 @@ export default {
.inputModal__name {{ $store.state.categories.items[category.parentId].name }}
template(v-else)
.inputModal__icon: .mdi.mdi-chart-bubble
- .inputModal__name No parent
- .inputModal__label Parent category
-
- template(v-if="$store.getters.getChildCategoriesIds(categoryId).length === 0")
- .form-line._p0._clean
- Checkbox(
- v-model="category.showInLastUsed"
- title="Show in last used categories"
- :alt="true")
- .form-line._p0._clean
- Checkbox(
- v-model="category.showInQuickSelector"
- :title="$lang.categories.form.quickSelector"
- :alt="true")
-
- .form__actions
- Button(
- className="_blue"
- title="Save category"
- v-on:onClick="handleSubmit"
- )
-
- //- colors
- ModalBottom(
- :center="true"
- :show="showColors"
- title="Category color"
- v-on:onClose="showColors = false")
- .inputText
- .inputText__colors
- .colors
- .colorItem(
- :class="{ _active: category.color === color }"
- :style="{ background: color }"
- @click="handleColorSelect(color)"
- v-for="color in colors"
- )
- .customColor
- .customColor__title Select your color
- input.customColor__value(v-model="category.color" type="color")
-
- //- parents
- ModalBottom(
- :center="true"
- :show="showParents"
- title="Parent category"
- v-on:onClose="showParents = false")
- .padding-bottom
- ModalButton(
- name="No parent"
- icon="mdi mdi-chart-bubble"
- v-on:onClick="() => handleParenCategorySelect(0)")
- CategoriesView(
- :noPadding="true"
- :ids="$store.getters.categoriesForBeParent.filter(cId => cId !== categoryId)"
- v-on:onClick="handleParenCategorySelect")
-
- //- icons
- ModalBottom(
- :center="true"
- :show="showIcons"
- title="Category icon"
- v-on:onClose="showIcons = false")
- .form-line._text
+ .inputModal__name {{ $lang.categories.form.parent.no }}
+ .inputModal__label {{ $lang.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 {{ $lang.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 {{ $lang.categories.form.icon.label }}
+
+ template(v-if="$store.getters.getChildCategoriesIds(categoryId).length === 0")
+ .form-line._p0._clean
+ Checkbox(
+ v-model="category.showInLastUsed"
+ :title="$lang.categories.form.lastUsed"
+ :alt="true")
+ .form-line._p0._clean
+ Checkbox(
+ v-model="category.showInQuickSelector"
+ :title="$lang.categories.form.quickSelector"
+ :alt="true")
+
+ //- colors
+ ModalBottom(
+ :center="true"
+ :show="showColors"
+ :title="$lang.categories.form.color.placeholder"
+ v-on:onClose="showColors = false")
.inputText
- input.inputText__value(
- type="text"
- placeholder="Filter icons..."
- v-model="filter"
- v-focus.lazy="showIcons")
- .inputText__label Filter
- .inputIcons
- .inputIcons__item(
- :class="{ _active: category.icon === `mdi ${icon}` }"
- @click="handleIconSelect(icon)"
- v-for="icon in selectedIcons")
- div(:class="`mdi ${icon}`")
+ .inputText__colors
+ .colors
+ .colorItem(
+ :class="{ _active: category.color === color }"
+ :style="{ background: color }"
+ @click="handleColorSelect(color)"
+ v-for="color in colors"
+ )
+ .customColor
+ .customColor__title {{ $lang.categories.form.color.custom }}
+ input.customColor__value(v-model="category.color" type="color")
+
+ //- parent
+ ModalBottom(
+ :center="true"
+ :show="showParents"
+ :title="$lang.categories.form.parent.label"
+ v-on:onClose="showParents = false")
+ .padding-bottom
+ ModalButton(
+ :name="$lang.categories.form.parent.no"
+ icon="mdi mdi-chart-bubble"
+ v-on:onClick="() => handleParenCategorySelect(0)")
+ CategoriesView(
+ :noPadding="true"
+ :ids="$store.getters.categoriesForBeParent.filter(cId => cId !== categoryId)"
+ v-on:onClick="handleParenCategorySelect")
+
+ //- icons
+ ModalBottom(
+ :center="true"
+ :show="showIcons"
+ :title="$lang.categories.form.color.placeholder"
+ v-on:onClose="showIcons = false")
+ .form-line._text
+ .inputText
+ input.inputText__value(
+ type="text"
+ placeholder="Filter icons..."
+ v-model="filter"
+ v-focus.lazy="showIcons")
+ .inputText__label Filter
+ .inputIcons
+ .inputIcons__item(
+ :class="{ _active: category.icon === `mdi ${icon}` }"
+ @click="handleIconSelect(icon)"
+ v-for="icon in selectedIcons")
+ div(:class="`mdi ${icon}`")
+
+ template(slot="bottom")
+ .col
+ Button(
+ :class="['_text-center _blue _ml-big', { _inline: $store.state.ui.pc }]"
+ :title="$lang.categories.form.save"
+ v-on:onClick="handleSubmit")
</template>
<style lang="stylus" scoped>
@@ -310,16 +319,6 @@ export default {
.padding-bottom
padding-bottom $m8
-.component
- width 100%
- padding $m9
-
- @media $media-phone
- margin 0 auto
-
- &__title
- padding-bottom $m10
-
.form
@media $media-laptop
max-width 380px
diff --git a/src/components/categories/list/CategoriesListSlot.vue b/src/components/categories/list/CategoriesListSlot.vue
new file mode 100644
index 00000000..801ff202
--- /dev/null
+++ b/src/components/categories/list/CategoriesListSlot.vue
@@ -0,0 +1,53 @@
+<script>
+import CategoryItem from '@/components/categories/item/CategoryItem'
+
+export default {
+ components: {
+ CategoryItem
+ },
+
+ props: {
+ ids: {
+ type: Array,
+ required: true
+ },
+ limit: {
+ type: Number,
+ default: null
+ }
+ },
+
+ computed: {
+ categories () {
+ const categores = {}
+ let ids = this.ids
+
+ if (!this.ids || this.ids.length <= 0) return categores
+
+ if (this.limit) {
+ ids = this.ids.slice(0, this.limit)
+ }
+
+ for (const categoryId of ids) {
+ const category = this.$store.state.categories.items[categoryId]
+
+ categores[categoryId] = {
+ id: categoryId,
+ ...category
+ }
+ }
+
+ return categores
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.categories
+ slot(:categories="categories")
+</template>
+
+<style lang="stylus" scoped>
+//
+</style>
diff --git a/src/components/categories/modal/CategoryModal.vue b/src/components/categories/modal/CategoryModal.vue
index cb1670fb..00ac0f25 100644
--- a/src/components/categories/modal/CategoryModal.vue
+++ b/src/components/categories/modal/CategoryModal.vue
@@ -121,15 +121,15 @@ ModalBottom(
template(slot="btns")
ModalButton(
- name="Delete"
+ :name="$lang.base.delete"
icon="mdi mdi-delete"
v-on:onClick="handleDeleteClick")
ModalButton(
- name="Edit"
+ :name="$lang.base.edit"
icon="mdi mdi-pencil"
v-on:onClick="handleEditClick")
ModalButton(
- name="Set filter"
+ :name="$lang.base.filter"
icon="mdi mdi-filter-outline"
v-on:onClick="handleSetFilterCategory")
diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index 645d4c39..6a978a4e 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -3,6 +3,7 @@ import DashboardFilter from '@/components/dashboard/DashboardFilter'
import DashboardNav from '@/components/dashboard/DashboardNav'
import DashboardStatControl from '@/components/dashboard/DashboardStatControl'
import EmptyData from '@/components/shared/emptyData/EmptyData'
+import StatChartDonut from '@/components/stat/StatChartDonut'
import StatChartsLine from '@/components/stat/StatChartsLine'
import StatPc from '@/components/stat/StatPc'
import StatSummaryPc from '@/components/stat/StatSummaryPc'
@@ -10,10 +11,11 @@ import TrnsList from '@/components/trns/list/TrnsList'
export default {
components: {
- EmptyData,
DashboardFilter,
DashboardNav,
DashboardStatControl,
+ EmptyData,
+ StatChartDonut,
StatChartsLine,
StatPc,
StatSummaryPc,
@@ -41,7 +43,7 @@ export default {
<template lang="pug">
.dashboard(v-show="$store.state.ui.activeTab === 'stat'")
- StatChartsLine
+ StatChartsLine(v-show="$store.state.dashboard.activeTab !== 'balance'")
DashboardNav
StatSummaryPc
DashboardFilter
@@ -66,7 +68,11 @@ export default {
transition(name="animation-tab")
.dashboard__wrap
.dashboard__tab._trns(v-show="$store.state.dashboard.activeTab === 'history'")
- TrnsList
+ TrnsList(:size="50" :key="$store.state.filter.date")
+
+ transition(name="animation-tab")
+ .dashboard__tab(v-show="$store.state.dashboard.activeTab === 'balance'")
+ StatChartDonut
</template>
<style lang="stylus" scoped>
@@ -74,12 +80,6 @@ export default {
@import "~@/stylus/variables/media"
@import "~@/stylus/variables/scrollbar"
-.trnsList
- display grid
- grid-template-columns repeat(3, 1fr)
- grid-column-gap $m7
- grid-row-gap $m7
-
.dashboard
overflow hidden
overflow-y scroll
diff --git a/src/components/dashboard/DashboardFilter.vue b/src/components/dashboard/DashboardFilter.vue
index f9a221b0..843631dc 100644
--- a/src/components/dashboard/DashboardFilter.vue
+++ b/src/components/dashboard/DashboardFilter.vue
@@ -84,12 +84,11 @@ export default {
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/fonts"
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.filter
background var(--c-bg-4)
+ border-bottom 1px solid var(--c-bg-2)
&__in
display flex
@@ -97,20 +96,6 @@ export default {
max-width 1100px
padding 10px 60px
- ^[0]._sidebar &
- padding 20px
- display block
- background var(--c-bg-3)
- border-top 1px solid var(--c-bg-6)
- border-bottom 1px solid var(--c-bg-6)
-
- .filterItem
- margin 0
- margin-bottom 10px
- &._clear
- margin-top 20px
- margin-bottom 0
-
&__title
font-header-1()
font-size 22px
diff --git a/src/components/dashboard/DashboardStatControl.vue b/src/components/dashboard/DashboardStatControl.vue
index 80fe5ed6..b1a15af9 100644
--- a/src/components/dashboard/DashboardStatControl.vue
+++ b/src/components/dashboard/DashboardStatControl.vue
@@ -15,6 +15,10 @@ export default {
:class="{ _disable: $store.state.filter.period === 'all' || $store.getters.isLastPeriodSelected }") Last {{ this.$store.state.filter.period }}
.tabs
+ .tabItem(
+ @click="$store.commit('setDashboardActiveTab', 'balance')"
+ :class="{ _active: $store.state.dashboard.activeTab === 'balance' }") Balance
+
.tabItem(
@click="$store.commit('setDashboardActiveTab', 'stat')"
:class="{ _active: $store.state.dashboard.activeTab === 'stat' }") Stat
@@ -41,7 +45,7 @@ $text-disable = var(--c-font-5)
display grid
grid-template-columns repeat(2, 1fr)
max-width 1100px
- padding 15px 60px
+ padding 16px 60px
.tabs
display flex
diff --git a/src/components/demo/store/actions.js b/src/components/demo/store/actions.js
index 96fbff4e..c431d7b2 100644
--- a/src/components/demo/store/actions.js
+++ b/src/components/demo/store/actions.js
@@ -1,7 +1,6 @@
import moment from 'moment'
import { db } from '@/firebase'
-
-const demoUid = '9yrjuIeeOKNj5TxwoPhQobxbE153' // [email protected]
+import { demoUid } from '@/config'
export default {
async getDemoDataStatus ({ commit }) {
diff --git a/src/components/groups/BudgetForm.vue b/src/components/groups/BudgetForm.vue
new file mode 100644
index 00000000..16cef5f2
--- /dev/null
+++ b/src/components/groups/BudgetForm.vue
@@ -0,0 +1,143 @@
+<script>
+import Button from '@/components/shared/button/Button'
+import Cleave from 'vue-cleave-component'
+import TrnItem from '@/components/budgets/BudgetFormTrn'
+import TrnsList from '@/components/trns/list/TrnsList2'
+
+export default {
+ components: {
+ Button,
+ Cleave,
+ TrnItem,
+ TrnsList
+ },
+
+ data () {
+ return {
+ budgetName: '',
+ budgetAmount: null,
+ budgetTrnsIds: []
+ }
+ },
+
+ methods: {
+ async handleCreateGroup () {
+ const isFormValid = this.validateForm()
+ if (isFormValid) {
+ const values = {
+ amount: this.budgetAmount,
+ currency: this.$store.state.currencies.base,
+ name: this.budgetName,
+ trnsIds: this.budgetTrnsIds
+ }
+
+ await this.$store.dispatch('createGroup', values)
+ this.budgetName = null
+ this.budgetAmount = null
+ }
+ },
+
+ validateForm () {
+ if (!this.budgetName) {
+ const budgetNameRef = this.$refs.budgetNameRef
+ this.focusInputName(budgetNameRef)
+ budgetNameRef.classList.remove('_error')
+ setTimeout(() => { budgetNameRef.classList.add('_error') }, 10)
+ return false
+ }
+
+ return true
+ },
+
+ focusInputName (ref) {
+ ref.querySelector('.inputText__value').focus()
+ },
+
+ isSelectedTrn (trnId) {
+ return this.budgetTrnsIds.includes(trnId)
+ },
+
+ handleSelectTrn (trnId) {
+ console.log(trnId)
+ if (this.budgetTrnsIds.includes(trnId)) {
+ this.budgetTrnsIds = this.budgetTrnsIds.filter(item => item !== trnId)
+ } else {
+ this.budgetTrnsIds.push(trnId)
+ }
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.form
+ .form__title {{ $lang.budgets.form.title }}
+ .form__group(ref="budgetNameRef")
+ .inputText__label {{ $lang.budgets.form.name }}
+ .inputText
+ input.inputText__value(
+ type="text"
+ :placeholder="`${$lang.budgets.form.name}...`"
+ v-model="budgetName")
+
+ Button(
+ className="_new"
+ :title="$lang.budgets.form.button"
+ v-on:onClick="handleCreateGroup")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+.form
+ overflow hidden
+ padding 25px 20px
+ background var(--c-bg-3)
+ border 1px solid var(--c-bg-4)
+
+ &__title
+ font-header-1()
+ margin-bottom 30px
+
+ &__group
+ padding-bottom 30px
+ &._error
+ animation shake .5s linear
+
+.inputText__value
+ height 40px
+ font-size 16px
+ padding 0 16px
+ background var(--c-bg-1)
+ border 1px solid var(--c-bg-7)
+ border-radius 3px
+
+ &._number
+ font-size 22px
+ font-secondary()
+ &::placeholder
+ font-primary()
+ font-size 16px
+
+ &:focus
+ border-color var(--c-bg-9)
+
+.inputText__label
+ border 0
+ margin 0
+ padding 0
+ padding-bottom 10px
+ font-size 11px
+
+@keyframes shake
+ 8%, 41%
+ transform translateX(-10px)
+ 25%, 58%
+ transform translateX(10px)
+ 75%
+ transform translateX(-5px)
+ 92%
+ transform translateX(5px)
+ 0%, 100%
+ transform translateX(0)
+</style>
diff --git a/src/components/groups/BudgetFormTrn.vue b/src/components/groups/BudgetFormTrn.vue
new file mode 100644
index 00000000..dd3f2949
--- /dev/null
+++ b/src/components/groups/BudgetFormTrn.vue
@@ -0,0 +1,132 @@
+<script>
+import { formatDate } from '@/utils/formatDate'
+import Amount from '@/components/amount/Amount'
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Amount,
+ Icon
+ },
+
+ props: {
+ category: {
+ type: Object,
+ required: true
+ },
+ trn: {
+ type: Object,
+ required: true
+ },
+ id: {
+ type: String,
+ required: true
+ },
+ wallet: {
+ type: Object,
+ required: true
+ },
+ className: {
+ type: Object,
+ default: () => {}
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.trn.date, 'number')
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.trnItem(@click="$emit('onClick')" :class="className")
+
+ .trnItem__date {{ formatedDate }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="wallet.name"
+ :background="wallet.color"
+ :small="true")
+ .walletName {{ wallet.name }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="category.name"
+ :background="category.color"
+ :small="true")
+ .walletName {{ category.name }}
+
+ //- .trnItem__desc(v-if="trn.description") {{ trn.description }}
+
+ .trnItem__amount
+ Amount(
+ :currency="wallet.currency"
+ :value="trn.amount"
+ :type="trn.type")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.trnItem
+ position relative
+ display flex
+ align-items center
+ padding 10px 0
+ border-bottom 1px solid var(--c-bg-6)
+ color var(--c-font-4)
+
+ &:hover
+ @media $media-laptop
+ margin -1px -20px 0 -20px
+ padding 11px 20px 10px 20px
+ background var(--c-bg-5)
+ border-color transparent
+ /.theme-light &
+ background var(--c-bg-5)
+ &:last-child
+ border-color transparent
+
+ &._selected
+ margin -1px -20px 0 -20px
+ padding 10px 20px 10px 20px
+ background var(--c-bg-1)
+ border-bottom 1px solid var(--c-bg-6)
+ border-top 1px solid var(--c-bg-6)
+
+ &__amount
+ align-self center
+ margin-left auto
+
+ &__categoryName
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__date
+ padding-right 20px
+ font-size 13px
+
+ &__desc
+ padding-right 10px
+ color var(--c-font-3)
+ font-size 12px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__wallet
+ display flex
+ align-items center
+ padding-right 20px
+ .walletIcon
+ margin-right 8px
+ .walletName
+ font-size 14px
+ white-space nowrap
+</style>
diff --git a/src/components/groups/BudgetItem.vue b/src/components/groups/BudgetItem.vue
new file mode 100644
index 00000000..75439cc8
--- /dev/null
+++ b/src/components/groups/BudgetItem.vue
@@ -0,0 +1,178 @@
+<script>
+import Amount from '@/components/amount/Amount'
+import TrnItem from '@/components/groups/BudgetItemTrn'
+import TrnsList from '@/components/trns/list/TrnsList2'
+import { formatDate } from '@/utils/formatDate'
+
+export default {
+ components: {
+ Amount,
+ TrnItem,
+ TrnsList
+ },
+
+ props: {
+ budget: {
+ type: Object,
+ required: true
+ }
+ },
+
+ data () {
+ return {
+ isTrnsVisible: false
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.budget.date, 'number')
+ },
+
+ totalAmount () {
+ return this.gotAmount.incomes - this.gotAmount.expenses || 0
+ },
+
+ trnsIds () {
+ if (this.budget.trnsIds) {
+ return Object.keys(this.budget.trnsIds)
+ .sort((a, b) => {
+ if (this.$store.state.trns.items[a].date > this.$store.state.trns.items[b].date) return -1
+ if (this.$store.state.trns.items[a].date < this.$store.state.trns.items[b].date) return 1
+ return 0
+ })
+ }
+ },
+
+ gotAmount () {
+ if (this.trnsIds) {
+ return this.$store.getters.getTotalOfTrnsIds(this.trnsIds)
+ }
+ return 0
+ },
+
+ styles () {
+ return {
+ width: `${Math.abs(this.gotAmount.incomes - this.gotAmount.expenses) / Math.abs(this.gotAmount.incomes) * 100}%`
+ }
+ }
+ },
+
+ methods: {
+ async removeBudgetId (id) {
+ // await this.$store.dispatch('removeBudget', id)
+ },
+
+ handleTrnItemClick (trnId) {
+ this.$store.commit('hideCategoryModal')
+ this.$store.commit('showTrnModal')
+ this.$store.commit('setTrnModalId', trnId)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.budgetItem(@click="removeBudgetId(budget.id)")
+ .budgetItem__top
+ .budgetItem__meta
+ .budgetItem__name {{ budget.name }}
+ .budgetItem__description(v-if="budget.description") {{ budget.description }}
+
+ //- total
+ .budgetItem__total
+ .sum._right
+ .sum__title {{ $lang.groups.stat.total }}
+ .sum__amount
+ Amount(:currency="budget.currency" :value="totalAmount")
+
+ //- info
+ .budgetItem__info(@click="isTrnsVisible = !isTrnsVisible")
+ .budgetItem__amounts
+ //- expenses
+ .sum
+ .sum__title {{ $lang.groups.stat.expenses }}
+ .sum__amount
+ Amount(:currency="budget.currency" :type="0" :value="gotAmount.expenses")
+
+ //- incomes
+ .sum._right
+ .sum__title {{ $lang.groups.stat.incomes }}
+ .sum__amount
+ Amount(:currency="budget.currency" :type="1" :value="gotAmount.incomes")
+
+ .budgetItem__graph: .budgetItem__graph__in(:style="styles")
+
+ .budgetItem__trns(v-if="budget.trnsIds" v-show="isTrnsVisible")
+ TrnsList(:ids="trnsIds" v-slot="{ trns }")
+ TrnItem(
+ v-for="trnId in trnsIds"
+ v-on:onClick="handleTrnItemClick"
+ :category="trns[trnId].category"
+ :id="trns[trnId].id"
+ :key="trns[trnId].id"
+ :trn="trns[trnId].trn"
+ :wallet="trns[trnId].wallet")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.budgetItem
+ overflow hidden
+ font-size 14px
+ background var(--c-bg-4)
+ border 1px solid var(--c-bg-5)
+ border-radius 3px
+
+ &:last-child
+ margin-bottom 0
+
+ &__top
+ display flex
+ align-items center
+ justify-content space-between
+ padding 12px
+
+ +media-laptop()
+ padding 16px
+
+ &__name
+ font-size 14px
+
+ &__description
+ padding-top 5px
+ font-size 11px
+ color var(--c-font-4)
+
+ &__info
+ padding 16px
+ background var(--c-bg-3)
+ border-top 1px solid var(--c-bg-2)
+
+ +media-laptop()
+ padding 16px
+
+ &__amounts
+ display flex
+ justify-content space-between
+ padding-bottom 8px
+
+ &__graph
+ overflow hidden
+ background var(--c-bg-7)
+ border-radius 3px
+
+ &__in
+ height 6px
+ min-width 0px
+ background rgba(44, 173, 34, 0.7)
+
+ &__trns
+ margin-top 1px
+ padding 0 12px
+ border-top 1px solid var(--c-bg-2)
+
+ +media-laptop()
+ padding 0 16px
+</style>
diff --git a/src/components/groups/BudgetItemTrn.vue b/src/components/groups/BudgetItemTrn.vue
new file mode 100644
index 00000000..94432c4c
--- /dev/null
+++ b/src/components/groups/BudgetItemTrn.vue
@@ -0,0 +1,121 @@
+<script>
+import { formatDate } from '@/utils/formatDate'
+import Amount from '@/components/amount/Amount'
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Amount,
+ Icon
+ },
+
+ props: {
+ category: {
+ type: Object,
+ required: true
+ },
+ trn: {
+ type: Object,
+ required: true
+ },
+ id: {
+ type: String,
+ required: true
+ },
+ wallet: {
+ type: Object,
+ required: true
+ }
+ },
+
+ computed: {
+ formatedDate () {
+ return formatDate(this.trn.date, 'number')
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.trnItem(@click="$emit('onClick', id)")
+ .trnItem__date {{ formatedDate }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="wallet.name"
+ :background="wallet.color"
+ :small="true")
+ .walletName {{ wallet.name }}
+
+ .trnItem__wallet
+ .walletIcon
+ Icon(
+ :abbr="category.name"
+ :background="category.color"
+ :small="true")
+ .walletName {{ category.name }}
+
+ //- .trnItem__desc(v-if="trn.description") {{ trn.description }}
+
+ .trnItem__amount
+ Amount(
+ :currency="wallet.currency"
+ :value="trn.amount"
+ :type="trn.type")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.trnItem
+ position relative
+ display flex
+ flex-flow wrap
+ align-items center
+ padding 10px 0
+ border-bottom 1px solid var(--c-bg-6)
+ color var(--c-font-4)
+
+ &:hover
+ @media $media-laptop
+ margin -1px -20px 0 -20px
+ padding 11px 20px 10px 20px
+ background var(--c-bg-5)
+ border-color transparent
+ /.theme-light &
+ background var(--c-bg-5)
+ &:last-child
+ border-color transparent
+
+ &__amount
+ align-self center
+ margin-left auto
+
+ &__categoryName
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__date
+ padding-right 20px
+ font-size 13px
+
+ &__desc
+ padding-right 10px
+ color var(--c-font-3)
+ font-size 12px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
+
+ &__wallet
+ display flex
+ align-items center
+ padding-right 20px
+ .walletIcon
+ margin-right 8px
+ .walletName
+ font-size 14px
+ white-space nowrap
+</style>
diff --git a/src/components/groups/Groups.vue b/src/components/groups/Groups.vue
new file mode 100644
index 00000000..f041003c
--- /dev/null
+++ b/src/components/groups/Groups.vue
@@ -0,0 +1,69 @@
+<script>
+import BudgetForm from '@/components/groups/BudgetForm'
+import BudgetItem from '@/components/groups/BudgetItem'
+import Button from '@/components/shared/button/Button'
+import ComponentWrap from '@/components/layout/component/Component'
+
+export default {
+ components: {
+ BudgetForm,
+ BudgetItem,
+ Button,
+ ComponentWrap
+ },
+
+ data () {
+ return {
+ isShowForm: false
+ }
+ },
+
+ computed: {
+ groups () {
+ const formatedGroups = {}
+ for (const id in this.$store.state.groups.items) {
+ formatedGroups[id] = {
+ id,
+ ...this.$store.state.groups.items[id]
+ }
+ }
+
+ return formatedGroups
+ }
+ },
+
+ async created () {
+ await this.$store.dispatch('initGroups')
+ }
+}
+</script>
+
+<template lang="pug">
+ComponentWrap
+ template(slot="headerLeft")
+ div {{ $lang.groups.name }}
+
+ template(slot="contentLeft")
+ .list
+ BudgetItem(
+ v-for="group in groups"
+ :budget="group"
+ :key="group.id")
+
+ template(slot="contentRight")
+ BudgetForm
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+.list
+ display grid
+ grid-template-columns repeat(auto-fill, minmax(auto, 1fr))
+ grid-column-gap 12px
+ grid-row-gap 12px
+
+ +media-laptop()
+ grid-column-gap 16px
+ grid-row-gap 16px
+</style>
diff --git a/src/components/groups/store/actions.js b/src/components/groups/store/actions.js
new file mode 100644
index 00000000..9c46687d
--- /dev/null
+++ b/src/components/groups/store/actions.js
@@ -0,0 +1,81 @@
+import moment from 'moment'
+import { db } from '@/firebase'
+import { generateDateId } from '@/utils/id'
+
+export default {
+ initGroups ({ dispatch, rootGetters }) {
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/groups`
+
+ db.ref(path).on('value', snapshot => {
+ const items = Object.freeze(snapshot.val())
+ dispatch('setGroups', items)
+ }, e => console.error(e))
+ },
+
+ setGroups ({ commit }, items) {
+ commit('setGroups', items)
+ },
+
+ async createGroup ({ rootGetters }, values) {
+ const id = generateDateId()
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/groups/${id}`
+
+ await db.ref(path)
+ .set({
+ currency: 'RUB',
+ name: values.name,
+ date: moment().valueOf()
+ })
+ .then(() => { return true })
+
+ return false
+ },
+
+ async removeGroup ({ rootGetters }, id) {
+ const uid = rootGetters.userUid
+ const path = `users/${uid}/groups/${id}`
+ await db.ref(path)
+ .remove()
+ .then(() => { return true })
+ },
+
+ async addTrnToGroup ({ rootGetters }, { groupId, trnId }) {
+ const uid = rootGetters.userUid
+
+ // add to group
+ await db.ref(`users/${uid}/groups/${groupId}/trnsIds/${trnId}`)
+ .set(trnId)
+ .then(() => { return true })
+
+ // info in trn
+ await db.ref(`users/${uid}/trns/${trnId}/groups/${groupId}`)
+ .set(groupId)
+ .then(() => { return true })
+ },
+
+ async removeTrnFromGroup ({ dispatch, rootGetters }, { groupId, trnId }) {
+ const uid = rootGetters.userUid
+
+ // remove from group
+ await db.ref(`users/${uid}/groups/${groupId}/trnsIds/${trnId}`)
+ .remove()
+ .then(() => { return true })
+
+ // remove from trn
+ await db.ref(`users/${uid}/trns/${trnId}/groups/${groupId}`)
+ .remove()
+ .then(() => { return true })
+ },
+
+ toogleAddToGroup ({ dispatch, rootState, rootGetters }, { groupId, trnId }) {
+ const trn = rootState.trns.items[trnId]
+
+ if (trn.groups && trn.groups[groupId]) {
+ dispatch('removeTrnFromGroup', { groupId, trnId })
+ } else {
+ dispatch('addTrnToGroup', { groupId, trnId })
+ }
+ }
+}
diff --git a/src/components/groups/store/getters.js b/src/components/groups/store/getters.js
new file mode 100644
index 00000000..aaf53538
--- /dev/null
+++ b/src/components/groups/store/getters.js
@@ -0,0 +1,11 @@
+export default {
+ /**
+ * Return groups
+ *
+ * @return {Object} Object
+ * @return {String} {}.name
+ */
+ groups (state, getters, rootState, rootGetters) {
+ return rootState.groups.items
+ }
+}
diff --git a/src/components/groups/store/index.js b/src/components/groups/store/index.js
new file mode 100644
index 00000000..a782a4df
--- /dev/null
+++ b/src/components/groups/store/index.js
@@ -0,0 +1,14 @@
+import actions from './actions'
+import mutations from './mutations'
+import getters from './getters'
+
+const state = {
+ items: {}
+}
+
+export default {
+ state,
+ actions,
+ mutations,
+ getters
+}
diff --git a/src/components/groups/store/mutations.js b/src/components/groups/store/mutations.js
new file mode 100644
index 00000000..1e10ffac
--- /dev/null
+++ b/src/components/groups/store/mutations.js
@@ -0,0 +1,5 @@
+export default {
+ setGroups (state, items) {
+ state.items = items
+ }
+}
diff --git a/src/components/layout/LayoutMobile.vue b/src/components/layout/LayoutMobile.vue
index 42dacf7f..6d31bacc 100644
--- a/src/components/layout/LayoutMobile.vue
+++ b/src/components/layout/LayoutMobile.vue
@@ -1,12 +1,20 @@
<script>
+import { Swiper } from 'swiper/dist/js/swiper.esm.js'
+import 'swiper/dist/css/swiper.min.css'
+
+import Budgets from '@/components/budgets/Budgets'
+import Button from '@/components/shared/button/Button'
import CategoriesList from '@/components/categories/list/CategoriesList'
import CategoryForm from '@/components/categories/form/CategoryForm'
import CategoryModal from '@/components/categories/modal/CategoryModal'
+import ComponentWrap from '@/components/layout/component/Component'
import CurrencyModal from '@/components/currencies/CurrencyModal'
+import Groups from '@/components/groups/Groups'
import LayoutMobileMenu from '@/components/layout/LayoutMobileMenu'
+import LayoutMobileStat from '@/components/layout/LayoutMobileStat'
+import Menu from '@/components/layout/sidebar/Menu'
import Settings from '@/components/settings/Settings'
-import StatChartsLine from '@/components/stat/StatChartsLine'
-import StatMobile from '@/components/stat/StatMobile'
+import StatNew from '@/components/stat/StatNew'
import TrnForm from '@/components/trnForm/TrnForm'
import TrnModal from '@/components/trns/modal/TrnModal'
import TrnsList from '@/components/trns/list/TrnsList'
@@ -14,97 +22,177 @@ import WalletForm from '@/components/wallets/form/WalletForm'
import WalletModal from '@/components/wallets/modal/WalletModal'
import WalletsList from '@/components/wallets/list/WalletsList'
import WalletsTotal from '@/components/wallets/total/WalletsTotal'
+import WalletsSort from '@/components/wallets/sort/WalletsSort'
export default {
components: {
+ Budgets,
+ Button,
CategoriesList,
CategoryForm,
CategoryModal,
+ ComponentWrap,
CurrencyModal,
+ Groups,
LayoutMobileMenu,
+ LayoutMobileStat,
+ Menu,
Settings,
- StatChartsLine,
- StatMobile,
+ StatNew,
TrnForm,
TrnModal,
TrnsList,
WalletForm,
WalletModal,
WalletsList,
+ WalletsSort,
WalletsTotal
},
+ data () {
+ return {
+ slider: null
+ }
+ },
+
computed: {
activeTab () {
return this.$store.state.ui.activeTab
}
},
+ mounted () {
+ this.slider = this.slider = new Swiper(this.$refs.slider, {
+ slidesPerView: 'auto',
+ initialSlide: 1,
+ resistanceRatio: 0,
+ touchReleaseOnEdges: true
+ })
+ },
+
methods: {
- handleShowCategoryModal (id) {
- this.$store.commit('showCategoryModal')
- this.$store.commit('setCategoryModalId', id)
- },
handleShowWalletModal (id) {
this.$store.commit('showWalletModal')
this.$store.commit('setWalletModalId', id)
+ },
+
+ clickHandler () {
+ const index = this.slider.activeIndex
+ index === 0 && this.slider.slideNext()
}
}
}
</script>
<template lang="pug">
-.tabs
- //- wallets
- transition(name="animation-tab")
- .tab(v-show="activeTab === 'wallets'")
- .tabPanel
- .tabPanel__top: WalletsTotal
- .tabPanel__scroll
- .wallets-list
- WalletsList(
- :showToogle="true"
- :limit="6"
- v-on:onClick="(id) => handleShowWalletModal(id)")
-
- //- categories
- transition(name="animation-tab")
- .tab._padding-top(v-show="activeTab === 'categories'")
- CategoriesList(v-on:onClick="(id) => handleShowCategoryModal(id)")
-
- //- stat
- transition(name="animation-tab")
- .tab(v-show="activeTab === 'stat'")
- WalletsList(
- v-show="$store.state.ui.stat.walletsVisibility === 'visible'"
- :limit="3"
- ui="widget"
- v-on:onClick="(id) => handleShowWalletModal(id)")
- StatChartsLine(
- v-show="$store.state.ui.statGraphsVisibility === 'visible' && ($store.state.filter.period !== 'all')")
- StatMobile
-
- //- trns
- transition(name="animation-tab")
- .tab(v-if="activeTab === 'trns'")
- TrnsList
-
- //- Settings
- transition(name="animation-tab")
- .tab(v-if="activeTab === 'settings'")
- Settings
-
- //- create category
- transition(name="animation-tab")
- .tab(v-if="activeTab === 'createCategory'")
- CategoryForm
-
- //- create wallet
- transition(name="animation-tab")
- .tab(v-if="activeTab === 'createWallet'")
- WalletForm
-
- LayoutMobileMenu
+.wrap
+ .swiper-container(ref="slider")
+ .swiper-wrapper
+ .swiper-slide._sidebar
+ .block
+ WalletsTotal
+ Menu(v-on:onClickMenuCalback="() => this.slider.slideNext()")
+
+ .swiper-slide._static
+ .handler(@click="clickHandler")
+
+ .layoutMobile
+ //------------------------------------------------
+ //- content
+ //------------------------------------------------
+ .layoutMobile__content
+ .tabs.swiper-no-swiping
+ //- wallets
+ transition(name="animation-tab")
+ .tab(v-show="activeTab === 'wallets'")
+ ComponentWrap(:contentPadding="false")
+ template(slot="header")
+ WalletsTotal
+
+ template(slot="content")
+ WalletsList(
+ :limit="6"
+ :showToogle="true"
+ :style="{ paddingTop: '8px' }"
+ v-on:onClick="(id) => handleShowWalletModal(id)")
+
+ template(slot="bottom")
+ .flex
+ .col
+ Button(
+ className="_inline _small"
+ :title="$lang.wallets.new"
+ v-on:onClick="$store.dispatch('setActiveTab', 'createWallet')")
+ .col
+ Button(
+ className="_inline _small"
+ :title="$lang.base.sort"
+ v-on:onClick="$store.dispatch('setActiveTab', 'walletsSort')")
+
+ //- wallets sort
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'walletsSort'")
+ walletsSort
+
+ //- categories
+ transition(name="animation-tab")
+ .tab(v-show="activeTab === 'categories'")
+ ComponentWrap(:contentPadding="false")
+ template(slot="headerLeft") {{ $lang.categories.name }}
+
+ template(slot="content")
+ CategoriesList(
+ :style="{ paddingTop: '16px' }"
+ v-on:onClick="(id) => $store.dispatch('showCategoryModal', id)")
+
+ template(slot="bottom")
+ Button(
+ className="_inline _small"
+ :title="$lang.categories.new"
+ v-on:onClick="$store.dispatch('setActiveTab', 'createCategory')")
+
+ //- stat
+ transition(name="animation-tab")
+ .tab(v-show="activeTab === 'stat'")
+ LayoutMobileStat
+
+ //- trns
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'trns'")
+ TrnsList
+
+ //- Settings
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'settings'")
+ Settings
+
+ //- create category
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'createCategory'")
+ CategoryForm
+
+ //- create wallet
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'createWallet'")
+ WalletForm
+
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'groups'")
+ Groups
+
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'budgets'")
+ Budgets
+
+ transition(name="animation-tab")
+ .tab(v-if="activeTab === 'statNew'")
+ StatNew
+
+ //------------------------------------------------
+ //- menu
+ //------------------------------------------------
+ .layoutMobile__menu
+ LayoutMobileMenu
//- modals
CategoryModal
@@ -115,19 +203,59 @@ export default {
</template>
<style lang="stylus" scoped>
+@import "~@/stylus/variables/animations"
@import "~@/stylus/variables/margins"
+@import "~@/stylus/variables/media"
+@import "~@/stylus/variables/fonts"
@import "~@/stylus/variables/scrollbar"
-.showDonut
- margin $m7
- padding $m7
- padding $m7 $m9
- color var(--c-font-1)
- background var(--c-blue-1)
- border-radius $m3
+.block
+ padding 16px
+ margin-bottom 8px
+ background var(--c-bg-3)
+ border-bottom 1px solid var(--c-bg-2)
+
+.layoutMobile
+ display grid
+ grid-template-rows 1fr minmax(30px, min-content)
+ height 100%
+
+.handler
+ z-index 200
+ position absolute
+ left 0
+ top 0
+ width 100%
+ height 100%
+ background alpha(#000, .9)
+ transition background 250ms
+
+.swiper-slide-active
+ .handler
+ width 16px
+ background none
+ transition background 0ms
+
+.swiper-container
+ height 100%
+
+._sidebar
+ overflow hidden
+ overflow-y auto
+ scrollbar()
+ z-index 10
+ max-width 70vw
+ height 100%
+ background var(--c-bg-4)
+ border-right 1px solid var(--c-bg-1)
-.wallets-list
- padding-top $m5
+.wrap
+ position absolute
+ left 0
+ top 0
+ width 100%
+ height 100%
+ overflow hidden
.tabs
overflow hidden
@@ -146,8 +274,8 @@ export default {
left 0
top 0
width 100%
- height calc(100vh - 120px)
+ height 100%
&._padding-top
- padding-top $m7
+ // padding-top $m7
</style>
diff --git a/src/components/layout/LayoutMobileMenu.vue b/src/components/layout/LayoutMobileMenu.vue
index c97db109..416c5a8c 100644
--- a/src/components/layout/LayoutMobileMenu.vue
+++ b/src/components/layout/LayoutMobileMenu.vue
@@ -1,25 +1,13 @@
<script>
import Button from '@/components/shared/button/Button'
-import ContextMenu from '@/components/shared/contextMenu/ContextMenu'
-import ContextMenuItem from '@/components/shared/contextMenu/ContextMenuItem'
-import Dropdown from '@/components/shared/dropdown/Dropdown'
import PeriodNavMobile from '@/components/layout/PeriodNavMobile'
export default {
components: {
Button,
- ContextMenu,
- ContextMenuItem,
- Dropdown,
PeriodNavMobile
},
- data () {
- return {
- visibleCustomizeMenu: false
- }
- },
-
computed: {
activeTab () {
return this.$store.state.ui.activeTab
@@ -28,7 +16,7 @@ export default {
return [{
icon: 'mdi mdi-credit-card-multiple',
id: 'wallets',
- name: this.$lang.wallets.title
+ name: this.$lang.wallets.name
}, {
icon: 'mdi mdi-chart-bubble',
id: 'categories',
@@ -82,48 +70,8 @@ export default {
<template lang="pug">
.menu
.menu__wrap
- .menu__row
- PeriodNavMobile(v-show="activeTab === 'stat' || activeTab === 'trns'")
-
- .create-btn(v-show="activeTab === 'categories'")
- Button(
- className="_inline _small"
- :title="$lang.categories.new"
- v-on:onClick="$store.dispatch('setActiveTab', 'createCategory')")
-
- .create-btn(v-show="activeTab === 'wallets'")
- Button(
- className="_inline _small"
- :title="$lang.wallets.new"
- v-on:onClick="$store.dispatch('setActiveTab', 'createWallet')")
-
- .customize(v-show="activeTab === 'wallets' || activeTab === 'categories'")
- ContextMenu(
- :position="{ right: true, bottom: true }"
- :visible="visibleCustomizeMenu"
- v-on:onClickOpener="visibleCustomizeMenu = !visibleCustomizeMenu")
- template(slot="opener")
- Dropdown(
- :active="visibleCustomizeMenu"
- icon="mdi mdi-tune"
- :title="$lang.settings.options")
- template(slot="content")
- ContextMenuItem(
- icon="mdi mdi-settings"
- :title="$lang.settings.open"
- v-on:onClick="$store.dispatch('setActiveTab', 'settings')"
- v-on:onClose="visibleCustomizeMenu = !visibleCustomizeMenu")
- .context-menu-sep
- ContextMenuItem(
- icon="mdi mdi-currency-usd"
- title="Change base currency"
- v-on:onClick="$store.commit('showBaseCurrenciesModal')"
- v-on:onClose="visibleCustomizeMenu = !visibleCustomizeMenu")
- ContextMenuItem(
- icon="mdi mdi-palette"
- title="Change theme"
- v-on:onClick="$store.dispatch('changeTheme')"
- v-on:onClose="visibleCustomizeMenu = !visibleCustomizeMenu")
+ .menu__row(v-show="activeTab === 'stat'")
+ PeriodNavMobile
.menu__row
template(v-for="menuItem of menu")
@@ -134,12 +82,13 @@ export default {
.menu__item__icon: div(:class="menuItem.icon")
.menu__item__text {{ menuItem.name }}
- .menu__item._hightlight(@click="$store.dispatch('openTrnForm', { action: 'create' })")
- .menu__item__icon: .mdi.mdi-library-plus
+ .menu__item(@click="$store.dispatch('openTrnForm', { action: 'create' })")
+ .menu__item__icon: .mdi.mdi-plus-box-multiple-outline
.menu__item__text {{ this.$lang.create.title }}
</template>
<style lang="stylus" scoped>
+@import "~@/stylus/variables/animations"
@import "~@/stylus/variables/margins"
.create-btn
@@ -153,12 +102,6 @@ export default {
padding-right $m7
.menu
- z-index 2
- position fixed
- left 0
- bottom 0
- padding-top $m6
- width 100%
background var(--c-bg-3)
border-top 1px solid var(--c-bg-1)
@@ -175,7 +118,9 @@ export default {
display flex
align-items center
justify-content center
- // height 66px
+
+ &:first-child
+ padding-top 10px
&__item
display flex
@@ -183,15 +128,16 @@ export default {
justify-content center
flex-grow 1
flex-flow column
- padding $m6 0 $m6 0
+ padding 10px 0 10px 0
color var(--c-font-4)
+ anim()
+
+ &:active
+ background var(--c-bg-1)
/.theme-light &
color var(--c-font-5)
- &._hightlight
- // border-left 1px solid rgba(128,128,128,0.05)
-
&._active
color var(--c-font-2)
diff --git a/src/components/layout/LayoutMobileStat.vue b/src/components/layout/LayoutMobileStat.vue
new file mode 100644
index 00000000..862023ae
--- /dev/null
+++ b/src/components/layout/LayoutMobileStat.vue
@@ -0,0 +1,42 @@
+<script>
+import StatChartsLine from '@/components/stat/StatChartsLine'
+import StatMobile from '@/components/stat/StatMobile'
+import WalletsList from '@/components/wallets/list/WalletsList'
+
+export default {
+ components: {
+ StatChartsLine,
+ StatMobile,
+ WalletsList
+ },
+
+ methods: {
+ handleShowWalletModal (id) {
+ this.$store.commit('showWalletModal')
+ this.$store.commit('setWalletModalId', id)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.layoutStat
+ .layoutStat__wallets(v-show="$store.state.ui.stat.walletsVisibility === 'visible'")
+ WalletsList(
+ :limit="3"
+ ui="widget"
+ v-on:onClick="id => handleShowWalletModal(id)")
+
+ .layoutStat__chart(v-show="$store.state.ui.statGraphsVisibility === 'visible' && ($store.state.filter.period !== 'all')")
+ StatChartsLine
+
+ .layoutStat__summary
+ StatMobile
+</template>
+
+<style lang="stylus" scoped>
+.layoutStat
+ height 100%
+ overflow hidden
+ overflow-y auto
+</style>
diff --git a/src/components/layout/LayoutPc.vue b/src/components/layout/LayoutPc.vue
index 45561185..10e41416 100644
--- a/src/components/layout/LayoutPc.vue
+++ b/src/components/layout/LayoutPc.vue
@@ -1,11 +1,14 @@
<script>
+import Budgets from '@/components/budgets/Budgets'
import Button from '@/components/shared/button/Button'
import CategoriesList from '@/components/categories/list/CategoriesList'
import CategoryForm from '@/components/categories/form/CategoryForm'
import CategoryModal from '@/components/categories/modal/CategoryModal'
+import ComponentWrap from '@/components/layout/component/Component'
import CurrencyModal from '@/components/currencies/CurrencyModal'
import Dashboard from '@/components/dashboard/Dashboard'
import DashboardNav from '@/components/dashboard/DashboardNav'
+import Groups from '@/components/groups/Groups'
import LayoutPcSidebar from '@/components/layout/LayoutPcSidebar'
import LayoutPcTab from '@/components/layout/LayoutPcTab'
import Settings from '@/components/settings/Settings'
@@ -14,24 +17,29 @@ import TrnModal from '@/components/trns/modal/TrnModal'
import WalletForm from '@/components/wallets/form/WalletForm'
import WalletModal from '@/components/wallets/modal/WalletModal'
import WalletsList from '@/components/wallets/list/WalletsList'
+import WalletsSort from '@/components/wallets/sort/WalletsSort'
export default {
components: {
+ Budgets,
Button,
CategoriesList,
CategoryForm,
CategoryModal,
+ ComponentWrap,
CurrencyModal,
Dashboard,
DashboardNav,
- LayoutPcTab,
+ Groups,
LayoutPcSidebar,
+ LayoutPcTab,
Settings,
TrnForm,
TrnModal,
WalletForm,
WalletModal,
- WalletsList
+ WalletsList,
+ WalletsSort
},
computed: {
@@ -51,7 +59,7 @@ export default {
<template lang="pug">
.layout
- .createTrnBtn(@click="$store.dispatch('openTrnForm', { action: 'create' })"): .mdi.mdi-library-plus
+ .createTrnBtn(@click="$store.dispatch('openTrnForm', { action: 'create' })"): .mdi.mdi-plus-box-multiple-outline
//- modals
CategoryModal
@@ -65,32 +73,62 @@ export default {
LayoutPcSidebar
.layout__item
- Dashboard
+ transition(name="animation-tab")
+ Dashboard
+
+ //- Budgets
+ //------------------------------------------------
+ LayoutPcTab(:show="activeTab === 'budgets'")
+ Budgets
+
+ //- Groups
+ //------------------------------------------------
+ LayoutPcTab(:show="activeTab === 'groups'")
+ Groups
//- categories
//------------------------------------------------
LayoutPcTab(:show="activeTab === 'categories'")
- .dashboard__title {{ $lang.categories.title }}
- CategoriesList.dashboardItems(
- v-on:onClick="id => $store.dispatch('showCategoryModal', id)")
- Button(
- className="_blue _inline"
- icon="mdi mdi-plus"
- :title="$lang.categories.new"
- v-on:onClick="$store.dispatch('setActiveTab', 'createCategory')")
+ ComponentWrap
+ template(slot="headerLeft") {{ $lang.categories.title }}
+
+ template(slot="content")
+ CategoriesList.dashboardItems(
+ v-on:onClick="id => $store.dispatch('showCategoryModal', id)")
+
+ template(slot="bottom")
+ .col
+ Button(
+ className="_blue _inline"
+ icon="mdi mdi-plus"
+ :title="$lang.categories.new"
+ v-on:onClick="$store.dispatch('setActiveTab', 'createCategory')")
//- wallets
//------------------------------------------------
LayoutPcTab(:show="activeTab === 'wallets'")
- .dashboard__title {{ $lang.wallets.title }}
- WalletsList.dashboardItems(
- ui="tile"
- v-on:onClick="(id) => handleShowWalletModal(id)")
- Button(
- className="_blue _inline"
- icon="mdi mdi-plus"
- :title="$lang.wallets.new"
- v-on:onClick="$store.dispatch('setActiveTab', 'createWallet')")
+ ComponentWrap
+ template(slot="headerLeft") {{ $lang.wallets.title }}
+
+ template(slot="content")
+ WalletsList.dashboardItems(
+ ui="tile"
+ v-on:onClick="(id) => handleShowWalletModal(id)")
+
+ template(slot="bottom")
+ .flex
+ .col
+ Button(
+ className="_inline _blue"
+ icon="mdi mdi-plus"
+ :title="$lang.wallets.new"
+ v-on:onClick="$store.dispatch('setActiveTab', 'createWallet')")
+ .col
+ Button(
+ className="_inline _blue"
+ :title="$lang.base.sort"
+ icon="mdi mdi-arrow-split-horizontal"
+ v-on:onClick="$store.dispatch('setActiveTab', 'walletsSort')")
//- add category
//------------------------------------------------
@@ -102,6 +140,11 @@ export default {
LayoutPcTab(:show="activeTab === 'createWallet'")
WalletForm(v-if="activeTab === 'createWallet'")
+ //- wallets sort
+ //------------------------------------------------
+ LayoutPcTab(:show="activeTab === 'walletsSort'")
+ WalletsSort(v-if="activeTab === 'walletsSort'")
+
//- settings
//------------------------------------------------
LayoutPcTab(:show="activeTab === 'settings'")
@@ -119,12 +162,19 @@ export default {
</style>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/fonts"
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
-@import "~@/stylus/variables/animations"
-@import "~@/stylus/mixins/animations"
-@import "~@/stylus/variables/scrollbar"
+@import "~@/stylus/variables"
+
+.layoutBg
+ z-index 1
+ position absolute
+ top 0
+ right 0
+ opacity .05
+ font-size 1000px
+ height 100%
+ display flex
+ align-items center
+ justify-content center
.layout-formSideOpener
cursor pointer
@@ -193,14 +243,20 @@ export default {
padding $m7 $m8
width 60px
height 60px
+ font-size 22px
color var(--c-font-1)
- background var(--c-bg-4)
+ background var(--c-blue-1)
border-radius 50%
- font-size 18px
- color var(--c-font-4)
anim()
&:hover
- color var(--c-font-1)
- background var(--c-blue-1)
+ transform scale(1.2)
+
+.position
+ display grid
+ position absolute
+ left 0
+ top 0
+ width 100%
+ height 100%
</style>
diff --git a/src/components/layout/LayoutPcSidebar.vue b/src/components/layout/LayoutPcSidebar.vue
index e89cb1ce..b31966f9 100644
--- a/src/components/layout/LayoutPcSidebar.vue
+++ b/src/components/layout/LayoutPcSidebar.vue
@@ -1,15 +1,15 @@
<script>
import ContextMenu from '@/components/shared/contextMenu/ContextMenu'
import ContextMenuItem from '@/components/shared/contextMenu/ContextMenuItem'
-import DashboardFilter from '@/components/dashboard/DashboardFilter'
import WalletsList from '@/components/wallets/list/WalletsList'
import WalletsTotal from '@/components/wallets/total/WalletsTotal'
+import Menu from '@/components/layout/sidebar/Menu'
export default {
components: {
+ Menu,
ContextMenu,
ContextMenuItem,
- DashboardFilter,
WalletsList,
WalletsTotal
},
@@ -77,36 +77,35 @@ export default {
:class="{ _active: activeTab === 'stat'}"
@click="$store.dispatch('setActiveTab', 'stat')"
): .mdi.mdi-poll
+ Menu
+ .sidebar__content
WalletsTotal
- .sidebar__content
WalletsList(
+ :style="{ paddingTop: '8px' }"
:showToogle="true"
:limit="6"
v-on:onClick="(id) => handleShowWalletModal(id)")
-
- .sidebar__filter
- DashboardFilter._sidebar(:showTittle="true")
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
-@import "~@/stylus/variables/scrollbar"
+@import "~@/stylus/variables"
.sidebar
- overflow hidden
- display flex
- flex-flow column
+ display grid
+ grid-template-columns 1fr
+ grid-template-rows minmax(auto, auto) minmax(auto, auto) 1fr
+ height 100vh
background var(--c-bg-4)
border-right 1px solid var(--c-bg-1)
- scrollbar()
&__menu
display flex
justify-content space-between
padding 0 $m7
+ background var(--c-bg-5)
+ border-bottom 1px solid var(--c-bg-1)
&__item
position relative
@@ -118,6 +117,9 @@ export default {
font-size 18px
color var(--c-font-4)
+ +media-laptop()
+ padding 10px 20px
+
&:hover
@media $media-laptop
background var(--c-bg-6)
@@ -126,15 +128,10 @@ export default {
color var(--c-font-2)
&__content
- overflow-y auto
- padding-top 10px
- height calc(100vh - 130px)
scrollbar()
-
- &__filter
- margin-top auto
- margin-bottom auto
- margin-top 100px
+ overflow hidden
+ overflow-y auto
+ height 100%
.link
z-index 1
diff --git a/src/components/layout/LayoutPcTab.vue b/src/components/layout/LayoutPcTab.vue
index a6ea9805..2b39490e 100644
--- a/src/components/layout/LayoutPcTab.vue
+++ b/src/components/layout/LayoutPcTab.vue
@@ -35,18 +35,18 @@ transition(name="animation-tab")
</style>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
@import "~@/stylus/variables/scrollbar"
.layout-tab
- scrollbar()
+ z-index 2
overflow hidden
overflow-y auto
- z-index 2
position absolute
left 0
top 0
width 100%
height 100%
- padding $m10 $mb2
+ padding 0
+ background var(--c-bg-2)
+ scrollbar()
</style>
diff --git a/src/components/layout/component/Component.vue b/src/components/layout/component/Component.vue
new file mode 100644
index 00000000..e5b3236a
--- /dev/null
+++ b/src/components/layout/component/Component.vue
@@ -0,0 +1,115 @@
+<script>
+export default {
+ props: {
+ contentPadding: {
+ type: Boolean,
+ default: true
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.component(:class="{ _padding: contentPadding }")
+ //------------------------------------------------
+ //- header
+ //------------------------------------------------
+ .component__header(v-if="$slots.header || $slots.headerLeft || $slots.headerRight")
+ .component__header-wrap(:class="{ _spaceBetween: $slots.headerLeft || $slots.headerRight }")
+ slot(name="header")
+
+ .component__header-left(v-if="$slots.headerLeft")
+ slot(name="headerLeft")
+
+ .component__header-right(v-if="$slots.headerRight")
+ slot(name="headerRight")
+
+ //------------------------------------------------
+ //- content
+ //------------------------------------------------
+ .component__content(:class="{ _scroll: $slots.bottom }")
+ .component__content-main(v-if="$slots.content")
+ slot(name="content")
+
+ .component__content-left(v-if="$slots.contentLeft")
+ slot(name="contentLeft")
+
+ .component__content-right(v-if="$slots.contentRight")
+ slot(name="contentRight")
+
+ .component__content-bottom(v-if="$slots.bottom")
+ .component__content-bottom-in
+ slot(name="bottom")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+.component
+ display grid
+ grid-template-columns 1fr
+ grid-template-rows minmax(auto, auto) 1fr minmax(auto, auto)
+ height 100%
+
+ &__header
+ background var(--c-bg-4)
+ border-bottom 1px solid var(--c-bg-1)
+
+ +media-laptop()
+ background 0
+ border-bottom 0
+
+ &-wrap
+ max-width 1100px
+ padding 12px 16px
+
+ &._spaceBetween
+ display flex
+ align-items center
+ justify-content space-between
+
+ +media-laptop()
+ padding 32px 60px
+ padding-bottom 0
+
+ &-left
+ font-h1()
+
+ +media-laptop()
+ font-size 24px
+
+ &__content
+ overflow hidden
+ overflow-y auto
+ max-width 1100px
+ scrollbar()
+
+ ~/._padding &
+ padding 16px
+
+ +media-laptop()
+ padding 32px 60px
+
+ &._scroll
+ display grid
+ grid-template-rows minmax(min-content, auto) minmax(50px, min-content)
+
+ &-main
+ height 100%
+ scrollbar()
+ overflow hidden
+ overflow-y auto
+
+ &-left
+ margin-bottom 16px
+
+ &-right
+ margin-bottom 16px
+
+ &-bottom
+ &-in
+ padding 16px
+
+ ~/._padding &
+ padding 0px
+</style>
diff --git a/src/components/layout/sidebar/CategoryItem.vue b/src/components/layout/sidebar/CategoryItem.vue
new file mode 100644
index 00000000..009a7da8
--- /dev/null
+++ b/src/components/layout/sidebar/CategoryItem.vue
@@ -0,0 +1,59 @@
+<script>
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Icon
+ },
+
+ props: {
+ category: {
+ type: Object,
+ required: true
+ }
+ },
+
+ computed: {
+ childCategoriesIds () {
+ return this.$store.getters.getChildCategoriesIds(this.category.id)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.category(@click="$emit('onClick')")
+ .category__icon(@click.stop="$emit('onClickIcon')")
+ Icon(
+ :icon="category.icon"
+ :medium="true"
+ :background="category.color || $store.state.ui.defaultBgColor")
+
+ .category__name {{ category.name }}
+
+ .category__count(v-if="childCategoriesIds.length > 0") {{ childCategoriesIds.length }}
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/media"
+
+.category
+ display grid
+ grid-template-columns 24px 1fr 24px
+ grid-column-gap 20px
+ padding 10px 20px
+ align-items center
+
+ &:hover
+ @media $media-laptop
+ background var(--c-bg-6)
+ ~/._open &
+ color var(--c-font-2)
+ background var(--c-bg-3)
+ ~/._active &
+ color var(--c-font-2)
+ background var(--c-bg-2)
+
+ &__count
+ text-align right
+</style>
diff --git a/src/components/layout/sidebar/Menu.vue b/src/components/layout/sidebar/Menu.vue
new file mode 100644
index 00000000..8d9914e1
--- /dev/null
+++ b/src/components/layout/sidebar/Menu.vue
@@ -0,0 +1,139 @@
+<script>
+import Button from '@/components/shared/button/Button'
+import CategoryItem from '@/components/layout/sidebar/CategoryItem'
+import WalletsList from '@/components/wallets/list/WalletsList'
+
+export default {
+ components: {
+ Button,
+ CategoryItem,
+ WalletsList
+ },
+
+ data () {
+ return {
+ menu: {
+ stat: {
+ icon: 'mdi mdi-poll',
+ name: this.$lang.stat.shortTitle,
+ isOpen: false
+ },
+ budgets: {
+ icon: 'mdi mdi-hand-saw',
+ name: this.$lang.budgets.name,
+ isOpen: false,
+ private: true
+ },
+ groups: {
+ icon: 'mdi mdi-folder-multiple-outline',
+ name: this.$lang.groups.name,
+ isOpen: false,
+ private: true
+ },
+ wallets: {
+ icon: 'mdi mdi-credit-card-multiple',
+ name: this.$lang.wallets.name,
+ isOpen: true
+ },
+ categories: {
+ icon: 'mdi mdi-chart-bubble',
+ name: this.$lang.categories.name,
+ isOpen: false
+ },
+ settings: {
+ icon: 'mdi mdi-settings',
+ name: this.$lang.settings.title,
+ isOpen: true
+ }
+ }
+ }
+ },
+
+ computed: {
+ activeTab () {
+ return this.$store.state.ui.activeTab
+ }
+ },
+
+ methods: {
+ handleClickMenu (menuId) {
+ if (this.$listeners.onClickMenuCalback) {
+ this.$listeners.onClickMenuCalback()
+ }
+ this.$store.dispatch('setActiveTab', menuId)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.menu
+ template(v-for="(menuItem, menuId) in menu")
+ .menuItem(
+ v-if="$store.getters.isTester || !menuItem.private"
+ @click="handleClickMenu(menuId)"
+ :class="{ _active: activeTab === menuId, [`_${menuId}`]: true }")
+ .menuItem__icon: div(:class="menuItem.icon")
+ .menuItem__text {{ menuItem.name }}
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+item-bg-active()
+ background var(--c-bg-6)
+
+.menu
+ border-bottom 1px solid var(--c-bg-1)
+
+ &:last-child
+ border-bottom 0
+
+.menuItem
+ display grid
+ grid-template-columns 24px 1fr 24px
+ grid-column-gap 20px
+ padding 16px 16px
+ align-items center
+
+ +media-laptop()
+ padding 16px 20px
+
+ &:hover
+ +media-laptop()
+ background var(--c-bg-6)
+
+ &:active
+ item-bg-active()
+
+ &._active
+ color var(--c-font-2)
+ border-right 4px solid var(--c-bg-8)
+
+ &__icon
+ align-self center
+ justify-self center
+ font-size 20px
+ grid-column 1 / 2
+ color var(--c-font-3)
+
+ &__text
+ grid-column 2 / 3
+ color var(--c-font-4)
+ font-size 14px
+
+ ~/._active &
+ color var(--c-font-2)
+
+ &__arrow
+ display flex
+ align-items center
+ justify-content center
+ margin -10px 0
+ width 40px
+ height 40px
+ margin-right -14px
+ justify-self end
+ font-size 22px
+ color var(--c-font-4)
+</style>
diff --git a/src/components/layout/sidebar/MenuItem.vue b/src/components/layout/sidebar/MenuItem.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/components/layout/styles/common.styl b/src/components/layout/styles/common.styl
new file mode 100644
index 00000000..f3f3c2f3
--- /dev/null
+++ b/src/components/layout/styles/common.styl
@@ -0,0 +1,98 @@
+//------------------------------------------------
+// sum
+//------------------------------------------------
+.sum
+ &__title
+ opacity .6
+ padding-bottom 5px
+ font-size 10px
+ color var(--c-font-4)
+
+ +media-laptop()
+ font-size 11px
+
+ &._right
+ text-align right
+
+
+//------------------------------------------------
+// budgetItem
+//------------------------------------------------
+.budgetItem
+ max-width 600px
+ position relative
+ overflow hidden
+ font-size 14px
+ background var(--c-bg-4)
+ border 1px solid var(--c-bg-5)
+ border-radius 3px
+
+ &._total
+ margin-bottom 24px
+ background var(--c-bg-1)
+ border-color var(--c-bg-6)
+
+ +media-laptop()
+ margin-bottom 32px
+
+ &__countTotal
+ position absolute
+ left 12px
+ top 0px
+ width 12px
+ height 2px
+ background var(--c-blue-1)
+ border-radius 2px
+
+ +media-laptop()
+ width 16px
+ left 16px
+
+ &__top
+ display flex
+ align-items center
+ justify-content space-between
+ padding 12px
+ padding-bottom 0
+
+ +media-laptop()
+ padding 16px
+ padding-bottom 0
+
+ &__name
+ font-size 14px
+
+ &__description
+ padding-top 5px
+ font-size 11px
+ color var(--c-font-4)
+
+ &__info
+ padding 16px
+
+ +media-laptop()
+ padding 16px
+
+ &__amounts
+ display flex
+ justify-content space-between
+ padding-bottom 8px
+
+ &__graph
+ overflow hidden
+ background var(--c-bg-7)
+ border-radius 3px
+
+ &__in
+ height 6px
+ min-width 0px
+ background rgba(44, 173, 34, 0.7)
+
+ &__trns
+ margin-top 1px
+ padding 0 12px
+ border-top 1px solid var(--c-bg-2)
+ background var(--c-bg-3)
+
+ +media-laptop()
+ padding 0 16px
diff --git a/src/components/layout/styles/component.styl b/src/components/layout/styles/component.styl
index ad60d326..865e528b 100644
--- a/src/components/layout/styles/component.styl
+++ b/src/components/layout/styles/component.styl
@@ -5,19 +5,26 @@
text-align left
border 1px solid var(--c-bg-6)
+ +media-laptop()
+ height auto
+ padding 12px 16px
+
&._text
margin-bottom $m9
padding 0
border 0
- @media $media-laptop
- margin-bottom $m10
+ +media-laptop()
+ margin-bottom 24px
&._p0
padding 0
margin 0
margin-bottom $m10
+ +media-laptop()
+ margin-bottom 24px
+
.v-input
.v-input__slot
.v-messages
@@ -70,3 +77,7 @@
&__color
width 32px
height 32px
+
+ +media-laptop()
+ width 22px
+ height 22px
diff --git a/src/components/layout/styles/tabPanel.styl b/src/components/layout/styles/tabPanel.styl
deleted file mode 100644
index 9c7d990c..00000000
--- a/src/components/layout/styles/tabPanel.styl
+++ /dev/null
@@ -1,23 +0,0 @@
-.tabPanel
- display grid
- grid-template-columns 1fr
- grid-template-rows minmax(auto, auto) 1fr minmax(auto, auto)
- height 100%
-
- &._disableFix
- display block
-
-.tabPanel__fix
- @media $media-phone
- overflow hidden
-
-.tabPanel__scroll
- scrollbar()
- overflow hidden
- overflow-y auto
-
-.tabPanel._disableFix
- .tabPanel__scroll
- display block
- height auto
- overflow hidden
diff --git a/src/components/modal/ModalBottom.vue b/src/components/modal/ModalBottom.vue
index c7bb59ac..909d9040 100644
--- a/src/components/modal/ModalBottom.vue
+++ b/src/components/modal/ModalBottom.vue
@@ -12,6 +12,10 @@ export default {
show: {
type: Boolean,
required: true
+ },
+ paddingless: {
+ type: Boolean,
+ default: false
}
},
@@ -28,7 +32,7 @@ export default {
<template lang="pug">
.modalBottom(
:style="{ maxHeight: `${$store.state.ui.height}px`}"
- :class="{ _center: center }")
+ :class="{ _center: center, _paddingless: paddingless }")
transition(name="fadeIn" appear)
.modalBottom__overflow(@click="$listeners.onClose" v-show="show")
diff --git a/src/components/modal/ModalButton.vue b/src/components/modal/ModalButton.vue
index c117b975..6ea9443f 100644
--- a/src/components/modal/ModalButton.vue
+++ b/src/components/modal/ModalButton.vue
@@ -26,8 +26,7 @@ export default {
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.button-link
width auto
@@ -54,4 +53,7 @@ export default {
&:active
background var(--c-bg-6)
+
+ &__name
+ font-size 12px
</style>
diff --git a/src/components/modal/styles/modalBottom.styl b/src/components/modal/styles/modalBottom.styl
index 2ea205aa..1cbdffb6 100644
--- a/src/components/modal/styles/modalBottom.styl
+++ b/src/components/modal/styles/modalBottom.styl
@@ -40,6 +40,10 @@
@media $media-laptop
padding $m9
+ ^[0]._paddingless &
+ padding 0
+
+
/.theme-light &
background var(--c-bg-2)
diff --git a/src/components/settings/Settings.vue b/src/components/settings/Settings.vue
index 6ab1186c..d32551ae 100644
--- a/src/components/settings/Settings.vue
+++ b/src/components/settings/Settings.vue
@@ -1,11 +1,13 @@
<script>
import Button from '@/components/shared/button/Button'
+import ComponentWrap from '@/components/layout/component/Component'
import ModalBottomConfirm from '@/components/modal/ModalBottomConfirm'
import LangDropdown from '@/components/lang/LangDropdown'
export default {
components: {
Button,
+ ComponentWrap,
ModalBottomConfirm,
LangDropdown
},
@@ -32,65 +34,68 @@ export default {
</script>
<template lang="pug">
-.settings
- .settings__header {{ $lang.settings.title }}
-
- .settings__group
- .settings__subHeader {{ $lang.trnForm.title }}
- .settings__item
- Button._bdb(
- :checkboxValue="$store.state.ui.lastUsedCatsInTrnForm === 'visible'"
- :showCheckbox="true"
- :title="$lang.trnForm.lastUsedCats"
- icon="mdi mdi-chart-bubble"
- v-on:onClick="$store.dispatch('toogleLastUsedCatsInTrnForm')")
-
- .settings__group
- .settings__subHeader {{ $lang.settings.lang }}
- .settings__item
- LangDropdown
-
- .settings__group
- .settings__subHeader {{ $lang.settings.app }}
- .settings__item
- Button._bdb(
- icon="mdi mdi-palette"
- title="Change theme"
- v-on:onClick="$store.dispatch('changeTheme')")
- .settings__item
- Button._bdb(
- icon="mdi mdi-logout"
- title="Sign Out"
- v-on:onClick="$store.dispatch('signOut')")
-
- .settings__group._paddingTop
- .settings__subHeader {{ $lang.settings.delete }}
- .settings__desc {{ $lang.alerts.willDeleteEverything }}
- .settings__item
- Button._bdb(
- icon="mdi mdi-delete"
- title="Delete my data"
- v-on:onClick="confirmRemoveUserData = true")
-
- .settings__group(v-if="$store.state.demo.hasDemo")
- .settings__subHeader {{ $lang.settings.demo }}
- .settings__desc {{ $lang.alerts.willDeleteEverything }}
- .settings__item
- Button._bdb(
- icon="mdi mdi-test-tube"
- title="Load demo"
- v-on:onClick="confirmCreateDemo = true")
-
- ModalBottomConfirm(
- description="This will delete all your wallets, categories and trns"
- :show="confirmCreateDemo"
- v-on:onClose="confirmCreateDemo = false"
- v-on:onConfirm="generateDemo")
- ModalBottomConfirm(
- description="This will delete all your wallets, categories and trns"
- :show="confirmRemoveUserData"
- v-on:onClose="confirmRemoveUserData = false"
- v-on:onConfirm="removeUserData")
+ComponentWrap(:contentPadding="false")
+ template(slot="headerLeft") {{ $lang.settings.title }}
+
+ template(slot="content")
+ .settings
+ .settings__group
+ .settings__subHeader {{ $lang.trnForm.title }}
+ .settings__item
+ Button._bdb(
+ :checkboxValue="$store.state.ui.lastUsedCatsInTrnForm === 'visible'"
+ :showCheckbox="true"
+ :title="$lang.trnForm.lastUsedCats"
+ icon="mdi mdi-chart-bubble"
+ v-on:onClick="$store.dispatch('toogleLastUsedCatsInTrnForm')")
+
+ .settings__group
+ .settings__subHeader {{ $lang.settings.lang }}
+ .settings__item
+ LangDropdown
+
+ .settings__group
+ .settings__subHeader {{ $lang.settings.app }}
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-palette"
+ title="Change theme"
+ v-on:onClick="$store.dispatch('changeTheme')")
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-logout"
+ title="Sign Out"
+ v-on:onClick="$store.dispatch('signOut')")
+
+ .settings__group._paddingTop
+ .settings__subHeader {{ $lang.settings.delete }}
+ .settings__desc {{ $lang.alerts.willDeleteEverything }}
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-delete"
+ title="Delete my data"
+ v-on:onClick="confirmRemoveUserData = true")
+
+ .settings__group(v-if="$store.state.demo.hasDemo")
+ .settings__subHeader {{ $lang.settings.demo }}
+ .settings__desc {{ $lang.alerts.willDeleteEverything }}
+ .settings__item
+ Button._bdb(
+ icon="mdi mdi-test-tube"
+ title="Load demo"
+ v-on:onClick="confirmCreateDemo = true")
+
+ ModalBottomConfirm(
+ description="This will delete all your wallets, categories and trns"
+ :show="confirmCreateDemo"
+ v-on:onClose="confirmCreateDemo = false"
+ v-on:onConfirm="generateDemo")
+
+ ModalBottomConfirm(
+ description="This will delete all your wallets, categories and trns"
+ :show="confirmRemoveUserData"
+ v-on:onClose="confirmRemoveUserData = false"
+ v-on:onConfirm="removeUserData")
</template>
<style lang="stylus" scoped>
@@ -99,11 +104,11 @@ export default {
@import "~@/stylus/variables/media"
.settings
- @media $media-phone
- padding $m7
+ padding 16px
- @media $media-laptop
- max-width 380px
+ +media-laptop()
+ max-width 480px
+ padding 32px 60px
&__group
padding-bottom 48px
diff --git a/src/components/shared/button/Button.vue b/src/components/shared/button/Button.vue
index 341b3a0f..bc12275e 100644
--- a/src/components/shared/button/Button.vue
+++ b/src/components/shared/button/Button.vue
@@ -100,6 +100,11 @@ export default {
border-radius $m3
font-size 15px
anim-background()
+ border 1px solid transparent
+
+ +media-laptop()
+ font-size 14px
+ padding 12px 20px
&:active
transform scale(0.96)
@@ -108,11 +113,11 @@ export default {
display flex
align-items center
justify-content center
- padding 10px 10px
background var(--c-bg-2)
border 1px solid var(--c-bg-7)
box-shadow 2px 2px 6px 0px var(--c-bg-2)
border-radius 3px
+ anim()
/.theme-light &
box-shadow 2px 2px 6px 0px var(--c-bg-11)
@@ -121,26 +126,13 @@ export default {
color var(--c-font-3)
transform scale(0.96)
- &._square
- width 40px
- height 40px
-
- &._blue
- display inline-flex
- align-items center
- justify-content center
- font-header-2()
- font-size 14px
- height 47px
- color var(--c-font-1)
- font-weight 600
- letter-spacing 1.6px
- background var(--c-blue-1)
- border-radius $m3
+ +media-laptop()
+ &:hover
+ border-color var(--c-bg-9)
- &:hover
- @media $media-laptop
- background var(--c-blue-2)
+ &._square
+ width 40px
+ height 40px
&._bdb
padding 12px $m7
@@ -196,6 +188,15 @@ export default {
background var(--c-bg-1)
border-color var(--c-bg-8)
+ &._blue
+ color var(--c-font-1)
+ background var(--c-blue-1)
+ // border 1px solid transparent
+
+ &:hover
+ @media $media-laptop
+ background var(--c-blue-2)
+
&__icon
width 22px
margin-left -5px
@@ -208,7 +209,17 @@ export default {
margin-right 0
margin-right -5px
+ +media-laptop()
+ margin-left -8px
+ margin-right 10px
+ font-size 14px
+
&__check
margin-left auto
padding-left 32px
+
+ &__title
+ ~/._text-center &
+ flex-grow 1
+ text-align center
</style>
diff --git a/src/components/shared/inputs/Checkbox.vue b/src/components/shared/inputs/Checkbox.vue
index ada8fd74..15936fba 100644
--- a/src/components/shared/inputs/Checkbox.vue
+++ b/src/components/shared/inputs/Checkbox.vue
@@ -27,12 +27,14 @@ label.checkbox(:class="{ _alt: alt }")
)
.checkbox__helper
.checkbox__toogle
- .checkbox__toogle__item._on on
- .checkbox__toogle__item._off off
+ .checkbox__toogle__item._on {{ $lang.base.on }}
+ .checkbox__toogle__item._off {{ $lang.base.off }}
.checkbox__title(v-if="title") {{ title }}
</template>
<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
.checkbox
position relative
display flex
@@ -40,11 +42,14 @@ label.checkbox(:class="{ _alt: alt }")
font-size 16px
cursor pointer
- --width 3.4em
- --height 1.6em
- --left 1.8em
+ --width 3.3em
+ --height 1.5em
+ --left 1.7em
$color-rail = var(--c-font-2)
+ +media-laptop()
+ font-size 14px
+
&._small
--width 2.6em
--height 1.2em
diff --git a/src/components/stat/StatChartDonut.vue b/src/components/stat/StatChartDonut.vue
index 753a09b6..2ff160b6 100644
--- a/src/components/stat/StatChartDonut.vue
+++ b/src/components/stat/StatChartDonut.vue
@@ -1,55 +1,141 @@
<script>
+import moment from 'moment'
import { Chart } from 'highcharts-vue'
+import ContextMenu from '@/components/shared/contextMenu/ContextMenu'
+import ContextMenuItem from '@/components/shared/contextMenu/ContextMenuItem'
+import Dropdown from '@/components/shared/dropdown/Dropdown'
+import chartOptions from './chartOptions'
export default {
components: {
- Chart
+ Chart,
+ ContextMenu,
+ ContextMenuItem,
+ Dropdown
},
data () {
return {
- chartData () {
- const categories = this.$store.state.categories.items
- const stat = this.$store.getters.stat.categories
- const seriesData = []
- for (const categoryId in stat) {
- seriesData.push({
- name: categories[categoryId].name,
- y: stat[categoryId].expenses,
- color: categories[categoryId].color
- })
- }
- return seriesData
- },
-
- chartOptions: {
- title: {
- text: null
- },
-
- chart: {
- type: 'pie'
- },
-
- plotOptions: {
- pie: {
- dataLabels: {
- enabled: false
- }
+ date: moment().valueOf(),
+ periodName: 'month',
+ visiblePeriodMenu: false,
+ dateStart: null,
+ dateEnd: null,
+ chartOptions
+ }
+ },
+
+ mounted () {
+ const data = this.generateData(this.periodName)
+ const handlePerioSelect = (date) => this.handlePerioSelect(date)
+ this.chartOptions.series = data.series
+ this.chartOptions.xAxis.categories = data.categories
+ this.chartOptions.plotOptions.series = {
+ cursor: 'pointer',
+ point: {
+ events: {
+ click: function () {
+ handlePerioSelect(this.date)
}
- },
+ }
+ }
+ }
+ },
+
+ methods: {
+ toogleModal () {
+ this.$refs.chart.classList.add('_modal')
+ this.$nextTick(() => {
+ this.chartOptions.chart.redraw()
+ })
+ },
+
+ handlePerioSelect (date) {
+ this.$store.dispatch('setDate', parseInt(date))
+ },
+
+ changePeriod (name) {
+ if (this.periodName !== name) {
+ this.periodName = name
+ const data = this.generateData(this.periodName, this.chartOptions.series)
+ this.chartOptions.series = data.series
+ this.chartOptions.xAxis.categories = data.categories
+ }
+ },
+
+ formatAmount (amount) {
+ const fixed = this.$store.state.currencies.base === 'RUB' ? 0 : 2
+ return Number(`${amount.toFixed(fixed)}`).toLocaleString('ru-RU')
+ },
+
+ generateData (periodName, oldSeries) {
+ const trns = this.$store.state.trns.items
+ const allTrnsIds = Object.keys(trns)
+
+ // diff periods from oldest trn and today
+ const oldestTrnDate = moment(trns[this.$store.getters.firstCreatedTrnId].date).endOf(periodName)
+ let periodsToShow = moment().endOf(periodName).diff(oldestTrnDate, periodName) + 1
+ // periodsToShow = 12
+
+ // get balance for first period
+ const dateStart = moment().endOf(periodName).subtract(periodsToShow, periodName).valueOf()
+ const trnsIdsBeforeDate = allTrnsIds.filter(id => trns[id].date < dateStart)
+ const totalStart = this.$store.getters.getTotalOfTrnsIds(trnsIdsBeforeDate, true)
+
+ let categories = []
+ let incomesData = []
+ let expensesData = []
+ let totalData = []
+ for (let index = 0; index < periodsToShow; index++) {
+ // count balance
+ const balanceDateStart = moment().endOf(periodName).subtract(index, periodName).valueOf()
+ const balanceTrnsIds = allTrnsIds.filter(id => trns[id].date > dateStart && trns[id].date < balanceDateStart)
+ const balanceTotal = this.$store.getters.getTotalOfTrnsIds(balanceTrnsIds, true)
+
+ // count total period
+ const periodDate = moment().endOf(periodName).subtract(index, periodName).valueOf()
+ const name = moment(periodDate).format('MMM Y')
+ const trnsIds = this.$store.getters.getTrns({ date: periodDate, periodName })
+ const periodTotal = this.$store.getters.getTotalOfTrnsIds(trnsIds)
+
+ // return
+ incomesData.push({
+ date: periodDate,
+ y: Number(`${periodTotal.incomes.toFixed()}`)
+ })
+ expensesData.push({
+ date: periodDate,
+ y: Number(`${periodTotal.expenses.toFixed()}`)
+ })
+ totalData.push({
+ date: periodDate,
+ y: Number(`${(totalStart.total + balanceTotal.total).toFixed()}`)
+ })
+ categories.push(name)
+ }
+
+ return {
series: [{
- data: this.chartData
+ visible: true,
+ type: 'areaspline',
+ name: 'Balance',
+ color: '#c1c1c1',
+ data: totalData
+ }, {
+ visible: true,
+ type: 'spline',
+ name: 'Incomes',
+ color: 'var(--c-incomes-1)',
+ data: incomesData
+ }, {
+ visible: true,
+ type: 'spline',
+ name: 'Expenses',
+ color: 'var(--c-expenses-1)',
+ data: expensesData
}],
-
- chartOptions: {
- series: [{
- dataLabels: {
- enabled: false
- }
- }]
- }
+ categories
}
}
}
@@ -57,10 +143,66 @@ export default {
</script>
<template lang="pug">
-div
- Chart(:options="chartOptions")
+.chart(ref="chart")
+ .chart__nav
+ .chart__wrap
+ ContextMenu(
+ :position="{ left: '-12px', top: true }"
+ :visible="visiblePeriodMenu"
+ v-on:onClickOpener="visiblePeriodMenu = !visiblePeriodMenu")
+ template(slot="opener")
+ Dropdown._noBd(
+ :active="visiblePeriodMenu")
+ template(slot="title") Period
+
+ template(slot="content")
+ ContextMenuItem(
+ icon="mdi mdi-calendar"
+ title="Month"
+ v-on:onClick="changePeriod('month')"
+ v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
+
+ ContextMenuItem(
+ icon="mdi mdi-calendar-star"
+ title="Year"
+ v-on:onClick="changePeriod('year')"
+ v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
+
+ //- .div(@click="toogleModal") Modal
+
+ .chart__content
+ Chart(:options="chartOptions")
</template>
-<style lang="stylus">
-@import "~@/stylus/variables/margins"
+<style lang="stylus" scoped>
+@import "~@/stylus/variables/animations"
+
+$background = var(--c-bg-4)
+$border = var(--c-bg-1)
+
+.chart
+ z-index 3
+ position relative
+ background var(--c-bg-2)
+ anim()
+
+ &__nav
+ display flex
+ background $background
+ border 1px solid $border
+
+ &__wrap
+ max-width 1100px
+ padding 5px 60px
+
+ &__content
+ padding 30px 60px
+
+ &._modal
+ z-index 5
+ position fixed
+ left 0
+ top 0
+ width 100%
+ height 100%
</style>
diff --git a/src/components/stat/StatChartsLine.vue b/src/components/stat/StatChartsLine.vue
index 34e815cb..0d6c2153 100644
--- a/src/components/stat/StatChartsLine.vue
+++ b/src/components/stat/StatChartsLine.vue
@@ -5,6 +5,7 @@ import Amount from '@/components/amount/Amount'
import ChartItem from '@/components/stat/chart/ChartItem'
import ChartMenu from '@/components/stat/chart/ChartMenu'
import ChartPopup from '@/components/stat/chart/ChartPopup'
+import { dragscroll } from 'vue-dragscroll'
export default {
components: {
@@ -14,6 +15,10 @@ export default {
ChartPopup
},
+ directives: {
+ dragscroll
+ },
+
computed: {
periods () {
return this.$store.state.chart.periods
@@ -192,7 +197,7 @@ export default {
.charts__items._grouped
template(v-for="(periodGroups, groupDate) in periodsGroupedValues")
.chart-group(:class="{ _grouped: periods[filterPeriod].grouped }")
- .chart-group__name(v-show="periods[filterPeriod].grouped")
+ .chart-group__name(data-dragscroll v-show="periods[filterPeriod].grouped")
template(v-if="periods[filterPeriod].grouped") {{ formatGroupName(groupDate, periods[filterPeriod].groupedBy) }}
.chart-group__content
@@ -201,8 +206,7 @@ export default {
:key="period.date"
:maxAmountValue="maxAmountValue"
:period="period"
- parentClassName=".charts__items"
- )
+ parentClassName=".charts__items")
.chart-space
//- simple
@@ -253,7 +257,9 @@ export default {
min-height 178px
&__items
+ cursor grab
scrollbar()
+ overflow hidden
overflow-x auto
display flex
margin-bottom -1px
@@ -279,8 +285,7 @@ export default {
.chart-group
position relative
flex-grow 0
- margin-right $m8
- padding-right $m8
+ margin-right 40px
&:last-child
margin-right 0
diff --git a/src/components/stat/StatItem.vue b/src/components/stat/StatItem.vue
index 22c51be2..d715f999 100644
--- a/src/components/stat/StatItem.vue
+++ b/src/components/stat/StatItem.vue
@@ -111,7 +111,7 @@ export default {
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.statItem
cursor pointer
diff --git a/src/components/stat/StatMobile.vue b/src/components/stat/StatMobile.vue
index c108d09c..9b3272ba 100644
--- a/src/components/stat/StatMobile.vue
+++ b/src/components/stat/StatMobile.vue
@@ -1,4 +1,7 @@
<script>
+import Swiper from 'swiper'
+import 'swiper/dist/css/swiper.min.css'
+
import Amount from '@/components/amount/Amount'
import EmptyData from '@/components/shared/emptyData/EmptyData'
import FilterItem from '@/components/filter/FilterItem'
@@ -22,6 +25,12 @@ export default {
TrnsList
},
+ data () {
+ return {
+ slider: null
+ }
+ },
+
computed: {
activeTabStat () {
return this.$store.state.ui.stat.activeTab
@@ -45,6 +54,12 @@ export default {
}
},
+ mounted () {
+ this.slider = new Swiper(this.$refs.slider, {
+ // autoHeight: true
+ })
+ },
+
methods: {
clearCategoryFilter () {
const nextCategory = this.filterCategory.parentId !== 0 ? this.filterCategory.parentId : null
@@ -62,8 +77,6 @@ export default {
<template lang="pug">
.stat
- StatSummaryMobile(v-show="$store.state.ui.statSummuryVisibility === 'visible'")
-
.stat__filter(v-if="$store.state.filter.categoryId || $store.state.filter.walletId")
template(v-if="$store.state.filter.walletId")
FilterItem(
@@ -85,95 +98,101 @@ export default {
:name="filterCategory.name"
v-on:onClick="clearCategoryFilter")
- //- empty
- //------------------------------------------------
- EmptyData(
- v-if="isEmptyData"
- :text="$lang.statCurrentPeriod.empty")
-
- //- history
- //------------------------------------------------
- div(v-if="activeTabStat === 'history'")
- TrnsList
-
- //- stat
- //------------------------------------------------
- div(v-show="activeTabStat === 'stat'")
- .stat__content
- //- incomes
- .statGroup(v-if="statCurrentPeriod.incomes.categoriesIds.length")
- .statItem-header
- .statItem-total
- .statItem-total__title._incomes {{ $lang.money.incomes }}
- .statItem-total__amount
- Amount(
- :currency="$store.state.currencies.base"
- :type="1"
- :value="statCurrentPeriod.incomes.total")
- .statItem-average(v-if="$store.state.stat.showedPeriods > 1")
- .statItem-average__title
- .statItem-average__title-icon: .mdi.mdi-chart-timeline
- .statItem-average__title-text {{ $lang.money.average }}
- .statItem-average__amount
- Amount(
- :currency="$store.state.currencies.base"
- :small="true"
- :value="$store.getters.statAverage.incomes")
- //- incomes: cats charts
- .stat__charts(v-show="$store.state.ui.catsChart === 'visible'")
- PeriodCatsChart(type="incomes")
-
- //- incomes: cats stat item
- .stat__cats(v-show="$store.state.ui.statItems === 'visible'")
- StatItem(
- v-for="categoryId in statCurrentPeriod.incomes.categoriesIds"
- :biggest="statCurrentPeriod.incomes.biggest"
- :category="$store.state.categories.items[categoryId]"
- :categoryId="categoryId"
- :currency="$store.state.currencies.base"
- :key="categoryId"
- :type="1"
- :total="statCurrentPeriod.categories[categoryId].incomes")
-
- //- expenses
- .statGroup(v-if="statCurrentPeriod.expenses.categoriesIds.length")
- .statItem-header
- .statItem-total
- .statItem-total__title._expenses {{ $lang.money.expenses }}
- .statItem-total__amount
- Amount(
- :currency="$store.state.currencies.base"
- :type="0"
- :value="statCurrentPeriod.expenses.total")
- .statItem-average(v-if="$store.state.stat.showedPeriods > 1")
- .statItem-average__title
- .statItem-average__title-icon: .mdi.mdi-chart-timeline
- .statItem-average__title-text {{ $lang.money.average }}
- .statItem-average__amount
- Amount(
- :currency="$store.state.currencies.base"
- :small="true"
- :value="$store.getters.statAverage.expenses"
- )
- //- expenses: cats charts
- .stat__charts(v-show="$store.state.ui.catsChart === 'visible'")
- PeriodCatsChart(type="expenses")
-
- //- expenses: cats stat item
- .stat__cats(v-show="$store.state.ui.statItems === 'visible'")
- StatItem(
- v-for="categoryId in statCurrentPeriod.expenses.categoriesIds"
- :biggest="statCurrentPeriod.expenses.biggest"
- :category="$store.state.categories.items[categoryId]"
- :categoryId="categoryId"
- :currency="$store.state.currencies.base"
- :key="categoryId"
- :type="0"
- :total="statCurrentPeriod.categories[categoryId].expenses")
-
- .stat__trns(v-if="$store.state.ui.statLastTrnsVisibility === 'visible' && $store.getters.selectedTrnsIdsWithDate.length > 0")
- .stat__name Last transactions
- TrnsList(:limit="6", ui="lastTrns")
+ .slider
+ .swiper-container(ref="slider")
+ .swiper-wrapper
+ .swiper-slide
+ StatSummaryMobile(v-show="$store.state.ui.statSummuryVisibility === 'visible'")
+
+ //- empty
+ //------------------------------------------------
+ EmptyData(
+ v-if="isEmptyData"
+ :text="$lang.stat.empty")
+
+ //- history
+ //------------------------------------------------
+ div(v-if="activeTabStat === 'history'")
+ TrnsList
+
+ //- stat
+ //------------------------------------------------
+ div(v-show="activeTabStat === 'stat'")
+ .stat__content
+ //- incomes
+ .statGroup(v-if="statCurrentPeriod.incomes.categoriesIds.length")
+ .statItem-header
+ .statItem-total
+ .statItem-total__title._incomes {{ $lang.money.incomes }}
+ .statItem-total__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="1"
+ :value="statCurrentPeriod.incomes.total")
+ .statItem-average(v-if="$store.state.stat.showedPeriods > 1")
+ .statItem-average__title
+ .statItem-average__title-icon: .mdi.mdi-chart-timeline
+ .statItem-average__title-text {{ $lang.money.average }}
+ .statItem-average__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :small="true"
+ :value="$store.getters.statAverage.incomes")
+ //- incomes: cats charts
+ .stat__charts(v-show="$store.state.ui.catsChart === 'visible'")
+ PeriodCatsChart(type="incomes")
+
+ //- incomes: cats stat item
+ .stat__cats(v-show="$store.state.ui.statItems === 'visible'")
+ StatItem(
+ v-for="categoryId in statCurrentPeriod.incomes.categoriesIds"
+ :biggest="statCurrentPeriod.incomes.biggest"
+ :category="$store.state.categories.items[categoryId]"
+ :categoryId="categoryId"
+ :currency="$store.state.currencies.base"
+ :key="categoryId"
+ :type="1"
+ :total="statCurrentPeriod.categories[categoryId].incomes")
+
+ //- expenses
+ .statGroup(v-if="statCurrentPeriod.expenses.categoriesIds.length")
+ .statItem-header
+ .statItem-total
+ .statItem-total__title._expenses {{ $lang.money.expenses }}
+ .statItem-total__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="0"
+ :value="statCurrentPeriod.expenses.total")
+ .statItem-average(v-if="$store.state.stat.showedPeriods > 1")
+ .statItem-average__title
+ .statItem-average__title-icon: .mdi.mdi-chart-timeline
+ .statItem-average__title-text {{ $lang.money.average }}
+ .statItem-average__amount
+ Amount(
+ :currency="$store.state.currencies.base"
+ :small="true"
+ :value="$store.getters.statAverage.expenses"
+ )
+ //- expenses: cats charts
+ .stat__charts(v-show="$store.state.ui.catsChart === 'visible'")
+ PeriodCatsChart(type="expenses")
+
+ //- expenses: cats stat item
+ .stat__cats(v-show="$store.state.ui.statItems === 'visible'")
+ StatItem(
+ v-for="categoryId in statCurrentPeriod.expenses.categoriesIds"
+ :biggest="statCurrentPeriod.expenses.biggest"
+ :category="$store.state.categories.items[categoryId]"
+ :categoryId="categoryId"
+ :currency="$store.state.currencies.base"
+ :key="categoryId"
+ :type="0"
+ :total="statCurrentPeriod.categories[categoryId].expenses")
+
+ .stat__trns(v-if="$store.state.ui.statLastTrnsVisibility === 'visible' && $store.getters.selectedTrnsIdsWithDate.length > 0")
+ .stat__name Last transactions
+ TrnsList(:limit="6", ui="lastTrns")
.customize
StatCustomizeMenuMobile
@@ -186,6 +205,16 @@ export default {
@import "~@/stylus/variables/fonts"
@import "~@/stylus/variables/scrollbar"
+.flickity-viewport
+ transition: height 0.2s
+.slider
+ height 100%
+
+.swiper-slide
+ height 100%
+ overflow hidden
+ overflow-y auto
+
.customize
display none
@@ -196,6 +225,8 @@ export default {
margin-top $m9
.stat
+ position relative
+
&__filter
display flex
overflow hidden
diff --git a/src/components/stat/StatNew.vue b/src/components/stat/StatNew.vue
new file mode 100644
index 00000000..a69a778a
--- /dev/null
+++ b/src/components/stat/StatNew.vue
@@ -0,0 +1,54 @@
+<script>
+import StatChartsLine from '@/components/stat/StatChartsLine'
+import StatMobile from '@/components/stat/StatMobile'
+import WalletsList from '@/components/wallets/list/WalletsList'
+
+export default {
+ components: {
+ StatChartsLine,
+ StatMobile,
+ WalletsList
+ },
+
+ methods: {
+ handleShowWalletModal (id) {
+ this.$store.commit('showWalletModal')
+ this.$store.commit('setWalletModalId', id)
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.layoutStat
+ .tabPanel
+ .tabPanel__top
+ .mainNav
+ .mainNav__wrap
+ .mainNav__title {{ $lang.categories.name }}
+ .mainNav__create
+ Button(
+ className="_newSm"
+ :title="$lang.categories.new"
+ v-on:onClick="$store.dispatch('setActiveTab', 'createCategory')")
+ .tabPanel__scroll
+
+ //- .layoutStat__wallets(v-show="$store.state.ui.stat.walletsVisibility === 'visible'")
+ //- WalletsList(
+ //- :limit="3"
+ //- ui="widget"
+ //- v-on:onClick="id => handleShowWalletModal(id)")
+
+ //- .layoutStat__chart(v-show="$store.state.ui.statGraphsVisibility === 'visible' && ($store.state.filter.period !== 'all')")
+ //- StatChartsLine
+
+ //- .layoutStat__summary
+ //- StatMobile
+</template>
+
+<style lang="stylus" scoped>
+.layoutStat
+ height 100%
+ overflow hidden
+ overflow-y auto
+</style>
diff --git a/src/components/stat/cats/PeriodCatsChartItem.vue b/src/components/stat/cats/PeriodCatsChartItem.vue
index 1fea1458..008391ce 100644
--- a/src/components/stat/cats/PeriodCatsChartItem.vue
+++ b/src/components/stat/cats/PeriodCatsChartItem.vue
@@ -86,8 +86,9 @@ export default {
@import "~@/stylus/variables/media"
.statCatsItem
- padding-top 12px
+ margin-top 12px
margin-right 10px
+ background var(--c-bg-4)
&:hover
@media $media-laptop
diff --git a/src/components/stat/chart/ChartItem.vue b/src/components/stat/chart/ChartItem.vue
index 8ae586a8..90cc3547 100644
--- a/src/components/stat/chart/ChartItem.vue
+++ b/src/components/stat/chart/ChartItem.vue
@@ -127,7 +127,7 @@ export default {
.chart-item
cursor pointer
padding $m5 $m5
- flex-grow 1
+ flex-grow 0
max-width 80px
border-left 1px solid transparent
border-right 1px solid transparent
@@ -144,8 +144,10 @@ export default {
padding-right $m5
&._month
+ padding-left 10px
+ padding-right 10px
@media $media-laptop
- min-width 70px
+ min-width 20px
&._year
padding-left $m8
@@ -156,6 +158,9 @@ export default {
min-width 0
&._grouped._day
+ padding-left 2px
+ padding-right 2px
+
&._grouped._week
&._grouped._month
padding-left 2px
@@ -211,7 +216,7 @@ export default {
&-line
width 6px
- margin 0 2px
+ margin 0 1px
min-height 1px
&._expenses
diff --git a/src/components/stat/chartOptions.js b/src/components/stat/chartOptions.js
new file mode 100644
index 00000000..8de148ba
--- /dev/null
+++ b/src/components/stat/chartOptions.js
@@ -0,0 +1,90 @@
+export default {
+ chart: {
+ backgroundColor: 'transparent',
+ // height: '40%',
+ spacing: [5, 0, 0, 0],
+ type: 'column',
+ zoomType: 'x',
+ panning: true,
+ panKey: 'shift'
+ },
+ credits: { enabled: false },
+ legend: {
+ itemHiddenStyle: {
+ color: 'var(--c-font-5)'
+ },
+ itemStyle: {
+ color: 'var(--c-font-2)'
+ },
+ itemHoverStyle: {
+ color: 'var(--c-font-3)'
+ }
+ },
+ plotOptions: {
+ areaspline: {
+ fillOpacity: 0.3,
+ borderWidth: 2,
+ marker: {
+ enabled: false,
+ symbol: 'circle',
+ radius: 3,
+ states: {
+ hover: {
+ enabled: true
+ }
+ }
+ }
+ },
+ column: {
+ groupPadding: 0.2,
+ pointPadding: 0.2,
+ borderWidth: 0
+ },
+ spline: {
+ lineWidth: 2,
+ states: {
+ hover: {
+ lineWidth: 2
+ }
+ },
+ marker: {
+ enabled: false
+ }
+ }
+ },
+ series: [],
+ title: { text: null },
+ tooltip: {
+ animation: true,
+ backgroundColor: 'var(--c-bg-3)',
+ borderColor: 'var(--c-bg-7)',
+ borderRadius: 3,
+ padding: 10,
+ shadow: false,
+ style: {
+ color: 'var(--c-font-2)',
+ fontSize: '12px'
+ },
+ shared: true
+ },
+ xAxis: {
+ categories: [],
+ crosshair: true,
+ lineColor: 'var(--c-bg-7)',
+ tickColor: 'var(--c-bg-7)',
+ tickmarkPlacement: 'on',
+ labels: {
+ style: {
+ color: 'var(--c-font-4)',
+ fontSize: '12px',
+ fontFamily: 'var(--font-secondary)',
+ textTransform: 'uppercase'
+ }
+ }
+ },
+ yAxis: {
+ alternateGridColor: '',
+ gridLineColor: 'var(--c-bg-4)',
+ title: { text: null }
+ }
+}
diff --git a/src/components/trnForm/store/actions.js b/src/components/trnForm/store/actions.js
index 0e8e345b..710fd9da 100644
--- a/src/components/trnForm/store/actions.js
+++ b/src/components/trnForm/store/actions.js
@@ -46,6 +46,7 @@ export default {
if (trnId && rootGetters.hasTrns) {
const trn = rootState.trns.items[trnId]
commit('setTrnFormValues', {
+ ...trn,
amount: trn.amount,
amountArray: [trn.amount],
amountType: trn.type,
@@ -62,6 +63,7 @@ export default {
if (trnId && rootGetters.hasTrns) {
const trn = rootState.trns.items[trnId]
commit('setTrnFormValues', {
+ ...trn,
amount: 0,
amountArray: [0],
amountType: trn.type,
diff --git a/src/components/trns/item/TrnItem.vue b/src/components/trns/item/TrnItem.vue
index 59ff3e69..b4265f8b 100644
--- a/src/components/trns/item/TrnItem.vue
+++ b/src/components/trns/item/TrnItem.vue
@@ -73,7 +73,8 @@ export default {
.trnItem(
v-if="category && wallet"
@click="handleClick"
- :class="className")
+ :class="className"
+)
//- detailed view
template(v-if="ui === 'detailed'")
@@ -186,7 +187,11 @@ export default {
:background="category.color"
:icon="category.icon"
:round="true")
- .trnItem__categoryName {{ category.name }}
+ .trnItem__categoryName
+ | {{ category.name }}
+ .trnItem__groups(v-if="trn.groups") In group
+ .trnItem__budgets(v-if="trn.budgets") In budget
+
.trnItem__walletFloatIcon
Icon(
:abbr="wallet.name"
@@ -305,9 +310,6 @@ export default {
&__desc
color var(--c-font-2)
font-size 14px
- white-space nowrap
- overflow hidden
- text-overflow ellipsis
^[0]._detailed &
grid-column 2
@@ -322,6 +324,9 @@ export default {
^[0]._stat &
^[0]._lastTrns &
padding-right 10px
+ white-space nowrap
+ overflow hidden
+ text-overflow ellipsis
&__line
^[0]._history &
@@ -377,4 +382,10 @@ export default {
position absolute
left 35px
top 24px
+
+ &__groups
+ &__budgest
+ display inline-block
+ padding-left 10px
+ font-size 10px
</style>
diff --git a/src/components/trns/list/TrnsList.vue b/src/components/trns/list/TrnsList.vue
index bfac8d7a..80154f43 100644
--- a/src/components/trns/list/TrnsList.vue
+++ b/src/components/trns/list/TrnsList.vue
@@ -1,11 +1,13 @@
<script>
import moment from 'moment'
+import Button from '@/components/shared/button/Button'
import TrnItem from '@/components/trns/item/TrnItem'
import TrnsListDate from '@/components/trns/list/TrnsListDate'
export default {
components: {
+ Button,
TrnItem,
TrnsListDate
},
@@ -30,10 +32,31 @@ export default {
incomes: {
type: Boolean,
default: false
+ },
+ size: {
+ type: Number,
+ required: false,
+ default: 30
+ }
+ },
+
+ data () {
+ return {
+ pageNumber: 1,
+ sortByEditDate: false
}
},
computed: {
+ isShowAllTrns () {
+ return this.paginatedTrnsIds.length === this.trnsIds.length
+ },
+
+ paginatedTrnsIds () {
+ const end = this.pageNumber * this.size
+ return this.trnsIds.slice(0, end)
+ },
+
trnsIds () {
const trns = this.$store.state.trns.items
let trnsIds = this.$store.getters.selectedTrnsIdsWithDate
@@ -54,11 +77,15 @@ export default {
groupedTrns () {
const trns = this.$store.state.trns.items
- const trnsIds = this.trnsIds
+ const trnsIds = this.paginatedTrnsIds
const trnsList = {}
for (const trnId of trnsIds) {
- const dayDate = moment(trns[trnId].date).startOf('day').valueOf()
+ let dayDate
+ this.sortByEditDate
+ ? dayDate = moment(trns[trnId].editDate).startOf('day').valueOf()
+ : dayDate = moment(trns[trnId].date).startOf('day').valueOf()
+
if (!trnsList[dayDate]) {
trnsList[dayDate] = [trnId]
} else {
@@ -67,58 +94,112 @@ export default {
}
return trnsList
}
+ },
+
+ methods: {
+ showMoreTrns () {
+ this.pageNumber = this.pageNumber + 1
+ }
}
}
</script>
<template lang="pug">
.trnsList
- template(v-if="trnsIds.length > 0")
- //- history view
- template(v-if="ui === 'history'")
- .trnsList__day(v-for="(trnsIds, date) in groupedTrns")
- .trnsList__header: TrnsListDate(:date="date")
- .trnsList__trns
+ //- div(@click="sortByEditDate = !sortByEditDate" style="padding-bottom: 20px")
+ //- template(v-if="sortByEditDate") Sort by transaction date
+ //- template(v-else) Sort by edit date
+
+ .trnsList__content
+ template(v-if="trnsIds.length > 0")
+ //- history view
+ template(v-if="ui === 'history'")
+ .trnsList__grid
+ .trnsList__day(v-for="(trnsIds, date) in groupedTrns")
+ .trnsList__header: TrnsListDate(:date="date")
+ .trnsList__trns
+ TrnItem(
+ v-for="trnId in trnsIds"
+ :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"
+ :key="trnId"
+ :trn="$store.state.trns.items[trnId]"
+ :trnId="trnId"
+ :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].accountId]")
+
+ //- stat view
+ template(v-else)
+ template(v-for="trnId of paginatedTrnsIds")
TrnItem(
- v-for="trnId in trnsIds"
:category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"
:key="trnId"
:trn="$store.state.trns.items[trnId]"
:trnId="trnId"
+ :ui="ui"
:wallet="$store.state.wallets.items[$store.state.trns.items[trnId].accountId]")
- //- stat view
- template(v-else)
- template(v-for="trnId of trnsIds")
- TrnItem(
- :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"
- :key="trnId"
- :trn="$store.state.trns.items[trnId]"
- :trnId="trnId"
- :ui="ui"
- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].accountId]")
+ .trnsList__pages(v-if="!isShowAllTrns")
+ Button(
+ :class="['_text-center _border _inline']"
+ :title="$lang.trns.more"
+ v-on:onClick="showMoreTrns")
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.trnsList
+ padding-bottom 8px
+
+ +media-laptop()
+ padding 0
+
+ &__grid
+ display grid
+ grid-template-rows 1fr
+ grid-template-columns 1fr
+ grid-column-gap 8px
+ grid-row-gap 8px
+ padding 8px
+ padding-bottom 0
+
+ +media-laptop()
+ grid-column-gap 20px
+ grid-row-gap 20px
+ grid-template-columns repeat(3, 1fr)
+ padding 0
+
&__day
- border-top 1px solid var(--c-bg-1)
+ overflow hidden
+ background var(--c-bg-3)
+ border 1px solid var(--c-bg-1)
+ border-radius 3px
+
+ +media-laptop()
+ margin 0
&:first-child
border-top 0
- @media $media-laptop
- border 1px solid var(--c-bg-1)
- background var(--c-bg-3)
-
&__header
display flex
align-items center
justify-content space-between
- padding $m7 $m7
+ padding 12px 12px
background var(--c-bg-5)
- border-bottom 1px solid var(--c-bg-1)
+ border-bottom 1px solid var(--c-bg-2)
+
+ &__pages
+ padding 16px 8px
+
+ +media-laptop()
+ padding 0
+ padding-top 20px
+
+.statItem
+ .trnsList__pages
+ padding-top 10px
+ padding-left 68px
+ padding-bottom 20px
+ +media-laptop()
+ padding-left 62px
</style>
diff --git a/src/components/trns/list/TrnsList2.vue b/src/components/trns/list/TrnsList2.vue
new file mode 100644
index 00000000..6f58e277
--- /dev/null
+++ b/src/components/trns/list/TrnsList2.vue
@@ -0,0 +1,38 @@
+<script>
+export default {
+ props: {
+ ids: {
+ type: Array,
+ default: () => []
+ }
+ },
+
+ computed: {
+ trns () {
+ let trns = {}
+ let trnsIds = this.ids
+
+ for (const trnId of trnsIds) {
+ const trn = this.$store.state.trns.items[trnId]
+ const wallet = this.$store.state.wallets.items[trn.accountId]
+ const category = this.$store.state.categories.items[trn.categoryId]
+
+ trns[trnId] = {
+ id: trnId,
+ trn,
+ category,
+ wallet
+ }
+ }
+
+ return trns
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.trnsList
+ template(v-if="trns")
+ slot(:trns="trns")
+</template>
diff --git a/src/components/trns/modal/TrnModal.vue b/src/components/trns/modal/TrnModal.vue
index 424b9bcf..2ba90fd4 100644
--- a/src/components/trns/modal/TrnModal.vue
+++ b/src/components/trns/modal/TrnModal.vue
@@ -1,4 +1,5 @@
<script>
+import Amount from '@/components/amount/Amount'
import ModalBottom from '@/components/modal/ModalBottom'
import ModalBottomConfirm from '@/components/modal/ModalBottomConfirm'
import ModalButton from '@/components/modal/ModalButton'
@@ -7,6 +8,7 @@ import Button from '@/components/shared/button/Button'
export default {
components: {
+ Amount,
Button,
ModalBottom,
ModalBottomConfirm,
@@ -16,7 +18,9 @@ export default {
data () {
return {
- showModalConfirm: false
+ showModalConfirm: false,
+ showModalBudgets: false,
+ showModalGroups: false
}
},
@@ -24,11 +28,20 @@ export default {
trnId () {
return this.$store.state.trns.modal.id
},
+ trn () {
+ return this.$store.state.trns.items[this.trnId]
+ },
category () {
return this.$store.state.categories.items[this.$store.state.trns.items[this.trnId].categoryId]
},
wallet () {
return this.$store.state.wallets.items[this.$store.state.trns.items[this.trnId].accountId]
+ },
+ budgets () {
+ return this.$store.getters.budgets
+ },
+ groups () {
+ return this.$store.getters.groups
}
},
@@ -66,6 +79,14 @@ export default {
setTimeout(() => {
this.$store.dispatch('deleteTrn', trnId)
}, 100)
+ },
+ toogleAddToBudget (budgetId) {
+ this.$store.dispatch('toogleAddToBudget', { budgetId, trnId: this.trnId })
+ this.showModalBudgets = false
+ },
+ toogleAddToGroup (groupId) {
+ this.$store.dispatch('toogleAddToGroup', { groupId, trnId: this.trnId })
+ this.showModalGroups = false
}
}
}
@@ -112,11 +133,62 @@ ModalBottom(
v-on:onClick="handleSetFilterCategory")
Button(
+ :class="{ marginBottom: budgets }"
className="_grey"
title="Set wallet filter"
icon="mdi mdi-credit-card-multiple"
v-on:onClick="handleSetFilterWallet")
+ Button(
+ :class="{ marginBottom: groups }"
+ className="_grey"
+ title="Show budgets"
+ icon="mdi mdi-hand-saw"
+ v-on:onClick="showModalBudgets = true")
+
+ Button(
+ className="_grey"
+ title="Show groups"
+ icon="mdi mdi-folder-multiple-outline"
+ v-on:onClick="showModalGroups = true")
+
+ //- budgets
+ template(v-if="budgets")
+ ModalBottom(
+ :show="showModalBudgets"
+ title="Budgets"
+ v-on:onClose="showModalBudgets = false"
+ paddingless
+ )
+ template(v-for="(budget, budgetId) in budgets")
+ .item(@click="toogleAddToBudget(budgetId)")
+ .item__active
+ template(v-if="trn && trn.budgets && trn.budgets[budgetId]")
+ .mdi.mdi-check
+ template(v-else)
+ .mdi.mdi-plus
+ .item__name {{ budget.name }}
+ .item__amount
+ Amount(:currency="budget.currency" :value="budget.amount")
+
+ template(v-if="groups")
+ ModalBottom(
+ :show="showModalGroups"
+ title="groups"
+ v-on:onClose="showModalGroups = false"
+ paddingless
+ )
+ template(v-for="(group, groupId) in groups")
+ .item(@click="toogleAddToGroup(groupId)")
+ .item__active
+ template(v-if="trn && trn.groups && trn.groups[groupId]")
+ .mdi.mdi-check
+ template(v-else)
+ .mdi.mdi-plus
+ .item__name {{ group.name }}
+ //- .item__amount
+ //- Amount(:currency="group.currency" :value="group.amount")
+
//- confirm
ModalBottomConfirm(
:show="showModalConfirm"
@@ -133,4 +205,27 @@ ModalBottom(
.moreActions
padding-top $m8
+
+.item
+ display flex
+ width 100%
+ flex-grow 1
+ cursor pointer
+ padding $m7 $m8
+ border-bottom 1px solid var(--c-bg-6)
+
+ &:last-child
+ border-bottom 0
+
+ &:hover
+ background var(--c-bg-5)
+ /.theme-light &
+ background var(--c-bg-5)
+
+ &__active
+ flex-grow 0
+ width 40px
+
+ &__name
+ flex-grow 1
</style>
diff --git a/src/components/trns/store/actions.js b/src/components/trns/store/actions.js
index a0b3b59c..2e9c1863 100644
--- a/src/components/trns/store/actions.js
+++ b/src/components/trns/store/actions.js
@@ -17,7 +17,9 @@ export default {
let isTrnSavedOnline = false
const formatedTrnValues = {
+ ...values,
accountId: values.walletId,
+ walletId: values.walletId,
amount: values.amount,
categoryId: values.categoryId,
date: moment(values.date).valueOf(),
@@ -58,7 +60,7 @@ export default {
.then(() => removeTrnToDeleteLaterLocal(id))
},
- async deleteTrnsByIds ({ commit, rootState }, trnsIds) {
+ async deleteTrnsByIds ({ rootState }, trnsIds) {
const uid = rootState.user.user.uid
const trnsForDelete = {}
for (const trnId of trnsIds) {
diff --git a/src/components/trns/store/getters.js b/src/components/trns/store/getters.js
index 9dc923da..f76c6125 100644
--- a/src/components/trns/store/getters.js
+++ b/src/components/trns/store/getters.js
@@ -1,12 +1,5 @@
import moment from 'moment'
-// getTotalOfTrnsIds
-// getTrnsIdsInWallet
-// lastCreatedTrnId
-// firstCreatedTrnIdFromSelectedTrns
-// selectedTrnsIds
-// selectedTrnsIdsWithDate
-// sortedTrnsIds
export default {
hasTrns (state, getters, rootState) {
if (rootState.trns.items) {
@@ -151,7 +144,6 @@ export default {
return trnsIds
},
- // selectedTrnsIdsWithDate
selectedTrnsIdsWithDate (state, getters, rootState, rootGetters) {
if (!rootGetters.hasTrns) return []
@@ -192,22 +184,24 @@ export default {
})
},
- getSelectedTrnsIdsByFilter: (state, getters, rootState, rootGetters) => ({ categoryId, type }) => {
+ getTrnsIdsByFilter: (state, getters, rootState, rootGetters) => ({ categoryId, type }) => {
const trns = rootState.trns.items
- let trnsIds = rootGetters.selectedTrnsIdsWithDate
+ let trnsIds = rootGetters.sortedTrnsIds
if (categoryId) trnsIds = trnsIds.filter(id => trns[id].categoryId === categoryId)
if (type) trnsIds = trnsIds.filter(id => trns[id].type === type)
return trnsIds
},
- getTrns: (state, getters, rootState, rootGetters) => ({ date, periodName }) => {
+ getTrns: (state, getters, rootState, rootGetters) => (props) => {
if (!rootGetters.hasTrns) return []
+ const { date, periodName, description } = props
const categories = rootState.categories.items
const categoriesIds = Object.keys(categories)
const filterCategoryId = rootState.filter.categoryId
const filterWalletId = rootState.filter.walletId
+
const trns = rootState.trns.items
let trnsIds = Object.keys(trns)
@@ -217,7 +211,7 @@ export default {
const endDateValue = filterDate.endOf(filterPeriod).valueOf()
// filter date
- if (filterPeriod !== 'all') {
+ if (date && filterPeriod !== 'all') {
trnsIds = trnsIds
.filter(trnId => (trns[trnId].date >= startDateValue) && (trns[trnId].date <= endDateValue))
}
@@ -242,6 +236,14 @@ export default {
}
}
+ // description
+ if (description) {
+ trnsIds = trnsIds
+ .filter(trnId =>
+ trns[trnId].description &&
+ trns[trnId].description.includes(description))
+ }
+
trnsIds = trnsIds
.sort((a, b) => {
if (trns[a].date > trns[b].date) return -1
diff --git a/src/components/ui/store/icons.js b/src/components/ui/store/icons.js
index b48f8b0d..16729c41 100644
--- a/src/components/ui/store/icons.js
+++ b/src/components/ui/store/icons.js
@@ -1,83 +1,632 @@
export default [
+ 'mdi-ab-testing',
'mdi-access-point',
+ 'mdi-access-point-network',
+ 'mdi-access-point-network-off',
'mdi-account',
+ 'mdi-account-alert',
+ 'mdi-account-alert-outline',
+ 'mdi-account-arrow-left',
+ 'mdi-account-arrow-left-outline',
+ 'mdi-account-arrow-right',
+ 'mdi-account-arrow-right-outline',
+ 'mdi-account-badge',
+ 'mdi-account-badge-alert',
+ 'mdi-account-badge-alert-outline',
+ 'mdi-account-badge-horizontal',
+ 'mdi-account-badge-horizontal-outline',
+ 'mdi-account-badge-outline',
+ 'mdi-account-box',
+ 'mdi-account-box-multiple',
+ 'mdi-account-box-multiple-outline',
+ 'mdi-account-box-outline',
'mdi-account-card-details',
+ 'mdi-account-card-details-outline',
+ 'mdi-account-cash',
+ 'mdi-account-cash-outline',
+ 'mdi-account-check',
+ 'mdi-account-check-outline',
+ 'mdi-account-child',
+ 'mdi-account-child-circle',
+ 'mdi-account-child-outline',
+ 'mdi-account-circle',
+ 'mdi-account-circle-outline',
+ 'mdi-account-clock',
+ 'mdi-account-clock-outline',
+ 'mdi-account-convert',
+ 'mdi-account-details',
+ 'mdi-account-edit',
+ 'mdi-account-edit-outline',
'mdi-account-group',
+ 'mdi-account-group-outline',
'mdi-account-heart',
+ 'mdi-account-heart-outline',
'mdi-account-key',
+ 'mdi-account-key-outline',
+ 'mdi-account-lock',
+ 'mdi-account-lock-outline',
+ 'mdi-account-minus',
+ 'mdi-account-minus-outline',
'mdi-account-multiple',
+ 'mdi-account-multiple-check',
+ 'mdi-account-multiple-minus',
+ 'mdi-account-multiple-minus-outline',
+ 'mdi-account-multiple-outline',
+ 'mdi-account-multiple-plus',
+ 'mdi-account-multiple-plus-outline',
+ 'mdi-account-network',
+ 'mdi-account-network-outline',
+ 'mdi-account-off',
+ 'mdi-account-off-outline',
'mdi-account-outline',
+ 'mdi-account-plus',
+ 'mdi-account-plus-outline',
+ 'mdi-account-question',
+ 'mdi-account-question-outline',
+ 'mdi-account-remove',
+ 'mdi-account-remove-outline',
+ 'mdi-account-search',
'mdi-account-search-outline',
+ 'mdi-account-settings',
+ 'mdi-account-settings-outline',
+ 'mdi-account-star',
+ 'mdi-account-star-outline',
+ 'mdi-account-supervisor',
+ 'mdi-account-supervisor-circle',
+ 'mdi-account-supervisor-outline',
+ 'mdi-account-switch',
+ 'mdi-account-tie',
+ 'mdi-account-tie-outline',
'mdi-accusoft',
+ 'mdi-adchoices',
'mdi-adjust',
'mdi-adobe',
+ 'mdi-adobe-acrobat',
'mdi-air-conditioner',
+ 'mdi-air-filter',
+ 'mdi-air-horn',
+ 'mdi-air-humidifier',
+ 'mdi-air-purifier',
+ 'mdi-airbag',
'mdi-airballoon',
+ 'mdi-airballoon-outline',
'mdi-airplane',
+ 'mdi-airplane-landing',
+ 'mdi-airplane-off',
+ 'mdi-airplane-takeoff',
+ 'mdi-airplay',
'mdi-airport',
'mdi-alarm',
'mdi-alarm-bell',
+ 'mdi-alarm-check',
+ 'mdi-alarm-light',
+ 'mdi-alarm-light-outline',
+ 'mdi-alarm-multiple',
+ 'mdi-alarm-note',
+ 'mdi-alarm-note-off',
+ 'mdi-alarm-off',
+ 'mdi-alarm-plus',
+ 'mdi-alarm-snooze',
+ 'mdi-album',
+ 'mdi-alert',
+ 'mdi-alert-box',
+ 'mdi-alert-box-outline',
+ 'mdi-alert-circle',
+ 'mdi-alert-circle-check',
+ 'mdi-alert-circle-check-outline',
+ 'mdi-alert-circle-outline',
+ 'mdi-alert-decagram',
+ 'mdi-alert-decagram-outline',
+ 'mdi-alert-octagon',
+ 'mdi-alert-octagon-outline',
+ 'mdi-alert-octagram',
+ 'mdi-alert-octagram-outline',
+ 'mdi-alert-outline',
+ 'mdi-alert-rhombus',
+ 'mdi-alert-rhombus-outline',
'mdi-alien',
+ 'mdi-alien-outline',
+ 'mdi-align-horizontal-center',
+ 'mdi-align-horizontal-left',
+ 'mdi-align-horizontal-right',
+ 'mdi-align-vertical-bottom',
+ 'mdi-align-vertical-center',
+ 'mdi-align-vertical-top',
'mdi-all-inclusive',
'mdi-alpha',
+ 'mdi-alpha-a',
+ 'mdi-alpha-a-box',
+ 'mdi-alpha-a-box-outline',
+ 'mdi-alpha-a-circle',
+ 'mdi-alpha-a-circle-outline',
+ 'mdi-alpha-b',
+ 'mdi-alpha-b-box',
+ 'mdi-alpha-b-box-outline',
+ 'mdi-alpha-b-circle',
+ 'mdi-alpha-b-circle-outline',
+ 'mdi-alpha-c',
+ 'mdi-alpha-c-box',
+ 'mdi-alpha-c-box-outline',
+ 'mdi-alpha-c-circle',
+ 'mdi-alpha-c-circle-outline',
+ 'mdi-alpha-d',
+ 'mdi-alpha-d-box',
+ 'mdi-alpha-d-box-outline',
+ 'mdi-alpha-d-circle',
+ 'mdi-alpha-d-circle-outline',
+ 'mdi-alpha-e',
+ 'mdi-alpha-e-box',
+ 'mdi-alpha-e-box-outline',
+ 'mdi-alpha-e-circle',
+ 'mdi-alpha-e-circle-outline',
+ 'mdi-alpha-f',
+ 'mdi-alpha-f-box',
+ 'mdi-alpha-f-box-outline',
+ 'mdi-alpha-f-circle',
+ 'mdi-alpha-f-circle-outline',
+ 'mdi-alpha-g',
+ 'mdi-alpha-g-box',
+ 'mdi-alpha-g-box-outline',
+ 'mdi-alpha-g-circle',
+ 'mdi-alpha-g-circle-outline',
+ 'mdi-alpha-h',
+ 'mdi-alpha-h-box',
+ 'mdi-alpha-h-box-outline',
+ 'mdi-alpha-h-circle',
+ 'mdi-alpha-h-circle-outline',
+ 'mdi-alpha-i',
+ 'mdi-alpha-i-box',
+ 'mdi-alpha-i-box-outline',
+ 'mdi-alpha-i-circle',
+ 'mdi-alpha-i-circle-outline',
+ 'mdi-alpha-j',
+ 'mdi-alpha-j-box',
+ 'mdi-alpha-j-box-outline',
+ 'mdi-alpha-j-circle',
+ 'mdi-alpha-j-circle-outline',
+ 'mdi-alpha-k',
+ 'mdi-alpha-k-box',
+ 'mdi-alpha-k-box-outline',
+ 'mdi-alpha-k-circle',
+ 'mdi-alpha-k-circle-outline',
+ 'mdi-alpha-l',
+ 'mdi-alpha-l-box',
+ 'mdi-alpha-l-box-outline',
+ 'mdi-alpha-l-circle',
+ 'mdi-alpha-l-circle-outline',
+ 'mdi-alpha-m',
+ 'mdi-alpha-m-box',
+ 'mdi-alpha-m-box-outline',
+ 'mdi-alpha-m-circle',
+ 'mdi-alpha-m-circle-outline',
+ 'mdi-alpha-n',
+ 'mdi-alpha-n-box',
+ 'mdi-alpha-n-box-outline',
+ 'mdi-alpha-n-circle',
+ 'mdi-alpha-n-circle-outline',
+ 'mdi-alpha-o',
+ 'mdi-alpha-o-box',
+ 'mdi-alpha-o-box-outline',
+ 'mdi-alpha-o-circle',
+ 'mdi-alpha-o-circle-outline',
+ 'mdi-alpha-p',
+ 'mdi-alpha-p-box',
+ 'mdi-alpha-p-box-outline',
+ 'mdi-alpha-p-circle',
+ 'mdi-alpha-p-circle-outline',
+ 'mdi-alpha-q',
+ 'mdi-alpha-q-box',
+ 'mdi-alpha-q-box-outline',
+ 'mdi-alpha-q-circle',
+ 'mdi-alpha-q-circle-outline',
+ 'mdi-alpha-r',
+ 'mdi-alpha-r-box',
+ 'mdi-alpha-r-box-outline',
+ 'mdi-alpha-r-circle',
+ 'mdi-alpha-r-circle-outline',
+ 'mdi-alpha-s',
+ 'mdi-alpha-s-box',
+ 'mdi-alpha-s-box-outline',
+ 'mdi-alpha-s-circle',
+ 'mdi-alpha-s-circle-outline',
+ 'mdi-alpha-t',
+ 'mdi-alpha-t-box',
+ 'mdi-alpha-t-box-outline',
+ 'mdi-alpha-t-circle',
+ 'mdi-alpha-t-circle-outline',
+ 'mdi-alpha-u',
+ 'mdi-alpha-u-box',
+ 'mdi-alpha-u-box-outline',
+ 'mdi-alpha-u-circle',
+ 'mdi-alpha-u-circle-outline',
+ 'mdi-alpha-v',
+ 'mdi-alpha-v-box',
+ 'mdi-alpha-v-box-outline',
+ 'mdi-alpha-v-circle',
+ 'mdi-alpha-v-circle-outline',
+ 'mdi-alpha-w',
+ 'mdi-alpha-w-box',
+ 'mdi-alpha-w-box-outline',
+ 'mdi-alpha-w-circle',
+ 'mdi-alpha-w-circle-outline',
+ 'mdi-alpha-x',
+ 'mdi-alpha-x-box',
+ 'mdi-alpha-x-box-outline',
+ 'mdi-alpha-x-circle',
+ 'mdi-alpha-x-circle-outline',
+ 'mdi-alpha-y',
+ 'mdi-alpha-y-box',
+ 'mdi-alpha-y-box-outline',
+ 'mdi-alpha-y-circle',
+ 'mdi-alpha-y-circle-outline',
+ 'mdi-alpha-z',
+ 'mdi-alpha-z-box',
+ 'mdi-alpha-z-box-outline',
+ 'mdi-alpha-z-circle',
+ 'mdi-alpha-z-circle-outline',
+ 'mdi-alphabetical',
+ 'mdi-alphabetical-off',
+ 'mdi-alphabetical-variant',
+ 'mdi-alphabetical-variant-off',
+ 'mdi-altimeter',
+ 'mdi-amazon',
+ 'mdi-amazon-alexa',
+ 'mdi-amazon-drive',
'mdi-ambulance',
+ 'mdi-ammunition',
+ 'mdi-ampersand',
+ 'mdi-amplifier',
+ 'mdi-amplifier-off',
'mdi-anchor',
'mdi-android',
+ 'mdi-android-auto',
+ 'mdi-android-debug-bridge',
+ 'mdi-android-head',
+ 'mdi-android-messages',
+ 'mdi-android-studio',
+ 'mdi-angle-acute',
+ 'mdi-angle-obtuse',
+ 'mdi-angle-right',
+ 'mdi-angular',
+ 'mdi-angularjs',
+ 'mdi-animation',
+ 'mdi-animation-outline',
+ 'mdi-animation-play',
+ 'mdi-animation-play-outline',
+ 'mdi-ansible',
+ 'mdi-antenna',
'mdi-anvil',
+ 'mdi-apache-kafka',
+ 'mdi-api',
'mdi-apple',
+ 'mdi-apple-finder',
+ 'mdi-apple-icloud',
'mdi-apple-ios',
+ 'mdi-apple-keyboard-caps',
+ 'mdi-apple-keyboard-command',
+ 'mdi-apple-keyboard-control',
+ 'mdi-apple-keyboard-option',
+ 'mdi-apple-keyboard-shift',
+ 'mdi-apple-safari',
+ 'mdi-application',
+ 'mdi-application-export',
+ 'mdi-application-import',
+ 'mdi-approximately-equal',
+ 'mdi-approximately-equal-box',
+ 'mdi-apps',
+ 'mdi-apps-box',
+ 'mdi-arch',
+ 'mdi-archive',
+ 'mdi-arm-flex',
+ 'mdi-arm-flex-outline',
+ 'mdi-arrange-bring-forward',
+ 'mdi-arrange-bring-to-front',
+ 'mdi-arrange-send-backward',
+ 'mdi-arrange-send-to-back',
+ 'mdi-arrow-all',
+ 'mdi-arrow-bottom-left',
+ 'mdi-arrow-bottom-left-bold-outline',
+ 'mdi-arrow-bottom-left-thick',
+ 'mdi-arrow-bottom-right',
+ 'mdi-arrow-bottom-right-bold-outline',
+ 'mdi-arrow-bottom-right-thick',
+ 'mdi-arrow-collapse',
+ 'mdi-arrow-collapse-all',
+ 'mdi-arrow-collapse-down',
+ 'mdi-arrow-collapse-horizontal',
+ 'mdi-arrow-collapse-left',
+ 'mdi-arrow-collapse-right',
+ 'mdi-arrow-collapse-up',
+ 'mdi-arrow-collapse-vertical',
+ 'mdi-arrow-decision',
+ 'mdi-arrow-decision-auto',
+ 'mdi-arrow-decision-auto-outline',
+ 'mdi-arrow-decision-outline',
+ 'mdi-arrow-down',
+ 'mdi-arrow-down-bold',
+ 'mdi-arrow-down-bold-box',
+ 'mdi-arrow-down-bold-box-outline',
+ 'mdi-arrow-down-bold-circle',
+ 'mdi-arrow-down-bold-circle-outline',
+ 'mdi-arrow-down-bold-hexagon-outline',
+ 'mdi-arrow-down-bold-outline',
+ 'mdi-arrow-down-box',
+ 'mdi-arrow-down-circle',
+ 'mdi-arrow-down-circle-outline',
+ 'mdi-arrow-down-drop-circle',
+ 'mdi-arrow-down-drop-circle-outline',
+ 'mdi-arrow-down-thick',
+ 'mdi-arrow-expand',
+ 'mdi-arrow-expand-all',
+ 'mdi-arrow-expand-down',
+ 'mdi-arrow-expand-horizontal',
+ 'mdi-arrow-expand-left',
+ 'mdi-arrow-expand-right',
+ 'mdi-arrow-expand-up',
+ 'mdi-arrow-expand-vertical',
+ 'mdi-arrow-horizontal-lock',
+ 'mdi-arrow-left',
+ 'mdi-arrow-left-bold',
+ 'mdi-arrow-left-bold-box',
+ 'mdi-arrow-left-bold-box-outline',
+ 'mdi-arrow-left-bold-circle',
+ 'mdi-arrow-left-bold-circle-outline',
+ 'mdi-arrow-left-bold-hexagon-outline',
+ 'mdi-arrow-left-bold-outline',
+ 'mdi-arrow-left-box',
+ 'mdi-arrow-left-circle',
+ 'mdi-arrow-left-circle-outline',
+ 'mdi-arrow-left-drop-circle',
+ 'mdi-arrow-left-drop-circle-outline',
+ 'mdi-arrow-left-right',
+ 'mdi-arrow-left-right-bold',
+ 'mdi-arrow-left-right-bold-outline',
+ 'mdi-arrow-left-thick',
+ 'mdi-arrow-right',
+ 'mdi-arrow-right-bold',
+ 'mdi-arrow-right-bold-box',
+ 'mdi-arrow-right-bold-box-outline',
+ 'mdi-arrow-right-bold-circle',
+ 'mdi-arrow-right-bold-circle-outline',
+ 'mdi-arrow-right-bold-hexagon-outline',
+ 'mdi-arrow-right-bold-outline',
+ 'mdi-arrow-right-box',
+ 'mdi-arrow-right-circle',
+ 'mdi-arrow-right-circle-outline',
+ 'mdi-arrow-right-drop-circle',
+ 'mdi-arrow-right-drop-circle-outline',
+ 'mdi-arrow-right-thick',
+ 'mdi-arrow-split-horizontal',
+ 'mdi-arrow-split-vertical',
+ 'mdi-arrow-top-left',
+ 'mdi-arrow-top-left-bold-outline',
+ 'mdi-arrow-top-left-bottom-right',
+ 'mdi-arrow-top-left-bottom-right-bold',
+ 'mdi-arrow-top-left-thick',
+ 'mdi-arrow-top-right',
+ 'mdi-arrow-top-right-bold-outline',
+ 'mdi-arrow-top-right-bottom-left',
+ 'mdi-arrow-top-right-bottom-left-bold',
+ 'mdi-arrow-top-right-thick',
+ 'mdi-arrow-up',
+ 'mdi-arrow-up-bold',
+ 'mdi-arrow-up-bold-box',
+ 'mdi-arrow-up-bold-box-outline',
+ 'mdi-arrow-up-bold-circle',
+ 'mdi-arrow-up-bold-circle-outline',
+ 'mdi-arrow-up-bold-hexagon-outline',
+ 'mdi-arrow-up-bold-outline',
+ 'mdi-arrow-up-box',
+ 'mdi-arrow-up-circle',
+ 'mdi-arrow-up-circle-outline',
+ 'mdi-arrow-up-down',
+ 'mdi-arrow-up-down-bold',
+ 'mdi-arrow-up-down-bold-outline',
+ 'mdi-arrow-up-drop-circle',
+ 'mdi-arrow-up-drop-circle-outline',
+ 'mdi-arrow-up-thick',
+ 'mdi-arrow-vertical-lock',
'mdi-artist',
+ 'mdi-artist-outline',
+ 'mdi-artstation',
+ 'mdi-aspect-ratio',
'mdi-assistant',
'mdi-asterisk',
'mdi-at',
'mdi-atlassian',
+ 'mdi-atm',
'mdi-atom',
+ 'mdi-atom-variant',
'mdi-attachment',
'mdi-audio-video',
+ 'mdi-audio-video-off',
'mdi-audiobook',
'mdi-augmented-reality',
'mdi-auto-fix',
'mdi-auto-upload',
'mdi-autorenew',
'mdi-av-timer',
+ 'mdi-aws',
'mdi-axe',
+ 'mdi-axis',
+ 'mdi-axis-arrow',
+ 'mdi-axis-arrow-lock',
+ 'mdi-axis-lock',
+ 'mdi-axis-x-arrow',
+ 'mdi-axis-x-arrow-lock',
+ 'mdi-axis-x-rotate-clockwise',
+ 'mdi-axis-x-rotate-counterclockwise',
+ 'mdi-axis-x-y-arrow-lock',
+ 'mdi-axis-y-arrow',
+ 'mdi-axis-y-arrow-lock',
+ 'mdi-axis-y-rotate-clockwise',
+ 'mdi-axis-y-rotate-counterclockwise',
+ 'mdi-axis-z-arrow',
+ 'mdi-axis-z-arrow-lock',
+ 'mdi-axis-z-rotate-clockwise',
+ 'mdi-axis-z-rotate-counterclockwise',
'mdi-azure',
+ 'mdi-azure-devops',
+ 'mdi-babel',
'mdi-baby',
- 'mdi-baby-buggy',
+ 'mdi-baby-bottle',
+ 'mdi-baby-bottle-outline',
+ 'mdi-baby-carriage',
+ 'mdi-baby-carriage-off',
+ 'mdi-baby-face',
+ 'mdi-baby-face-outline',
'mdi-backburger',
'mdi-backspace',
+ 'mdi-backspace-outline',
+ 'mdi-backspace-reverse',
+ 'mdi-backspace-reverse-outline',
'mdi-backup-restore',
+ 'mdi-bacteria',
+ 'mdi-bacteria-outline',
'mdi-badminton',
+ 'mdi-bag-carry-on',
+ 'mdi-bag-carry-on-check',
+ 'mdi-bag-carry-on-off',
+ 'mdi-bag-checked',
+ 'mdi-bag-personal',
+ 'mdi-bag-personal-off',
+ 'mdi-bag-personal-off-outline',
+ 'mdi-bag-personal-outline',
+ 'mdi-baguette',
+ 'mdi-balloon',
+ 'mdi-ballot',
+ 'mdi-ballot-outline',
+ 'mdi-ballot-recount',
+ 'mdi-ballot-recount-outline',
+ 'mdi-bandage',
'mdi-bandcamp',
'mdi-bank',
+ 'mdi-bank-minus',
+ 'mdi-bank-outline',
+ 'mdi-bank-plus',
+ 'mdi-bank-remove',
+ 'mdi-bank-transfer',
+ 'mdi-bank-transfer-in',
+ 'mdi-bank-transfer-out',
'mdi-barcode',
'mdi-barcode-scan',
'mdi-barley',
+ 'mdi-barley-off',
+ 'mdi-barn',
'mdi-barrel',
'mdi-baseball',
'mdi-baseball-bat',
'mdi-basecamp',
+ 'mdi-bash',
'mdi-basket',
'mdi-basket-fill',
+ 'mdi-basket-outline',
'mdi-basket-unfill',
'mdi-basketball',
+ 'mdi-basketball-hoop',
+ 'mdi-basketball-hoop-outline',
+ 'mdi-bat',
'mdi-battery',
+ 'mdi-battery-10',
+ 'mdi-battery-10-bluetooth',
+ 'mdi-battery-20',
+ 'mdi-battery-20-bluetooth',
+ 'mdi-battery-30',
+ 'mdi-battery-30-bluetooth',
+ 'mdi-battery-40',
+ 'mdi-battery-40-bluetooth',
+ 'mdi-battery-50',
+ 'mdi-battery-50-bluetooth',
+ 'mdi-battery-60',
+ 'mdi-battery-60-bluetooth',
+ 'mdi-battery-70',
+ 'mdi-battery-70-bluetooth',
+ 'mdi-battery-80',
+ 'mdi-battery-80-bluetooth',
+ 'mdi-battery-90',
+ 'mdi-battery-90-bluetooth',
+ 'mdi-battery-alert',
+ 'mdi-battery-alert-bluetooth',
+ 'mdi-battery-alert-variant',
+ 'mdi-battery-alert-variant-outline',
+ 'mdi-battery-bluetooth',
+ 'mdi-battery-bluetooth-variant',
+ 'mdi-battery-charging',
+ 'mdi-battery-charging-10',
+ 'mdi-battery-charging-100',
+ 'mdi-battery-charging-20',
+ 'mdi-battery-charging-30',
+ 'mdi-battery-charging-40',
+ 'mdi-battery-charging-50',
+ 'mdi-battery-charging-60',
+ 'mdi-battery-charging-70',
+ 'mdi-battery-charging-80',
+ 'mdi-battery-charging-90',
+ 'mdi-battery-charging-outline',
+ 'mdi-battery-charging-wireless',
+ 'mdi-battery-charging-wireless-10',
+ 'mdi-battery-charging-wireless-20',
+ 'mdi-battery-charging-wireless-30',
+ 'mdi-battery-charging-wireless-40',
+ 'mdi-battery-charging-wireless-50',
+ 'mdi-battery-charging-wireless-60',
+ 'mdi-battery-charging-wireless-70',
+ 'mdi-battery-charging-wireless-80',
+ 'mdi-battery-charging-wireless-90',
+ 'mdi-battery-charging-wireless-alert',
+ 'mdi-battery-charging-wireless-outline',
+ 'mdi-battery-minus',
+ 'mdi-battery-negative',
+ 'mdi-battery-outline',
+ 'mdi-battery-plus',
+ 'mdi-battery-positive',
+ 'mdi-battery-unknown',
+ 'mdi-battery-unknown-bluetooth',
+ 'mdi-battlenet',
'mdi-beach',
'mdi-beaker',
+ 'mdi-beaker-outline',
'mdi-beats',
+ 'mdi-bed-double',
+ 'mdi-bed-double-outline',
'mdi-bed-empty',
+ 'mdi-bed-king',
+ 'mdi-bed-king-outline',
+ 'mdi-bed-queen',
+ 'mdi-bed-queen-outline',
+ 'mdi-bed-single',
+ 'mdi-bed-single-outline',
+ 'mdi-bee',
+ 'mdi-bee-flower',
+ 'mdi-beehive-outline',
'mdi-beer',
'mdi-behance',
'mdi-bell',
+ 'mdi-bell-alert',
+ 'mdi-bell-alert-outline',
+ 'mdi-bell-check',
+ 'mdi-bell-check-outline',
+ 'mdi-bell-circle',
+ 'mdi-bell-circle-outline',
'mdi-bell-off',
+ 'mdi-bell-off-outline',
'mdi-bell-outline',
'mdi-bell-plus',
+ 'mdi-bell-plus-outline',
'mdi-bell-ring',
'mdi-bell-ring-outline',
'mdi-bell-sleep',
+ 'mdi-bell-sleep-outline',
'mdi-beta',
+ 'mdi-betamax',
+ 'mdi-biathlon',
'mdi-bible',
+ 'mdi-bicycle',
'mdi-bike',
+ 'mdi-bike-fast',
+ 'mdi-billboard',
+ 'mdi-billiards',
+ 'mdi-billiards-rack',
'mdi-bing',
'mdi-binoculars',
'mdi-bio',
@@ -87,37 +636,100 @@ export default [
'mdi-black-mesa',
'mdi-blackberry',
'mdi-blender',
+ 'mdi-blender-software',
'mdi-blinds',
+ 'mdi-blinds-open',
'mdi-block-helper',
'mdi-blogger',
+ 'mdi-blood-bag',
'mdi-bluetooth',
+ 'mdi-bluetooth-audio',
+ 'mdi-bluetooth-connect',
+ 'mdi-bluetooth-off',
+ 'mdi-bluetooth-settings',
+ 'mdi-bluetooth-transfer',
'mdi-blur',
'mdi-blur-linear',
'mdi-blur-off',
'mdi-blur-radial',
+ 'mdi-bolnisi-cross',
+ 'mdi-bolt',
'mdi-bomb',
'mdi-bomb-off',
'mdi-bone',
'mdi-book',
+ 'mdi-book-information-variant',
+ 'mdi-book-lock',
+ 'mdi-book-lock-open',
'mdi-book-minus',
+ 'mdi-book-minus-multiple',
'mdi-book-multiple',
- 'mdi-book-multiple-variant',
'mdi-book-open',
+ 'mdi-book-open-outline',
'mdi-book-open-page-variant',
'mdi-book-open-variant',
+ 'mdi-book-outline',
+ 'mdi-book-play',
+ 'mdi-book-play-outline',
'mdi-book-plus',
- 'mdi-book-secure',
- 'mdi-book-unsecure',
+ 'mdi-book-plus-multiple',
+ 'mdi-book-remove',
+ 'mdi-book-remove-multiple',
+ 'mdi-book-search',
+ 'mdi-book-search-outline',
'mdi-book-variant',
+ 'mdi-book-variant-multiple',
'mdi-bookmark',
'mdi-bookmark-check',
+ 'mdi-bookmark-minus',
+ 'mdi-bookmark-minus-outline',
+ 'mdi-bookmark-multiple',
+ 'mdi-bookmark-multiple-outline',
'mdi-bookmark-music',
+ 'mdi-bookmark-off',
+ 'mdi-bookmark-off-outline',
'mdi-bookmark-outline',
'mdi-bookmark-plus',
'mdi-bookmark-plus-outline',
'mdi-bookmark-remove',
+ 'mdi-boom-gate',
+ 'mdi-boom-gate-alert',
+ 'mdi-boom-gate-alert-outline',
+ 'mdi-boom-gate-down',
+ 'mdi-boom-gate-down-outline',
+ 'mdi-boom-gate-outline',
+ 'mdi-boom-gate-up',
+ 'mdi-boom-gate-up-outline',
'mdi-boombox',
+ 'mdi-boomerang',
'mdi-bootstrap',
+ 'mdi-border-all',
+ 'mdi-border-all-variant',
+ 'mdi-border-bottom',
+ 'mdi-border-bottom-variant',
+ 'mdi-border-color',
+ 'mdi-border-horizontal',
+ 'mdi-border-inside',
+ 'mdi-border-left',
+ 'mdi-border-left-variant',
+ 'mdi-border-none',
+ 'mdi-border-none-variant',
+ 'mdi-border-outside',
+ 'mdi-border-right',
+ 'mdi-border-right-variant',
+ 'mdi-border-style',
+ 'mdi-border-top',
+ 'mdi-border-top-variant',
+ 'mdi-border-vertical',
+ 'mdi-bottle-soda',
+ 'mdi-bottle-soda-classic',
+ 'mdi-bottle-soda-outline',
+ 'mdi-bottle-tonic',
+ 'mdi-bottle-tonic-outline',
+ 'mdi-bottle-tonic-plus',
+ 'mdi-bottle-tonic-plus-outline',
+ 'mdi-bottle-tonic-skull',
+ 'mdi-bottle-tonic-skull-outline',
'mdi-bottle-wine',
'mdi-bow-tie',
'mdi-bowl',
@@ -125,8 +737,33 @@ export default [
'mdi-box',
'mdi-box-cutter',
'mdi-box-shadow',
+ 'mdi-boxing-glove',
+ 'mdi-braille',
+ 'mdi-brain',
+ 'mdi-bread-slice',
+ 'mdi-bread-slice-outline',
'mdi-bridge',
'mdi-briefcase',
+ 'mdi-briefcase-account',
+ 'mdi-briefcase-account-outline',
+ 'mdi-briefcase-check',
+ 'mdi-briefcase-clock',
+ 'mdi-briefcase-clock-outline',
+ 'mdi-briefcase-download',
+ 'mdi-briefcase-download-outline',
+ 'mdi-briefcase-edit',
+ 'mdi-briefcase-edit-outline',
+ 'mdi-briefcase-minus',
+ 'mdi-briefcase-minus-outline',
+ 'mdi-briefcase-outline',
+ 'mdi-briefcase-plus',
+ 'mdi-briefcase-plus-outline',
+ 'mdi-briefcase-remove',
+ 'mdi-briefcase-remove-outline',
+ 'mdi-briefcase-search',
+ 'mdi-briefcase-search-outline',
+ 'mdi-briefcase-upload',
+ 'mdi-briefcase-upload-outline',
'mdi-brightness-1',
'mdi-brightness-2',
'mdi-brightness-3',
@@ -135,28 +772,82 @@ export default [
'mdi-brightness-6',
'mdi-brightness-7',
'mdi-brightness-auto',
+ 'mdi-brightness-percent',
'mdi-broom',
'mdi-brush',
'mdi-buddhism',
'mdi-buffer',
'mdi-bug',
+ 'mdi-bug-check',
+ 'mdi-bug-check-outline',
+ 'mdi-bug-outline',
+ 'mdi-bugle',
+ 'mdi-bulldozer',
+ 'mdi-bullet',
'mdi-bulletin-board',
'mdi-bullhorn',
+ 'mdi-bullhorn-outline',
'mdi-bullseye',
+ 'mdi-bullseye-arrow',
'mdi-bus',
+ 'mdi-bus-alert',
'mdi-bus-articulated-end',
'mdi-bus-articulated-front',
'mdi-bus-clock',
'mdi-bus-double-decker',
+ 'mdi-bus-multiple',
'mdi-bus-school',
'mdi-bus-side',
+ 'mdi-bus-stop',
+ 'mdi-bus-stop-covered',
+ 'mdi-bus-stop-uncovered',
'mdi-cached',
+ 'mdi-cactus',
'mdi-cake',
'mdi-cake-layered',
'mdi-cake-variant',
'mdi-calculator',
+ 'mdi-calculator-variant',
'mdi-calendar',
+ 'mdi-calendar-account',
+ 'mdi-calendar-account-outline',
+ 'mdi-calendar-alert',
+ 'mdi-calendar-arrow-left',
+ 'mdi-calendar-arrow-right',
+ 'mdi-calendar-blank',
+ 'mdi-calendar-blank-multiple',
+ 'mdi-calendar-blank-outline',
+ 'mdi-calendar-check',
+ 'mdi-calendar-check-outline',
+ 'mdi-calendar-clock',
+ 'mdi-calendar-edit',
+ 'mdi-calendar-export',
+ 'mdi-calendar-heart',
+ 'mdi-calendar-import',
+ 'mdi-calendar-minus',
+ 'mdi-calendar-month',
+ 'mdi-calendar-month-outline',
+ 'mdi-calendar-multiple',
+ 'mdi-calendar-multiple-check',
+ 'mdi-calendar-multiselect',
+ 'mdi-calendar-outline',
+ 'mdi-calendar-plus',
+ 'mdi-calendar-question',
+ 'mdi-calendar-range',
+ 'mdi-calendar-range-outline',
+ 'mdi-calendar-remove',
+ 'mdi-calendar-remove-outline',
+ 'mdi-calendar-repeat',
+ 'mdi-calendar-repeat-outline',
+ 'mdi-calendar-search',
+ 'mdi-calendar-star',
'mdi-calendar-text',
+ 'mdi-calendar-text-outline',
+ 'mdi-calendar-today',
+ 'mdi-calendar-week',
+ 'mdi-calendar-week-begin',
+ 'mdi-calendar-weekend',
+ 'mdi-calendar-weekend-outline',
'mdi-call-made',
'mdi-call-merge',
'mdi-call-missed',
@@ -169,7 +860,9 @@ export default [
'mdi-camera',
'mdi-camera-account',
'mdi-camera-burst',
+ 'mdi-camera-control',
'mdi-camera-enhance',
+ 'mdi-camera-enhance-outline',
'mdi-camera-front',
'mdi-camera-front-variant',
'mdi-camera-gopro',
@@ -180,30 +873,87 @@ export default [
'mdi-camera-metering-partial',
'mdi-camera-metering-spot',
'mdi-camera-off',
+ 'mdi-camera-outline',
'mdi-camera-party-mode',
+ 'mdi-camera-plus',
+ 'mdi-camera-plus-outline',
'mdi-camera-rear',
'mdi-camera-rear-variant',
+ 'mdi-camera-retake',
+ 'mdi-camera-retake-outline',
'mdi-camera-switch',
'mdi-camera-timer',
+ 'mdi-camera-wireless',
+ 'mdi-camera-wireless-outline',
+ 'mdi-campfire',
'mdi-cancel',
'mdi-candle',
'mdi-candycane',
'mdi-cannabis',
+ 'mdi-caps-lock',
'mdi-car',
+ 'mdi-car-2-plus',
+ 'mdi-car-3-plus',
+ 'mdi-car-back',
'mdi-car-battery',
+ 'mdi-car-brake-abs',
+ 'mdi-car-brake-alert',
+ 'mdi-car-brake-hold',
+ 'mdi-car-brake-parking',
+ 'mdi-car-brake-retarder',
+ 'mdi-car-child-seat',
+ 'mdi-car-clutch',
'mdi-car-connected',
'mdi-car-convertible',
+ 'mdi-car-coolant-level',
+ 'mdi-car-cruise-control',
+ 'mdi-car-defrost-front',
+ 'mdi-car-defrost-rear',
+ 'mdi-car-door',
+ 'mdi-car-door-lock',
+ 'mdi-car-electric',
+ 'mdi-car-esp',
'mdi-car-estate',
'mdi-car-hatchback',
+ 'mdi-car-info',
+ 'mdi-car-key',
+ 'mdi-car-light-dimmed',
+ 'mdi-car-light-fog',
+ 'mdi-car-light-high',
'mdi-car-limousine',
+ 'mdi-car-multiple',
+ 'mdi-car-off',
+ 'mdi-car-parking-lights',
'mdi-car-pickup',
+ 'mdi-car-seat',
+ 'mdi-car-seat-cooler',
+ 'mdi-car-seat-heater',
+ 'mdi-car-shift-pattern',
'mdi-car-side',
'mdi-car-sports',
+ 'mdi-car-tire-alert',
+ 'mdi-car-traction-control',
+ 'mdi-car-turbocharger',
'mdi-car-wash',
+ 'mdi-car-windshield',
+ 'mdi-car-windshield-outline',
'mdi-caravan',
+ 'mdi-card',
+ 'mdi-card-bulleted',
+ 'mdi-card-bulleted-off',
+ 'mdi-card-bulleted-off-outline',
+ 'mdi-card-bulleted-outline',
+ 'mdi-card-bulleted-settings',
+ 'mdi-card-bulleted-settings-outline',
+ 'mdi-card-outline',
+ 'mdi-card-search',
+ 'mdi-card-search-outline',
+ 'mdi-card-text',
+ 'mdi-card-text-outline',
'mdi-cards',
'mdi-cards-club',
'mdi-cards-diamond',
+ 'mdi-cards-diamond-outline',
'mdi-cards-heart',
'mdi-cards-outline',
'mdi-cards-playing-outline',
@@ -211,16 +961,28 @@ export default [
'mdi-cards-variant',
'mdi-carrot',
'mdi-cart',
+ 'mdi-cart-arrow-down',
+ 'mdi-cart-arrow-right',
+ 'mdi-cart-arrow-up',
+ 'mdi-cart-minus',
'mdi-cart-off',
'mdi-cart-outline',
'mdi-cart-plus',
+ 'mdi-cart-remove',
'mdi-case-sensitive-alt',
'mdi-cash',
'mdi-cash-100',
+ 'mdi-cash-marker',
'mdi-cash-multiple',
+ 'mdi-cash-refund',
+ 'mdi-cash-register',
'mdi-cash-usd',
+ 'mdi-cash-usd-outline',
+ 'mdi-cassette',
'mdi-cast',
+ 'mdi-cast-audio',
'mdi-cast-connected',
+ 'mdi-cast-education',
'mdi-cast-off',
'mdi-castle',
'mdi-cat',
@@ -228,27 +990,41 @@ export default [
'mdi-ceiling-light',
'mdi-cellphone',
'mdi-cellphone-android',
+ 'mdi-cellphone-arrow-down',
'mdi-cellphone-basic',
'mdi-cellphone-dock',
'mdi-cellphone-erase',
+ 'mdi-cellphone-information',
'mdi-cellphone-iphone',
'mdi-cellphone-key',
'mdi-cellphone-link',
'mdi-cellphone-link-off',
'mdi-cellphone-lock',
'mdi-cellphone-message',
+ 'mdi-cellphone-message-off',
+ 'mdi-cellphone-nfc',
'mdi-cellphone-off',
+ 'mdi-cellphone-play',
+ 'mdi-cellphone-screenshot',
'mdi-cellphone-settings',
'mdi-cellphone-settings-variant',
'mdi-cellphone-sound',
'mdi-cellphone-text',
'mdi-cellphone-wireless',
+ 'mdi-celtic-cross',
+ 'mdi-centos',
'mdi-certificate',
+ 'mdi-certificate-outline',
+ 'mdi-chair-rolling',
'mdi-chair-school',
+ 'mdi-charity',
'mdi-chart-arc',
'mdi-chart-areaspline',
+ 'mdi-chart-areaspline-variant',
'mdi-chart-bar',
'mdi-chart-bar-stacked',
+ 'mdi-chart-bell-curve',
+ 'mdi-chart-bell-curve-cumulative',
'mdi-chart-bubble',
'mdi-chart-donut',
'mdi-chart-donut-variant',
@@ -259,13 +1035,32 @@ export default [
'mdi-chart-line-variant',
'mdi-chart-multiline',
'mdi-chart-pie',
- 'mdi-chart-scatterplot-hexbin',
+ 'mdi-chart-scatter-plot',
+ 'mdi-chart-scatter-plot-hexbin',
+ 'mdi-chart-snakey',
+ 'mdi-chart-snakey-variant',
'mdi-chart-timeline',
+ 'mdi-chart-timeline-variant',
+ 'mdi-chart-tree',
+ 'mdi-chat',
+ 'mdi-chat-alert',
+ 'mdi-chat-outline',
+ 'mdi-chat-processing',
'mdi-check',
'mdi-check-all',
+ 'mdi-check-bold',
+ 'mdi-check-box-multiple-outline',
+ 'mdi-check-box-outline',
'mdi-check-circle',
'mdi-check-circle-outline',
+ 'mdi-check-decagram',
+ 'mdi-check-network',
+ 'mdi-check-network-outline',
'mdi-check-outline',
+ 'mdi-check-underline',
+ 'mdi-check-underline-circle',
+ 'mdi-check-underline-circle-outline',
+ 'mdi-checkbook',
'mdi-checkbox-blank',
'mdi-checkbox-blank-circle',
'mdi-checkbox-blank-circle-outline',
@@ -284,6 +1079,7 @@ export default [
'mdi-checkbox-multiple-marked-circle-outline',
'mdi-checkbox-multiple-marked-outline',
'mdi-checkerboard',
+ 'mdi-chef-hat',
'mdi-chemical-weapon',
'mdi-chess-bishop',
'mdi-chess-king',
@@ -296,35 +1092,94 @@ export default [
'mdi-chevron-double-right',
'mdi-chevron-double-up',
'mdi-chevron-down',
+ 'mdi-chevron-down-box',
+ 'mdi-chevron-down-box-outline',
+ 'mdi-chevron-down-circle',
+ 'mdi-chevron-down-circle-outline',
'mdi-chevron-left',
+ 'mdi-chevron-left-box',
+ 'mdi-chevron-left-box-outline',
+ 'mdi-chevron-left-circle',
+ 'mdi-chevron-left-circle-outline',
'mdi-chevron-right',
+ 'mdi-chevron-right-box',
+ 'mdi-chevron-right-box-outline',
+ 'mdi-chevron-right-circle',
+ 'mdi-chevron-right-circle-outline',
+ 'mdi-chevron-triple-down',
+ 'mdi-chevron-triple-left',
+ 'mdi-chevron-triple-right',
+ 'mdi-chevron-triple-up',
'mdi-chevron-up',
+ 'mdi-chevron-up-box',
+ 'mdi-chevron-up-box-outline',
+ 'mdi-chevron-up-circle',
+ 'mdi-chevron-up-circle-outline',
'mdi-chili-hot',
'mdi-chili-medium',
'mdi-chili-mild',
'mdi-chip',
- 'mdi-christiantiy',
+ 'mdi-christianity',
+ 'mdi-christianity-outline',
'mdi-church',
+ 'mdi-cigar',
'mdi-circle',
+ 'mdi-circle-double',
'mdi-circle-edit-outline',
+ 'mdi-circle-expand',
+ 'mdi-circle-medium',
+ 'mdi-circle-off-outline',
'mdi-circle-outline',
+ 'mdi-circle-slice-1',
+ 'mdi-circle-slice-2',
+ 'mdi-circle-slice-3',
+ 'mdi-circle-slice-4',
+ 'mdi-circle-slice-5',
+ 'mdi-circle-slice-6',
+ 'mdi-circle-slice-7',
+ 'mdi-circle-slice-8',
+ 'mdi-circle-small',
+ 'mdi-circular-saw',
'mdi-cisco-webex',
'mdi-city',
+ 'mdi-city-variant',
+ 'mdi-city-variant-outline',
'mdi-clipboard',
'mdi-clipboard-account',
+ 'mdi-clipboard-account-outline',
'mdi-clipboard-alert',
+ 'mdi-clipboard-alert-outline',
+ 'mdi-clipboard-arrow-down',
+ 'mdi-clipboard-arrow-down-outline',
+ 'mdi-clipboard-arrow-left',
+ 'mdi-clipboard-arrow-left-outline',
+ 'mdi-clipboard-arrow-right',
+ 'mdi-clipboard-arrow-right-outline',
+ 'mdi-clipboard-arrow-up',
+ 'mdi-clipboard-arrow-up-outline',
'mdi-clipboard-check',
'mdi-clipboard-check-outline',
'mdi-clipboard-flow',
+ 'mdi-clipboard-flow-outline',
+ 'mdi-clipboard-list',
+ 'mdi-clipboard-list-outline',
'mdi-clipboard-outline',
+ 'mdi-clipboard-play',
+ 'mdi-clipboard-play-outline',
'mdi-clipboard-plus',
'mdi-clipboard-pulse',
'mdi-clipboard-pulse-outline',
'mdi-clipboard-text',
+ 'mdi-clipboard-text-outline',
+ 'mdi-clipboard-text-play',
+ 'mdi-clipboard-text-play-outline',
'mdi-clippy',
'mdi-clock',
'mdi-clock-alert',
'mdi-clock-alert-outline',
+ 'mdi-clock-check',
+ 'mdi-clock-check-outline',
+ 'mdi-clock-digital',
'mdi-clock-end',
'mdi-clock-fast',
'mdi-clock-in',
@@ -333,31 +1188,44 @@ export default [
'mdi-clock-start',
'mdi-close',
'mdi-close-box',
+ 'mdi-close-box-multiple',
+ 'mdi-close-box-multiple-outline',
'mdi-close-box-outline',
'mdi-close-circle',
'mdi-close-circle-outline',
'mdi-close-network',
+ 'mdi-close-network-outline',
'mdi-close-octagon',
'mdi-close-octagon-outline',
'mdi-close-outline',
'mdi-closed-caption',
+ 'mdi-closed-caption-outline',
'mdi-cloud',
+ 'mdi-cloud-alert',
'mdi-cloud-braces',
'mdi-cloud-check',
'mdi-cloud-circle',
'mdi-cloud-download',
+ 'mdi-cloud-download-outline',
+ 'mdi-cloud-lock',
+ 'mdi-cloud-lock-outline',
'mdi-cloud-off-outline',
'mdi-cloud-outline',
'mdi-cloud-print',
'mdi-cloud-print-outline',
+ 'mdi-cloud-question',
'mdi-cloud-search',
'mdi-cloud-search-outline',
'mdi-cloud-sync',
'mdi-cloud-tags',
'mdi-cloud-upload',
+ 'mdi-cloud-upload-outline',
'mdi-clover',
+ 'mdi-coach-lamp',
+ 'mdi-coat-rack',
'mdi-code-array',
'mdi-code-braces',
+ 'mdi-code-braces-box',
'mdi-code-brackets',
'mdi-code-equal',
'mdi-code-greater-than',
@@ -367,72 +1235,145 @@ export default [
'mdi-code-not-equal',
'mdi-code-not-equal-variant',
'mdi-code-parentheses',
+ 'mdi-code-parentheses-box',
'mdi-code-string',
'mdi-code-tags',
'mdi-code-tags-check',
'mdi-codepen',
'mdi-coffee',
+ 'mdi-coffee-maker',
+ 'mdi-coffee-off',
+ 'mdi-coffee-off-outline',
'mdi-coffee-outline',
'mdi-coffee-to-go',
+ 'mdi-coffin',
+ 'mdi-cog-clockwise',
+ 'mdi-cog-counterclockwise',
'mdi-cogs',
'mdi-coin',
+ 'mdi-coin-outline',
'mdi-coins',
'mdi-collage',
+ 'mdi-collapse-all',
+ 'mdi-collapse-all-outline',
'mdi-color-helper',
+ 'mdi-comma',
+ 'mdi-comma-box',
+ 'mdi-comma-box-outline',
+ 'mdi-comma-circle',
+ 'mdi-comma-circle-outline',
'mdi-comment',
'mdi-comment-account',
'mdi-comment-account-outline',
'mdi-comment-alert',
'mdi-comment-alert-outline',
+ 'mdi-comment-arrow-left',
+ 'mdi-comment-arrow-left-outline',
+ 'mdi-comment-arrow-right',
+ 'mdi-comment-arrow-right-outline',
'mdi-comment-check',
'mdi-comment-check-outline',
+ 'mdi-comment-edit',
+ 'mdi-comment-eye',
+ 'mdi-comment-eye-outline',
'mdi-comment-multiple',
'mdi-comment-multiple-outline',
'mdi-comment-outline',
+ 'mdi-comment-plus',
'mdi-comment-plus-outline',
'mdi-comment-processing',
'mdi-comment-processing-outline',
'mdi-comment-question',
'mdi-comment-question-outline',
+ 'mdi-comment-quote',
+ 'mdi-comment-quote-outline',
'mdi-comment-remove',
'mdi-comment-remove-outline',
+ 'mdi-comment-search',
+ 'mdi-comment-search-outline',
'mdi-comment-text',
'mdi-comment-text-multiple',
'mdi-comment-text-multiple-outline',
'mdi-comment-text-outline',
'mdi-compare',
'mdi-compass',
+ 'mdi-compass-off',
+ 'mdi-compass-off-outline',
'mdi-compass-outline',
+ 'mdi-concourse-ci',
'mdi-console',
'mdi-console-line',
'mdi-console-network',
+ 'mdi-console-network-outline',
+ 'mdi-consolidate',
'mdi-contact-mail',
+ 'mdi-contact-mail-outline',
+ 'mdi-contact-phone',
+ 'mdi-contact-phone-outline',
+ 'mdi-contactless-payment',
'mdi-contacts',
+ 'mdi-contain',
+ 'mdi-contain-end',
+ 'mdi-contain-start',
'mdi-content-copy',
'mdi-content-cut',
'mdi-content-duplicate',
'mdi-content-paste',
'mdi-content-save',
+ 'mdi-content-save-alert',
+ 'mdi-content-save-alert-outline',
'mdi-content-save-all',
+ 'mdi-content-save-all-outline',
+ 'mdi-content-save-edit',
+ 'mdi-content-save-edit-outline',
+ 'mdi-content-save-move',
+ 'mdi-content-save-move-outline',
'mdi-content-save-outline',
'mdi-content-save-settings',
+ 'mdi-content-save-settings-outline',
'mdi-contrast',
'mdi-contrast-box',
'mdi-contrast-circle',
+ 'mdi-controller-classic',
+ 'mdi-controller-classic-outline',
'mdi-cookie',
+ 'mdi-coolant-temperature',
'mdi-copyright',
'mdi-cordova',
'mdi-corn',
'mdi-counter',
'mdi-cow',
+ 'mdi-cowboy',
+ 'mdi-cpu-32-bit',
+ 'mdi-cpu-64-bit',
'mdi-crane',
'mdi-creation',
+ 'mdi-creative-commons',
'mdi-credit-card',
+ 'mdi-credit-card-clock',
+ 'mdi-credit-card-clock-outline',
+ 'mdi-credit-card-marker',
+ 'mdi-credit-card-marker-outline',
+ 'mdi-credit-card-minus',
+ 'mdi-credit-card-minus-outline',
'mdi-credit-card-multiple',
+ 'mdi-credit-card-multiple-outline',
'mdi-credit-card-off',
+ 'mdi-credit-card-off-outline',
+ 'mdi-credit-card-outline',
'mdi-credit-card-plus',
+ 'mdi-credit-card-plus-outline',
+ 'mdi-credit-card-refund',
+ 'mdi-credit-card-refund-outline',
+ 'mdi-credit-card-remove',
+ 'mdi-credit-card-remove-outline',
'mdi-credit-card-scan',
+ 'mdi-credit-card-scan-outline',
'mdi-credit-card-settings',
+ 'mdi-credit-card-settings-outline',
+ 'mdi-credit-card-wireless',
+ 'mdi-credit-card-wireless-outline',
+ 'mdi-cricket',
'mdi-crop',
'mdi-crop-free',
'mdi-crop-landscape',
@@ -441,29 +1382,39 @@ export default [
'mdi-crop-square',
'mdi-crosshairs',
'mdi-crosshairs-gps',
+ 'mdi-crosshairs-off',
+ 'mdi-crosshairs-question',
'mdi-crown',
+ 'mdi-crown-outline',
'mdi-cryengine',
+ 'mdi-crystal-ball',
'mdi-cube',
'mdi-cube-outline',
+ 'mdi-cube-scan',
'mdi-cube-send',
'mdi-cube-unfolded',
'mdi-cup',
'mdi-cup-off',
'mdi-cup-water',
+ 'mdi-cupboard',
+ 'mdi-cupboard-outline',
'mdi-cupcake',
'mdi-curling',
'mdi-currency-bdt',
+ 'mdi-currency-brl',
'mdi-currency-btc',
- 'mdi-currency-chf',
'mdi-currency-cny',
'mdi-currency-eth',
'mdi-currency-eur',
'mdi-currency-gbp',
+ 'mdi-currency-ils',
'mdi-currency-inr',
'mdi-currency-jpy',
'mdi-currency-krw',
'mdi-currency-kzt',
'mdi-currency-ngn',
+ 'mdi-currency-php',
+ 'mdi-currency-rial',
'mdi-currency-rub',
'mdi-currency-sign',
'mdi-currency-try',
@@ -473,93 +1424,185 @@ export default [
'mdi-current-ac',
'mdi-current-dc',
'mdi-cursor-default',
+ 'mdi-cursor-default-click',
+ 'mdi-cursor-default-click-outline',
+ 'mdi-cursor-default-gesture',
+ 'mdi-cursor-default-gesture-outline',
'mdi-cursor-default-outline',
'mdi-cursor-move',
'mdi-cursor-pointer',
'mdi-cursor-text',
'mdi-database',
+ 'mdi-database-check',
+ 'mdi-database-edit',
'mdi-database-export',
'mdi-database-import',
+ 'mdi-database-lock',
'mdi-database-minus',
'mdi-database-plus',
+ 'mdi-database-refresh',
+ 'mdi-database-remove',
'mdi-database-search',
+ 'mdi-database-settings',
'mdi-death-star',
'mdi-death-star-variant',
+ 'mdi-deathly-hallows',
'mdi-debian',
'mdi-debug-step-into',
'mdi-debug-step-out',
'mdi-debug-step-over',
'mdi-decagram',
'mdi-decagram-outline',
+ 'mdi-decimal',
+ 'mdi-decimal-comma',
+ 'mdi-decimal-comma-decrease',
+ 'mdi-decimal-comma-increase',
'mdi-decimal-decrease',
'mdi-decimal-increase',
'mdi-delete',
+ 'mdi-delete-alert',
+ 'mdi-delete-alert-outline',
'mdi-delete-circle',
+ 'mdi-delete-circle-outline',
'mdi-delete-empty',
+ 'mdi-delete-empty-outline',
'mdi-delete-forever',
+ 'mdi-delete-forever-outline',
+ 'mdi-delete-off',
+ 'mdi-delete-off-outline',
+ 'mdi-delete-outline',
'mdi-delete-restore',
'mdi-delete-sweep',
+ 'mdi-delete-sweep-outline',
'mdi-delete-variant',
'mdi-delta',
'mdi-desk-lamp',
'mdi-deskphone',
'mdi-desktop-classic',
'mdi-desktop-mac',
+ 'mdi-desktop-mac-dashboard',
'mdi-desktop-tower',
+ 'mdi-desktop-tower-monitor',
'mdi-details',
+ 'mdi-dev-to',
'mdi-developer-board',
'mdi-deviantart',
+ 'mdi-devices',
+ 'mdi-diabetes',
'mdi-dialpad',
+ 'mdi-diameter',
+ 'mdi-diameter-outline',
+ 'mdi-diameter-variant',
'mdi-diamond',
+ 'mdi-diamond-outline',
+ 'mdi-diamond-stone',
'mdi-dice-1',
+ 'mdi-dice-1-outline',
'mdi-dice-2',
+ 'mdi-dice-2-outline',
'mdi-dice-3',
+ 'mdi-dice-3-outline',
'mdi-dice-4',
+ 'mdi-dice-4-outline',
'mdi-dice-5',
+ 'mdi-dice-5-outline',
'mdi-dice-6',
+ 'mdi-dice-6-outline',
'mdi-dice-d10',
+ 'mdi-dice-d10-outline',
'mdi-dice-d12',
+ 'mdi-dice-d12-outline',
'mdi-dice-d20',
+ 'mdi-dice-d20-outline',
'mdi-dice-d4',
+ 'mdi-dice-d4-outline',
'mdi-dice-d6',
+ 'mdi-dice-d6-outline',
'mdi-dice-d8',
+ 'mdi-dice-d8-outline',
'mdi-dice-multiple',
+ 'mdi-dice-multiple-outline',
'mdi-dictionary',
'mdi-dip-switch',
'mdi-directions',
'mdi-directions-fork',
+ 'mdi-disc',
+ 'mdi-disc-alert',
+ 'mdi-disc-player',
'mdi-discord',
- 'mdi-disk',
- 'mdi-disk-alert',
- 'mdi-disk-player',
+ 'mdi-dishwasher',
+ 'mdi-dishwasher-alert',
+ 'mdi-dishwasher-off',
'mdi-disqus',
'mdi-disqus-outline',
+ 'mdi-distribute-horizontal-center',
+ 'mdi-distribute-horizontal-left',
+ 'mdi-distribute-horizontal-right',
+ 'mdi-distribute-vertical-bottom',
+ 'mdi-distribute-vertical-center',
+ 'mdi-distribute-vertical-top',
+ 'mdi-diving-flippers',
+ 'mdi-diving-helmet',
+ 'mdi-diving-scuba',
+ 'mdi-diving-scuba-flag',
+ 'mdi-diving-scuba-tank',
+ 'mdi-diving-scuba-tank-multiple',
+ 'mdi-diving-snorkel',
'mdi-division',
'mdi-division-box',
+ 'mdi-dlna',
'mdi-dna',
'mdi-dns',
+ 'mdi-dns-outline',
'mdi-do-not-disturb',
'mdi-do-not-disturb-off',
+ 'mdi-dock-bottom',
+ 'mdi-dock-left',
+ 'mdi-dock-right',
+ 'mdi-dock-window',
'mdi-docker',
+ 'mdi-doctor',
+ 'mdi-dog',
+ 'mdi-dog-service',
+ 'mdi-dog-side',
'mdi-dolby',
+ 'mdi-dolly',
'mdi-domain',
+ 'mdi-domain-off',
+ 'mdi-domain-plus',
+ 'mdi-domain-remove',
+ 'mdi-domino-mask',
'mdi-donkey',
'mdi-door',
'mdi-door-closed',
+ 'mdi-door-closed-lock',
'mdi-door-open',
'mdi-doorbell-video',
+ 'mdi-dot-net',
'mdi-dots-horizontal',
'mdi-dots-horizontal-circle',
+ 'mdi-dots-horizontal-circle-outline',
'mdi-dots-vertical',
'mdi-dots-vertical-circle',
+ 'mdi-dots-vertical-circle-outline',
'mdi-douban',
'mdi-download',
+ 'mdi-download-multiple',
'mdi-download-network',
+ 'mdi-download-network-outline',
+ 'mdi-download-off',
+ 'mdi-download-off-outline',
+ 'mdi-download-outline',
'mdi-drag',
'mdi-drag-horizontal',
+ 'mdi-drag-variant',
'mdi-drag-vertical',
+ 'mdi-drama-masks',
+ 'mdi-draw',
'mdi-drawing',
'mdi-drawing-box',
+ 'mdi-dresser',
+ 'mdi-dresser-outline',
'mdi-dribbble',
'mdi-dribbble-box',
'mdi-drone',
@@ -567,44 +1610,104 @@ export default [
'mdi-drupal',
'mdi-duck',
'mdi-dumbbell',
+ 'mdi-dump-truck',
'mdi-ear-hearing',
+ 'mdi-ear-hearing-off',
'mdi-earth',
'mdi-earth-box',
'mdi-earth-box-off',
'mdi-earth-off',
'mdi-edge',
+ 'mdi-egg',
+ 'mdi-egg-easter',
+ 'mdi-eight-track',
'mdi-eject',
+ 'mdi-eject-outline',
+ 'mdi-electric-switch',
+ 'mdi-electric-switch-closed',
+ 'mdi-electron-framework',
'mdi-elephant',
'mdi-elevation-decline',
'mdi-elevation-rise',
'mdi-elevator',
+ 'mdi-ellipse',
+ 'mdi-ellipse-outline',
'mdi-email',
'mdi-email-alert',
+ 'mdi-email-box',
+ 'mdi-email-check',
+ 'mdi-email-check-outline',
+ 'mdi-email-edit',
+ 'mdi-email-edit-outline',
+ 'mdi-email-lock',
+ 'mdi-email-mark-as-unread',
+ 'mdi-email-minus',
+ 'mdi-email-minus-outline',
+ 'mdi-email-multiple',
+ 'mdi-email-multiple-outline',
+ 'mdi-email-newsletter',
'mdi-email-open',
+ 'mdi-email-open-multiple',
+ 'mdi-email-open-multiple-outline',
'mdi-email-open-outline',
'mdi-email-outline',
+ 'mdi-email-plus',
+ 'mdi-email-plus-outline',
+ 'mdi-email-receive',
+ 'mdi-email-receive-outline',
'mdi-email-search',
'mdi-email-search-outline',
- 'mdi-email-secure',
+ 'mdi-email-send',
+ 'mdi-email-send-outline',
'mdi-email-variant',
+ 'mdi-ember',
'mdi-emby',
'mdi-emoticon',
+ 'mdi-emoticon-angry',
+ 'mdi-emoticon-angry-outline',
+ 'mdi-emoticon-confused',
+ 'mdi-emoticon-confused-outline',
'mdi-emoticon-cool',
+ 'mdi-emoticon-cool-outline',
+ 'mdi-emoticon-cry',
+ 'mdi-emoticon-cry-outline',
'mdi-emoticon-dead',
+ 'mdi-emoticon-dead-outline',
'mdi-emoticon-devil',
+ 'mdi-emoticon-devil-outline',
'mdi-emoticon-excited',
+ 'mdi-emoticon-excited-outline',
+ 'mdi-emoticon-frown',
+ 'mdi-emoticon-frown-outline',
'mdi-emoticon-happy',
+ 'mdi-emoticon-happy-outline',
+ 'mdi-emoticon-kiss',
+ 'mdi-emoticon-kiss-outline',
'mdi-emoticon-neutral',
+ 'mdi-emoticon-neutral-outline',
+ 'mdi-emoticon-outline',
'mdi-emoticon-poop',
+ 'mdi-emoticon-poop-outline',
'mdi-emoticon-sad',
+ 'mdi-emoticon-sad-outline',
'mdi-emoticon-tongue',
+ 'mdi-emoticon-tongue-outline',
+ 'mdi-emoticon-wink',
+ 'mdi-emoticon-wink-outline',
'mdi-engine',
+ 'mdi-engine-off',
+ 'mdi-engine-off-outline',
'mdi-engine-outline',
+ 'mdi-epsilon',
'mdi-equal',
'mdi-equal-box',
+ 'mdi-equalizer',
+ 'mdi-equalizer-outline',
'mdi-eraser',
'mdi-eraser-variant',
'mdi-escalator',
+ 'mdi-eslint',
+ 'mdi-et',
'mdi-ethereum',
'mdi-ethernet',
'mdi-ethernet-cable',
@@ -613,12 +1716,25 @@ export default [
'mdi-ev-station',
'mdi-eventbrite',
'mdi-evernote',
+ 'mdi-excavator',
'mdi-exclamation',
+ 'mdi-exit-run',
'mdi-exit-to-app',
+ 'mdi-expand-all',
+ 'mdi-expand-all-outline',
+ 'mdi-expansion-card',
+ 'mdi-expansion-card-variant',
'mdi-exponent',
'mdi-exponent-box',
'mdi-export',
+ 'mdi-export-variant',
'mdi-eye',
+ 'mdi-eye-check',
+ 'mdi-eye-check-outline',
+ 'mdi-eye-circle',
+ 'mdi-eye-circle-outline',
+ 'mdi-eye-minus',
+ 'mdi-eye-minus-outline',
'mdi-eye-off',
'mdi-eye-off-outline',
'mdi-eye-outline',
@@ -629,80 +1745,209 @@ export default [
'mdi-eyedropper',
'mdi-eyedropper-variant',
'mdi-face',
+ 'mdi-face-agent',
+ 'mdi-face-outline',
'mdi-face-profile',
+ 'mdi-face-profile-woman',
+ 'mdi-face-recognition',
+ 'mdi-face-woman',
+ 'mdi-face-woman-outline',
'mdi-facebook',
'mdi-facebook-box',
'mdi-facebook-messenger',
+ 'mdi-facebook-workplace',
'mdi-factory',
'mdi-fan',
'mdi-fan-off',
'mdi-fast-forward',
+ 'mdi-fast-forward-10',
+ 'mdi-fast-forward-30',
'mdi-fast-forward-outline',
'mdi-fax',
'mdi-feather',
+ 'mdi-feature-search',
+ 'mdi-feature-search-outline',
'mdi-fedora',
+ 'mdi-ferris-wheel',
'mdi-ferry',
'mdi-file',
'mdi-file-account',
+ 'mdi-file-account-outline',
+ 'mdi-file-alert',
+ 'mdi-file-alert-outline',
+ 'mdi-file-cabinet',
+ 'mdi-file-cad',
+ 'mdi-file-cad-box',
+ 'mdi-file-cancel',
+ 'mdi-file-cancel-outline',
+ 'mdi-file-certificate',
+ 'mdi-file-certificate-outline',
'mdi-file-chart',
+ 'mdi-file-chart-outline',
'mdi-file-check',
+ 'mdi-file-check-outline',
'mdi-file-cloud',
+ 'mdi-file-cloud-outline',
+ 'mdi-file-code',
+ 'mdi-file-code-outline',
'mdi-file-compare',
'mdi-file-delimited',
+ 'mdi-file-delimited-outline',
'mdi-file-document',
'mdi-file-document-box',
+ 'mdi-file-document-box-check',
+ 'mdi-file-document-box-check-outline',
+ 'mdi-file-document-box-minus',
+ 'mdi-file-document-box-minus-outline',
+ 'mdi-file-document-box-multiple',
+ 'mdi-file-document-box-multiple-outline',
+ 'mdi-file-document-box-outline',
+ 'mdi-file-document-box-plus',
+ 'mdi-file-document-box-plus-outline',
+ 'mdi-file-document-box-remove',
+ 'mdi-file-document-box-remove-outline',
+ 'mdi-file-document-box-search',
+ 'mdi-file-document-box-search-outline',
+ 'mdi-file-document-edit',
+ 'mdi-file-document-edit-outline',
+ 'mdi-file-document-outline',
'mdi-file-download',
'mdi-file-download-outline',
+ 'mdi-file-edit',
+ 'mdi-file-edit-outline',
'mdi-file-excel',
'mdi-file-excel-box',
+ 'mdi-file-excel-box-outline',
+ 'mdi-file-excel-outline',
'mdi-file-export',
+ 'mdi-file-export-outline',
+ 'mdi-file-eye',
+ 'mdi-file-eye-outline',
'mdi-file-find',
+ 'mdi-file-find-outline',
'mdi-file-hidden',
'mdi-file-image',
+ 'mdi-file-image-outline',
'mdi-file-import',
+ 'mdi-file-import-outline',
+ 'mdi-file-key',
+ 'mdi-file-key-outline',
+ 'mdi-file-link',
+ 'mdi-file-link-outline',
'mdi-file-lock',
+ 'mdi-file-lock-outline',
+ 'mdi-file-move',
+ 'mdi-file-move-outline',
'mdi-file-multiple',
+ 'mdi-file-multiple-outline',
'mdi-file-music',
+ 'mdi-file-music-outline',
'mdi-file-outline',
'mdi-file-pdf',
'mdi-file-pdf-box',
+ 'mdi-file-pdf-box-outline',
+ 'mdi-file-pdf-outline',
'mdi-file-percent',
+ 'mdi-file-percent-outline',
+ 'mdi-file-phone',
+ 'mdi-file-phone-outline',
'mdi-file-plus',
+ 'mdi-file-plus-outline',
'mdi-file-powerpoint',
'mdi-file-powerpoint-box',
+ 'mdi-file-powerpoint-box-outline',
+ 'mdi-file-powerpoint-outline',
'mdi-file-presentation-box',
'mdi-file-question',
+ 'mdi-file-question-outline',
+ 'mdi-file-remove',
+ 'mdi-file-remove-outline',
+ 'mdi-file-replace',
+ 'mdi-file-replace-outline',
'mdi-file-restore',
+ 'mdi-file-restore-outline',
+ 'mdi-file-search',
+ 'mdi-file-search-outline',
'mdi-file-send',
+ 'mdi-file-send-outline',
+ 'mdi-file-settings',
+ 'mdi-file-settings-outline',
+ 'mdi-file-settings-variant',
+ 'mdi-file-settings-variant-outline',
+ 'mdi-file-star',
+ 'mdi-file-star-outline',
+ 'mdi-file-swap',
+ 'mdi-file-swap-outline',
+ 'mdi-file-table',
+ 'mdi-file-table-box',
+ 'mdi-file-table-box-multiple',
+ 'mdi-file-table-box-multiple-outline',
+ 'mdi-file-table-box-outline',
+ 'mdi-file-table-outline',
'mdi-file-tree',
'mdi-file-undo',
+ 'mdi-file-undo-outline',
+ 'mdi-file-upload',
+ 'mdi-file-upload-outline',
'mdi-file-video',
+ 'mdi-file-video-outline',
'mdi-file-word',
'mdi-file-word-box',
- 'mdi-file-xml',
+ 'mdi-file-word-box-outline',
+ 'mdi-file-word-outline',
'mdi-film',
'mdi-filmstrip',
'mdi-filmstrip-off',
'mdi-filter',
+ 'mdi-filter-menu',
+ 'mdi-filter-menu-outline',
+ 'mdi-filter-minus',
+ 'mdi-filter-minus-outline',
'mdi-filter-outline',
+ 'mdi-filter-plus',
+ 'mdi-filter-plus-outline',
'mdi-filter-remove',
'mdi-filter-remove-outline',
'mdi-filter-variant',
+ 'mdi-filter-variant-minus',
+ 'mdi-filter-variant-plus',
+ 'mdi-filter-variant-remove',
'mdi-finance',
'mdi-find-replace',
'mdi-fingerprint',
+ 'mdi-fingerprint-off',
'mdi-fire',
+ 'mdi-fire-extinguisher',
+ 'mdi-fire-hydrant',
+ 'mdi-fire-hydrant-alert',
+ 'mdi-fire-hydrant-off',
'mdi-fire-truck',
'mdi-firebase',
'mdi-firefox',
+ 'mdi-fireplace',
+ 'mdi-fireplace-off',
+ 'mdi-firework',
'mdi-fish',
+ 'mdi-fishbowl',
+ 'mdi-fishbowl-outline',
+ 'mdi-fit-to-page',
+ 'mdi-fit-to-page-outline',
'mdi-flag',
'mdi-flag-checkered',
+ 'mdi-flag-minus',
+ 'mdi-flag-minus-outline',
'mdi-flag-outline',
+ 'mdi-flag-plus',
+ 'mdi-flag-plus-outline',
+ 'mdi-flag-remove',
+ 'mdi-flag-remove-outline',
'mdi-flag-triangle',
'mdi-flag-variant',
'mdi-flag-variant-outline',
+ 'mdi-flare',
'mdi-flash',
+ 'mdi-flash-alert',
+ 'mdi-flash-alert-outline',
'mdi-flash-auto',
'mdi-flash-circle',
'mdi-flash-off',
@@ -715,20 +1960,49 @@ export default [
'mdi-flask-empty-outline',
'mdi-flask-outline',
'mdi-flattr',
+ 'mdi-flickr',
+ 'mdi-flip-horizontal',
'mdi-flip-to-back',
'mdi-flip-to-front',
+ 'mdi-flip-vertical',
'mdi-floor-lamp',
+ 'mdi-floor-lamp-dual',
+ 'mdi-floor-lamp-variant',
'mdi-floor-plan',
'mdi-floppy',
+ 'mdi-floppy-variant',
'mdi-flower',
+ 'mdi-flower-outline',
+ 'mdi-flower-poppy',
+ 'mdi-flower-tulip',
+ 'mdi-flower-tulip-outline',
+ 'mdi-focus-auto',
+ 'mdi-focus-field',
+ 'mdi-focus-field-horizontal',
+ 'mdi-focus-field-vertical',
'mdi-folder',
'mdi-folder-account',
+ 'mdi-folder-account-outline',
+ 'mdi-folder-alert',
+ 'mdi-folder-alert-outline',
+ 'mdi-folder-clock',
+ 'mdi-folder-clock-outline',
'mdi-folder-download',
+ 'mdi-folder-download-outline',
'mdi-folder-edit',
+ 'mdi-folder-edit-outline',
'mdi-folder-google-drive',
+ 'mdi-folder-heart',
+ 'mdi-folder-heart-outline',
+ 'mdi-folder-home',
+ 'mdi-folder-home-outline',
'mdi-folder-image',
+ 'mdi-folder-information',
+ 'mdi-folder-information-outline',
'mdi-folder-key',
'mdi-folder-key-network',
+ 'mdi-folder-key-network-outline',
+ 'mdi-folder-key-outline',
'mdi-folder-lock',
'mdi-folder-lock-open',
'mdi-folder-move',
@@ -736,55 +2010,215 @@ export default [
'mdi-folder-multiple-image',
'mdi-folder-multiple-outline',
'mdi-folder-network',
+ 'mdi-folder-network-outline',
'mdi-folder-open',
+ 'mdi-folder-open-outline',
'mdi-folder-outline',
'mdi-folder-plus',
+ 'mdi-folder-plus-outline',
+ 'mdi-folder-pound',
+ 'mdi-folder-pound-outline',
'mdi-folder-remove',
+ 'mdi-folder-remove-outline',
'mdi-folder-search',
'mdi-folder-search-outline',
+ 'mdi-folder-settings',
+ 'mdi-folder-settings-outline',
+ 'mdi-folder-settings-variant',
+ 'mdi-folder-settings-variant-outline',
'mdi-folder-star',
+ 'mdi-folder-star-outline',
+ 'mdi-folder-swap',
+ 'mdi-folder-swap-outline',
+ 'mdi-folder-sync',
+ 'mdi-folder-sync-outline',
+ 'mdi-folder-text',
+ 'mdi-folder-text-outline',
'mdi-folder-upload',
+ 'mdi-folder-upload-outline',
+ 'mdi-folder-zip',
+ 'mdi-folder-zip-outline',
'mdi-font-awesome',
'mdi-food',
'mdi-food-apple',
+ 'mdi-food-apple-outline',
'mdi-food-croissant',
'mdi-food-fork-drink',
'mdi-food-off',
'mdi-food-variant',
+ 'mdi-foot-print',
'mdi-football',
'mdi-football-australian',
'mdi-football-helmet',
'mdi-forklift',
+ 'mdi-format-align-bottom',
+ 'mdi-format-align-center',
+ 'mdi-format-align-justify',
+ 'mdi-format-align-left',
+ 'mdi-format-align-middle',
+ 'mdi-format-align-right',
+ 'mdi-format-align-top',
+ 'mdi-format-annotation-minus',
+ 'mdi-format-annotation-plus',
+ 'mdi-format-bold',
+ 'mdi-format-clear',
+ 'mdi-format-color-fill',
+ 'mdi-format-color-highlight',
+ 'mdi-format-color-text',
+ 'mdi-format-columns',
+ 'mdi-format-float-center',
+ 'mdi-format-float-left',
+ 'mdi-format-float-none',
+ 'mdi-format-float-right',
+ 'mdi-format-font',
+ 'mdi-format-font-size-decrease',
+ 'mdi-format-font-size-increase',
+ 'mdi-format-header-1',
+ 'mdi-format-header-2',
+ 'mdi-format-header-3',
+ 'mdi-format-header-4',
+ 'mdi-format-header-5',
+ 'mdi-format-header-6',
+ 'mdi-format-header-decrease',
+ 'mdi-format-header-equal',
+ 'mdi-format-header-increase',
+ 'mdi-format-header-pound',
+ 'mdi-format-horizontal-align-center',
+ 'mdi-format-horizontal-align-left',
+ 'mdi-format-horizontal-align-right',
+ 'mdi-format-indent-decrease',
+ 'mdi-format-indent-increase',
+ 'mdi-format-italic',
+ 'mdi-format-letter-case',
+ 'mdi-format-letter-case-lower',
+ 'mdi-format-letter-case-upper',
+ 'mdi-format-letter-ends-with',
+ 'mdi-format-letter-matches',
+ 'mdi-format-letter-starts-with',
+ 'mdi-format-line-spacing',
+ 'mdi-format-line-style',
+ 'mdi-format-line-weight',
+ 'mdi-format-list-bulleted',
+ 'mdi-format-list-bulleted-square',
+ 'mdi-format-list-bulleted-triangle',
+ 'mdi-format-list-bulleted-type',
+ 'mdi-format-list-checkbox',
+ 'mdi-format-list-checks',
+ 'mdi-format-list-numbered',
+ 'mdi-format-list-numbered-rtl',
+ 'mdi-format-overline',
+ 'mdi-format-page-break',
+ 'mdi-format-paint',
+ 'mdi-format-paragraph',
+ 'mdi-format-pilcrow',
+ 'mdi-format-quote-close',
+ 'mdi-format-quote-close-outline',
+ 'mdi-format-quote-open',
+ 'mdi-format-quote-open-outline',
+ 'mdi-format-rotate-90',
+ 'mdi-format-section',
+ 'mdi-format-size',
+ 'mdi-format-strikethrough',
+ 'mdi-format-strikethrough-variant',
+ 'mdi-format-subscript',
+ 'mdi-format-superscript',
+ 'mdi-format-text',
+ 'mdi-format-text-rotation-angle-down',
+ 'mdi-format-text-rotation-angle-up',
+ 'mdi-format-text-rotation-down',
+ 'mdi-format-text-rotation-down-vertical',
+ 'mdi-format-text-rotation-none',
+ 'mdi-format-text-rotation-up',
+ 'mdi-format-text-rotation-vertical',
+ 'mdi-format-text-variant',
+ 'mdi-format-text-wrapping-clip',
+ 'mdi-format-text-wrapping-overflow',
+ 'mdi-format-text-wrapping-wrap',
+ 'mdi-format-textbox',
+ 'mdi-format-textdirection-l-to-r',
+ 'mdi-format-textdirection-r-to-l',
+ 'mdi-format-title',
+ 'mdi-format-underline',
+ 'mdi-format-vertical-align-bottom',
+ 'mdi-format-vertical-align-center',
+ 'mdi-format-vertical-align-top',
+ 'mdi-format-wrap-inline',
+ 'mdi-format-wrap-square',
+ 'mdi-format-wrap-tight',
+ 'mdi-format-wrap-top-bottom',
'mdi-forum',
'mdi-forum-outline',
'mdi-forward',
+ 'mdi-forwardburger',
'mdi-fountain',
+ 'mdi-fountain-pen',
+ 'mdi-fountain-pen-tip',
'mdi-foursquare',
'mdi-freebsd',
+ 'mdi-frequently-asked-questions',
'mdi-fridge',
- 'mdi-fridge-filled',
- 'mdi-fridge-filled-bottom',
- 'mdi-fridge-filled-top',
+ 'mdi-fridge-alert',
+ 'mdi-fridge-alert-outline',
+ 'mdi-fridge-bottom',
+ 'mdi-fridge-off',
+ 'mdi-fridge-off-outline',
+ 'mdi-fridge-outline',
+ 'mdi-fridge-top',
+ 'mdi-fruit-cherries',
+ 'mdi-fruit-citrus',
+ 'mdi-fruit-grapes',
+ 'mdi-fruit-grapes-outline',
+ 'mdi-fruit-pineapple',
+ 'mdi-fruit-watermelon',
'mdi-fuel',
'mdi-fullscreen',
'mdi-fullscreen-exit',
'mdi-function',
'mdi-function-variant',
+ 'mdi-furigana-horizontal',
+ 'mdi-furigana-vertical',
+ 'mdi-fuse',
+ 'mdi-fuse-blade',
'mdi-gamepad',
+ 'mdi-gamepad-circle',
+ 'mdi-gamepad-circle-down',
+ 'mdi-gamepad-circle-left',
+ 'mdi-gamepad-circle-outline',
+ 'mdi-gamepad-circle-right',
+ 'mdi-gamepad-circle-up',
+ 'mdi-gamepad-down',
+ 'mdi-gamepad-left',
+ 'mdi-gamepad-right',
+ 'mdi-gamepad-round',
+ 'mdi-gamepad-round-down',
+ 'mdi-gamepad-round-left',
+ 'mdi-gamepad-round-outline',
+ 'mdi-gamepad-round-right',
+ 'mdi-gamepad-round-up',
+ 'mdi-gamepad-square',
+ 'mdi-gamepad-square-outline',
+ 'mdi-gamepad-up',
'mdi-gamepad-variant',
+ 'mdi-gamepad-variant-outline',
+ 'mdi-gamma',
+ 'mdi-gantry-crane',
'mdi-garage',
'mdi-garage-alert',
'mdi-garage-open',
'mdi-gas-cylinder',
'mdi-gas-station',
+ 'mdi-gas-station-outline',
'mdi-gate',
'mdi-gate-and',
+ 'mdi-gate-arrow-right',
'mdi-gate-nand',
'mdi-gate-nor',
'mdi-gate-not',
+ 'mdi-gate-open',
'mdi-gate-or',
'mdi-gate-xnor',
'mdi-gate-xor',
+ 'mdi-gatsby',
'mdi-gauge',
'mdi-gauge-empty',
'mdi-gauge-full',
@@ -793,26 +2227,39 @@ export default [
'mdi-gender-female',
'mdi-gender-male',
'mdi-gender-male-female',
+ 'mdi-gender-male-female-variant',
+ 'mdi-gender-non-binary',
'mdi-gender-transgender',
'mdi-gentoo',
'mdi-gesture',
'mdi-gesture-double-tap',
+ 'mdi-gesture-pinch',
+ 'mdi-gesture-spread',
+ 'mdi-gesture-swipe',
'mdi-gesture-swipe-down',
+ 'mdi-gesture-swipe-horizontal',
'mdi-gesture-swipe-left',
'mdi-gesture-swipe-right',
'mdi-gesture-swipe-up',
+ 'mdi-gesture-swipe-vertical',
'mdi-gesture-tap',
+ 'mdi-gesture-tap-hold',
'mdi-gesture-two-double-tap',
'mdi-gesture-two-tap',
'mdi-ghost',
+ 'mdi-ghost-off',
+ 'mdi-gif',
'mdi-gift',
+ 'mdi-gift-outline',
'mdi-git',
'mdi-github-box',
'mdi-github-circle',
'mdi-github-face',
+ 'mdi-gitlab',
'mdi-glass-cocktail',
'mdi-glass-flute',
'mdi-glass-mug',
+ 'mdi-glass-mug-variant',
'mdi-glass-stange',
'mdi-glass-tulip',
'mdi-glass-wine',
@@ -821,10 +2268,16 @@ export default [
'mdi-globe-model',
'mdi-gmail',
'mdi-gnome',
+ 'mdi-go-kart',
+ 'mdi-go-kart-track',
+ 'mdi-gog',
'mdi-golf',
+ 'mdi-golf-cart',
+ 'mdi-golf-tee',
'mdi-gondola',
+ 'mdi-goodreads',
'mdi-google',
- 'mdi-google-allo',
+ 'mdi-google-adwords',
'mdi-google-analytics',
'mdi-google-assistant',
'mdi-google-cardboard',
@@ -833,6 +2286,8 @@ export default [
'mdi-google-circles-communities',
'mdi-google-circles-extended',
'mdi-google-circles-group',
+ 'mdi-google-classroom',
+ 'mdi-google-cloud',
'mdi-google-controller',
'mdi-google-controller-off',
'mdi-google-drive',
@@ -842,7 +2297,9 @@ export default [
'mdi-google-hangouts',
'mdi-google-home',
'mdi-google-keep',
+ 'mdi-google-lens',
'mdi-google-maps',
+ 'mdi-google-my-business',
'mdi-google-nearby',
'mdi-google-pages',
'mdi-google-photos',
@@ -850,17 +2307,24 @@ export default [
'mdi-google-play',
'mdi-google-plus',
'mdi-google-plus-box',
+ 'mdi-google-podcast',
+ 'mdi-google-spreadsheet',
+ 'mdi-google-street-view',
'mdi-google-translate',
- 'mdi-google-wallet',
- 'mdi-gpu',
'mdi-gradient',
+ 'mdi-grain',
+ 'mdi-graph',
+ 'mdi-graph-outline',
'mdi-graphql',
+ 'mdi-grave-stone',
'mdi-grease-pencil',
'mdi-greater-than',
'mdi-greater-than-or-equal',
'mdi-grid',
'mdi-grid-large',
'mdi-grid-off',
+ 'mdi-grill',
+ 'mdi-grill-outline',
'mdi-group',
'mdi-guitar-acoustic',
'mdi-guitar-electric',
@@ -868,12 +2332,35 @@ export default [
'mdi-guitar-pick-outline',
'mdi-guy-fawkes-mask',
'mdi-hackernews',
+ 'mdi-hail',
+ 'mdi-hair-dryer',
+ 'mdi-hair-dryer-outline',
+ 'mdi-halloween',
'mdi-hamburger',
'mdi-hammer',
+ 'mdi-hand',
+ 'mdi-hand-heart',
+ 'mdi-hand-left',
+ 'mdi-hand-okay',
+ 'mdi-hand-peace',
+ 'mdi-hand-peace-variant',
+ 'mdi-hand-pointing-down',
+ 'mdi-hand-pointing-left',
'mdi-hand-pointing-right',
+ 'mdi-hand-pointing-up',
+ 'mdi-hand-right',
+ 'mdi-hand-saw',
+ 'mdi-handball',
+ 'mdi-handcuffs',
'mdi-hanger',
'mdi-hard-hat',
'mdi-harddisk',
+ 'mdi-harddisk-plus',
+ 'mdi-harddisk-remove',
+ 'mdi-hat-fedora',
+ 'mdi-hazard-lights',
+ 'mdi-hdr',
+ 'mdi-hdr-off',
'mdi-headphones',
'mdi-headphones-bluetooth',
'mdi-headphones-box',
@@ -886,25 +2373,43 @@ export default [
'mdi-heart-box',
'mdi-heart-box-outline',
'mdi-heart-broken',
+ 'mdi-heart-broken-outline',
'mdi-heart-circle',
'mdi-heart-circle-outline',
+ 'mdi-heart-flash',
'mdi-heart-half',
'mdi-heart-half-full',
'mdi-heart-half-outline',
+ 'mdi-heart-multiple',
+ 'mdi-heart-multiple-outline',
'mdi-heart-off',
'mdi-heart-outline',
'mdi-heart-pulse',
+ 'mdi-helicopter',
'mdi-help',
'mdi-help-box',
'mdi-help-circle',
'mdi-help-circle-outline',
'mdi-help-network',
+ 'mdi-help-network-outline',
+ 'mdi-help-rhombus',
+ 'mdi-help-rhombus-outline',
'mdi-hexagon',
'mdi-hexagon-multiple',
+ 'mdi-hexagon-multiple-outline',
'mdi-hexagon-outline',
+ 'mdi-hexagon-slice-1',
+ 'mdi-hexagon-slice-2',
+ 'mdi-hexagon-slice-3',
+ 'mdi-hexagon-slice-4',
+ 'mdi-hexagon-slice-5',
+ 'mdi-hexagon-slice-6',
+ 'mdi-hexagram',
+ 'mdi-hexagram-outline',
'mdi-high-definition',
'mdi-high-definition-box',
'mdi-highway',
+ 'mdi-hiking',
'mdi-hinduism',
'mdi-history',
'mdi-hockey-puck',
@@ -913,11 +2418,30 @@ export default [
'mdi-home',
'mdi-home-account',
'mdi-home-alert',
+ 'mdi-home-analytics',
'mdi-home-assistant',
'mdi-home-automation',
'mdi-home-circle',
+ 'mdi-home-circle-outline',
+ 'mdi-home-city',
+ 'mdi-home-city-outline',
'mdi-home-currency-usd',
+ 'mdi-home-edit',
+ 'mdi-home-edit-outline',
+ 'mdi-home-export-outline',
+ 'mdi-home-flood',
+ 'mdi-home-floor-0',
+ 'mdi-home-floor-1',
+ 'mdi-home-floor-2',
+ 'mdi-home-floor-3',
+ 'mdi-home-floor-a',
+ 'mdi-home-floor-b',
+ 'mdi-home-floor-g',
+ 'mdi-home-floor-l',
+ 'mdi-home-floor-negative-1',
+ 'mdi-home-group',
'mdi-home-heart',
+ 'mdi-home-import-outline',
'mdi-home-lock',
'mdi-home-lock-open',
'mdi-home-map-marker',
@@ -925,38 +2449,74 @@ export default [
'mdi-home-modern',
'mdi-home-outline',
'mdi-home-plus',
+ 'mdi-home-roof',
+ 'mdi-home-thermometer',
+ 'mdi-home-thermometer-outline',
'mdi-home-variant',
+ 'mdi-home-variant-outline',
'mdi-hook',
'mdi-hook-off',
'mdi-hops',
+ 'mdi-horizontal-rotate-clockwise',
+ 'mdi-horizontal-rotate-counterclockwise',
+ 'mdi-horseshoe',
'mdi-hospital',
+ 'mdi-hospital-box',
+ 'mdi-hospital-box-outline',
'mdi-hospital-building',
'mdi-hospital-marker',
'mdi-hot-tub',
'mdi-hotel',
'mdi-houzz',
'mdi-houzz-box',
+ 'mdi-hubspot',
'mdi-hulu',
'mdi-human',
'mdi-human-child',
'mdi-human-female',
+ 'mdi-human-female-boy',
+ 'mdi-human-female-female',
+ 'mdi-human-female-girl',
'mdi-human-greeting',
'mdi-human-handsdown',
'mdi-human-handsup',
'mdi-human-male',
+ 'mdi-human-male-boy',
'mdi-human-male-female',
+ 'mdi-human-male-girl',
+ 'mdi-human-male-height',
+ 'mdi-human-male-height-variant',
+ 'mdi-human-male-male',
'mdi-human-pregnant',
'mdi-humble-bundle',
'mdi-ice-cream',
+ 'mdi-ice-pop',
+ 'mdi-id-card',
+ 'mdi-identifier',
+ 'mdi-iframe',
+ 'mdi-iframe-array',
+ 'mdi-iframe-array-outline',
+ 'mdi-iframe-braces',
+ 'mdi-iframe-braces-outline',
+ 'mdi-iframe-outline',
+ 'mdi-iframe-parentheses',
+ 'mdi-iframe-parentheses-outline',
+ 'mdi-iframe-variable',
+ 'mdi-iframe-variable-outline',
'mdi-image',
'mdi-image-album',
'mdi-image-area',
'mdi-image-area-close',
+ 'mdi-image-auto-adjust',
'mdi-image-broken',
'mdi-image-broken-variant',
+ 'mdi-image-edit',
+ 'mdi-image-edit-outline',
'mdi-image-filter',
'mdi-image-filter-black-white',
'mdi-image-filter-center-focus',
+ 'mdi-image-filter-center-focus-strong',
+ 'mdi-image-filter-center-focus-strong-outline',
'mdi-image-filter-center-focus-weak',
'mdi-image-filter-drama',
'mdi-image-filter-frames',
@@ -964,15 +2524,24 @@ export default [
'mdi-image-filter-none',
'mdi-image-filter-tilt-shift',
'mdi-image-filter-vintage',
+ 'mdi-image-frame',
+ 'mdi-image-move',
'mdi-image-multiple',
'mdi-image-off',
+ 'mdi-image-off-outline',
'mdi-image-outline',
'mdi-image-plus',
'mdi-image-search',
'mdi-image-search-outline',
+ 'mdi-image-size-select-actual',
+ 'mdi-image-size-select-large',
+ 'mdi-image-size-select-small',
'mdi-import',
'mdi-inbox',
+ 'mdi-inbox-arrow-down',
+ 'mdi-inbox-arrow-up',
'mdi-inbox-multiple',
+ 'mdi-inbox-multiple-outline',
'mdi-incognito',
'mdi-infinity',
'mdi-information',
@@ -980,38 +2549,67 @@ export default [
'mdi-information-variant',
'mdi-instagram',
'mdi-instapaper',
+ 'mdi-instrument-triangle',
'mdi-internet-explorer',
'mdi-invert-colors',
+ 'mdi-invert-colors-off',
+ 'mdi-ip',
+ 'mdi-ip-network',
+ 'mdi-ip-network-outline',
+ 'mdi-ipod',
'mdi-islam',
+ 'mdi-island',
'mdi-itunes',
+ 'mdi-iv-bag',
+ 'mdi-jabber',
'mdi-jeepney',
+ 'mdi-jellyfish',
+ 'mdi-jellyfish-outline',
'mdi-jira',
'mdi-jquery',
'mdi-jsfiddle',
'mdi-json',
'mdi-judaism',
+ 'mdi-kabaddi',
'mdi-karate',
'mdi-keg',
'mdi-kettle',
+ 'mdi-kettle-outline',
'mdi-key',
'mdi-key-change',
+ 'mdi-key-link',
'mdi-key-minus',
+ 'mdi-key-outline',
'mdi-key-plus',
'mdi-key-remove',
+ 'mdi-key-star',
'mdi-key-variant',
+ 'mdi-key-wireless',
'mdi-keyboard',
'mdi-keyboard-backspace',
'mdi-keyboard-caps',
'mdi-keyboard-close',
'mdi-keyboard-off',
+ 'mdi-keyboard-off-outline',
'mdi-keyboard-outline',
'mdi-keyboard-return',
+ 'mdi-keyboard-settings',
+ 'mdi-keyboard-settings-outline',
+ 'mdi-keyboard-space',
'mdi-keyboard-tab',
'mdi-keyboard-variant',
+ 'mdi-khanda',
'mdi-kickstarter',
+ 'mdi-knife',
+ 'mdi-knife-military',
'mdi-kodi',
+ 'mdi-kubernetes',
'mdi-label',
+ 'mdi-label-off',
+ 'mdi-label-off-outline',
'mdi-label-outline',
+ 'mdi-label-variant',
+ 'mdi-label-variant-outline',
'mdi-ladybug',
'mdi-lambda',
'mdi-lamp',
@@ -1024,13 +2622,16 @@ export default [
'mdi-language-csharp',
'mdi-language-css3',
'mdi-language-go',
+ 'mdi-language-haskell',
'mdi-language-html5',
+ 'mdi-language-java',
'mdi-language-javascript',
'mdi-language-lua',
'mdi-language-php',
'mdi-language-python',
'mdi-language-python-text',
'mdi-language-r',
+ 'mdi-language-ruby-on-rails',
'mdi-language-swift',
'mdi-language-typescript',
'mdi-laptop',
@@ -1038,47 +2639,84 @@ export default [
'mdi-laptop-mac',
'mdi-laptop-off',
'mdi-laptop-windows',
+ 'mdi-laravel',
+ 'mdi-lasso',
'mdi-lastfm',
'mdi-lastpass',
+ 'mdi-latitude',
'mdi-launch',
'mdi-lava-lamp',
'mdi-layers',
+ 'mdi-layers-minus',
'mdi-layers-off',
+ 'mdi-layers-off-outline',
+ 'mdi-layers-outline',
+ 'mdi-layers-plus',
+ 'mdi-layers-remove',
+ 'mdi-layers-triple',
+ 'mdi-layers-triple-outline',
'mdi-lead-pencil',
'mdi-leaf',
+ 'mdi-leaf-maple',
+ 'mdi-leak',
+ 'mdi-leak-off',
'mdi-led-off',
'mdi-led-on',
'mdi-led-outline',
'mdi-led-strip',
+ 'mdi-led-strip-variant',
'mdi-led-variant-off',
'mdi-led-variant-on',
'mdi-led-variant-outline',
+ 'mdi-leek',
'mdi-less-than',
'mdi-less-than-or-equal',
'mdi-library',
'mdi-library-books',
+ 'mdi-library-movie',
'mdi-library-music',
- 'mdi-library-plus',
+ 'mdi-library-music-outline',
+ 'mdi-library-shelves',
+ 'mdi-library-video',
+ 'mdi-license',
'mdi-lifebuoy',
'mdi-light-switch',
'mdi-lightbulb',
+ 'mdi-lightbulb-off',
+ 'mdi-lightbulb-off-outline',
'mdi-lightbulb-on',
'mdi-lightbulb-on-outline',
'mdi-lightbulb-outline',
+ 'mdi-lighthouse',
+ 'mdi-lighthouse-on',
'mdi-link',
+ 'mdi-link-box',
+ 'mdi-link-box-outline',
+ 'mdi-link-box-variant',
+ 'mdi-link-box-variant-outline',
+ 'mdi-link-lock',
'mdi-link-off',
+ 'mdi-link-plus',
'mdi-link-variant',
+ 'mdi-link-variant-minus',
'mdi-link-variant-off',
+ 'mdi-link-variant-plus',
+ 'mdi-link-variant-remove',
'mdi-linkedin',
'mdi-linkedin-box',
'mdi-linux',
'mdi-linux-mint',
+ 'mdi-litecoin',
'mdi-loading',
+ 'mdi-location-enter',
+ 'mdi-location-exit',
'mdi-lock',
'mdi-lock-alert',
'mdi-lock-clock',
'mdi-lock-open',
'mdi-lock-open-outline',
+ 'mdi-lock-open-variant',
+ 'mdi-lock-open-variant-outline',
'mdi-lock-outline',
'mdi-lock-pattern',
'mdi-lock-plus',
@@ -1091,69 +2729,131 @@ export default [
'mdi-login-variant',
'mdi-logout',
'mdi-logout-variant',
+ 'mdi-longitude',
'mdi-looks',
- 'mdi-loop',
'mdi-loupe',
'mdi-lumx',
+ 'mdi-lungs',
+ 'mdi-lyft',
'mdi-magnet',
'mdi-magnet-on',
'mdi-magnify',
'mdi-magnify-close',
'mdi-magnify-minus',
+ 'mdi-magnify-minus-cursor',
'mdi-magnify-minus-outline',
'mdi-magnify-plus',
+ 'mdi-magnify-plus-cursor',
'mdi-magnify-plus-outline',
+ 'mdi-mail',
'mdi-mail-ru',
'mdi-mailbox',
+ 'mdi-mailbox-open',
+ 'mdi-mailbox-open-outline',
+ 'mdi-mailbox-open-up',
+ 'mdi-mailbox-open-up-outline',
+ 'mdi-mailbox-outline',
+ 'mdi-mailbox-up',
+ 'mdi-mailbox-up-outline',
'mdi-map',
+ 'mdi-map-check',
+ 'mdi-map-check-outline',
+ 'mdi-map-clock',
+ 'mdi-map-clock-outline',
+ 'mdi-map-legend',
'mdi-map-marker',
+ 'mdi-map-marker-alert',
+ 'mdi-map-marker-alert-outline',
+ 'mdi-map-marker-check',
'mdi-map-marker-circle',
'mdi-map-marker-distance',
+ 'mdi-map-marker-down',
'mdi-map-marker-minus',
'mdi-map-marker-multiple',
'mdi-map-marker-off',
'mdi-map-marker-outline',
+ 'mdi-map-marker-path',
'mdi-map-marker-plus',
+ 'mdi-map-marker-question',
+ 'mdi-map-marker-question-outline',
'mdi-map-marker-radius',
+ 'mdi-map-marker-remove',
+ 'mdi-map-marker-remove-variant',
+ 'mdi-map-marker-up',
'mdi-map-minus',
'mdi-map-outline',
'mdi-map-plus',
'mdi-map-search',
'mdi-map-search-outline',
+ 'mdi-mapbox',
'mdi-margin',
'mdi-markdown',
+ 'mdi-markdown-outline',
'mdi-marker',
+ 'mdi-marker-cancel',
'mdi-marker-check',
+ 'mdi-mastodon',
+ 'mdi-mastodon-variant',
'mdi-material-design',
'mdi-material-ui',
'mdi-math-compass',
+ 'mdi-math-cos',
+ 'mdi-math-integral',
+ 'mdi-math-integral-box',
+ 'mdi-math-log',
+ 'mdi-math-norm',
+ 'mdi-math-norm-box',
+ 'mdi-math-sin',
+ 'mdi-math-tan',
'mdi-matrix',
'mdi-maxcdn',
'mdi-medal',
'mdi-medical-bag',
+ 'mdi-meditation',
'mdi-medium',
+ 'mdi-meetup',
'mdi-memory',
'mdi-menu',
'mdi-menu-down',
'mdi-menu-down-outline',
'mdi-menu-left',
+ 'mdi-menu-left-outline',
+ 'mdi-menu-open',
'mdi-menu-right',
+ 'mdi-menu-right-outline',
+ 'mdi-menu-swap',
+ 'mdi-menu-swap-outline',
'mdi-menu-up',
'mdi-menu-up-outline',
+ 'mdi-merge',
'mdi-message',
'mdi-message-alert',
+ 'mdi-message-alert-outline',
'mdi-message-bulleted',
'mdi-message-bulleted-off',
'mdi-message-draw',
'mdi-message-image',
+ 'mdi-message-image-outline',
+ 'mdi-message-lock',
+ 'mdi-message-lock-outline',
+ 'mdi-message-minus',
+ 'mdi-message-minus-outline',
'mdi-message-outline',
'mdi-message-plus',
+ 'mdi-message-plus-outline',
'mdi-message-processing',
+ 'mdi-message-processing-outline',
'mdi-message-reply',
'mdi-message-reply-text',
'mdi-message-settings',
+ 'mdi-message-settings-outline',
'mdi-message-settings-variant',
+ 'mdi-message-settings-variant-outline',
'mdi-message-text',
+ 'mdi-message-text-clock',
+ 'mdi-message-text-clock-outline',
+ 'mdi-message-text-lock',
+ 'mdi-message-text-lock-outline',
'mdi-message-text-outline',
'mdi-message-video',
'mdi-meteor',
@@ -1171,23 +2871,53 @@ export default [
'mdi-microscope',
'mdi-microsoft',
'mdi-microsoft-dynamics',
+ 'mdi-microwave',
+ 'mdi-middleware',
+ 'mdi-middleware-outline',
'mdi-midi',
'mdi-midi-port',
+ 'mdi-mine',
'mdi-minecraft',
+ 'mdi-mini-sd',
+ 'mdi-minidisc',
'mdi-minus',
'mdi-minus-box',
+ 'mdi-minus-box-multiple',
+ 'mdi-minus-box-multiple-outline',
'mdi-minus-box-outline',
'mdi-minus-circle',
'mdi-minus-circle-outline',
'mdi-minus-network',
+ 'mdi-minus-network-outline',
'mdi-mixcloud',
+ 'mdi-mixed-martial-arts',
'mdi-mixed-reality',
'mdi-mixer',
+ 'mdi-molecule',
'mdi-monitor',
'mdi-monitor-cellphone',
'mdi-monitor-cellphone-star',
+ 'mdi-monitor-clean',
+ 'mdi-monitor-dashboard',
+ 'mdi-monitor-lock',
'mdi-monitor-multiple',
+ 'mdi-monitor-off',
+ 'mdi-monitor-screenshot',
+ 'mdi-monitor-speaker',
+ 'mdi-monitor-speaker-off',
+ 'mdi-monitor-star',
+ 'mdi-moon-first-quarter',
+ 'mdi-moon-full',
+ 'mdi-moon-last-quarter',
+ 'mdi-moon-new',
+ 'mdi-moon-waning-crescent',
+ 'mdi-moon-waning-gibbous',
+ 'mdi-moon-waxing-crescent',
+ 'mdi-moon-waxing-gibbous',
+ 'mdi-moped',
'mdi-more',
+ 'mdi-mother-nurse',
+ 'mdi-motion-sensor',
'mdi-motorbike',
'mdi-mouse',
'mdi-mouse-bluetooth',
@@ -1197,35 +2927,72 @@ export default [
'mdi-move-resize',
'mdi-move-resize-variant',
'mdi-movie',
+ 'mdi-movie-edit',
+ 'mdi-movie-edit-outline',
+ 'mdi-movie-filter',
+ 'mdi-movie-filter-outline',
+ 'mdi-movie-open',
+ 'mdi-movie-open-outline',
+ 'mdi-movie-outline',
'mdi-movie-roll',
+ 'mdi-movie-search',
+ 'mdi-movie-search-outline',
'mdi-muffin',
'mdi-multiplication',
'mdi-multiplication-box',
'mdi-mushroom',
'mdi-mushroom-outline',
'mdi-music',
+ 'mdi-music-accidental-double-flat',
+ 'mdi-music-accidental-double-sharp',
+ 'mdi-music-accidental-flat',
+ 'mdi-music-accidental-natural',
+ 'mdi-music-accidental-sharp',
'mdi-music-box',
'mdi-music-box-outline',
'mdi-music-circle',
+ 'mdi-music-circle-outline',
+ 'mdi-music-clef-alto',
+ 'mdi-music-clef-bass',
+ 'mdi-music-clef-treble',
'mdi-music-note',
'mdi-music-note-bluetooth',
'mdi-music-note-bluetooth-off',
'mdi-music-note-eighth',
+ 'mdi-music-note-eighth-dotted',
'mdi-music-note-half',
+ 'mdi-music-note-half-dotted',
'mdi-music-note-off',
+ 'mdi-music-note-off-outline',
+ 'mdi-music-note-outline',
+ 'mdi-music-note-plus',
'mdi-music-note-quarter',
+ 'mdi-music-note-quarter-dotted',
'mdi-music-note-sixteenth',
+ 'mdi-music-note-sixteenth-dotted',
'mdi-music-note-whole',
+ 'mdi-music-note-whole-dotted',
'mdi-music-off',
+ 'mdi-music-rest-eighth',
+ 'mdi-music-rest-half',
+ 'mdi-music-rest-quarter',
+ 'mdi-music-rest-sixteenth',
+ 'mdi-music-rest-whole',
+ 'mdi-nail',
'mdi-nas',
'mdi-nativescript',
'mdi-nature',
'mdi-nature-people',
'mdi-navigation',
'mdi-near-me',
+ 'mdi-necklace',
'mdi-needle',
'mdi-netflix',
'mdi-network',
+ 'mdi-network-off',
+ 'mdi-network-off-outline',
+ 'mdi-network-outline',
+ 'mdi-network-router',
'mdi-network-strength-1',
'mdi-network-strength-1-alert',
'mdi-network-strength-2',
@@ -1239,12 +3006,23 @@ export default [
'mdi-network-strength-outline',
'mdi-new-box',
'mdi-newspaper',
+ 'mdi-newspaper-minus',
+ 'mdi-newspaper-plus',
+ 'mdi-newspaper-variant',
+ 'mdi-newspaper-variant-multiple',
+ 'mdi-newspaper-variant-multiple-outline',
+ 'mdi-newspaper-variant-outline',
'mdi-nfc',
+ 'mdi-nfc-off',
+ 'mdi-nfc-search-variant',
'mdi-nfc-tap',
'mdi-nfc-variant',
+ 'mdi-nfc-variant-off',
'mdi-ninja',
'mdi-nintendo-switch',
+ 'mdi-nix',
'mdi-nodejs',
+ 'mdi-noodles',
'mdi-not-equal',
'mdi-not-equal-variant',
'mdi-note',
@@ -1254,7 +3032,10 @@ export default [
'mdi-note-plus',
'mdi-note-plus-outline',
'mdi-note-text',
+ 'mdi-note-text-outline',
'mdi-notebook',
+ 'mdi-notebook-multiple',
+ 'mdi-notebook-outline',
'mdi-notification-clear-all',
'mdi-npm',
'mdi-npm-variant',
@@ -1262,42 +3043,97 @@ export default [
'mdi-nuke',
'mdi-null',
'mdi-numeric',
+ 'mdi-numeric-0',
'mdi-numeric-0-box',
+ 'mdi-numeric-0-box-multiple',
'mdi-numeric-0-box-multiple-outline',
'mdi-numeric-0-box-outline',
+ 'mdi-numeric-0-circle',
+ 'mdi-numeric-0-circle-outline',
+ 'mdi-numeric-1',
'mdi-numeric-1-box',
+ 'mdi-numeric-1-box-multiple',
'mdi-numeric-1-box-multiple-outline',
'mdi-numeric-1-box-outline',
+ 'mdi-numeric-1-circle',
+ 'mdi-numeric-1-circle-outline',
+ 'mdi-numeric-10',
+ 'mdi-numeric-10-box',
+ 'mdi-numeric-10-box-multiple',
+ 'mdi-numeric-10-box-multiple-outline',
+ 'mdi-numeric-10-box-outline',
+ 'mdi-numeric-10-circle',
+ 'mdi-numeric-10-circle-outline',
+ 'mdi-numeric-2',
'mdi-numeric-2-box',
+ 'mdi-numeric-2-box-multiple',
'mdi-numeric-2-box-multiple-outline',
'mdi-numeric-2-box-outline',
+ 'mdi-numeric-2-circle',
+ 'mdi-numeric-2-circle-outline',
+ 'mdi-numeric-3',
'mdi-numeric-3-box',
+ 'mdi-numeric-3-box-multiple',
'mdi-numeric-3-box-multiple-outline',
'mdi-numeric-3-box-outline',
+ 'mdi-numeric-3-circle',
+ 'mdi-numeric-3-circle-outline',
+ 'mdi-numeric-4',
'mdi-numeric-4-box',
+ 'mdi-numeric-4-box-multiple',
'mdi-numeric-4-box-multiple-outline',
'mdi-numeric-4-box-outline',
+ 'mdi-numeric-4-circle',
+ 'mdi-numeric-4-circle-outline',
+ 'mdi-numeric-5',
'mdi-numeric-5-box',
+ 'mdi-numeric-5-box-multiple',
'mdi-numeric-5-box-multiple-outline',
'mdi-numeric-5-box-outline',
+ 'mdi-numeric-5-circle',
+ 'mdi-numeric-5-circle-outline',
+ 'mdi-numeric-6',
'mdi-numeric-6-box',
+ 'mdi-numeric-6-box-multiple',
'mdi-numeric-6-box-multiple-outline',
'mdi-numeric-6-box-outline',
+ 'mdi-numeric-6-circle',
+ 'mdi-numeric-6-circle-outline',
+ 'mdi-numeric-7',
'mdi-numeric-7-box',
+ 'mdi-numeric-7-box-multiple',
'mdi-numeric-7-box-multiple-outline',
'mdi-numeric-7-box-outline',
+ 'mdi-numeric-7-circle',
+ 'mdi-numeric-7-circle-outline',
+ 'mdi-numeric-8',
'mdi-numeric-8-box',
+ 'mdi-numeric-8-box-multiple',
'mdi-numeric-8-box-multiple-outline',
'mdi-numeric-8-box-outline',
+ 'mdi-numeric-8-circle',
+ 'mdi-numeric-8-circle-outline',
+ 'mdi-numeric-9',
'mdi-numeric-9-box',
+ 'mdi-numeric-9-box-multiple',
'mdi-numeric-9-box-multiple-outline',
'mdi-numeric-9-box-outline',
+ 'mdi-numeric-9-circle',
+ 'mdi-numeric-9-circle-outline',
+ 'mdi-numeric-9-plus',
'mdi-numeric-9-plus-box',
+ 'mdi-numeric-9-plus-box-multiple',
'mdi-numeric-9-plus-box-multiple-outline',
'mdi-numeric-9-plus-box-outline',
+ 'mdi-numeric-9-plus-circle',
+ 'mdi-numeric-9-plus-circle-outline',
+ 'mdi-numeric-negative-1',
'mdi-nut',
'mdi-nutrition',
+ 'mdi-nuxt',
'mdi-oar',
+ 'mdi-ocarina',
+ 'mdi-ocr',
'mdi-octagon',
'mdi-octagon-outline',
'mdi-octagram',
@@ -1306,20 +3142,29 @@ export default [
'mdi-office',
'mdi-office-building',
'mdi-oil',
+ 'mdi-oil-lamp',
+ 'mdi-oil-level',
'mdi-oil-temperature',
'mdi-omega',
+ 'mdi-one-up',
'mdi-onedrive',
'mdi-onenote',
'mdi-onepassword',
'mdi-opacity',
'mdi-open-in-app',
'mdi-open-in-new',
+ 'mdi-open-source-initiative',
'mdi-openid',
'mdi-opera',
'mdi-orbit',
+ 'mdi-origin',
'mdi-ornament',
'mdi-ornament-variant',
+ 'mdi-outdoor-lamp',
+ 'mdi-outlook',
+ 'mdi-overscan',
'mdi-owl',
+ 'mdi-pac-man',
'mdi-package',
'mdi-package-down',
'mdi-package-up',
@@ -1330,11 +3175,29 @@ export default [
'mdi-page-layout-body',
'mdi-page-layout-footer',
'mdi-page-layout-header',
+ 'mdi-page-layout-header-footer',
'mdi-page-layout-sidebar-left',
'mdi-page-layout-sidebar-right',
+ 'mdi-page-next',
+ 'mdi-page-next-outline',
+ 'mdi-page-previous',
+ 'mdi-page-previous-outline',
'mdi-palette',
'mdi-palette-advanced',
+ 'mdi-palette-outline',
'mdi-palette-swatch',
+ 'mdi-palm-tree',
+ 'mdi-pan',
+ 'mdi-pan-bottom-left',
+ 'mdi-pan-bottom-right',
+ 'mdi-pan-down',
+ 'mdi-pan-horizontal',
+ 'mdi-pan-left',
+ 'mdi-pan-right',
+ 'mdi-pan-top-left',
+ 'mdi-pan-top-right',
+ 'mdi-pan-up',
+ 'mdi-pan-vertical',
'mdi-panda',
'mdi-pandora',
'mdi-panorama',
@@ -1343,9 +3206,17 @@ export default [
'mdi-panorama-vertical',
'mdi-panorama-wide-angle',
'mdi-paper-cut-vertical',
+ 'mdi-paper-roll',
+ 'mdi-paper-roll-outline',
'mdi-paperclip',
+ 'mdi-parachute',
+ 'mdi-parachute-outline',
'mdi-parking',
+ 'mdi-party-popper',
'mdi-passport',
+ 'mdi-passport-biometric',
+ 'mdi-pasta',
+ 'mdi-patio-heater',
'mdi-patreon',
'mdi-pause',
'mdi-pause-circle',
@@ -1355,48 +3226,106 @@ export default [
'mdi-paw',
'mdi-paw-off',
'mdi-paypal',
+ 'mdi-pdf-box',
'mdi-peace',
+ 'mdi-peanut',
+ 'mdi-peanut-off',
+ 'mdi-peanut-off-outline',
+ 'mdi-peanut-outline',
'mdi-pen',
+ 'mdi-pen-lock',
+ 'mdi-pen-minus',
+ 'mdi-pen-off',
+ 'mdi-pen-plus',
+ 'mdi-pen-remove',
'mdi-pencil',
'mdi-pencil-box',
+ 'mdi-pencil-box-multiple',
+ 'mdi-pencil-box-multiple-outline',
'mdi-pencil-box-outline',
'mdi-pencil-circle',
'mdi-pencil-circle-outline',
'mdi-pencil-lock',
+ 'mdi-pencil-lock-outline',
+ 'mdi-pencil-minus',
+ 'mdi-pencil-minus-outline',
'mdi-pencil-off',
+ 'mdi-pencil-off-outline',
+ 'mdi-pencil-outline',
+ 'mdi-pencil-plus',
+ 'mdi-pencil-plus-outline',
+ 'mdi-pencil-remove',
+ 'mdi-pencil-remove-outline',
+ 'mdi-penguin',
'mdi-pentagon',
'mdi-pentagon-outline',
'mdi-percent',
'mdi-periodic-table',
'mdi-periodic-table-co2',
'mdi-periscope',
+ 'mdi-perspective-less',
+ 'mdi-perspective-more',
'mdi-pharmacy',
'mdi-phone',
+ 'mdi-phone-alert',
+ 'mdi-phone-alert-outline',
'mdi-phone-bluetooth',
+ 'mdi-phone-bluetooth-outline',
+ 'mdi-phone-cancel',
+ 'mdi-phone-cancel-outline',
+ 'mdi-phone-check',
+ 'mdi-phone-check-outline',
'mdi-phone-classic',
'mdi-phone-forward',
+ 'mdi-phone-forward-outline',
'mdi-phone-hangup',
+ 'mdi-phone-hangup-outline',
'mdi-phone-in-talk',
+ 'mdi-phone-in-talk-outline',
'mdi-phone-incoming',
- 'mdi-phone-locked',
+ 'mdi-phone-incoming-outline',
+ 'mdi-phone-lock',
+ 'mdi-phone-lock-outline',
'mdi-phone-log',
+ 'mdi-phone-log-outline',
+ 'mdi-phone-message',
+ 'mdi-phone-message-outline',
'mdi-phone-minus',
+ 'mdi-phone-minus-outline',
'mdi-phone-missed',
+ 'mdi-phone-missed-outline',
+ 'mdi-phone-off',
+ 'mdi-phone-off-outline',
'mdi-phone-outgoing',
+ 'mdi-phone-outgoing-outline',
+ 'mdi-phone-outline',
'mdi-phone-paused',
+ 'mdi-phone-paused-outline',
'mdi-phone-plus',
+ 'mdi-phone-plus-outline',
'mdi-phone-return',
+ 'mdi-phone-return-outline',
+ 'mdi-phone-ring',
+ 'mdi-phone-ring-outline',
'mdi-phone-rotate-landscape',
'mdi-phone-rotate-portrait',
'mdi-phone-settings',
+ 'mdi-phone-settings-outline',
'mdi-phone-voip',
'mdi-pi',
'mdi-pi-box',
+ 'mdi-pi-hole',
'mdi-piano',
'mdi-pickaxe',
+ 'mdi-picture-in-picture-bottom-right',
+ 'mdi-picture-in-picture-bottom-right-outline',
+ 'mdi-picture-in-picture-top-right',
+ 'mdi-picture-in-picture-top-right-outline',
'mdi-pier',
'mdi-pier-crane',
'mdi-pig',
+ 'mdi-pig-variant',
+ 'mdi-piggy-bank',
'mdi-pill',
'mdi-pillar',
'mdi-pin',
@@ -1407,31 +3336,40 @@ export default [
'mdi-pine-tree-box',
'mdi-pinterest',
'mdi-pinterest-box',
+ 'mdi-pinwheel',
+ 'mdi-pinwheel-outline',
'mdi-pipe',
'mdi-pipe-disconnected',
'mdi-pipe-leak',
+ 'mdi-pirate',
'mdi-pistol',
'mdi-piston',
'mdi-pizza',
- 'mdi-plane-shield',
'mdi-play',
'mdi-play-box-outline',
'mdi-play-circle',
'mdi-play-circle-outline',
'mdi-play-network',
+ 'mdi-play-network-outline',
+ 'mdi-play-outline',
'mdi-play-pause',
'mdi-play-protected-content',
'mdi-play-speed',
'mdi-playlist-check',
'mdi-playlist-edit',
'mdi-playlist-minus',
+ 'mdi-playlist-music',
+ 'mdi-playlist-music-outline',
'mdi-playlist-play',
'mdi-playlist-plus',
'mdi-playlist-remove',
+ 'mdi-playlist-star',
'mdi-playstation',
'mdi-plex',
'mdi-plus',
'mdi-plus-box',
+ 'mdi-plus-box-multiple',
+ 'mdi-plus-box-multiple-outline',
'mdi-plus-box-outline',
'mdi-plus-circle',
'mdi-plus-circle-multiple-outline',
@@ -1439,22 +3377,36 @@ export default [
'mdi-plus-minus',
'mdi-plus-minus-box',
'mdi-plus-network',
+ 'mdi-plus-network-outline',
'mdi-plus-one',
'mdi-plus-outline',
+ 'mdi-plus-thick',
'mdi-pocket',
'mdi-podcast',
+ 'mdi-podium',
+ 'mdi-podium-bronze',
+ 'mdi-podium-gold',
+ 'mdi-podium-silver',
+ 'mdi-point-of-sale',
'mdi-pokeball',
+ 'mdi-pokemon-go',
'mdi-poker-chip',
'mdi-polaroid',
+ 'mdi-police-badge',
+ 'mdi-police-badge-outline',
'mdi-poll',
'mdi-poll-box',
'mdi-polymer',
'mdi-pool',
'mdi-popcorn',
+ 'mdi-post',
+ 'mdi-post-outline',
+ 'mdi-postage-stamp',
'mdi-pot',
'mdi-pot-mix',
'mdi-pound',
'mdi-pound-box',
+ 'mdi-pound-box-outline',
'mdi-power',
'mdi-power-cycle',
'mdi-power-off',
@@ -1465,68 +3417,118 @@ export default [
'mdi-power-sleep',
'mdi-power-socket',
'mdi-power-socket-au',
+ 'mdi-power-socket-de',
'mdi-power-socket-eu',
+ 'mdi-power-socket-fr',
+ 'mdi-power-socket-jp',
'mdi-power-socket-uk',
'mdi-power-socket-us',
'mdi-power-standby',
+ 'mdi-powershell',
'mdi-prescription',
'mdi-presentation',
'mdi-presentation-play',
'mdi-printer',
'mdi-printer-3d',
+ 'mdi-printer-3d-nozzle',
+ 'mdi-printer-3d-nozzle-alert',
+ 'mdi-printer-3d-nozzle-alert-outline',
+ 'mdi-printer-3d-nozzle-outline',
'mdi-printer-alert',
+ 'mdi-printer-check',
+ 'mdi-printer-off',
+ 'mdi-printer-pos',
'mdi-printer-settings',
+ 'mdi-printer-wireless',
'mdi-priority-high',
'mdi-priority-low',
'mdi-professional-hexagon',
+ 'mdi-progress-alert',
'mdi-progress-check',
'mdi-progress-clock',
+ 'mdi-progress-close',
'mdi-progress-download',
'mdi-progress-upload',
+ 'mdi-progress-wrench',
'mdi-projector',
'mdi-projector-screen',
+ 'mdi-protocol',
'mdi-publish',
'mdi-pulse',
+ 'mdi-pumpkin',
+ 'mdi-purse',
+ 'mdi-purse-outline',
'mdi-puzzle',
+ 'mdi-puzzle-outline',
'mdi-qi',
'mdi-qqchat',
'mdi-qrcode',
'mdi-qrcode-edit',
+ 'mdi-qrcode-minus',
+ 'mdi-qrcode-plus',
+ 'mdi-qrcode-remove',
'mdi-qrcode-scan',
'mdi-quadcopter',
'mdi-quality-high',
+ 'mdi-quality-low',
+ 'mdi-quality-medium',
'mdi-quicktime',
+ 'mdi-quora',
'mdi-rabbit',
+ 'mdi-racing-helmet',
+ 'mdi-racquetball',
'mdi-radar',
'mdi-radiator',
+ 'mdi-radiator-disabled',
+ 'mdi-radiator-off',
'mdi-radio',
+ 'mdi-radio-am',
+ 'mdi-radio-fm',
'mdi-radio-handheld',
'mdi-radio-tower',
'mdi-radioactive',
+ 'mdi-radioactive-off',
'mdi-radiobox-blank',
'mdi-radiobox-marked',
- 'mdi-raspberrypi',
+ 'mdi-radius',
+ 'mdi-radius-outline',
+ 'mdi-railroad-light',
+ 'mdi-raspberry-pi',
'mdi-ray-end',
+ 'mdi-ray-end-arrow',
'mdi-ray-start',
+ 'mdi-ray-start-arrow',
'mdi-ray-start-end',
'mdi-ray-vertex',
'mdi-react',
'mdi-read',
'mdi-receipt',
'mdi-record',
+ 'mdi-record-circle',
+ 'mdi-record-circle-outline',
'mdi-record-player',
'mdi-record-rec',
+ 'mdi-rectangle',
+ 'mdi-rectangle-outline',
'mdi-recycle',
'mdi-reddit',
+ 'mdi-redhat',
'mdi-redo',
'mdi-redo-variant',
+ 'mdi-reflect-horizontal',
+ 'mdi-reflect-vertical',
'mdi-refresh',
'mdi-regex',
+ 'mdi-registered-trademark',
'mdi-relative-scale',
'mdi-reload',
+ 'mdi-reload-alert',
'mdi-reminder',
'mdi-remote',
'mdi-remote-desktop',
+ 'mdi-remote-off',
+ 'mdi-remote-tv',
+ 'mdi-remote-tv-off',
'mdi-rename-box',
'mdi-reorder-horizontal',
'mdi-reorder-vertical',
@@ -1536,40 +3538,88 @@ export default [
'mdi-replay',
'mdi-reply',
'mdi-reply-all',
+ 'mdi-reply-all-outline',
+ 'mdi-reply-circle',
+ 'mdi-reply-outline',
'mdi-reproduction',
+ 'mdi-resistor',
+ 'mdi-resistor-nodes',
+ 'mdi-resize',
'mdi-resize-bottom-right',
'mdi-responsive',
'mdi-restart',
+ 'mdi-restart-alert',
+ 'mdi-restart-off',
'mdi-restore',
- 'mdi-restore-clock',
+ 'mdi-restore-alert',
'mdi-rewind',
+ 'mdi-rewind-10',
+ 'mdi-rewind-30',
+ 'mdi-rewind-5',
'mdi-rewind-outline',
'mdi-rhombus',
+ 'mdi-rhombus-medium',
'mdi-rhombus-outline',
+ 'mdi-rhombus-split',
'mdi-ribbon',
'mdi-rice',
'mdi-ring',
+ 'mdi-rivet',
'mdi-road',
'mdi-road-variant',
+ 'mdi-robber',
'mdi-robot',
+ 'mdi-robot-industrial',
+ 'mdi-robot-mower',
+ 'mdi-robot-mower-outline',
'mdi-robot-vacuum',
'mdi-robot-vacuum-variant',
'mdi-rocket',
+ 'mdi-roller-skate',
+ 'mdi-rollerblade',
+ 'mdi-rollupjs',
+ 'mdi-roman-numeral-1',
+ 'mdi-roman-numeral-10',
+ 'mdi-roman-numeral-2',
+ 'mdi-roman-numeral-3',
+ 'mdi-roman-numeral-4',
+ 'mdi-roman-numeral-5',
+ 'mdi-roman-numeral-6',
+ 'mdi-roman-numeral-7',
+ 'mdi-roman-numeral-8',
+ 'mdi-roman-numeral-9',
'mdi-room-service',
+ 'mdi-room-service-outline',
'mdi-rotate-3d',
+ 'mdi-rotate-3d-variant',
'mdi-rotate-left',
'mdi-rotate-left-variant',
+ 'mdi-rotate-orbit',
'mdi-rotate-right',
'mdi-rotate-right-variant',
'mdi-rounded-corner',
+ 'mdi-router',
'mdi-router-wireless',
+ 'mdi-router-wireless-settings',
'mdi-routes',
+ 'mdi-routes-clock',
'mdi-rowing',
'mdi-rss',
'mdi-rss-box',
+ 'mdi-rss-off',
+ 'mdi-ruby',
+ 'mdi-rugby',
'mdi-ruler',
+ 'mdi-ruler-square',
+ 'mdi-ruler-square-compass',
'mdi-run',
'mdi-run-fast',
+ 'mdi-rv-truck',
+ 'mdi-sack',
+ 'mdi-sack-percent',
+ 'mdi-safe',
+ 'mdi-safety-goggles',
+ 'mdi-sailing',
'mdi-sale',
'mdi-salesforce',
'mdi-sass',
@@ -1577,43 +3627,76 @@ export default [
'mdi-satellite-uplink',
'mdi-satellite-variant',
'mdi-sausage',
+ 'mdi-saw-blade',
'mdi-saxophone',
'mdi-scale',
'mdi-scale-balance',
'mdi-scale-bathroom',
+ 'mdi-scale-off',
'mdi-scanner',
'mdi-scanner-off',
+ 'mdi-scatter-plot',
+ 'mdi-scatter-plot-outline',
'mdi-school',
+ 'mdi-school-outline',
+ 'mdi-scissors-cutting',
+ 'mdi-scooter',
'mdi-screen-rotation',
'mdi-screen-rotation-lock',
+ 'mdi-screw-flat-top',
+ 'mdi-screw-lag',
+ 'mdi-screw-machine-flat-top',
+ 'mdi-screw-machine-round-top',
+ 'mdi-screw-round-top',
'mdi-screwdriver',
'mdi-script',
+ 'mdi-script-outline',
+ 'mdi-script-text',
+ 'mdi-script-text-outline',
'mdi-sd',
'mdi-seal',
+ 'mdi-seal-variant',
'mdi-search-web',
+ 'mdi-seat',
'mdi-seat-flat',
'mdi-seat-flat-angled',
'mdi-seat-individual-suite',
'mdi-seat-legroom-extra',
'mdi-seat-legroom-normal',
'mdi-seat-legroom-reduced',
+ 'mdi-seat-outline',
'mdi-seat-recline-extra',
'mdi-seat-recline-normal',
+ 'mdi-seatbelt',
'mdi-security',
- 'mdi-security-account',
- 'mdi-security-close',
- 'mdi-security-home',
- 'mdi-security-lock',
'mdi-security-network',
- 'mdi-security-off',
+ 'mdi-seed',
+ 'mdi-seed-outline',
+ 'mdi-segment',
'mdi-select',
'mdi-select-all',
+ 'mdi-select-color',
+ 'mdi-select-compare',
+ 'mdi-select-drag',
+ 'mdi-select-group',
'mdi-select-inverse',
'mdi-select-off',
+ 'mdi-select-place',
'mdi-selection',
+ 'mdi-selection-drag',
+ 'mdi-selection-ellipse',
+ 'mdi-selection-ellipse-arrow-inside',
'mdi-selection-off',
'mdi-send',
- 'mdi-send-secure',
+ 'mdi-send-check',
+ 'mdi-send-check-outline',
+ 'mdi-send-circle',
+ 'mdi-send-circle-outline',
+ 'mdi-send-clock',
+ 'mdi-send-clock-outline',
+ 'mdi-send-lock',
+ 'mdi-send-lock-outline',
+ 'mdi-send-outline',
'mdi-serial-port',
'mdi-server',
'mdi-server-minus',
@@ -1634,7 +3717,12 @@ export default [
'mdi-set-top-box',
'mdi-settings',
'mdi-settings-box',
+ 'mdi-settings-helper',
'mdi-settings-outline',
+ 'mdi-settings-transfer',
+ 'mdi-settings-transfer-outline',
+ 'mdi-shaker',
+ 'mdi-shaker-outline',
'mdi-shape',
'mdi-shape-circle-plus',
'mdi-shape-outline',
@@ -1643,14 +3731,60 @@ export default [
'mdi-shape-rectangle-plus',
'mdi-shape-square-plus',
'mdi-share',
+ 'mdi-share-all',
+ 'mdi-share-all-outline',
+ 'mdi-share-circle',
+ 'mdi-share-off',
+ 'mdi-share-off-outline',
'mdi-share-outline',
'mdi-share-variant',
+ 'mdi-sheep',
'mdi-shield',
+ 'mdi-shield-account',
+ 'mdi-shield-account-outline',
+ 'mdi-shield-airplane',
+ 'mdi-shield-airplane-outline',
+ 'mdi-shield-alert',
+ 'mdi-shield-alert-outline',
+ 'mdi-shield-car',
+ 'mdi-shield-check',
+ 'mdi-shield-check-outline',
+ 'mdi-shield-cross',
+ 'mdi-shield-cross-outline',
+ 'mdi-shield-edit',
+ 'mdi-shield-edit-outline',
'mdi-shield-half-full',
+ 'mdi-shield-home',
+ 'mdi-shield-home-outline',
+ 'mdi-shield-key',
+ 'mdi-shield-key-outline',
+ 'mdi-shield-link-variant',
+ 'mdi-shield-link-variant-outline',
+ 'mdi-shield-lock',
+ 'mdi-shield-lock-outline',
+ 'mdi-shield-off',
+ 'mdi-shield-off-outline',
'mdi-shield-outline',
+ 'mdi-shield-plus',
+ 'mdi-shield-plus-outline',
+ 'mdi-shield-refresh',
+ 'mdi-shield-refresh-outline',
+ 'mdi-shield-remove',
+ 'mdi-shield-remove-outline',
+ 'mdi-shield-search',
+ 'mdi-shield-star',
+ 'mdi-shield-star-outline',
+ 'mdi-shield-sun',
+ 'mdi-shield-sun-outline',
'mdi-ship-wheel',
+ 'mdi-shoe-formal',
+ 'mdi-shoe-heel',
+ 'mdi-shoe-print',
+ 'mdi-shopify',
'mdi-shopping',
'mdi-shopping-music',
+ 'mdi-shopping-outline',
+ 'mdi-shopping-search',
'mdi-shovel',
'mdi-shovel-off',
'mdi-shower',
@@ -1663,58 +3797,104 @@ export default [
'mdi-sigma-lower',
'mdi-sign-caution',
'mdi-sign-direction',
+ 'mdi-sign-direction-minus',
+ 'mdi-sign-direction-plus',
+ 'mdi-sign-direction-remove',
+ 'mdi-sign-real-estate',
'mdi-sign-text',
'mdi-signal',
'mdi-signal-2g',
'mdi-signal-3g',
'mdi-signal-4g',
+ 'mdi-signal-5g',
'mdi-signal-cellular-1',
'mdi-signal-cellular-2',
'mdi-signal-cellular-3',
'mdi-signal-cellular-outline',
+ 'mdi-signal-distance-variant',
'mdi-signal-hspa',
'mdi-signal-hspa-plus',
'mdi-signal-off',
'mdi-signal-variant',
+ 'mdi-signature',
+ 'mdi-signature-freehand',
+ 'mdi-signature-image',
+ 'mdi-signature-text',
+ 'mdi-silo',
'mdi-silverware',
+ 'mdi-silverware-clean',
'mdi-silverware-fork',
+ 'mdi-silverware-fork-knife',
'mdi-silverware-spoon',
'mdi-silverware-variant',
'mdi-sim',
'mdi-sim-alert',
'mdi-sim-off',
+ 'mdi-sina-weibo',
'mdi-sitemap',
+ 'mdi-skate',
+ 'mdi-skew-less',
+ 'mdi-skew-more',
'mdi-skip-backward',
+ 'mdi-skip-backward-outline',
'mdi-skip-forward',
+ 'mdi-skip-forward-outline',
'mdi-skip-next',
'mdi-skip-next-circle',
'mdi-skip-next-circle-outline',
+ 'mdi-skip-next-outline',
'mdi-skip-previous',
'mdi-skip-previous-circle',
'mdi-skip-previous-circle-outline',
+ 'mdi-skip-previous-outline',
'mdi-skull',
+ 'mdi-skull-crossbones',
+ 'mdi-skull-crossbones-outline',
+ 'mdi-skull-outline',
'mdi-skype',
'mdi-skype-business',
'mdi-slack',
'mdi-slackware',
+ 'mdi-slash-forward',
+ 'mdi-slash-forward-box',
'mdi-sleep',
'mdi-sleep-off',
+ 'mdi-slope-downhill',
+ 'mdi-slope-uphill',
+ 'mdi-slot-machine',
+ 'mdi-slot-machine-outline',
+ 'mdi-smart-card',
+ 'mdi-smart-card-outline',
+ 'mdi-smart-card-reader',
+ 'mdi-smart-card-reader-outline',
+ 'mdi-smog',
'mdi-smoke-detector',
'mdi-smoking',
'mdi-smoking-off',
'mdi-snapchat',
'mdi-snowflake',
+ 'mdi-snowflake-alert',
+ 'mdi-snowflake-variant',
'mdi-snowman',
'mdi-soccer',
'mdi-soccer-field',
'mdi-sofa',
+ 'mdi-solar-panel',
+ 'mdi-solar-panel-large',
+ 'mdi-solar-power',
+ 'mdi-soldering-iron',
'mdi-solid',
'mdi-sort',
'mdi-sort-alphabetical',
+ 'mdi-sort-alphabetical-ascending',
+ 'mdi-sort-alphabetical-descending',
'mdi-sort-ascending',
'mdi-sort-descending',
'mdi-sort-numeric',
'mdi-sort-variant',
+ 'mdi-sort-variant-lock',
+ 'mdi-sort-variant-lock-open',
+ 'mdi-sort-variant-remove',
'mdi-soundcloud',
'mdi-source-branch',
'mdi-source-commit',
@@ -1727,37 +3907,67 @@ export default [
'mdi-source-fork',
'mdi-source-merge',
'mdi-source-pull',
+ 'mdi-source-repository',
+ 'mdi-source-repository-multiple',
'mdi-soy-sauce',
+ 'mdi-spa',
+ 'mdi-spa-outline',
+ 'mdi-space-invaders',
+ 'mdi-spade',
'mdi-speaker',
'mdi-speaker-bluetooth',
+ 'mdi-speaker-multiple',
'mdi-speaker-off',
'mdi-speaker-wireless',
'mdi-speedometer',
+ 'mdi-speedometer-medium',
+ 'mdi-speedometer-slow',
'mdi-spellcheck',
+ 'mdi-spider',
+ 'mdi-spider-thread',
+ 'mdi-spider-web',
'mdi-spotify',
'mdi-spotlight',
'mdi-spotlight-beam',
'mdi-spray',
+ 'mdi-spray-bottle',
+ 'mdi-sprinkler',
+ 'mdi-sprinkler-variant',
+ 'mdi-sprout',
+ 'mdi-sprout-outline',
'mdi-square',
'mdi-square-edit-outline',
'mdi-square-inc',
'mdi-square-inc-cash',
+ 'mdi-square-medium',
+ 'mdi-square-medium-outline',
'mdi-square-outline',
'mdi-square-root',
'mdi-square-root-box',
+ 'mdi-square-small',
+ 'mdi-squeegee',
'mdi-ssh',
'mdi-stack-exchange',
'mdi-stack-overflow',
'mdi-stadium',
+ 'mdi-stadium-variant',
'mdi-stairs',
+ 'mdi-stamper',
'mdi-standard-definition',
'mdi-star',
+ 'mdi-star-box',
+ 'mdi-star-box-outline',
'mdi-star-circle',
'mdi-star-circle-outline',
'mdi-star-face',
+ 'mdi-star-four-points',
+ 'mdi-star-four-points-outline',
'mdi-star-half',
'mdi-star-off',
'mdi-star-outline',
+ 'mdi-star-three-points',
+ 'mdi-star-three-points-outline',
+ 'mdi-state-machine',
'mdi-steam',
'mdi-steam-box',
'mdi-steering',
@@ -1770,13 +3980,24 @@ export default [
'mdi-sticker',
'mdi-sticker-emoji',
'mdi-stocking',
+ 'mdi-stomach',
'mdi-stop',
'mdi-stop-circle',
'mdi-stop-circle-outline',
'mdi-store',
'mdi-store-24-hour',
+ 'mdi-storefront',
'mdi-stove',
+ 'mdi-strategy',
+ 'mdi-strava',
+ 'mdi-stretch-to-page',
+ 'mdi-stretch-to-page-outline',
+ 'mdi-subdirectory-arrow-left',
+ 'mdi-subdirectory-arrow-right',
+ 'mdi-subtitles',
+ 'mdi-subtitles-outline',
'mdi-subway',
+ 'mdi-subway-alert-variant',
'mdi-subway-variant',
'mdi-summit',
'mdi-sunglasses',
@@ -1787,29 +4008,45 @@ export default [
'mdi-surround-sound-7-1',
'mdi-svg',
'mdi-swap-horizontal',
+ 'mdi-swap-horizontal-bold',
+ 'mdi-swap-horizontal-circle',
+ 'mdi-swap-horizontal-circle-outline',
'mdi-swap-horizontal-variant',
'mdi-swap-vertical',
+ 'mdi-swap-vertical-bold',
+ 'mdi-swap-vertical-circle',
+ 'mdi-swap-vertical-circle-outline',
'mdi-swap-vertical-variant',
'mdi-swim',
'mdi-switch',
'mdi-sword',
'mdi-sword-cross',
+ 'mdi-symfony',
'mdi-sync',
'mdi-sync-alert',
'mdi-sync-off',
'mdi-tab',
+ 'mdi-tab-minus',
'mdi-tab-plus',
+ 'mdi-tab-remove',
'mdi-tab-unselected',
'mdi-table',
+ 'mdi-table-border',
+ 'mdi-table-chair',
'mdi-table-column',
'mdi-table-column-plus-after',
'mdi-table-column-plus-before',
'mdi-table-column-remove',
'mdi-table-column-width',
'mdi-table-edit',
+ 'mdi-table-eye',
'mdi-table-large',
+ 'mdi-table-large-plus',
+ 'mdi-table-large-remove',
'mdi-table-merge-cells',
'mdi-table-of-contents',
+ 'mdi-table-plus',
+ 'mdi-table-remove',
'mdi-table-row',
'mdi-table-row-height',
'mdi-table-row-plus-after',
@@ -1817,53 +4054,80 @@ export default [
'mdi-table-row-remove',
'mdi-table-search',
'mdi-table-settings',
+ 'mdi-table-tennis',
'mdi-tablet',
'mdi-tablet-android',
'mdi-tablet-cellphone',
+ 'mdi-tablet-dashboard',
'mdi-tablet-ipad',
'mdi-taco',
'mdi-tag',
'mdi-tag-faces',
'mdi-tag-heart',
+ 'mdi-tag-heart-outline',
'mdi-tag-minus',
'mdi-tag-multiple',
'mdi-tag-outline',
'mdi-tag-plus',
'mdi-tag-remove',
'mdi-tag-text-outline',
+ 'mdi-tank',
+ 'mdi-tanker-truck',
+ 'mdi-tape-measure',
'mdi-target',
+ 'mdi-target-account',
+ 'mdi-target-variant',
'mdi-taxi',
+ 'mdi-tea',
+ 'mdi-tea-outline',
'mdi-teach',
'mdi-teamviewer',
'mdi-telegram',
+ 'mdi-telescope',
'mdi-television',
'mdi-television-box',
'mdi-television-classic',
'mdi-television-classic-off',
+ 'mdi-television-clean',
'mdi-television-guide',
'mdi-television-off',
+ 'mdi-television-pause',
+ 'mdi-television-play',
+ 'mdi-television-stop',
'mdi-temperature-celsius',
'mdi-temperature-fahrenheit',
'mdi-temperature-kelvin',
'mdi-tennis',
+ 'mdi-tennis-ball',
'mdi-tent',
+ 'mdi-terraform',
'mdi-terrain',
'mdi-test-tube',
'mdi-test-tube-empty',
'mdi-test-tube-off',
'mdi-text',
+ 'mdi-text-recognition',
'mdi-text-shadow',
'mdi-text-short',
'mdi-text-subject',
'mdi-text-to-speech',
'mdi-text-to-speech-off',
+ 'mdi-textarea',
'mdi-textbox',
'mdi-textbox-password',
'mdi-texture',
+ 'mdi-texture-box',
'mdi-theater',
'mdi-theme-light-dark',
'mdi-thermometer',
+ 'mdi-thermometer-alert',
+ 'mdi-thermometer-chevron-down',
+ 'mdi-thermometer-chevron-up',
+ 'mdi-thermometer-high',
'mdi-thermometer-lines',
+ 'mdi-thermometer-low',
+ 'mdi-thermometer-minus',
+ 'mdi-thermometer-plus',
'mdi-thermostat',
'mdi-thermostat-box',
'mdi-thought-bubble',
@@ -1881,6 +4145,16 @@ export default [
'mdi-tie',
'mdi-tilde',
'mdi-timelapse',
+ 'mdi-timeline',
+ 'mdi-timeline-alert',
+ 'mdi-timeline-alert-outline',
+ 'mdi-timeline-help',
+ 'mdi-timeline-help-outline',
+ 'mdi-timeline-outline',
+ 'mdi-timeline-plus',
+ 'mdi-timeline-plus-outline',
+ 'mdi-timeline-text',
+ 'mdi-timeline-text-outline',
'mdi-timer',
'mdi-timer-10',
'mdi-timer-3',
@@ -1889,20 +4163,34 @@ export default [
'mdi-timer-sand-empty',
'mdi-timer-sand-full',
'mdi-timetable',
+ 'mdi-toaster',
+ 'mdi-toaster-off',
+ 'mdi-toaster-oven',
'mdi-toggle-switch',
'mdi-toggle-switch-off',
+ 'mdi-toggle-switch-off-outline',
+ 'mdi-toggle-switch-outline',
'mdi-toilet',
'mdi-toolbox',
'mdi-toolbox-outline',
+ 'mdi-tools',
'mdi-tooltip',
+ 'mdi-tooltip-account',
'mdi-tooltip-edit',
'mdi-tooltip-image',
+ 'mdi-tooltip-image-outline',
'mdi-tooltip-outline',
- 'mdi-tooltip-outline-plus',
+ 'mdi-tooltip-plus',
+ 'mdi-tooltip-plus-outline',
'mdi-tooltip-text',
+ 'mdi-tooltip-text-outline',
'mdi-tooth',
'mdi-tooth-outline',
+ 'mdi-toothbrush',
+ 'mdi-toothbrush-electric',
+ 'mdi-toothbrush-paste',
'mdi-tor',
+ 'mdi-tortoise',
'mdi-tournament',
'mdi-tower-beach',
'mdi-tower-fire',
@@ -1911,50 +4199,80 @@ export default [
'mdi-trackpad',
'mdi-trackpad-lock',
'mdi-tractor',
+ 'mdi-trademark',
'mdi-traffic-light',
'mdi-train',
+ 'mdi-train-car',
'mdi-train-variant',
'mdi-tram',
+ 'mdi-tram-side',
'mdi-transcribe',
'mdi-transcribe-close',
'mdi-transfer',
+ 'mdi-transfer-down',
+ 'mdi-transfer-left',
+ 'mdi-transfer-right',
+ 'mdi-transfer-up',
+ 'mdi-transit-connection',
+ 'mdi-transit-connection-variant',
+ 'mdi-transit-detour',
'mdi-transit-transfer',
'mdi-transition',
'mdi-transition-masked',
'mdi-translate',
+ 'mdi-translate-off',
+ 'mdi-transmission-tower',
+ 'mdi-trash-can',
+ 'mdi-trash-can-outline',
'mdi-treasure-chest',
'mdi-tree',
+ 'mdi-tree-outline',
'mdi-trello',
'mdi-trending-down',
'mdi-trending-neutral',
'mdi-trending-up',
'mdi-triangle',
'mdi-triangle-outline',
+ 'mdi-triforce',
'mdi-trophy',
'mdi-trophy-award',
+ 'mdi-trophy-broken',
'mdi-trophy-outline',
'mdi-trophy-variant',
'mdi-trophy-variant-outline',
'mdi-truck',
+ 'mdi-truck-check',
'mdi-truck-delivery',
'mdi-truck-fast',
'mdi-truck-trailer',
+ 'mdi-trumpet',
'mdi-tshirt-crew',
+ 'mdi-tshirt-crew-outline',
'mdi-tshirt-v',
+ 'mdi-tshirt-v-outline',
'mdi-tumble-dryer',
+ 'mdi-tumble-dryer-alert',
+ 'mdi-tumble-dryer-off',
'mdi-tumblr',
'mdi-tumblr-box',
'mdi-tumblr-reblog',
'mdi-tune',
'mdi-tune-vertical',
+ 'mdi-turnstile',
+ 'mdi-turnstile-outline',
+ 'mdi-turtle',
'mdi-twitch',
'mdi-twitter',
'mdi-twitter-box',
'mdi-twitter-circle',
'mdi-twitter-retweet',
'mdi-two-factor-authentication',
+ 'mdi-typewriter',
'mdi-uber',
+ 'mdi-ubisoft',
'mdi-ubuntu',
+ 'mdi-ufo',
+ 'mdi-ufo-outline',
'mdi-ultra-high-definition',
'mdi-umbraco',
'mdi-umbrella',
@@ -1967,6 +4285,7 @@ export default [
'mdi-unfold-more-horizontal',
'mdi-unfold-more-vertical',
'mdi-ungroup',
+ 'mdi-unicode',
'mdi-unity',
'mdi-unreal',
'mdi-untappd',
@@ -1974,12 +4293,24 @@ export default [
'mdi-upload',
'mdi-upload-multiple',
'mdi-upload-network',
+ 'mdi-upload-network-outline',
+ 'mdi-upload-off',
+ 'mdi-upload-off-outline',
+ 'mdi-upload-outline',
'mdi-usb',
+ 'mdi-usb-port',
+ 'mdi-valve',
+ 'mdi-valve-closed',
+ 'mdi-valve-open',
'mdi-van-passenger',
'mdi-van-utility',
'mdi-vanish',
+ 'mdi-vanity-light',
+ 'mdi-variable',
+ 'mdi-variable-box',
'mdi-vector-arrange-above',
'mdi-vector-arrange-below',
+ 'mdi-vector-bezier',
'mdi-vector-circle',
'mdi-vector-circle-variant',
'mdi-vector-combine',
@@ -1990,6 +4321,7 @@ export default [
'mdi-vector-ellipse',
'mdi-vector-intersection',
'mdi-vector-line',
+ 'mdi-vector-link',
'mdi-vector-point',
'mdi-vector-polygon',
'mdi-vector-polyline',
@@ -2000,31 +4332,69 @@ export default [
'mdi-vector-triangle',
'mdi-vector-union',
'mdi-venmo',
- 'mdi-verified',
+ 'mdi-vhs',
'mdi-vibrate',
+ 'mdi-vibrate-off',
'mdi-video',
'mdi-video-3d',
+ 'mdi-video-3d-variant',
'mdi-video-4k-box',
'mdi-video-account',
+ 'mdi-video-check',
+ 'mdi-video-check-outline',
'mdi-video-image',
'mdi-video-input-antenna',
'mdi-video-input-component',
'mdi-video-input-hdmi',
+ 'mdi-video-input-scart',
'mdi-video-input-svideo',
'mdi-video-minus',
'mdi-video-off',
+ 'mdi-video-off-outline',
+ 'mdi-video-outline',
'mdi-video-plus',
'mdi-video-stabilization',
'mdi-video-switch',
+ 'mdi-video-vintage',
+ 'mdi-video-wireless',
+ 'mdi-video-wireless-outline',
+ 'mdi-view-agenda',
+ 'mdi-view-agenda-outline',
+ 'mdi-view-array',
+ 'mdi-view-carousel',
+ 'mdi-view-column',
+ 'mdi-view-comfy',
+ 'mdi-view-compact',
+ 'mdi-view-compact-outline',
+ 'mdi-view-dashboard',
+ 'mdi-view-dashboard-outline',
+ 'mdi-view-dashboard-variant',
+ 'mdi-view-day',
+ 'mdi-view-grid',
+ 'mdi-view-grid-outline',
+ 'mdi-view-grid-plus',
+ 'mdi-view-grid-plus-outline',
+ 'mdi-view-headline',
+ 'mdi-view-list',
+ 'mdi-view-module',
+ 'mdi-view-parallel',
+ 'mdi-view-quilt',
+ 'mdi-view-sequential',
+ 'mdi-view-split-horizontal',
+ 'mdi-view-split-vertical',
+ 'mdi-view-stream',
+ 'mdi-view-week',
'mdi-vimeo',
'mdi-violin',
'mdi-virtual-reality',
- 'mdi-visualstudio',
+ 'mdi-visual-studio',
+ 'mdi-visual-studio-code',
'mdi-vk',
'mdi-vk-box',
'mdi-vk-circle',
'mdi-vlc',
'mdi-voice',
+ 'mdi-voice-off',
'mdi-voicemail',
'mdi-volleyball',
'mdi-volume-high',
@@ -2034,8 +4404,14 @@ export default [
'mdi-volume-mute',
'mdi-volume-off',
'mdi-volume-plus',
+ 'mdi-volume-source',
+ 'mdi-volume-variant-off',
+ 'mdi-volume-vibrate',
+ 'mdi-vote',
+ 'mdi-vote-outline',
'mdi-vpn',
'mdi-vuejs',
+ 'mdi-vuetify',
'mdi-walk',
'mdi-wall',
'mdi-wall-sconce',
@@ -2044,9 +4420,18 @@ export default [
'mdi-wallet',
'mdi-wallet-giftcard',
'mdi-wallet-membership',
+ 'mdi-wallet-outline',
+ 'mdi-wallet-plus',
+ 'mdi-wallet-plus-outline',
'mdi-wallet-travel',
+ 'mdi-wallpaper',
'mdi-wan',
+ 'mdi-wardrobe',
+ 'mdi-wardrobe-outline',
+ 'mdi-warehouse',
'mdi-washing-machine',
+ 'mdi-washing-machine-alert',
+ 'mdi-washing-machine-off',
'mdi-watch',
'mdi-watch-export',
'mdi-watch-export-variant',
@@ -2054,37 +4439,61 @@ export default [
'mdi-watch-import-variant',
'mdi-watch-variant',
'mdi-watch-vibrate',
+ 'mdi-watch-vibrate-off',
'mdi-water',
+ 'mdi-water-boiler',
+ 'mdi-water-boiler-alert',
+ 'mdi-water-boiler-off',
'mdi-water-off',
+ 'mdi-water-outline',
'mdi-water-percent',
'mdi-water-pump',
+ 'mdi-water-pump-off',
+ 'mdi-water-well',
+ 'mdi-water-well-outline',
'mdi-watermark',
+ 'mdi-wave',
'mdi-waves',
+ 'mdi-waze',
'mdi-weather-cloudy',
+ 'mdi-weather-cloudy-alert',
+ 'mdi-weather-cloudy-arrow-right',
'mdi-weather-fog',
'mdi-weather-hail',
+ 'mdi-weather-hazy',
'mdi-weather-hurricane',
'mdi-weather-lightning',
'mdi-weather-lightning-rainy',
'mdi-weather-night',
- 'mdi-weather-partlycloudy',
+ 'mdi-weather-night-partly-cloudy',
+ 'mdi-weather-partly-cloudy',
+ 'mdi-weather-partly-lightning',
+ 'mdi-weather-partly-rainy',
+ 'mdi-weather-partly-snowy',
+ 'mdi-weather-partly-snowy-rainy',
'mdi-weather-pouring',
'mdi-weather-rainy',
'mdi-weather-snowy',
+ 'mdi-weather-snowy-heavy',
'mdi-weather-snowy-rainy',
'mdi-weather-sunny',
+ 'mdi-weather-sunny-alert',
'mdi-weather-sunset',
'mdi-weather-sunset-down',
'mdi-weather-sunset-up',
+ 'mdi-weather-tornado',
'mdi-weather-windy',
'mdi-weather-windy-variant',
'mdi-web',
+ 'mdi-web-box',
'mdi-webcam',
'mdi-webhook',
'mdi-webpack',
'mdi-wechat',
'mdi-weight',
+ 'mdi-weight-gram',
'mdi-weight-kilogram',
+ 'mdi-weight-lifter',
'mdi-weight-pound',
'mdi-whatsapp',
'mdi-wheelchair-accessibility',
@@ -2096,6 +4505,7 @@ export default [
'mdi-widgets',
'mdi-wifi',
'mdi-wifi-off',
+ 'mdi-wifi-star',
'mdi-wifi-strength-1',
'mdi-wifi-strength-1-alert',
'mdi-wifi-strength-1-lock',
@@ -2116,17 +4526,28 @@ export default [
'mdi-wii',
'mdi-wiiu',
'mdi-wikipedia',
+ 'mdi-wind-turbine',
'mdi-window-close',
'mdi-window-closed',
+ 'mdi-window-closed-variant',
'mdi-window-maximize',
'mdi-window-minimize',
'mdi-window-open',
+ 'mdi-window-open-variant',
'mdi-window-restore',
+ 'mdi-window-shutter',
+ 'mdi-window-shutter-alert',
+ 'mdi-window-shutter-open',
'mdi-windows',
+ 'mdi-windows-classic',
+ 'mdi-wiper',
+ 'mdi-wiper-wash',
'mdi-wordpress',
'mdi-worker',
'mdi-wrap',
+ 'mdi-wrap-disabled',
'mdi-wrench',
+ 'mdi-wrench-outline',
'mdi-wunderlist',
'mdi-xamarin',
'mdi-xamarin-outline',
@@ -2134,25 +4555,48 @@ export default [
'mdi-xbox',
'mdi-xbox-controller',
'mdi-xbox-controller-battery-alert',
+ 'mdi-xbox-controller-battery-charging',
'mdi-xbox-controller-battery-empty',
'mdi-xbox-controller-battery-full',
'mdi-xbox-controller-battery-low',
'mdi-xbox-controller-battery-medium',
'mdi-xbox-controller-battery-unknown',
+ 'mdi-xbox-controller-menu',
'mdi-xbox-controller-off',
+ 'mdi-xbox-controller-view',
'mdi-xda',
'mdi-xing',
'mdi-xing-box',
'mdi-xing-circle',
'mdi-xml',
'mdi-xmpp',
+ 'mdi-yahoo',
'mdi-yammer',
'mdi-yeast',
'mdi-yelp',
'mdi-yin-yang',
+ 'mdi-yoga',
'mdi-youtube',
'mdi-youtube-creator-studio',
'mdi-youtube-gaming',
+ 'mdi-youtube-subscription',
'mdi-youtube-tv',
- 'mdi-zip-box'
+ 'mdi-z-wave',
+ 'mdi-zend',
+ 'mdi-zigbee',
+ 'mdi-zip-box',
+ 'mdi-zip-box-outline',
+ 'mdi-zip-disk',
+ 'mdi-zodiac-aquarius',
+ 'mdi-zodiac-aries',
+ 'mdi-zodiac-cancer',
+ 'mdi-zodiac-capricorn',
+ 'mdi-zodiac-gemini',
+ 'mdi-zodiac-leo',
+ 'mdi-zodiac-libra',
+ 'mdi-zodiac-pisces',
+ 'mdi-zodiac-sagittarius',
+ 'mdi-zodiac-scorpio',
+ 'mdi-zodiac-taurus',
+ 'mdi-zodiac-virgo'
]
diff --git a/src/components/ui/store/index.js b/src/components/ui/store/index.js
index ca7e3d5a..7fed8f54 100644
--- a/src/components/ui/store/index.js
+++ b/src/components/ui/store/index.js
@@ -8,7 +8,7 @@ const state = {
mobile: true,
pc: false,
catsChart: 'visible',
- lastUsedCatsInTrnForm: 'visible',
+ lastUsedCatsInTrnForm: 'hidden',
statGraphsVisibility: 'visible',
statItems: 'visible',
statLastTrnsVisibility: 'visible',
diff --git a/src/components/user/store/actions.js b/src/components/user/store/actions.js
index 14b92ffc..c9e809bc 100644
--- a/src/components/user/store/actions.js
+++ b/src/components/user/store/actions.js
@@ -10,11 +10,11 @@ export default {
displayName: userParams.displayName,
email: userParams.email,
uid: userParams.uid
+ // uid: 'kXVGIN19Mhd7WZUeTtZRqUSo2aJ3'
}
dispatch('setUser', user)
dispatch('saveUserInfo', user)
- dispatch('saveLastLoginDate', user)
},
setUser ({ commit }, user) {
@@ -23,6 +23,9 @@ export default {
},
async signOut ({ rootState, commit, dispatch }) {
+ const uid = rootState.user.user.uid
+ db.ref(`users-info/${uid}/actions/${moment().valueOf()}`).set('signOut')
+
commit('setAppStatus', 'login')
dispatch('unsubcribeCategories')
dispatch('unsubcribeTrns')
@@ -31,16 +34,31 @@ export default {
auth().signOut()
},
- saveUserInfo ({ rootState }) {
+ async saveUserInfo ({ rootState }) {
const user = rootState.user.user
- db.ref(`users/${user.uid}/user`).set(user)
- db.ref(`users/${user.uid}/displayName`).set(user.displayName)
- },
+ const todayValueOf = moment().valueOf()
- saveLastLoginDate ({ rootState }) {
- const user = rootState.user.user
- const lastLoginDate = moment().format('YYYY-MM-DD:HH:mm')
- db.ref(`users/${user.uid}/lastLoginDate`).set(lastLoginDate)
+ // add to user list
+ const usersInfo = await db.ref(`users-info/${user.uid}/`).once('value')
+ const usersInfoVal = usersInfo.val()
+ const userData = {
+ displayName: user.displayName,
+ email: user.email,
+ uid: user.uid,
+ loginDate: todayValueOf
+ }
+
+ db.ref(`users/${user.uid}/user`).set(userData)
+
+ db.ref(`users-info/${user.uid}/name`).set(user.displayName)
+ db.ref(`users-info/${user.uid}/email`).set(user.email)
+ db.ref(`users-info/${user.uid}/uid`).set(user.uid)
+ db.ref(`users-info/${user.uid}/loginDate`).set(todayValueOf)
+
+ // set creation date once
+ if (!usersInfoVal || (usersInfoVal && !usersInfoVal.creationDate)) {
+ db.ref(`users-info/${user.uid}/creationDate`).set(todayValueOf)
+ }
},
async removeUserData ({ rootState, commit, dispatch }) {
@@ -51,6 +69,7 @@ export default {
db.ref(`users/${uid}/accounts/`).set(null)
db.ref(`users/${uid}/categories/`).set(null)
db.ref(`users/${uid}/trns/`).set(null)
+ db.ref(`users-info/${uid}/actions/${moment().valueOf()}`).set('removeUserData')
commit('setAppStatus', 'ready')
}
}
diff --git a/src/components/user/store/getters.js b/src/components/user/store/getters.js
index efba7fa6..bb86d295 100644
--- a/src/components/user/store/getters.js
+++ b/src/components/user/store/getters.js
@@ -1,2 +1,14 @@
+import { testerEmail } from '@/config'
+
export default {
+ userUid (state, getters, rootState) {
+ if (rootState.user.user) {
+ return rootState.user.user.uid
+ }
+ },
+
+ isTester (state) {
+ if (state.user && state.user.email === testerEmail) return true
+ else return false
+ }
}
diff --git a/src/components/wallets/form/WalletForm.vue b/src/components/wallets/form/WalletForm.vue
index c83063e4..0b359cb5 100644
--- a/src/components/wallets/form/WalletForm.vue
+++ b/src/components/wallets/form/WalletForm.vue
@@ -5,12 +5,14 @@ import colors from '@/components/ui/store/colors'
import Button from '@/components/shared/button/Button'
import Checkbox from '@/components/shared/inputs/Checkbox'
+import ComponentWrap from '@/components/layout/component/Component'
import ModalBottom from '@/components/modal/ModalBottom'
export default {
components: {
Button,
Checkbox,
+ ComponentWrap,
ModalBottom
},
@@ -98,7 +100,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Write wallet name'
+ text: this.$lang.wallets.form.name.error
})
return false
}
@@ -108,7 +110,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Write wallet currency'
+ text: this.$lang.wallets.form.currency.error
})
return false
}
@@ -120,7 +122,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Wallet with same name is exist'
+ text: this.$lang.wallets.form.name.exist
})
return false
}
@@ -128,7 +130,7 @@ export default {
this.$notify({
group: 'main',
title: '😮',
- text: 'Wallet with same name is exist'
+ text: this.$lang.wallets.form.name.exist
})
return false
}
@@ -142,94 +144,85 @@ export default {
</script>
<template lang="pug">
-.component
- .form
- h1.component__title
- template(v-if="!walletId") Create new wallet
- template(v-else) Edit wallet
-
- .form-line._text
+ComponentWrap
+ template(slot="headerLeft")
+ template(v-if="!walletId") {{ $lang.wallets.createNewTitle }}
+ template(v-else) {{ $lang.wallets.editTitle }}
+
+ template(slot="content")
+ .form
+ .form-line._text
+ .inputText
+ input(
+ type="text"
+ :placeholder="$lang.wallets.form.name.placeholder"
+ v-model="wallet.name"
+ v-focus.lazy="$store.state.ui.pc"
+ ).inputText__value
+ .inputText__label {{ $lang.wallets.form.name.label }}
+
+ .form__btns
+ .form__btns__i
+ .form-line(@click="showCurrencies = true")
+ .inputModal._flex
+ .inputModal__value {{ wallet.currency }}
+ .inputModal__content
+ .inputModal__label {{ $lang.wallets.form.currency.label }}
+
+ .form__btns__i
+ .form-line(@click="showColors = true")
+ .inputModal._flex
+ .inputModal__value: .inputModal__color(:style="{ background: wallet.color }")
+ .inputModal__label {{ $lang.wallets.form.color.label }}
+
+ .form-line._p0._clean
+ Checkbox(
+ v-model="wallet.countTotal"
+ :title="$lang.wallets.form.total.placeholder"
+ :alt="true")
+
+ //- colors
+ ModalBottom(
+ :center="true"
+ :show="showColors"
+ :title="$lang.wallets.form.color.placeholder"
+ v-on:onClose="showColors = false")
.inputText
- input(
- type="text"
- placeholder="Write wallet name..."
- v-model="wallet.name"
- v-focus.lazy="$store.state.ui.pc"
- ).inputText__value
- .inputText__label Wallet name
-
- .form-line._text(v-if="$store.getters.hasCategories")
+ .inputText__colors
+ .colors
+ .colorItem(
+ :class="{ _active: wallet.color === color }"
+ :style="{ background: color }"
+ @click="handleColorSelect(color)"
+ v-for="color in colors")
+ .customColor
+ .customColor__title {{ $lang.wallets.form.color.custom }}
+ input.customColor__value(v-model="wallet.color" type="color")
+
+ //- currencies
+ ModalBottom(
+ :center="true"
+ :show="showCurrencies"
+ :title="$lang.wallets.form.currency.placeholder"
+ v-on:onClose="showCurrencies = false")
.inputText
- input(
- type="number"
- placeholder="Wallet order..."
- value="1"
- v-model="wallet.order"
- ).inputText__value
- .inputText__label Wallet order
-
- .form__btns
- .form__btns__i
- .form-line(@click="showCurrencies = true")
- .inputModal._flex
- .inputModal__value {{ wallet.currency }}
- .inputModal__content
- .inputModal__label Currency
-
- .form__btns__i
- .form-line(@click="showColors = true")
- .inputModal._flex
- .inputModal__value: .inputModal__color(:style="{ background: wallet.color }")
- .inputModal__label Color
-
- .form-line._p0._clean
- Checkbox(
- v-model="wallet.countTotal"
- title="Count amount of this wallet in total"
- :alt="true")
-
- .form__actions
- Button(
- className="_blue"
- title="Save wallet"
- v-on:onClick="handleSubmit")
-
- //- colors
- ModalBottom(
- :center="true"
- :show="showColors"
- title="Select color"
- v-on:onClose="showColors = false")
- .inputText
- .inputText__colors
- .colors
- .colorItem(
- :class="{ _active: wallet.color === color }"
- :style="{ background: color }"
- @click="handleColorSelect(color)"
- v-for="color in colors")
- .customColor
- .customColor__title Select your color
- input.customColor__value(v-model="wallet.color" type="color")
-
- //- currencies
- ModalBottom(
- :center="true"
- :show="showCurrencies"
- title="Select currency"
- v-on:onClose="showCurrencies = false")
- .inputText
- .currencies
- .currencies__item(
- :class="{ _active: wallet.currency === currency }"
- @click="handleCurrencySelect(currency)"
- v-for="(item, currency) in $store.state.currencies.items"
- ) {{ currency }}
+ .currencies
+ .currencies__item(
+ :class="{ _active: wallet.currency === currency }"
+ @click="handleCurrencySelect(currency)"
+ v-for="(item, currency) in $store.state.currencies.items"
+ ) {{ currency }}
+
+ template(slot="bottom")
+ .col
+ Button(
+ :class="['_text-center _blue', { _inline: $store.state.ui.pc }]"
+ :title="$lang.wallets.form.save"
+ v-on:onClick="handleSubmit")
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.customColor
margin (- $m7)
@@ -253,16 +246,6 @@ export default {
padding 0
border 0
-.component
- width 100%
-
- @media $media-phone
- margin 0 auto
- padding $m9
-
- &__title
- padding-bottom $m10
-
.form
@media $media-laptop
max-width 380px
@@ -278,10 +261,10 @@ export default {
grid-row-gap $m9
padding-bottom $m9
- @media $media-laptop
+ +media-laptop()
grid-column-gap $m10
grid-row-gap $m10
- padding-bottom $m10
+ padding-bottom 24px
&__i._full
grid-column 1 / -1
@@ -294,6 +277,9 @@ export default {
height 56px
margin-bottom 0
+ +media-laptop()
+ height auto
+
.inputModal
&._flex
flex 1
diff --git a/src/components/wallets/item/WalletItem.vue b/src/components/wallets/item/WalletItem.vue
index f627028d..65f0cdd6 100644
--- a/src/components/wallets/item/WalletItem.vue
+++ b/src/components/wallets/item/WalletItem.vue
@@ -84,6 +84,7 @@ div(
.walletItem__icon(
@click.stop="handleIconClick")
Icon(
+ :medium="true"
:abbr="wallet.name"
:background="wallet.color || $store.state.ui.defaultBgColor")
.walletItem__name {{ wallet.name }}
diff --git a/src/components/wallets/list/WalletsList.vue b/src/components/wallets/list/WalletsList.vue
index ebeb305d..e830c80b 100644
--- a/src/components/wallets/list/WalletsList.vue
+++ b/src/components/wallets/list/WalletsList.vue
@@ -68,9 +68,9 @@ export default {
:key="walletId"
:id="walletId"
:ui="ui"
- v-on="$listeners"
- )
+ v-on="$listeners")
+
.walletsList__toogle(v-if="showToogle && $store.getters.walletsSortedIds.length > limit" @click="toogleWallets")
- template(v-if="stateLimit > 0") show all wallets
- template(v-else) show only {{ limit }} wallet
+ template(v-if="stateLimit > 0") {{ this.$lang.wallets.showAll }}
+ template(v-else) {{ this.$lang.wallets.showOnly }} {{ limit }}
</template>
diff --git a/src/components/wallets/list/WalletsList2.vue b/src/components/wallets/list/WalletsList2.vue
new file mode 100644
index 00000000..0b78dfdb
--- /dev/null
+++ b/src/components/wallets/list/WalletsList2.vue
@@ -0,0 +1,31 @@
+<script>
+export default {
+ props: {
+ limit: {
+ type: Number,
+ default: null
+ }
+ },
+
+ computed: {
+ wallets () {
+ const wallets = {}
+ const walletsIds = this.$store.getters.walletsSortedIds
+
+ for (const walletId of walletsIds) {
+ wallets[walletId] = {
+ ...this.$store.state.wallets.items[walletId],
+ total: this.$store.getters.walletsTotal[walletId].base
+ }
+ }
+
+ return wallets
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+.walletsList
+ slot(:wallets="wallets")
+</template>
diff --git a/src/components/wallets/modal/WalletModal.vue b/src/components/wallets/modal/WalletModal.vue
index 875769e6..1cd08713 100644
--- a/src/components/wallets/modal/WalletModal.vue
+++ b/src/components/wallets/modal/WalletModal.vue
@@ -90,15 +90,15 @@ ModalBottom(
template(slot="btns")
ModalButton(
- name="Delete"
+ :name="$lang.base.delete"
icon="mdi mdi-delete"
v-on:onClick="handleDeleteClick")
ModalButton(
- name="Edit"
+ :name="$lang.base.edit"
icon="mdi mdi-pencil"
v-on:onClick="handleEditClick")
ModalButton(
- name="Set filter"
+ :name="$lang.base.filter"
icon="mdi mdi-filter-outline"
v-on:onClick="handleSetFilterWallet")
diff --git a/src/components/wallets/sort/WalletsSort.vue b/src/components/wallets/sort/WalletsSort.vue
new file mode 100644
index 00000000..bfe89a4e
--- /dev/null
+++ b/src/components/wallets/sort/WalletsSort.vue
@@ -0,0 +1,139 @@
+<script>
+import draggable from 'vuedraggable'
+import Button from '@/components/shared/button/Button'
+import ComponentWrap from '@/components/layout/component/Component'
+import WalletsList from '@/components/wallets/list/WalletsList2'
+import WalletsTotal from '@/components/wallets/total/WalletsTotal'
+
+import Amount from '@/components/amount/Amount'
+import Icon from '@/components/icon/Icon'
+
+export default {
+ components: {
+ Amount,
+ draggable,
+ Button,
+ Icon,
+ ComponentWrap,
+ WalletsList,
+ WalletsTotal
+ },
+
+ data () {
+ return {
+ sortedWalletsIds: this.$store.getters.walletsSortedIds
+ }
+ },
+
+ methods: {
+ /**
+ * Get array of wallets IDs
+ * Convert them to objects with order value
+ * Push object with wallets to DB
+ *
+ */
+ async saveWalletsOrder () {
+ const sortedWallets = {}
+
+ for (const [idx, walletId] of this.sortedWalletsIds.entries()) {
+ sortedWallets[walletId] = idx
+ }
+
+ const result = await this.$store.dispatch('saveWalletsOrder', sortedWallets)
+ if (result.succsess) {
+ this.$store.dispatch('setActiveTab', 'wallets')
+ this.$notify({
+ group: 'main',
+ type: 'success',
+ title: 'OK',
+ text: 'Saved'
+ })
+ }
+ }
+ }
+}
+</script>
+
+<template lang="pug">
+ComponentWrap(:contentPadding="$store.state.ui.pc")
+ template(slot="headerLeft") {{ $lang.wallets.sortTitle }}
+
+ template(slot="content")
+ WalletsList(
+ :style="{ paddingTop: '10px' }"
+ v-slot="{ wallets }")
+ draggable(
+ v-model="sortedWalletsIds"
+ handle=".handle"
+ ghost-class="_draggable")
+ template(v-for="walletId in sortedWalletsIds")
+ .walletItem2(:key="walletId")
+ .walletItem2__icon.handle
+ Icon(
+ :abbr="$store.state.wallets.items[walletId].name"
+ :background="$store.state.wallets.items[walletId].color || $store.state.ui.defaultBgColor")
+
+ .walletItem2__name {{ $store.state.wallets.items[walletId].name }}
+ .walletItem2__drag.handle: .mdi.mdi-arrow-split-horizontal
+
+ template(slot="bottom")
+ .col
+ Button(
+ className="_small _blue _text-center"
+ :title="$lang.base.save"
+ v-on:onClick="saveWalletsOrder")
+</template>
+
+<style lang="stylus" scoped>
+@import "~@/stylus/variables"
+
+item-bg-active()
+ background var(--c-bg-6)
+
+item-main-text()
+ color var(--c-font-4)
+ fs-m()
+
+item-icon()
+ font-size 22px
+ color var(--c-font-5)
+
+ &:active
+ item-bg-active()
+
+.walletItem2
+ display grid
+ grid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)
+ grid-template-rows repeat(2, 1fr)
+ grid-column-gap 20px
+ padding 0px 16px
+
+ +media-laptop()
+ padding 0
+
+ &._draggable
+ item-bg-active()
+
+ &__icon
+ grid-column 1 / 2
+ grid-row 1 / -1
+ align-self center
+
+ &__name
+ grid-column 2 / 3
+ grid-row 1 / 3
+ align-self center
+ item-main-text()
+
+ &__drag
+ grid-column 3 / 4
+ grid-row 1 / 3
+ align-self center
+ justify-self cent
+ item-icon()
+ display flex
+ align-items center
+ justify-content center
+ width 40px
+ height 40px
+</style>
diff --git a/src/components/wallets/store/actions.js b/src/components/wallets/store/actions.js
index 103bf7d2..f90985c5 100644
--- a/src/components/wallets/store/actions.js
+++ b/src/components/wallets/store/actions.js
@@ -35,8 +35,32 @@ export default {
localforage.setItem('next.wallets', items)
},
- unsubcribeWallets ({ rootState }) {
- const uid = rootState.user.user.uid
+ unsubcribeWallets ({ rootGetters }) {
+ const uid = rootGetters.userUid
db.ref(`users/${uid}/accounts`).off()
+ },
+
+ /**
+ * Get object of wallets with order value
+ * Create object with path to order field in DB
+ * Update only order field for each wallet
+ *
+ */
+ async saveWalletsOrder ({ rootGetters }, wallets) {
+ const updates = {}
+ const result = {}
+
+ for (const walletId in wallets) {
+ updates[`${walletId}/order`] = wallets[walletId]
+ }
+
+ await db.ref(`users/${rootGetters.userUid}/accounts`)
+ .update(updates, (error) => {
+ error
+ ? result.error = error
+ : result.succsess = 'Updated'
+ })
+
+ return result
}
}
diff --git a/src/components/wallets/total/WalletsTotal.vue b/src/components/wallets/total/WalletsTotal.vue
index b6a6bfc9..b4c2ceb0 100644
--- a/src/components/wallets/total/WalletsTotal.vue
+++ b/src/components/wallets/total/WalletsTotal.vue
@@ -39,6 +39,13 @@ export default {
<template lang="pug">
.wallets-total(v-if="$store.getters.hasWallets")
+ .wallets-total__item(v-if="totalInWallets.all > 0")
+ .wallets-total__title {{ $lang.money.also }}
+ .wallets-total__value
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="totalInWallets.all")
+
.wallets-total__item
.wallets-total__title {{ $lang.money.total }}
.wallets-total__value
@@ -47,12 +54,6 @@ export default {
:value="totalInWallets.counted"
:alwaysShowSymbol="true")
- .wallets-total__item(v-if="totalInWallets.all > 0")
- .wallets-total__title Also
- .wallets-total__value
- Amount(
- :currency="$store.state.currencies.base"
- :value="totalInWallets.all")
</template>
<style lang="stylus" scoped>
@@ -62,13 +63,11 @@ export default {
.wallets-total
display flex
justify-content space-between
- padding $m8
- background var(--c-bg-6)
@media $media-laptop
- background var(--c-bg-3)
- border-top 1px solid var(--c-bg-1)
- border-bottom 1px solid var(--c-bg-6)
+ padding $m8
+ background var(--c-bg-5)
+ border-bottom 1px solid var(--c-bg-1)
&__item
margin-right $m9
@@ -76,6 +75,9 @@ export default {
&:last-child
margin-right 0
+ &:nth-child(2)
+ text-align right
+
&__title
padding-bottom $m5
color var(--c-font-4)
diff --git a/src/components/welcome/Welcome.vue b/src/components/welcome/Welcome.vue
index b9d3e04c..a1617c38 100644
--- a/src/components/welcome/Welcome.vue
+++ b/src/components/welcome/Welcome.vue
@@ -43,6 +43,7 @@ export default {
.header
.header__title {{ $lang.app.welcome }}
.header__desc {{ $lang.app.desc }}
+ .header__user(@click="$store.dispatch('signOut')") Logout {{ $store.state.user.user.email }}
.options
.options__item
.options__desc {{ $lang.app.lang.select }}
@@ -60,6 +61,7 @@ export default {
.header(@click="$store.dispatch('changeTheme')")
.header__title {{ $lang.app.welcome }}
.header__desc {{ $lang.app.desc }}
+ .header__user(@click="$store.dispatch('signOut')") Logout {{ $store.state.user.user.email }}
.options
.options__item
.options__desc {{ $lang.welcome.create.text }}
@@ -86,6 +88,7 @@ export default {
.header
.header__title {{ $lang.app.welcome }}
.header__desc {{ $lang.app.desc }}
+ .header__user(@click="$store.dispatch('signOut')") Logout {{ $store.state.user.user.email }}
.text {{ $lang.welcome.createFirstWallet.text }}
.button
Button._blue(
@@ -175,6 +178,15 @@ export default {
padding-top $m7
font-size 14px
+ &__user
+ cursor pointer
+ padding-top $m5
+ font-size 12px
+
+ @media $media-laptop
+ padding-top $m7
+ font-size 14px
+
.options
&__or
display flex
diff --git a/src/config.js b/src/config.js
index 7c9d8b29..caacc3ae 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,8 +1,15 @@
import moment from 'moment'
+// moment
moment.locale('rus')
moment.updateLocale('rus', {
week: {
dow: 1
}
})
+
+// demo
+export const demoUid = '9yrjuIeeOKNj5TxwoPhQobxbE153'
+
+// tester
+export const testerEmail = '[email protected]'
diff --git a/src/store/index.js b/src/store/index.js
index 0d92d048..f62b1f63 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,12 +2,14 @@ import Vue from 'vue'
import Vuex from 'vuex'
import app from '@/components/app/store'
+import budgets from '@/components/budgets/store'
import categories from '@/components/categories/store'
import chart from '@/components/chart/store'
import currencies from '@/components/currencies/store'
import dashboard from '@/components/dashboard/store'
import demo from '@/components/demo/store'
import filter from '@/components/filter/store'
+import groups from '@/components/groups/store'
import lang from '@/components/lang/store'
import stat from '@/components/stat/store'
import trnForm from '@/components/trnForm/store'
@@ -21,12 +23,14 @@ Vue.use(Vuex)
export default new Vuex.Store({
modules: {
app,
+ budgets,
categories,
chart,
currencies,
dashboard,
demo,
filter,
+ groups,
lang,
stat,
trnForm,