Merge pull request #44 from jeremykenedy/dev

Dev
jeremykenedy · Dec 6, 2022 · 057e7d3 · 057e7d3
2 parents c23b620 + b0b47c3
commit 057e7d3
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 15 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -109,7 +109,7 @@
             @click="toggleTheme()"
           >
             <Switch
-              v-model="user.theme_dark"
+              :default-checked="user.theme_dark"
               :class="user.theme_dark ? 'bg-gray-500' : 'bg-gray-400'"
               class="relative inline-flex h-[20px] w-[36px] shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75"
             >
@@ -244,7 +244,7 @@
           >
             <AppButton
               primary
-              text="Sign up"
+              text="Sign Up"
               class="ml-8"
               :class="[isActive && 'opacity-60']"
             />
@@ -409,7 +409,7 @@
                 @click="toggleTheme()"
               >
                 <Switch
-                  v-model="user.theme_dark"
+                  :default-checked="user.theme_dark"
                   :class="user.theme_dark ? 'bg-gray-500' : 'bg-gray-400'"
                   class="relative inline-flex h-[18px] w-[30px] shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75"
                 >
@@ -434,8 +434,8 @@
             <div v-if="!authenticated">
               <router-link v-slot="{ isActive }" :to="{ name: 'register' }">
                 <AppButton
+                  primary
                   text="Sign up"
-                  type="button"
                   class="flex w-full items-center justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-indigo-700"
                   :class="[isActive && 'opacity-60']"
                   @click="close"
@@ -463,9 +463,10 @@
             </div>
             <div v-if="authenticated">
               <AppButton
+                primary
                 text="Logout"
                 type="button"
-                class="flex w-full items-center justify-center rounded-md border border-transparent bg-gray-500 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-gray-800"
+                class="flex w-full items-center justify-center px-4 py-2"
                 @click.prevent="logout(), closeDrop()"
               >
                 <template #text>
@@ -568,7 +569,7 @@ export default {
       this.errors = null;
       this.success = '';
       try {
-        await this.updateTheme({ theme_dark: this.user.theme_dark }).then(
+        await this.updateTheme({ theme_dark: !this.user.theme_dark }).then(
           (response) => {
             if (
               response &&

diff --git a/resources/js/components/common/AppButton.vue b/resources/js/components/common/AppButton.vue
@@ -32,6 +32,7 @@ export default {
     success: { type: Boolean, default: false },
     warning: { type: Boolean, default: false },
     danger: { type: Boolean, default: false },
+    info: { type: Boolean, default: false },
   },
   setup() {
     return {};
@@ -73,8 +74,11 @@ export default {
       } else if (this.secondary) {
         t = 'slate';
         buttonClasses = buttonClasses + ' text-white';
+      } else if (this.info) {
+        t = 'blue';
+        buttonClasses = buttonClasses + ' text-white';
       } else if (this.accent) {
-        t = 'teal';
+        t = 'gray';
         buttonClasses = buttonClasses + ' text-white';
       } else if (this.success) {
         t = 'green';
@@ -83,7 +87,9 @@ export default {
         t = 'yellow';
         buttonClasses = buttonClasses + ' text-white';
       } else {
-        // buttonClasses = buttonClasses + ' text-gray-700 hover:text-gray-900';
+        buttonClasses =
+          buttonClasses +
+          ' text-gray-700 hover:text-gray-900 hover:bg-gray-500 hover:text-gray-100';
       }
       if (this.danger) {
         t = 'red';

diff --git a/resources/js/components/common/AppSwitch.vue b/resources/js/components/common/AppSwitch.vue
@@ -6,7 +6,7 @@
     <Switch
       :class="
         enabled
-          ? 'bg-gray-600 dark:bg-gray-500'
+          ? 'bg-green-600 dark:bg-green-500'
           : 'bg-gray-400 dark:bg-gray-600'
       "
       class="relative inline-flex h-[24px] w-[40px] shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75"