kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-21 03:39:00 +00:00
Code Issues Projects Releases Wiki Activity

Update libraries, add some views.

Browse Source
This commit is contained in:
James Cole
2019-08-04 19:54:31 +02:00
parent cc56a981cd
commit a077d58e9c
17 changed files with 74 additions and 57833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/intro.php
View File

@@ -27,7 +27,7 @@ declare(strict_types=1);
return [ return [
// index // index
'index' => [ 'index' => [
'intro' => [], 'intro' => [],
'accounts-chart' => ['element' => '#accounts-chart'], 'accounts-chart' => ['element' => '#accounts-chart'],
'box_out_holder' => ['element' => '#box_out_holder'], 'box_out_holder' => ['element' => '#box_out_holder'],
@@ -37,18 +37,28 @@ return [
'outro' => [], 'outro' => [],
], ],
// accounts: create // accounts: create
'accounts_create' => [ 'accounts_create' => [
'iban' => ['element' => '#ffInput_iban'], 'iban' => ['element' => '#ffInput_iban'],
], ],
// transactions: create
'transactions_create' => [
'source' => ['element' => 'input[name="source[]"]'],
'foreign_currency' => ['element' => 'select[name="foreign_currency[]"]'],
'more_meta' => ['element' => 'input[name="category[]"]'],
'split_add' => ['element' => '.split_add_btn'],
],
// extra text for asset account creation. // extra text for asset account creation.
'accounts_create_asset' => [ 'accounts_create_asset' => [
'opening_balance' => ['element' => '#ffInput_opening_balance'], 'opening_balance' => ['element' => '#ffInput_opening_balance'],
'currency' => ['element' => '#ffInput_currency_id'], 'currency' => ['element' => '#ffInput_currency_id'],
'virtual' => ['element' => '#ffInput_virtual_balance'], 'virtual' => ['element' => '#ffInput_virtual_balance'],
], ],
// budgets: index // budgets: index
'budgets_index' => [ 'budgets_index' => [
'intro' => [], 'intro' => [],
'set_budget' => ['element' => '#availableBar',], 'set_budget' => ['element' => '#availableBar',],
'see_expenses_bar' => ['element' => '#spentBar'], 'see_expenses_bar' => ['element' => '#spentBar'],
@@ -59,17 +69,17 @@ return [
], ],
// reports: index, default report, audit, budget, cat, tag // reports: index, default report, audit, budget, cat, tag
'reports_index' => [ 'reports_index' => [
'intro' => [], 'intro' => [],
'inputReportType' => ['element' => '#inputReportType'], 'inputReportType' => ['element' => '#inputReportType'],
'inputAccountsSelect' => ['element' => '#inputAccountsSelect'], 'inputAccountsSelect' => ['element' => '#inputAccountsSelect'],
'inputDateRange' => ['element' => '#inputDateRange'], 'inputDateRange' => ['element' => '#inputDateRange'],
'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'], 'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'],
], ],
'reports_report_default' => [ 'reports_report_default' => [
'intro' => [], 'intro' => [],
], ],
'reports_report_audit' => [ 'reports_report_audit' => [
'intro' => [], 'intro' => [],
'optionsBox' => ['element' => '#optionsBox'], 'optionsBox' => ['element' => '#optionsBox'],
], ],

4
package.json
View File

@@ -10,11 +10,11 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.17", "axios": "^0.18.1",
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"cross-env": "^5.1", "cross-env": "^5.1",
"laravel-mix": "^1.0", "laravel-mix": "^1.0",
"lodash": "^4.17.4", "lodash": "^4.17.13",
"vue": "^2.5.7" "vue": "^2.5.7"
}, },
"dependencies": { "dependencies": {

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

File diff suppressed because one or more lines are too long

2
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -164,7 +164,7 @@
</div> </div>
</div> </div>
<div class="box-footer" v-if="transactions.length-1 === index"> <div class="box-footer" v-if="transactions.length-1 === index">
<button class="btn btn-primary" @click="addTransactionToArray">Add another split</button> <button class="split_add_btn btn btn-primary" @click="addTransactionToArray">Add another split</button>
</div> </div>
</div> </div>
</div> </div>

3
resources/views/v1/accounts/show.twig
View File

@@ -170,5 +170,6 @@
<script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript"></script> <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"></script> <script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript"></script> <script src="v1/js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/bills/show.twig
View File

@@ -180,5 +180,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/budgets/no-budget.twig
View File

@@ -59,5 +59,6 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/budgets/show.twig
View File

@@ -183,5 +183,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/categories/no-category.twig
View File

@@ -59,5 +59,6 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/categories/show.twig
View File

@@ -103,5 +103,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

10
resources/views/v1/list/groups.twig
View File

@@ -2,7 +2,7 @@
TODO: reconcile TODO: reconcile
TODO: hide and show columns TODO: hide and show columns
--> -->
<table class="table"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<td colspan="7" class="no-margin-pagination">{{ groups.render|raw }}</td> <td colspan="7" class="no-margin-pagination">{{ groups.render|raw }}</td>
@@ -80,7 +80,13 @@ TODO: hide and show columns
{% if transaction.reconciled %} {% if transaction.reconciled %}
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
{% endif %} {% endif %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">{{ transaction.description }}</a> {% if group.count == 1 %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
{% endif %}
{{ transaction.description }}
{% if group.count == 1 %}
</a>
{% endif %}
</td> </td>
<td style=" {{ style|raw }}"> <td style=" {{ style|raw }}">
{% if transaction.transaction_type_type == 'Deposit' %} {% if transaction.transaction_type_type == 'Deposit' %}

3
resources/views/v1/recurring/show.twig
View File

@@ -211,5 +211,6 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

3
resources/views/v1/search/index.twig
View File

@@ -124,5 +124,6 @@
var searchUri = "{{ route('search.search') }}"; var searchUri = "{{ route('search.search') }}";
</script> </script>
<script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> {# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

2
resources/views/v1/search/search.twig
View File

@@ -3,4 +3,4 @@
{{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }} {{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }}
</p> </p>
{% include 'list.groups' %} {% include 'list.groups' %}

7
resources/views/v1/transactions/index.twig
View File

@@ -66,11 +66,6 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{# old list script #} {# required for groups.twig #}
{# <script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> #}
<script type="text/javascript">
</script>
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %} {% endblock %}

6
resources/views/v1/transactions/show.twig
View File

@@ -91,7 +91,7 @@
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %} {% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
CLONE <!--CLONE-->
{#<a href="{{ route('transactions.clone', [transactionGroup.id]) }}" class="btn btn-default"><i class="fa fa-copy"></i> {{ 'clone'|_ }}</a>#} {#<a href="{{ route('transactions.clone', [transactionGroup.id]) }}" class="btn btn-default"><i class="fa fa-copy"></i> {{ 'clone'|_ }}</a>#}
{% endif %} {% endif %}
{# {#
@@ -148,10 +148,10 @@
<td> <td>
{% for amount in amounts %} {% for amount in amounts %}
{% if type == 'Withdrawal' or type == 'Deposit' %} {% if type == 'Withdrawal' or type == 'Deposit' %}
{{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}, {{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
{% elseif type == 'Transfer' %} {% elseif type == 'Transfer' %}
<span class="text-info"> <span class="text-info">
{{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}, {{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
</span> </span>
{% endif %} {% endif %}
{% endfor %} {% endfor %}

31
yarn.lock
View File

@@ -364,13 +364,13 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
axios@^0.17: axios@^0.18.1:
version "0.17.1" version "0.18.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d" resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.1.tgz#ff3f0de2e7b5d180e757ad98000f1081b87bcea3"
integrity sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0= integrity sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==
dependencies: dependencies:
follow-redirects "^1.2.5" follow-redirects "1.5.10"
is-buffer "^1.1.5" is-buffer "^2.0.2"
babel-code-frame@^6.26.0: babel-code-frame@^6.26.0:
version "6.26.0" version "6.26.0"
@@ -3222,7 +3222,14 @@ flush-write-stream@^1.0.0:
inherits "^2.0.1" inherits "^2.0.1"
readable-stream "^2.0.4" readable-stream "^2.0.4"
follow-redirects@^1.0.0, follow-redirects@^1.2.5: follow-redirects@1.5.10:
version "1.5.10"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
dependencies:
debug "=3.1.0"
follow-redirects@^1.0.0:
version "1.6.1" version "1.6.1"
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.1.tgz#514973c44b5757368bad8bddfe52f81f015c94cb"
integrity sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ== integrity sha512-t2JCjbzxQpWvbhts3l6SH1DKzSrx8a+SsaVf4h6bG4kOXUuPYS/kg2Lr4gQSb7eemaHqJkOThF1BGyjlUkO1GQ==
@@ -4176,6 +4183,11 @@ is-buffer@^1.1.5, is-buffer@~1.1.1:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
is-buffer@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
is-builtin-module@^1.0.0: is-builtin-module@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -4981,6 +4993,11 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5,
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
lodash@^4.17.13:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
logalot@^2.0.0: logalot@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552" resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"