IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rebuild frontend.

Browse Source
This commit is contained in:
James Cole 2021-09-16 14:32:06 +02:00
parent eaa293f406
commit f95a064eca
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
62 changed files with 1207 additions and 989 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/src/components/transactions/Index.vue
View File

@ -36,13 +36,14 @@
</div>
</div>
</div>
<!-- page is ignored for the time being -->
<TransactionListLarge
:transactions="transactionRows"
:current-page="currentPage"
:entries="rawTransactions"
:page="currentPage"
:total="total"
:per-page="perPage"
:loading="loading"
:sort-desc="sortDesc"
v-on:jump-page="jumpToPage($event)"
/>
<div class="row">
<div class="col-xl-2 col-lg-4 col-sm-6 col-xs-12" v-for="range in ranges">
@ -74,6 +75,7 @@ export default {
components: {TransactionListLarge},
data() {
return {
rawTransactions: [],
transactions: [],
transactionRows: [],
type: 'all',
@ -137,25 +139,6 @@ export default {
let params = new URLSearchParams(window.location.search);
this.currentPage = params.get('page') ? parseInt(params.get('page')) : 1;
this.ready = true;
// make object thing:
// let token = document.head.querySelector('meta[name="csrf-token"]');
// this.api = setup(
// {
// // `axios` options
// //baseURL: './',
// headers: {'X-CSRF-TOKEN': token.content, 'X-James': 'yes'},
//
// // `axios-cache-adapter` options
// cache: {
// maxAge: 15 * 60 * 1000,
// readHeaders: false,
// exclude: {
// query: false,
// },
// debug: true
// }
// });
},
methods: {
...mapMutations('root', ['refreshCacheKey',]),
@ -165,6 +148,11 @@ export default {
this.accounts = [];
this.getTransactionList();
},
jumpToPage: function(event) {
console.log('noticed a change!');
this.currentPage = event.page;
this.downloadTransactionList(event.page);
},
getTransactionList: function () {
// console.log('getTransactionList()');
if (this.indexReady && !this.loading && !this.downloaded) {
@ -173,7 +161,8 @@ export default {
this.perPage = this.listPageSize ?? 51;
this.transactions = [];
this.transactionRows = [];
this.downloadTransactionList(1);
this.rawTransactions = [];
this.downloadTransactionList(this.currentPage);
this.calculateDateRanges();
}
},
@ -206,24 +195,25 @@ export default {
startStr = format(this.urlStart, 'y-MM-dd');
endStr = format(this.urlEnd, 'y-MM-dd');
}
api.get('./api/v1/transactions?type=' + this.type + '&page=' + page + "&start=" + startStr + "&end=" + endStr + '&cache=' + this.cacheKey)
let url = './api/v1/transactions?type=' + this.type + '&page=' + page + "&start=" + startStr + "&end=" + endStr + '&cache=' + this.cacheKey;
url = './api/v1/transactions?type=' + this.type + '&page=' + page + '&cache=' + this.cacheKey;
api.get(url)
.then(response => {
//let currentPage = parseInt(response.data.meta.pagination.current_page);
//let totalPages = parseInt(response.data.meta.pagination.total_pages);
this.total = parseInt(response.data.meta.pagination.total);
//console.log('total is ' + this.total);
this.transactions.push(...response.data.data);
this.rawTransactions = response.data.data;
// if (currentPage < totalPage) {
// let nextPage = currentPage + 1;
// this.downloadTransactionList(nextPage);
// }
// if (currentPage >= totalPage) {
// console.log('Looks like all downloaded.');
this.downloaded = true;
this.createTransactionRows();
//this.downloaded = true;
//this.createTransactionRows();
// }
this.loading = false;
}
);
});

133
frontend/src/components/transactions/TransactionListLarge.vue
View File

@ -22,11 +22,18 @@
<div>
<div class="row">
<div class="col-lg-8 col-md-6 col-sm-12 col-xs-12">
<BPagination
v-model="currentPage"
:total-rows="total"
:per-page="perPage"
aria-controls="my-table"
currentPage: {{ currentPage }}<br>
page: {{ page }}<br>
Total: {{ total }}<br>
Per page: {{ perPage }}<br>
Loading: {{ loading }}<br>
<BPagination v-if="!loading"
v-model="currentPage"
@change="currentPage = $event"
:total-rows="total"
:per-page="perPage"
aria-controls="my-table"
></BPagination>
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
@ -49,7 +56,7 @@
:sort-compare="tableSortCompare"
>
<template #table-busy>
<span class="fa fa-spinner"></span>
<span class="fa fa-spinner fa-spin"></span>
</template>
<template #cell(type)="data">
<span v-if="! data.item.split || data.item.split_parent === null">
@ -63,6 +70,7 @@
<a :class="false === data.item.active ? 'text-muted' : ''" :href="'./transactions/show/' + data.item.id" :title="data.value">{{
data.value
}}</a>
<span class="fa fa-spinner fa-spin" v-if="data.item.dummy"></span>
</template>
<template #cell(amount)="data">
<span class="text-success" v-if="'deposit' === data.item.type">
@ -122,9 +130,11 @@
</BTable>
</div>
<div class="card-footer">
<div class="card-footer"> (button)
<!--
<a :href="'./transactions/create/' + type" class="btn btn-success"
:title="$t('firefly.create_new_transaction')">{{ $t('firefly.create_new_transaction') }}</a>
-->
</div>
</div>
</div>
@ -264,6 +274,7 @@ toggleCollapse: function (row) {
import {mapGetters, mapMutations} from "vuex";
import {BPagination, BTable} from 'bootstrap-vue';
import format from "date-fns/format";
export default {
name: "TransactionListLarge",
@ -272,6 +283,9 @@ export default {
return {
locale: 'en-US',
fields: [],
currentPage: 1,
transactions: [],
loading: true
}
},
computed: {
@ -280,17 +294,80 @@ export default {
created() {
this.locale = localStorage.locale ?? 'en-US';
this.updateFieldList();
//this.currentPage = this.page;
this.parseTransactions();
},
watch: {
currentPage: function (value) {
console.log('Watch currentPage go to ' + value);
this.$emit('jump-page', {page: value});
},
// page: function (value) {
// console.log('Watch page go to ' + value);
// this.currentPage = value;
// },
entries: function (value) {
this.parseTransactions();
},
},
methods: {
...mapMutations('root', ['refreshCacheKey',]),
toggleCollapse: function (row) {
let transaction = this.entries.filter(transaction => transaction.id === row.id)[0];
if (transaction.collapsed === undefined) {
transaction.collapsed = false;
} else {
transaction.collapsed = !transaction.collapsed;
}
this.parseTransactions();
},
parseTransactions: function () {
console.log('parseTransactions. Count is ' + this.entries.length + ' and page is ' + this.page);
for (let i = 0; i < this.total; i++) {
this.transactions.push({dummy: true});
}
let index = (this.page - 1) * this.perPage;
for (let i in this.entries) {
let transaction = this.entries[i];
this.transactions[index] = this.getTransactionRow(transaction, 0);
// this code will not be used for the time being.
// if (transaction.attributes.transactions.length > 1) {
// transactionRow.description = transaction.attributes.group_title;
// transactionRow.split = true;
// transactionRow.collapsed = transaction.collapsed === true || transaction.collapsed === undefined;
// transactionRow.amount = transaction.attributes.transactions
// .map(transaction => Number(transaction.amount))
// .reduce((sum, n) => sum + n);
// transactionRow.source_name = '';
// transactionRow.source_id = '';
// transactionRow.destination_name = '';
// transactionRow.destination_id = '';
//
// if (!transactionRow.collapsed) {
// for (let i = 0; i < transaction.attributes.transactions.length; i++) {
// let splitTransactionRow = this.getTransactionRow(transaction, i);
// splitTransactionRow.key = splitTransactionRow.id + "." + i
// splitTransactionRow.split = true;
// splitTransactionRow.split_index = i + 1;
// splitTransactionRow.split_parent = transactionRow;
//
// // need to verify this.
// index++;
// this.transactions[index] = splitTransactionRow;
// }
// }
// }
index++;
}
this.loading = false;
},
newCacheKey: function () {
alert('TODO');
this.refreshCacheKey();
//this.downloaded = false;
//this.accounts = [];
//this.getTransactionList();
},
updateFieldList: function () {
this.fields = [
@ -304,6 +381,31 @@ export default {
{key: 'menu', label: ' ', sortable: false},
];
},
getTransactionRow(transaction, index) {
let transactionRow = {};
let currentTransaction = transaction.attributes.transactions[index];
transactionRow.key = transaction.id;
transactionRow.id = transaction.id;
transactionRow.type = currentTransaction.type;
transactionRow.description = currentTransaction.description;
transactionRow.amount = currentTransaction.amount;
transactionRow.currency_code = currentTransaction.currency_code;
transactionRow.date = new Date(currentTransaction.date);
transactionRow.date_formatted = format(transactionRow.date, this.$t('config.month_and_day_fns'));
transactionRow.source_name = currentTransaction.source_name;
transactionRow.source_id = currentTransaction.source_id;
transactionRow.destination_name = currentTransaction.destination_name;
transactionRow.destination_id = currentTransaction.destination_id;
transactionRow.category_id = currentTransaction.category_id;
transactionRow.category_name = currentTransaction.category_name;
transactionRow.split = false;
transactionRow.split_index = 0;
transactionRow.split_parent = null;
return transactionRow;
},
tableSortCompare: function (aRow, bRow, key, sortDesc, formatter, compareOptions, compareLocale) {
let a = aRow[key]
let b = bRow[key]
@ -352,18 +454,13 @@ export default {
},
props: {
currentPage: {
type: Number,
default: 1
page: {
type: Number
},
perPage: {
type: Number,
default: 1
},
loading: {
type: Boolean,
default: true
},
sortDesc: {
type: Boolean,
default: true
@ -372,7 +469,7 @@ export default {
type: Number,
default: 1
},
transactions: {
entries: {
type: Array,
default: function () {
return [];

8
frontend/src/locales/bg.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u0442\u0440\u0438\u043c\u0435\u0441\u0435\u0447\u043d\u043e",
"repeat_freq_monthly": "\u043c\u0435\u0441\u0435\u0447\u043d\u043e",
"repeat_freq_weekly": "\u0435\u0436\u0435\u0441\u0435\u0434\u043c\u0438\u0447\u043d\u043e",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u0437\u0430\u0434\u044a\u043b\u0436\u0435\u043d\u0438\u0435",
"update_expense_account": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u0441\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0440\u0430\u0437\u0445\u043e\u0434\u0438",
"update_revenue_account": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u0441\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u043f\u0440\u0438\u0445\u043e\u0434\u0438",
"update_undefined_account": "Update account",
"update_asset_account": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u0441\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u041a\u0430\u0441\u0438\u0447\u043a\u0430",

8
frontend/src/locales/cs.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u010dtvrtletn\u011b",
"repeat_freq_monthly": "m\u011bs\u00ed\u010dn\u011b",
"repeat_freq_weekly": "t\u00fddn\u011b",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Aktualizovat z\u00e1vazek",
"update_expense_account": "Aktualizovat v\u00fddajov\u00fd \u00fa\u010det",
"update_revenue_account": "Aktualizovat p\u0159\u00edjmov\u00fd \u00fa\u010det",
"update_undefined_account": "Update account",
"update_asset_account": "Aktualizovat v\u00fddajov\u00fd \u00fa\u010det",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Pokladni\u010dka",

8
frontend/src/locales/de.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "viertelj\u00e4hrlich",
"repeat_freq_monthly": "monatlich",
"repeat_freq_weekly": "w\u00f6chentlich",
"credit_card_type_monthlyFull": "Vollst\u00e4ndige Zahlung jeden Monat"
"credit_card_type_monthlyFull": "Vollst\u00e4ndige Zahlung jeden Monat",
"update_liabilities_account": "Verbindlichkeit aktualisieren",
"update_expense_account": "Ausgabenkonto aktualisieren",
"update_revenue_account": "Einnahmenkonto aktualisieren",
"update_undefined_account": "Konto aktualisieren",
"update_asset_account": "Bestandskonto aktualisieren",
"updated_account_js": "Konto \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\" aktualisiert."
},
"list": {
"piggy_bank": "Sparschwein",

8
frontend/src/locales/el.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u03c4\u03c1\u03b9\u03bc\u03b7\u03bd\u03b9\u03b1\u03af\u03c9\u03c2",
"repeat_freq_monthly": "\u03bc\u03b7\u03bd\u03b9\u03b1\u03af\u03c9\u03c2",
"repeat_freq_weekly": "\u03b5\u03b2\u03b4\u03bf\u03bc\u03b1\u03b4\u03b9\u03b1\u03af\u03c9\u03c2",
"credit_card_type_monthlyFull": "\u0395\u03be\u03cc\u03c6\u03bb\u03b7\u03c3\u03b7 \u03ba\u03ac\u03b8\u03b5 \u03bc\u03ae\u03bd\u03b1"
"credit_card_type_monthlyFull": "\u0395\u03be\u03cc\u03c6\u03bb\u03b7\u03c3\u03b7 \u03ba\u03ac\u03b8\u03b5 \u03bc\u03ae\u03bd\u03b1",
"update_liabilities_account": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03c5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7\u03c2",
"update_expense_account": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd \u03b4\u03b1\u03c0\u03b1\u03bd\u03ce\u03bd",
"update_revenue_account": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd \u03b5\u03c3\u03cc\u03b4\u03c9\u03bd",
"update_undefined_account": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd",
"update_asset_account": "\u0395\u03bd\u03b7\u03bc\u03ad\u03c1\u03c9\u03c3\u03b7 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
"updated_account_js": "\u0395\u03bd\u03b7\u03bc\u03b5\u03c1\u03ce\u03b8\u03b7\u03ba\u03b5 \u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u039a\u03bf\u03c5\u03bc\u03c0\u03b1\u03c1\u03ac\u03c2",

8
frontend/src/locales/en-gb.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "quarterly",
"repeat_freq_monthly": "monthly",
"repeat_freq_weekly": "weekly",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Update liability",
"update_expense_account": "Update expense account",
"update_revenue_account": "Update revenue account",
"update_undefined_account": "Update account",
"update_asset_account": "Update asset account",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Piggy bank",

8
frontend/src/locales/en.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "quarterly",
"repeat_freq_monthly": "monthly",
"repeat_freq_weekly": "weekly",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Update liability",
"update_expense_account": "Update expense account",
"update_revenue_account": "Update revenue account",
"update_undefined_account": "Update account",
"update_asset_account": "Update asset account",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Piggy bank",

8
frontend/src/locales/es.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestralmente",
"repeat_freq_monthly": "mensualmente",
"repeat_freq_weekly": "semanalmente",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Actualizar pasivo",
"update_expense_account": "Actualizar cuenta de gastos",
"update_revenue_account": "Actualizar cuenta de ingresos",
"update_undefined_account": "Update account",
"update_asset_account": "Actualizar cuenta de activos",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Alcancilla",

8
frontend/src/locales/fi.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "nelj\u00e4nnesvuosittain",
"repeat_freq_monthly": "kuukausittain",
"repeat_freq_weekly": "viikoittain",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "P\u00e4ivit\u00e4 vastuu",
"update_expense_account": "P\u00e4ivit\u00e4 kulutustili",
"update_revenue_account": "P\u00e4ivit\u00e4 tuottotili",
"update_undefined_account": "Update account",
"update_asset_account": "P\u00e4ivit\u00e4 omaisuustili",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "S\u00e4\u00e4st\u00f6possu",

8
frontend/src/locales/fr.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestriel",
"repeat_freq_monthly": "mensuel",
"repeat_freq_weekly": "hebdomadaire",
"credit_card_type_monthlyFull": "Paiement complet tous les mois"
"credit_card_type_monthlyFull": "Paiement complet tous les mois",
"update_liabilities_account": "Mettre \u00e0 jour le passif",
"update_expense_account": "Mettre \u00e0 jour le compte de d\u00e9penses",
"update_revenue_account": "Mettre \u00e0 jour le compte de recettes",
"update_undefined_account": "Mettre \u00e0 jour le compte",
"update_asset_account": "Mettre \u00e0 jour le compte d\u2019actif",
"updated_account_js": "Compte \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\" mis \u00e0 jour."
},
"list": {
"piggy_bank": "Tirelire",

8
frontend/src/locales/hu.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "negyed\u00e9ves",
"repeat_freq_monthly": "havi",
"repeat_freq_weekly": "heti",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "K\u00f6telezetts\u00e9g friss\u00edt\u00e9se",
"update_expense_account": "K\u00f6lts\u00e9gsz\u00e1mla friss\u00edt\u00e9se",
"update_revenue_account": "J\u00f6vedelemsz\u00e1mla friss\u00edt\u00e9se",
"update_undefined_account": "Update account",
"update_asset_account": "Eszk\u00f6zsz\u00e1mla friss\u00edt\u00e9se",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Malacpersely",

8
frontend/src/locales/it.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestralmente",
"repeat_freq_monthly": "mensilmente",
"repeat_freq_weekly": "settimanalmente",
"credit_card_type_monthlyFull": "Pagamento intero ogni mese"
"credit_card_type_monthlyFull": "Pagamento intero ogni mese",
"update_liabilities_account": "Aggiorna passivit\u00e0",
"update_expense_account": "Aggiorna conto uscite",
"update_revenue_account": "Aggiorna conto entrate",
"update_undefined_account": "Aggiorna conto",
"update_asset_account": "Aggiorna conto attivit\u00e0",
"updated_account_js": "Conto \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\" aggiornato."
},
"list": {
"piggy_bank": "Salvadanaio",

8
frontend/src/locales/nb.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "kvartalsvis",
"repeat_freq_monthly": "m\u00e5nedlig",
"repeat_freq_weekly": "ukentlig",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Oppdater gjeld",
"update_expense_account": "Oppdater utgiftskonto",
"update_revenue_account": "Oppdater inntektskonto",
"update_undefined_account": "Update account",
"update_asset_account": "Oppdater aktivakonto",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Sparegris",

8
frontend/src/locales/nl.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "elk kwartaal",
"repeat_freq_monthly": "maandelijks",
"repeat_freq_weekly": "wekelijks",
"credit_card_type_monthlyFull": "Volledige betaling elke maand"
"credit_card_type_monthlyFull": "Volledige betaling elke maand",
"update_liabilities_account": "Update passiva",
"update_expense_account": "Wijzig crediteur",
"update_revenue_account": "Wijzig debiteur",
"update_undefined_account": "Account bijwerken",
"update_asset_account": "Wijzig betaalrekening",
"updated_account_js": "Account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\" bijgewerkt."
},
"list": {
"piggy_bank": "Spaarpotje",

8
frontend/src/locales/pl.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "kwartalnie",
"repeat_freq_monthly": "miesi\u0119cznie",
"repeat_freq_weekly": "tygodniowo",
"credit_card_type_monthlyFull": "Pe\u0142na p\u0142atno\u015b\u0107 co miesi\u0105c"
"credit_card_type_monthlyFull": "Pe\u0142na p\u0142atno\u015b\u0107 co miesi\u0105c",
"update_liabilities_account": "Modyfikuj zobowi\u0105zanie",
"update_expense_account": "Aktualizuj konto wydatk\u00f3w",
"update_revenue_account": "Aktualizuj konto przychod\u00f3w",
"update_undefined_account": "Update account",
"update_asset_account": "Aktualizuj konto aktyw\u00f3w",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Skarbonka",

8
frontend/src/locales/pt-br.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestral",
"repeat_freq_monthly": "mensal",
"repeat_freq_weekly": "semanal",
"credit_card_type_monthlyFull": "Pagamento completo todo m\u00eas"
"credit_card_type_monthlyFull": "Pagamento completo todo m\u00eas",
"update_liabilities_account": "Atualizar passivo",
"update_expense_account": "Atualizar conta de despesas",
"update_revenue_account": "Atualizar conta de receita",
"update_undefined_account": "Atualizar conta",
"update_asset_account": "Atualizar de conta de ativo",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Cofrinho",

8
frontend/src/locales/pt.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestral",
"repeat_freq_monthly": "mensalmente",
"repeat_freq_weekly": "semanalmente",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Actualizar passivo",
"update_expense_account": "Alterar conta de despesas",
"update_revenue_account": "Alterar conta de receitas",
"update_undefined_account": "Update account",
"update_asset_account": "Actualizar conta de activos",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Mealheiro",

8
frontend/src/locales/ro.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "trimestrial",
"repeat_freq_monthly": "lunar",
"repeat_freq_weekly": "s\u0103pt\u0103m\u00e2nal",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Actualiza\u021bi provizionul",
"update_expense_account": "Actualiza\u021bi cont de cheltuieli",
"update_revenue_account": "Actualiza\u021bi cont de venituri",
"update_undefined_account": "Update account",
"update_asset_account": "Actualiza\u021bi contul de active",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Pu\u0219culi\u021b\u0103",

8
frontend/src/locales/ru.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u0440\u0430\u0437 \u0432 \u043a\u0432\u0430\u0440\u0442\u0430\u043b",
"repeat_freq_monthly": "\u0435\u0436\u0435\u043c\u0435\u0441\u044f\u0447\u043d\u043e",
"repeat_freq_weekly": "\u0435\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0434\u043e\u043b\u0433\u043e\u0432\u043e\u0439 \u0441\u0447\u0451\u0442",
"update_expense_account": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0451\u0442 \u0440\u0430\u0441\u0445\u043e\u0434\u0430",
"update_revenue_account": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0451\u0442 \u0434\u043e\u0445\u043e\u0434\u0430",
"update_undefined_account": "Update account",
"update_asset_account": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0441\u0447\u0451\u0442",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u041a\u043e\u043f\u0438\u043b\u043a\u0430",

8
frontend/src/locales/sk.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u0161tvr\u0165ro\u010dne",
"repeat_freq_monthly": "mesa\u010dne",
"repeat_freq_weekly": "t\u00fd\u017edenne",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "Upravi\u0165 z\u00e1v\u00e4zok",
"update_expense_account": "Upravi\u0165 v\u00fddavkov\u00fd \u00fa\u010det",
"update_revenue_account": "Upravi\u0165 pr\u00edjmov\u00fd \u00fa\u010det",
"update_undefined_account": "Update account",
"update_asset_account": "Upravi\u0165 v\u00fddajov\u00fd \u00fa\u010det",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Pokladni\u010dka",

8
frontend/src/locales/sv.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "kvartal",
"repeat_freq_monthly": "m\u00e5nadsvis",
"repeat_freq_weekly": "veckovis",
"credit_card_type_monthlyFull": "Full betalning varje m\u00e5nad"
"credit_card_type_monthlyFull": "Full betalning varje m\u00e5nad",
"update_liabilities_account": "Uppdatera skuld",
"update_expense_account": "Uppdatera utgiftskonto",
"update_revenue_account": "Uppdatera int\u00e4ktskonto",
"update_undefined_account": "Update account",
"update_asset_account": "Uppdatera tillg\u00e5ngskonto",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "Spargris",

8
frontend/src/locales/vi.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "h\u00e0ng qu\u00fd",
"repeat_freq_monthly": "h\u00e0ng th\u00e1ng",
"repeat_freq_weekly": "h\u00e0ng tu\u1ea7n",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "C\u1eadp nh\u1eadt n\u1ee3",
"update_expense_account": "C\u1eadp nh\u1eadt t\u00e0i kho\u1ea3n chi ph\u00ed",
"update_revenue_account": "C\u1eadp nh\u1eadt t\u00e0i kho\u1ea3n doanh thu",
"update_undefined_account": "Update account",
"update_asset_account": "C\u1eadp nh\u1eadt t\u00e0i kho\u1ea3n",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u1ed0ng heo con",

8
frontend/src/locales/zh-cn.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u6bcf\u5b63",
"repeat_freq_monthly": "\u6bcf\u6708",
"repeat_freq_weekly": "\u6bcf\u5468",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "\u66f4\u65b0\u503a\u52a1\u8d26\u6237",
"update_expense_account": "\u66f4\u65b0\u652f\u51fa\u8d26\u6237",
"update_revenue_account": "\u66f4\u65b0\u6536\u5165\u8d26\u6237",
"update_undefined_account": "Update account",
"update_asset_account": "\u66f4\u65b0\u8d44\u4ea7\u8d26\u6237",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u5b58\u94b1\u7f50",

8
frontend/src/locales/zh-tw.json
View File

@ -169,7 +169,13 @@
"repeat_freq_quarterly": "\u6bcf\u5b63",
"repeat_freq_monthly": "\u6bcf\u6708",
"repeat_freq_weekly": "\u6bcf\u9031",
"credit_card_type_monthlyFull": "Full payment every month"
"credit_card_type_monthlyFull": "Full payment every month",
"update_liabilities_account": "\u66f4\u65b0\u50b5\u52d9",
"update_expense_account": "\u66f4\u65b0\u652f\u51fa\u5e33\u6236",
"update_revenue_account": "\u66f4\u65b0\u6536\u5165\u5e33\u6236",
"update_undefined_account": "Update account",
"update_asset_account": "\u66f4\u65b0\u8cc7\u7522\u5e33\u6236",
"updated_account_js": "Updated account \"<a href=\"accounts\/show\/{ID}\">{title}<\/a>\"."
},
"list": {
"piggy_bank": "\u5c0f\u8c6c\u64b2\u6eff",

20
frontend/src/pages/accounts/edit.js vendored
View File

@ -1,3 +1,23 @@
/*
* edit.js
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
require('../../bootstrap');
import Edit from "../../components/accounts/Edit";

895
frontend/yarn.lock
View File

File diff suppressed because it is too large Load Diff

20
public/safari-pinned-tab.svg
View File

@ -1,4 +1,24 @@
<?xml version="1.0" standalone="no"?>
<!--
- safari-pinned-tab.svg
- Copyright (c) 2021 james@firefly-iii.org
-
- This file is part of Firefly III (https://github.com/firefly-iii).
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

2
public/v1/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/app_vue.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/delete.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/edit.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/edit.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/index.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/show.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/show.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/bills/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/bills/create.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/bills/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/bills/index.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/budgets/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/budgets/index.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/index.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/vendor.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/vendor.js.LICENSE.txt
View File

@ -90,7 +90,7 @@
*/
/*!
* vue-i18n v8.25.0
* vue-i18n v8.25.1
* (c) 2021 kazuya kawaguchi
* Released under the MIT License.
*/

2
public/v2/js/vendor.js.map
View File

File diff suppressed because one or more lines are too long

1
resources/lang/.gitignore vendored
View File

@ -11,3 +11,4 @@ lt_LT
fa_IR
si_LK
th_TH
ko_KR

2
resources/views/v1/currencies/index.twig
View File

@ -103,4 +103,4 @@
var makeDefaultUrl = "{{ route('currencies.default') }}";
</script>
<script type="text/javascript" src="v1/js/ff/currencies/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}
{% endblock %}

6
tests/Api/Models/Rule/UpdateControllerTest.php
View File

@ -1,7 +1,7 @@
<?php
declare(strict_types=1);
/*
* UpdateControllerTEst.php
* UpdateControllerTest.php
* Copyright (c) 2021 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
@ -20,6 +20,8 @@ declare(strict_types=1);
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace Tests\Api\Models\Rule;
use Laravel\Passport\Passport;

827
yarn.lock
View File

File diff suppressed because it is too large Load Diff