From 6c2486faa72b02954f81ec38a833c538aec2475f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 21 Jan 2023 17:14:24 +0100 Subject: [PATCH] Clean up top boxes --- .../V2/TransactionGroupTransformer.php | 2 +- frontend/package.json | 4 +- frontend/quasar.conf.js | 4 +- .../components/dashboard/BillInsightBox.vue | 8 +- .../dashboard/NetWorthInsightBox.vue | 4 +- .../components/dashboard/SpendInsightBox.vue | 6 +- .../components/transactions/LargeTable.vue | 1 - frontend/src/layouts/MainLayout.vue | 90 +- frontend/src/pages/administration/Index.vue | 60 + frontend/src/pages/dashboard/Boxes.vue | 207 --- frontend/src/pages/dashboard/Dashboard.vue | 22 +- .../src/pages/{admin => system}/Index.vue | 0 frontend/src/pages/transactions/Index.vue | 156 ++- frontend/src/router/routes.js | 26 +- frontend/yarn.lock | 1211 +++++++++-------- resources/lang/en_US/firefly.php | 3 + 16 files changed, 954 insertions(+), 850 deletions(-) create mode 100644 frontend/src/pages/administration/Index.vue delete mode 100644 frontend/src/pages/dashboard/Boxes.vue rename frontend/src/pages/{admin => system}/Index.vue (100%) diff --git a/app/Transformers/V2/TransactionGroupTransformer.php b/app/Transformers/V2/TransactionGroupTransformer.php index 737f92cd1f..d0e50f47a7 100644 --- a/app/Transformers/V2/TransactionGroupTransformer.php +++ b/app/Transformers/V2/TransactionGroupTransformer.php @@ -239,7 +239,7 @@ class TransactionGroupTransformer extends AbstractTransformer */ private function stringFromArray(NullArrayObject $array, string $key, ?string $default): ?string { - Log::debug(sprintf('%s: %s', $key, var_export($array[$key]))); + //Log::debug(sprintf('%s: %s', $key, var_export($array[$key], true))); if (null === $array[$key] && null === $default) { return null; } diff --git a/frontend/package.json b/frontend/package.json index 7f334f39ea..800dd97e42 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@popperjs/core": "^2.11.2", - "@quasar/extras": "^1.15.9", + "@quasar/extras": "^1.15.10", "apexcharts": "^3.32.1", "axios": "^0.21.1", "axios-cache-adapter": "^2.7.3", @@ -26,7 +26,7 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.13.14", - "@quasar/app-webpack": "^3.6.2", + "@quasar/app-webpack": "^3.7.1", "@types/node": "^12.20.21", "@typescript-eslint/eslint-plugin": "^4.16.1", "@typescript-eslint/parser": "^4.16.1", diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index c6f65cb50e..b36494dfaf 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -55,7 +55,7 @@ module.exports = configure(function (ctx) { extras: [ // 'ionicons-v4', // 'mdi-v5', - 'fontawesome-v5', + 'fontawesome-v6', // 'eva-icons', // 'themify', // 'line-awesome', @@ -126,7 +126,7 @@ module.exports = configure(function (ctx) { }, lang: 'en-US', // Quasar language pack - iconSet: 'fontawesome-v5', + iconSet: 'fontawesome-v6', // For special cases outside of where the auto-import strategy can have an impact // (like functional components as one of the examples), diff --git a/frontend/src/components/dashboard/BillInsightBox.vue b/frontend/src/components/dashboard/BillInsightBox.vue index f1fe7b7c48..c9ed006f95 100644 --- a/frontend/src/components/dashboard/BillInsightBox.vue +++ b/frontend/src/components/dashboard/BillInsightBox.vue @@ -22,14 +22,13 @@ -
- + - {{ $t('firefly.bills_to_pay') }} + {{ $t('firefly.bills') }} - + -
+ + diff --git a/frontend/src/pages/dashboard/Boxes.vue b/frontend/src/pages/dashboard/Boxes.vue deleted file mode 100644 index e26759c433..0000000000 --- a/frontend/src/pages/dashboard/Boxes.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - - diff --git a/frontend/src/pages/dashboard/Dashboard.vue b/frontend/src/pages/dashboard/Dashboard.vue index c64a1ec2bf..d069fac80f 100644 --- a/frontend/src/pages/dashboard/Dashboard.vue +++ b/frontend/src/pages/dashboard/Dashboard.vue @@ -19,31 +19,29 @@ -->