From 5cecb731f600c9cd8db5e596b3f31bf62691d823 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 30 Aug 2018 16:48:29 +0800
Subject: [PATCH] fix some error in notification frontend

---
 app/Http/Controllers/BookingController.php |  1 -
 app/Http/Controllers/UserController.php    |  2 +-
 resources/assets/js/components/Navbar.vue  | 31 +++++++++++-----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index d6715d51..d9e62eda 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -20,7 +20,6 @@ use DateTime;
 
 class BookingController extends Controller
 {
-
     public function index(){
 		$user = Auth::user();
         $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 3e36f399..2ec0cacf 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -25,6 +25,6 @@ class UserController extends Controller
     public function notifications()
     {
         $notifications = auth()->user()->unreadNotifications()->limit(5)->get();
-        return response()->json(['notifications'=>$notifications], 200);
+        return response()->json(['notifications'=> $notifications], 200);
     }
 }
diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue
index 1aabf1b3..abe9edfe 100644
--- a/resources/assets/js/components/Navbar.vue
+++ b/resources/assets/js/components/Navbar.vue
@@ -13,23 +13,24 @@
               <el-dropdown-menu slot="dropdown">
                 <div id="notification">
                 <div v-if="notifications">
-                  <div v-for="(idx,item) in notifications" :key="idx">
-                    <a v-on:click.prevent='navigateTo(item.data.link)'>
+                  <div v-for="(idx,item) in notifications" :key="idx.id">
                       <el-dropdown-item>
-                        <!-- <b v-if="item.is_read == 0">
-                          {{item.detail}}
-                          asd
-                        </b> -->
-                        <span >
-                          {{item.data.details}}
-                          
-                        </span>
-                        <br/>
-                        <span class="opacity80">
-                          <timeago :datetime="item.created_at"></timeago>
-                        </span>
+                        <a v-on:click.prevent='navigateTo(item.data.link)'>
+                          <!-- <b v-if="item.is_read == 0">
+                            {{item.detail}}
+                            asd
+                          </b> -->
+                          <span >
+                            {{item.data.details}}
+                            
+                          </span>
+                          <br/>
+                          <span class="opacity80">
+                            <timeago :datetime="item.created_at"></timeago>
+                          </span>
+                        </a>
                       </el-dropdown-item>
-                    </a>
+                   
                   </div>
 
                 </div>