initial

Author: DepokSarkar

app/Http/Controllers/AuthController.php

@@ -20,9 +20,7 @@ public function login(Request $request)
         );
         if (Auth::attempt($request->only(['email', 'password']))) {
             $user = Auth::user();
-            $user->roles = $user->roles;
-            $user->permissions = $user->permissions;
-            return response()->json($user, 200);
+            return response()->json($user->load('roles', 'permissions'), 200);
         } else {
             return response()->json([
               'message' => 'Your username and password it worng. Please try again with correct login info.'
@@ -41,8 +39,6 @@ public function logout()
     public function me()
     {
         $user = Auth::user();
-        $user->roles = $user->roles;
-        $user->permissions = $user->permissions;
-        return response()->json($user, 200);
+        return response()->json($user->load('roles', 'permissions'), 200);
     }
 }

src/components/widget/links.vue

@@ -7,7 +7,7 @@
     :label="title"
     header-class="text-white"
     expand-icon-class="text-white"
-    active-class="bg-primary"
+    active-class="bg-cyan-7"
     @click="active = !active"
     :to="route"
   >
@@ -16,7 +16,7 @@
       tag="a"
       :to="{ name: item.route }"
       class="text-white"
-      active-class="bg-heather text-black"
+      active-class="bg-cyan-6 text-black"
     >
       <q-item-section avatar style="min-width: auto" class="q-pr-md">
         <q-icon :name="item.icon"></q-icon>
@@ -33,7 +33,7 @@
     tag="a"
     :to="{ name: route }"
     class="text-white"
-    active-class="bg-primary"
+    active-class="bg-cyan-7"
   >
     <q-item-section avatar style="min-width: auto" class="q-pr-md">
       <q-icon :name="icon"></q-icon>

src/css/app.sass

@@ -69,18 +69,18 @@ body
     clear: both
 
 .bg-gm-pink
-    color: $gm-pink-text
-    background: $gm-pink
+    color: white
+    background: $negative
 
 .text-gm-pink
-    color: $gm-pink
+    color: $negative
 
 .bg-gm-blue
-    background: $gmBlueLight
+    background: $secondary
     color: white
 
 .text-gm-blue
-    color: $gmBlueLight
+    color: $secondary
 
 .logo-min
   display: none

src/css/quasar.variables.sass

@@ -26,25 +26,16 @@
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
-$primary   : #1976D2
-$secondary : #0e100b
-$accent    : #9C27B0
+$primary   : #42029c
+$secondary : #0f869d
+$accent    : #b0274e
 
-$dark      : #0e100b
+$dark      : #00183d
 
-$positive  : #21BA45
-$negative  : #C10015
+$positive  : #21b844
+$negative  : #ea1d75
 $info      : #31CCEC
-$warning   : #F2C037
-
-$gm-pink : #ea1d75
-$gm-pink-text: #ffffff
-
-$gmBlueLight : #0f869d
-$gmBlueDark : #085a6a
-
-$companyPrimary : #f8b03c
-$companySecondary : #0e100b
+$warning   : #f8b03c
 
 $button-border-radius: 0 !important
 $input-font-size: 12px

src/layouts/Dashboard.vue

@@ -1,5 +1,5 @@
 <template>
-  <q-layout view="LHr lpR lfr" class="bg-light-cloud">
+  <q-layout view="LHr lpR lfr" class="bg-grey-3">
     <q-header class="bg-white shadow-2 text-primary">
       <q-toolbar style="height:70px">
         <q-btn
@@ -78,9 +78,9 @@
       :mini="miniState"
       @mouseover="mouseOver"
       @mouseout="mouseOver"
-      show-if-above bordered :width="250" side="left" content-class="bg-dark text-white"
+      show-if-above bordered :width="250" side="left" content-class="bg-secondary text-white"
     >
-      <div @click="$router.push({ name: 'Dashboard' })" class="cursor-pointer full-width row wrap justify-center logo q-pa-sm" style="min-height: 70px">
+      <div @click="$router.push({ name: 'Dashboard' })" class="bg-dark cursor-pointer full-width row wrap justify-center logo q-pa-sm" style="min-height: 70px">
         <img class="logo-full self-center" width="150px" src="assets/logo-alt.png" />
         <img class="logo-min self-center" width="150px" src="assets/icon-alt.png" />
       </div>
@@ -101,7 +101,7 @@
       <q-toolbar style="height: 70px">
           <div class="text-body q-mr-md">Copyright © 2020 | <b>{{appName}}.</b></div>
           <q-space class="gt-xs"></q-space>
-          <div class="text-body">Powered by <a href="/app">CodersTM</a></div>
+          <div class="text-body">Powered by <a href="/">CodersTM</a></div>
       </q-toolbar>
     </q-footer>