QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 06:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Merge conflict.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
client/src/routes/dashboard.js
View File

@@ -10,7 +10,7 @@ export default [
component: LazyLoader({
loader: () => import('containers/Dashboard/Homepage')
}),
exact: true,
exact: true
},
// Accounts.
@@ -19,7 +19,7 @@ export default [
name: 'dashboard.accounts',
component: LazyLoader({
loader: () => import('containers/Dashboard/Accounts/AccountsChart')
}),
})
},
// Custom views.
@@ -28,14 +28,14 @@ export default [
name: 'dashboard.custom_view.new',
component: LazyLoader({
loader: () => import('containers/Dashboard/Views/ViewFormPage')
}),
})
},
{
path: `${BASE_URL}/custom_views/:view_id/edit`,
name: 'dashboard.custom_view.edit',
component: LazyLoader({
loader: () => import('containers/Dashboard/Views/ViewFormPage')
}),
})
},
// Expenses.
@@ -45,25 +45,25 @@ export default [
component: LazyLoader({
loader: () => import('containers/Dashboard/Expenses/ExpenseForm')
}),
text: 'New Expense',
text: 'New Expense'
},
{
path: `${BASE_URL}/expenses`,
name: 'dashboard.expeneses.list',
component: LazyLoader({
loader: () => import('containers/Dashboard/Expenses/ExpensesList')
}),
})
},
// Accounting
{
path: `${BASE_URL}/accounting/make-journal-entry`,
name: 'dashboard.accounting.make.journal',
component: LazyLoader({
loader: () => import('containers/Dashboard/Accounting/MakeJournalEntriesPage')
loader: () =>
import('containers/Dashboard/Accounting/MakeJournalEntriesPage')
}),
text: 'Make Journal Entry',
text: 'Make Journal Entry'
},
// Items
@@ -73,41 +73,58 @@ export default [
loader: () => import('containers/Dashboard/Items/ItemsList')
}),
},
{
path: `${BASE_URL}/items/new`,
component: LazyLoader({
loader: () => import('containers/Dashboard/Items/ItemForm')
}),
},
// Financial Reports.
{
path: `${BASE_URL}/accounting/general-ledger`,
name: 'dashboard.accounting.general.ledger',
component: LazyLoader({
loader: () => import('containers/Dashboard/FinancialStatements/LedgerSheet')
}),
loader: () =>
import('containers/Dashboard/FinancialStatements/LedgerSheet')
})
},
{
path: `${BASE_URL}/accounting/balance-sheet`,
name: 'dashboard.accounting.balance.sheet',
component: LazyLoader({
loader: () => import('containers/Dashboard/FinancialStatements/BalanceSheet/BalanceSheet')
}),
loader: () =>
import(
'containers/Dashboard/FinancialStatements/BalanceSheet/BalanceSheet'
)
})
},
{
path: `${BASE_URL}/accounting/trial-balance-sheet`,
name: 'dashboard.accounting.trial.balance',
component: LazyLoader({
loader: () => import('containers/Dashboard/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet')
}),
loader: () =>
import(
'containers/Dashboard/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet'
)
})
},
{
path: `${BASE_URL}/accounting/profit-loss-sheet`,
name: 'dashboard.accounting.profit.loss.sheet',
component: LazyLoader({
loader: () => import('containers/Dashboard/FinancialStatements/ProfitLossSheet/ProfitLossSheet')
}),
loader: () =>
import(
'containers/Dashboard/FinancialStatements/ProfitLossSheet/ProfitLossSheet'
)
})
},
{
path: `${BASE_URL}/accounting/journal-sheet`,
name: 'dashboard.accounting.journal.sheet',
component: LazyLoader({
loader: () => import('containers/Dashboard/FinancialStatements/Journal/Journal')
}),
},
];
loader: () =>
import('containers/Dashboard/FinancialStatements/Journal/Journal')
})
}
];