Skip to content

Commit 324fbe9

Browse files
committed
refactor! renamed some files and functions for more consistency; squashed a pernicious bug that erased our account balances when editing
1 parent f144a6e commit 324fbe9

File tree

11 files changed

+18
-22
lines changed

11 files changed

+18
-22
lines changed

src/app/accounts/api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const saveAccount = (account) => {
1919
});
2020
};
2121

22-
export const removeAccount = (account) => {
22+
export const deleteAccount = (account) => {
2323
return localforage.removeItem(
2424
ACCOUNT_NAMESPACE + account.id
2525
).then(() => {

src/app/accounts/components/AccountsListView.vue renamed to src/app/accounts/components/AccountsList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="tag is-small is-info">{{ categories[account.category] }}</span>
1111
${{ account.balance }}
1212
<a @click="confirmDeleteAccount(account)">Delete</a>
13-
<router-link :to="{ name: 'editAccount', params: { accountId: account.id } }">Edit</router-link>
13+
<router-link :to="{ name: 'updateAccount', params: { accountId: account.id } }">Edit</router-link>
1414
</li>
1515
</ul>
1616
</div>

src/app/accounts/components/CreateEditAccount.vue renamed to src/app/accounts/components/CreateUpdateAccount.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,7 @@ export default {
5555
let selectedAccount = this.getAccountById(this.$route.params.accountId);
5656
if (selectedAccount) {
5757
this.editing = true;
58-
this.selectedAccount = {
59-
name: selectedAccount.name,
60-
category: selectedAccount.category,
61-
id: selectedAccount.id
62-
};
58+
this.selectedAccount = Object.assign({}, selectedAccount);
6359
}
6460
// TODO: the object does not exist, how do we handle this scenario?
6561
});
@@ -68,7 +64,7 @@ export default {
6864
6965
methods: {
7066
...mapActions([
71-
'addAccount',
67+
'createAccount',
7268
'updateAccount',
7369
'loadAccounts'
7470
]),
@@ -79,7 +75,7 @@ export default {
7975
},
8076
8177
saveNewAccount () {
82-
this.addAccount(this.selectedAccount).then(() => {
78+
this.createAccount(this.selectedAccount).then(() => {
8379
this.resetAndGo();
8480
});
8581
},
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export { default as AccountsListView } from './AccountsListView';
2-
export { default as CreateEditAccount } from './CreateEditAccount';
1+
export { default as AccountsListView } from './AccountsList';
2+
export { default as CreateUpdateAccount } from './CreateUpdateAccount';

src/app/accounts/routes.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ export default [
88
},
99
{
1010
path: '/accounts/create',
11-
component: components.CreateEditAccount,
11+
component: components.CreateUpdateAccount,
1212
name: 'createAccount'
1313
},
1414
{
15-
path: '/accounts/:accountId/edit',
16-
component: components.CreateEditAccount,
17-
name: 'editAccount'
15+
path: '/accounts/:accountId/update',
16+
component: components.CreateUpdateAccount,
17+
name: 'updateAccount'
1818
}
1919
];

src/app/accounts/vuex/actions.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { guid } from '../../../utils';
2-
import { removeAccount, saveAccount, fetchAccounts } from '../api';
2+
import { deleteAccount as deleteAccountFromAPI, saveAccount, fetchAccounts } from '../api';
33

4-
export const addAccount = ({ commit }, data) => {
4+
export const createAccount = ({ commit }, data) => {
55
let id = guid();
66
let account = Object.assign({ id: id }, data);
7-
commit('ADD_ACCOUNT', {account: account});
7+
commit('CREATE_ACCOUNT', {account: account});
88
saveAccount(account).then((value) => {
99
// we've saved the account, what now
1010
});
@@ -17,7 +17,7 @@ export const updateAccount = ({ commit }, data) => {
1717

1818
export const deleteAccount = ({ commit }, data) => {
1919
commit('DELETE_ACCOUNT', { account: data });
20-
removeAccount(data);
20+
deleteAccountFromAPI(data);
2121
};
2222

2323
export const loadAccounts = (state) => {

src/app/accounts/vuex/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vue from 'vue';
22

33
export default {
4-
ADD_ACCOUNT (state, payload) {
4+
CREATE_ACCOUNT (state, payload) {
55
state.accounts[payload.account.id] = payload.account;
66
},
77

File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default as BudgetsListView } from './BudgetsListView';
1+
export { default as BudgetsListView } from './BudgetsList';

src/app/transactions/components/TransactionsListView.vue renamed to src/app/transactions/components/TransactionsList.vue

File renamed without changes.

0 commit comments

Comments
 (0)