From 14e06bfedd22be7cf13ea5bf42d94f5637ab9d9d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 10 Jul 2020 06:48:39 +0200 Subject: [PATCH] Experimental signed commit. --- .../Controllers/Account/IndexController.php | 8 ++++++++ frontend/mix-manifest.json | 9 +++------ frontend/package-lock.json | 17 +++++++++++------ frontend/package.json | 7 ++++--- frontend/webpack.mix.js | 2 ++ resources/views/v2/accounts/empty-index.twig | 12 ++++++++++++ resources/views/v2/partials/layout/sidebar.twig | 8 ++++---- routes/web.php | 1 + 8 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 resources/views/v2/accounts/empty-index.twig diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 427f12fe8f..7eb389ea53 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -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. * diff --git a/frontend/mix-manifest.json b/frontend/mix-manifest.json index dcf1d27f48..69ef22a67a 100644 --- a/frontend/mix-manifest.json +++ b/frontend/mix-manifest.json @@ -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" } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 55049591c3..6580c9b702 100755 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -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", diff --git a/frontend/package.json b/frontend/package.json index 314276b3f3..b3a49f42b9 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -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" } } diff --git a/frontend/webpack.mix.js b/frontend/webpack.mix.js index d4890b422d..36c1a7b117 100644 --- a/frontend/webpack.mix.js +++ b/frontend/webpack.mix.js @@ -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') diff --git a/resources/views/v2/accounts/empty-index.twig b/resources/views/v2/accounts/empty-index.twig new file mode 100644 index 0000000000..972cca9e6b --- /dev/null +++ b/resources/views/v2/accounts/empty-index.twig @@ -0,0 +1,12 @@ +{% extends "./layout/default" %} +{% block content %} +
+{% endblock %} + +{% block styles %} + +{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/resources/views/v2/partials/layout/sidebar.twig b/resources/views/v2/partials/layout/sidebar.twig index aeb8559712..069b6f9ac8 100644 --- a/resources/views/v2/partials/layout/sidebar.twig +++ b/resources/views/v2/partials/layout/sidebar.twig @@ -131,25 +131,25 @@