Rebuild frontend

This commit is contained in:
James Cole 2021-02-03 19:52:47 +01:00
parent fdba28fad7
commit d69843d4bc
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
9 changed files with 554 additions and 550 deletions

View File

@ -93,7 +93,7 @@
<script> <script>
export default { export default {
name: "BudgetLimitRow", name: "BudgetLimitRow",
mounted() { created() {
this.locale = localStorage.locale ?? 'en-US'; this.locale = localStorage.locale ?? 'en-US';
}, },
data() { data() {

View File

@ -24,7 +24,12 @@
v-for="account in accounts"> v-for="account in accounts">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<h3 class="card-title"><a :href="account.uri">{{ account.title }}</a></h3> <h3 class="card-title"><a :href="account.url">{{ account.title }}</a></h3>
<div class="card-tools">
<span :class="parseFloat(account.current_balance) < 0 ? 'text-danger' : 'text-success'">
{{ Intl.NumberFormat(locale, {style: 'currency', currency: account.currency_code}).format(parseFloat(account.current_balance)) }}
</span>
</div>
</div> </div>
<div class="card-body table-responsive p-0"> <div class="card-body table-responsive p-0">
<transaction-list-large :transactions="account.transactions" v-if="1===accounts.length" :account_id="account.id"/> <transaction-list-large :transactions="account.transactions" v-if="1===accounts.length" :account_id="account.id"/>
@ -42,9 +47,11 @@ export default {
data() { data() {
return { return {
accounts: [], accounts: [],
locale: 'en-US'
} }
}, },
created() { created() {
this.locale = localStorage.locale ?? 'en-US';
axios.get('./api/v1/preferences/frontpageAccounts') axios.get('./api/v1/preferences/frontpageAccounts')
.then(response => { .then(response => {
this.loadAccounts(response); this.loadAccounts(response);
@ -60,7 +67,9 @@ export default {
this.accounts.push({ this.accounts.push({
id: accountIds[key], id: accountIds[key],
title: '', title: '',
uri: '', url: '',
current_balance: '',
currency_code: '',
transactions: [] transactions: []
}); });
this.loadSingleAccount(key, accountIds[key]); this.loadSingleAccount(key, accountIds[key]);
@ -71,7 +80,10 @@ export default {
axios.get('./api/v1/accounts/' + accountId) axios.get('./api/v1/accounts/' + accountId)
.then(response => { .then(response => {
this.accounts[key].title = response.data.data.attributes.name; this.accounts[key].title = response.data.data.attributes.name;
this.accounts[key].uri = './accounts/show/' + response.data.data.id; this.accounts[key].url = './accounts/show/' + response.data.data.id;
this.accounts[key].current_balance = response.data.data.attributes.current_balance;
this.accounts[key].currency_code = response.data.data.attributes.currency_code;
this.loadTransactions(key, accountId); this.loadTransactions(key, accountId);
} }
); );

View File

@ -34,7 +34,7 @@
</thead> </thead>
<tbody> <tbody>
<tr v-for="bill in this.bills"> <tr v-for="bill in this.bills">
<td><a :href="'./bills/show' + bill.id" :title="bill.attributes.name">{{ bill.attributes.name }}</a> <td><a :href="'./bills/show/' + bill.id" :title="bill.attributes.name">{{ bill.attributes.name }}</a>
~{{ ~{{
Intl.NumberFormat(locale, {style: 'currency', currency: bill.attributes.currency_code}).format((parseFloat(bill.attributes.amount_min) + Intl.NumberFormat(locale, {style: 'currency', currency: bill.attributes.currency_code}).format((parseFloat(bill.attributes.amount_min) +
parseFloat(bill.attributes.amount_max)) / 2) parseFloat(bill.attributes.amount_max)) / 2)

View File

@ -29,7 +29,7 @@
<div class="alert alert-success alert-dismissible" v-if="successMessage.length > 0"> <div class="alert alert-success alert-dismissible" v-if="successMessage.length > 0">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-thumbs-up"></i> {{ $t("firefly.flash_success") }}</h5> <h5><i class="icon fas fa-thumbs-up"></i> {{ $t("firefly.flash_success") }}</h5>
{{ successMessage }} <span v-html="successMessage"></span>
</div> </div>
<div class="row" v-if="transactions.length > 1"> <div class="row" v-if="transactions.length > 1">
@ -434,10 +434,12 @@ export default {
} }
// render msg: // render msg:
this.successMessage = this.$t('firefly.transaction_stored_link', {ID: this.groupId, title: this.groupTitle}); this.successMessage = this.$t('firefly.transaction_stored_link', {ID: this.groupId, title: this.groupTitle});
if(this.resetFormAfter) { if (this.resetFormAfter) {
this.resetTransactions(); this.submitted = false;
this.resetTransactions();
// do a short time out? // do a short time out?
setTimeout(() => this.addTransaction(), 50); setTimeout(() => this.addTransaction(), 50);
// reset the form:
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long