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

Experimental signed commit.

Browse Source
This commit is contained in:
James Cole 2020-07-10 06:48:39 +02:00
parent 886475740a
commit 14e06bfedd
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
8 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Account/IndexController.php
View File

@ -115,6 +115,14 @@ class IndexController extends Controller
}
/**
* @return \Illuminate\Contracts\Foundation\Application|Factory|View
*/
public function emptyIndex()
{
return view('accounts.empty-index');
}
/**
* Show list of accounts.
*

9
frontend/mix-manifest.json
View File

@ -1,11 +1,8 @@
{
"/public/js/manifest.js": "/public/js/manifest.js",
"/public/js/manifest.js.map": "/public/js/manifest.js.map",
"/public/js/vendor.js": "/public/js/vendor.js",
"/public/js/vendor.js.map": "/public/js/vendor.js.map",
"/public/js/accounts.js": "/public/js/accounts.js",
"/public/js/dashboard.js": "/public/js/dashboard.js",
"/public/css/app.css": "/public/css/app.css",
"/public/js/dashboard.js.map": "/public/js/dashboard.js.map",
"/public/js/manifest.js": "/public/js/manifest.js",
"/public/js/register.js": "/public/js/register.js",
"/public/js/register.js.map": "/public/js/register.js.map"
"/public/js/vendor.js": "/public/js/vendor.js"
}

17
frontend/package-lock.json generated
View File

@ -5487,9 +5487,9 @@
}
},
"lodash": {
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
"dev": true
},
"lodash.memoize": {
@ -7873,9 +7873,9 @@
"dev": true
},
"sass": {
"version": "1.26.9",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.9.tgz",
"integrity": "sha512-t8AkRVi+xvba4yZiLWkJdgJHBFCB3Dh4johniQkPy9ywkgFHNasXFEFP+RG/F6LhQ+aoE4aX+IorIWQjS0esVw==",
"version": "1.26.10",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz",
"integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==",
"dev": true,
"requires": {
"chokidar": ">=2.0.0 <4.0.0"
@ -9340,6 +9340,11 @@
"vue-style-loader": "^4.1.0"
}
},
"vue-router": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
"integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",

7
frontend/package.json
View File

@ -14,9 +14,9 @@
"cross-env": "^7.0",
"laravel-mix": "^5.0.1",
"laravel-mix-bundle-analyzer": "^1.0.5",
"lodash": "^4.17.13",
"lodash": "^4.17.19",
"resolve-url-loader": "^3.1.0",
"sass": "^1.26.9",
"sass": "^1.26.10",
"sass-loader": "^8.0.0",
"vue": "^2.6",
"vue-i18n": "^8.15",
@ -32,6 +32,7 @@
"jquery-ui": "^1.12.1",
"overlayscrollbars": "^1.12.0",
"popper.js": "^1.16.1",
"vue-chartjs": "^3.5.0"
"vue-chartjs": "^3.5.0",
"vue-router": "^3.3.4"
}
}

2
frontend/webpack.mix.js vendored
View File

@ -54,6 +54,8 @@ mix
// dashboard component (frontpage):
.js('src/pages/dashboard.js', 'public/js')
.js('src/pages/accounts.js', 'public/js')
// register page
.js('src/pages/register.js', 'public/js')

12
resources/views/v2/accounts/empty-index.twig Normal file
View File

@ -0,0 +1,12 @@
{% extends "./layout/default" %}
{% block content %}
<div id="accounts"></div>
{% endblock %}
{% block styles %}
{% endblock %}
{% block scripts %}
<script src="v2/js/accounts.js" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

8
resources/views/v2/partials/layout/sidebar.twig
View File

@ -131,25 +131,25 @@
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ route('accounts.index', 'asset') }}" class="nav-link">
<a href="{{ route('accounts.empty-index') }}#/asset" class="nav-link">
<i class="far fa-money-bill-alt nav-icon"></i>
<p>{{ 'asset_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'expense') }}" class="nav-link">
<a href="{{ route('accounts.empty-index') }}#/expense" class="nav-link">
<i class="fas fa-shopping-cart nav-icon"></i>
<p>{{ 'expense_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'revenue') }}" class="nav-link">
<a href="{{ route('accounts.empty-index') }}#/revenue" class="nav-link">
<i class="fas fa-briefcase nav-icon"></i>
<p>{{ 'revenue_accounts'|_ }}</p>
</a>
</li>
<li class="nav-item">
<a href="{{ route('accounts.index', 'liabilities') }}" class="nav-link">
<a href="{{ route('accounts.empty-index') }}#/liabilities" class="nav-link">
<i class="far fa-funnel-dollar nav-icon"></i>
<p>{{ 'liabilities_accounts'|_ }}</p>
</a>

1
routes/web.php
View File

@ -127,6 +127,7 @@ Route::group(
static function () {
// show:
Route::get('', ['uses' => 'Account\IndexController@emptyIndex', 'as' => 'empty-index']);
Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities');
// create