From 96b816d5a09d4bc4ebcb903db79da0eeded3eea3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 03:52:12 +0000 Subject: [PATCH 1/2] docs(CHANGELOG): update release notes --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d76c37..e3594c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # CHANGELOG +## [v3.3.8](https://github.com/jeremykenedy/laravel-spa/releases/tag/v3.3.8) - 2022-12-06 03:49:07 + +- 9c22d32 WIP :: Changelog workflow + +## [v3.3.7](https://github.com/jeremykenedy/laravel-spa/releases/tag/v3.3.7) - 2022-12-06 03:45:36 + +- 7bad79b Merge branch 'dev' of github.com:jeremykenedy/laravel-spa into dev + - 313641e docs(CHANGELOG): update release notes + +## [v3.3.5](https://github.com/jeremykenedy/laravel-spa/releases/tag/v3.3.5) - 2022-12-06 03:40:59 + +## What's Changed +* Dev by @jeremykenedy in https://github.com/jeremykenedy/laravel-spa/pull/41 +* WIP :: Changelog workflow by @jeremykenedy in https://github.com/jeremykenedy/laravel-spa/pull/42 + + +**Full Changelog**: https://github.com/jeremykenedy/laravel-spa/compare/v3.3.3...v3.3.5 + ## [v3.3.4](https://github.com/jeremykenedy/laravel-spa/releases/tag/v3.3.4) - 2022-12-06 03:34:37 - eec03af WIP :: Changelog workflow From 6369aad032937a4d33c9cb6f4a819b5bfef367ed Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 5 Dec 2022 21:05:21 -0800 Subject: [PATCH 2/2] cleanup --- app/Http/Controllers/DashboardController.php | 11 +++++++---- app/Http/Controllers/ProfileController.php | 1 - composer.json | 1 + resources/js/app.js | 2 +- resources/js/components/AppNav.vue | 13 +++++++------ resources/js/components/common/AppButton.vue | 10 ++++++++-- resources/js/components/common/AppSwitch.vue | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 4c5723c..4d65ae7 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -39,11 +39,14 @@ protected function superAdminDashboardData() $data['users'] = User::all('id', 'name', 'email'); $data['roles'] = new RolesCollection(config('roles.models.role')::all()); $data['permissions'] = new RolesCollection(config('roles.models.permission')::all()); // TODO :: Change collection + $settings = Setting::where('group', 'auth') + ->orWhere('group', 'analytics') + ->orWhere('group', 'monitoring') + ->get(['id', 'key', 'name', 'val', 'group']); - // FIX THESE - $data['authSettings'] = Setting::whereGroup('auth')->get(['id', 'key', 'name', 'val']); - $data['analytics'] = Setting::whereGroup('analytics')->get(['id', 'key', 'name', 'val']); - $data['monitoring'] = Setting::whereGroup('monitoring')->get(['id', 'key', 'name', 'val']); + $data['authSettings'] = $settings->where('group', 'auth')->values(); + $data['analytics'] = $settings->where('group', 'analytics')->values(); + $data['monitoring'] = $settings->where('group', 'monitoring')->values(); } return $data; diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 2b8cbd0..8c0101c 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; class ProfileController extends Controller { diff --git a/composer.json b/composer.json index 7dfd3a0..fd38518 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "laravel/tinker": "^2.7", "laravel/ui": "^4.1", "league/flysystem-aws-s3-v3": "^3.10", + "mtownsend/laravel-make-trait": "^1.4", "nesbot/carbon": "^2.63", "qcod/laravel-settings": "^1.1", "sentry/sentry-laravel": "^3.1", diff --git a/resources/js/app.js b/resources/js/app.js index 6eb6375..04da467 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -48,7 +48,7 @@ if (VUE_SENTRY_ENABLED) { // Check if it is an exception, and if so, show the report dialog if (event.exception) { if (VUE_SENTRY_FEEDBACK_ENABLED) { - Sentry.showReportDialog({ eventId: event.event_id }); + // Sentry.showReportDialog({ eventId: event.event_id }); } } return event; diff --git a/resources/js/components/AppNav.vue b/resources/js/components/AppNav.vue index e7877a4..8ed216a 100644 --- a/resources/js/components/AppNav.vue +++ b/resources/js/components/AppNav.vue @@ -109,7 +109,7 @@ @click="toggleTheme()" > @@ -244,7 +244,7 @@ > @@ -409,7 +409,7 @@ @click="toggleTheme()" > @@ -434,8 +434,8 @@