From 232edde8e49299d5c1cf9f560b517f8cca97ad59 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 09:40:54 +0800
Subject: [PATCH 01/10] fix unauthorized booking access

---
 app/Http/Controllers/BookingController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 49aee280..4b3d1705 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -24,12 +24,12 @@ 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')
-                                    ->where('user_id', Auth::user()->id)
                                     ->where('status', '=', '6')
                                     ->orwhere('status', '=', '4')
                                     ->orwhere('status', '=', '3')
                                     ->orwhere('status', '=', '2')
                                     ->orwhere('status', '=', '1') 
+                                    ->where('user_id', Auth::user()->id)
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 

From 7bbe69638c5693980462b2c200e9aaa22eb5a1cf Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 09:52:40 +0800
Subject: [PATCH 02/10] fix unauthorized booking access

---
 app/Http/Controllers/BookingController.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 4b3d1705..27c6b625 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -24,12 +24,19 @@ 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')
-                                    ->where('status', '=', '6')
-                                    ->orwhere('status', '=', '4')
-                                    ->orwhere('status', '=', '3')
-                                    ->orwhere('status', '=', '2')
-                                    ->orwhere('status', '=', '1') 
+                                    // ->where('status', '=', '6')
+                                    // ->orwhere('status', '=', '4')
+                                    // ->orwhere('status', '=', '3')
+                                    // ->orwhere('status', '=', '2')
+                                    // ->orwhere('status', '=', '1') 
                                     ->where('user_id', Auth::user()->id)
+                                    ->where(function ($query) {
+                                            $query->where('status', '=', '6')
+                                            ->orwhere('status', '=', '4')
+                                            ->orwhere('status', '=', '3')
+                                            ->orwhere('status', '=', '2')
+                                            ->orwhere('status', '=', '1');
+                                    })
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 

From f6bd74ed5ec7599025d7ade130e1cd537def0fe0 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 10:12:05 +0800
Subject: [PATCH 03/10] removed unused code

---
 app/Http/Controllers/BookingController.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 27c6b625..1135da04 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -24,11 +24,6 @@ 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')
-                                    // ->where('status', '=', '6')
-                                    // ->orwhere('status', '=', '4')
-                                    // ->orwhere('status', '=', '3')
-                                    // ->orwhere('status', '=', '2')
-                                    // ->orwhere('status', '=', '1') 
                                     ->where('user_id', Auth::user()->id)
                                     ->where(function ($query) {
                                             $query->where('status', '=', '6')
@@ -166,14 +161,13 @@ class BookingController extends Controller
 	public function adminIndex(){
 		$user = Auth::user(); 
 		$bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-         
-        ->where('admin_status', '=', '5')
-        ->orwhere('admin_status', '=', '4') 
-        ->orwhere('admin_status', '=', '3') 
-        ->orwhere('admin_status', '=', '2')
-        ->orwhere('admin_status', '=', '1')   
-        ->orderby('updated_at','desc')
-        ->paginate(10);
+            ->where('admin_status', '=', '5')
+            ->orwhere('admin_status', '=', '4') 
+            ->orwhere('admin_status', '=', '3') 
+            ->orwhere('admin_status', '=', '2')
+            ->orwhere('admin_status', '=', '1')   
+            ->orderby('updated_at','desc')
+            ->paginate(10);
 
 			// reformat to fit frontend structure 
 			foreach ($bookings as $booking) {

From 5bc4f5929d8ee48ae1b5b29fc6885600f8d96344 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 10:23:03 +0800
Subject: [PATCH 04/10] removed all notifications code

---
 .../Controllers/ChinaBankSlipController.php   |  8 ---
 ..._08_16_101635_drop_notifications_table.php | 28 ++++++++
 ...8_16_101737_create_notifications_table.php | 35 +++++++++
 database/seeds/NotificationSeeder.php         | 35 ---------
 resources/assets/js/components/Navbar.vue     | 72 +++++++++----------
 routes/api.php                                | 14 ++--
 6 files changed, 106 insertions(+), 86 deletions(-)
 create mode 100644 database/migrations/2018_08_16_101635_drop_notifications_table.php
 create mode 100644 database/migrations/2018_08_16_101737_create_notifications_table.php
 delete mode 100644 database/seeds/NotificationSeeder.php

diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 0ed406ed..e4cc5742 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App\ChinaBankSlip;
 use App\Booking;
 use App\User;
-use App\Notification;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Validator;
@@ -82,13 +81,6 @@ class ChinaBankSlipController extends Controller
 		$booking->admin_status = 6; 
 		$booking->save();
 
-        $userNotification = new Notification;
-        $userNotification->detail = "Your china bankslip for booking " . $booking->id . " is uploaded.";
-        $userNotification->link = "/booking/" . $booking->id . "/upload-po";
-        $userNotification->user_id = $booking->user_id;
-        $userNotification->save();
-
-
         return response()->json(["message"=> "Success"],200);
     }
 
diff --git a/database/migrations/2018_08_16_101635_drop_notifications_table.php b/database/migrations/2018_08_16_101635_drop_notifications_table.php
new file mode 100644
index 00000000..d0b458c2
--- /dev/null
+++ b/database/migrations/2018_08_16_101635_drop_notifications_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropNotificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('notifications');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/database/migrations/2018_08_16_101737_create_notifications_table.php b/database/migrations/2018_08_16_101737_create_notifications_table.php
new file mode 100644
index 00000000..fb16d5bc
--- /dev/null
+++ b/database/migrations/2018_08_16_101737_create_notifications_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateNotificationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('notifications', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('type');
+            $table->morphs('notifiable');
+            $table->text('data');
+            $table->timestamp('read_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('notifications');
+    }
+}
diff --git a/database/seeds/NotificationSeeder.php b/database/seeds/NotificationSeeder.php
deleted file mode 100644
index 316b11ad..00000000
--- a/database/seeds/NotificationSeeder.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Seeder;
-use App\User;
-use Carbon\Carbon;
-
-class NotificationSeeder extends Seeder
-{
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-    	$user = User::where("email", "user@example.com")->first();
-    	$admin = User::where("email", "admin@example.com")->first();
-
-        DB::table('notifications')->insert([
-            'detail' => 'This is an user seeder notification',
-            'user_id' => $user->id,
-            'link' => '/',
-            'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
-            'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
-        ]);
-
-        DB::table('notifications')->insert([
-            'detail' => 'This is an admin seeder notification',
-            'user_id' => $admin->id,
-            'link' => '/',
-            'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
-            'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
-        ]);
-    }
-}
diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue
index 7f32c3c2..e7d999fe 100644
--- a/resources/assets/js/components/Navbar.vue
+++ b/resources/assets/js/components/Navbar.vue
@@ -6,7 +6,7 @@
       </router-link>
 
       <template v-if="user">
-            <el-dropdown trigger="click" align="right">
+            <!-- <el-dropdown trigger="click" align="right">
               <el-badge :value="bellBadge > 0 ? bellBadge : ''" class="item">
                 <el-button icon="el-icon-bell" circle @click="refreshNoti()"></el-button>
               </el-badge>
@@ -32,7 +32,7 @@
                 <el-button v-if="pagination.next_page_url != null" id="notification-load-more" v-on:click='fetchPaginateBooking(pagination.next_page_url)'>Load more</el-button>
                 <div v-else id="notification-load-more"></div>
               </el-dropdown-menu>
-            </el-dropdown>
+            </el-dropdown> -->
             </template>
 
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false">
@@ -98,8 +98,8 @@ export default {
 
   data: () => ({
     appName: window.config.appName,
-    notification:[],
-    loadingNotification:false,
+    //notification:[],
+    //loadingNotification:false,
     bellBadge : 0,
     unread_message_length:0,
     url: '/api/notification/user',
@@ -110,7 +110,7 @@ export default {
   }),
   mounted(){
     if(this.user){
-      this.getNotification(this.url)
+      //this.getNotification(this.url)
     }
   },
   methods: {
@@ -130,24 +130,24 @@ export default {
         console.log(response.data);
       })
     },
-    getNotification(url){
-      this.notification = [];
-      this.loadingNotification=true;
-      axios
-        .get(url)
-        .then((response) => {
-          this.loadingNotification=false;
-          this.notification = response.data.message.data;
-          this.bellBadge = response.data.unread_message.length;
-          this.makePagination(response.data.message);
-          console.log(response.data);
-        }).catch((error) => {
-          console.log(error)
-          this.$router.push({
-            name: 'notfound'
-          })
-        })
-    },
+    // getNotification(url){
+    //   this.notification = [];
+    //   this.loadingNotification=true;
+    //   axios
+    //     .get(url)
+    //     .then((response) => {
+    //       this.loadingNotification=false;
+    //       this.notification = response.data.message.data;
+    //       this.bellBadge = response.data.unread_message.length;
+    //       this.makePagination(response.data.message);
+    //       console.log(response.data);
+    //     }).catch((error) => {
+    //       console.log(error)
+    //       this.$router.push({
+    //         name: 'notfound'
+    //       })
+    //     })
+    // },
     makePagination(data){
       let pagination ={
         current_page: data.current_page,
@@ -159,7 +159,7 @@ export default {
     },
     fetchPaginateBooking(url) {
       this.url = url;
-      this.loadingNotification=true;
+      //this.loadingNotification=true;
       if(this.url !== null){
         axios
           .get(url)
@@ -177,18 +177,18 @@ export default {
           })
       }
     },
-    readNotification(notification_id){
-      axios
-        .post('/api/notification/read-notification/'+notification_id)
-        .then((response) => {
-          this.getNotification(this.url);
-        }).catch((error) => {
-          console.log(error)
-          this.$router.push({
-            name: 'notfound'
-          })
-        })
-    },
+    // readNotification(notification_id){
+    //   axios
+    //     .post('/api/notification/read-notification/'+notification_id)
+    //     .then((response) => {
+    //       this.getNotification(this.url);
+    //     }).catch((error) => {
+    //       console.log(error)
+    //       this.$router.push({
+    //         name: 'notfound'
+    //       })
+    //     })
+    // },
     navigateTo(nav) {
       window.location.href = nav;
     }
diff --git a/routes/api.php b/routes/api.php
index 2be2d238..46836995 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -49,8 +49,8 @@ Route::group(['middleware' => 'auth:api'], function () {
 	Route::patch('settings/profile', 'Settings\ProfileController@update');
 	Route::patch('settings/password', 'Settings\PasswordController@update');
 
-	Route::get('notification/user', 'NotificationController@getUserMessage');
-	Route::post('notification/read-notification/{notification_id}', 'NotificationController@readNotification');
+	//Route::get('notification/user', 'NotificationController@getUserMessage');
+	//Route::post('notification/read-notification/{notification_id}', 'NotificationController@readNotification');
 
 	// for both user and admin
 	Route::get('active-bank', 'SettingActiveBankController@index');	
@@ -115,11 +115,11 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
 	Route::post('booking/{id}/confirm-supplier', 'BookingController@confirmSupplier');
 
-	Route::get('notification', 'NotificationController@index');
-	Route::get('notification/{notification}', 'NotificationController@show');
-	Route::post('notification', 'NotificationController@store');
-	Route::put('notification/{notification}', 'NotificationController@update');
-	Route::delete('notification/{notification}', 'NotificationController@delete');
+	// Route::get('notification', 'NotificationController@index');
+	// Route::get('notification/{notification}', 'NotificationController@show');
+	// Route::post('notification', 'NotificationController@store');
+	// Route::put('notification/{notification}', 'NotificationController@update');
+	// Route::delete('notification/{notification}', 'NotificationController@delete');
 
 	Route::post('booking/{id}/upload-china-bankslip','ChinaBankSlipController@store');
 	Route::patch('booking/{id}/update-china-bankslip','ChinaBankSlipController@update');

From 2fff081268103c842887d3eb3d3f3411ff7e327d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 10:23:52 +0800
Subject: [PATCH 05/10] remove notification

---
 app/Http/Controllers/BookingController.php | 34 +++-------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index ac8ba39a..d3028c35 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -624,13 +624,6 @@ class BookingController extends Controller
 		$booking->admin_status = 2; 
 		$booking->save();
 
-        // Add notification message to admin
-        $adminNotification = new Notification;
-        $adminNotification->detail = "A bankslip is uploaded for booking " . $booking->id;
-        $adminNotification->link = "/booking/" . $booking->id . "/verification";
-        $adminNotification->user_id = User::withRole('admin')->first()->id;
-        $adminNotification->save();
-
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
         return response()->json($adminNotification,200);
@@ -855,21 +848,13 @@ class BookingController extends Controller
 		$booking->status = 4;
         if($booking->term !== "x1_ba" || $booking->term !== "x2_cheque"){
     		$booking->admin_status = 3;
-            // Add notification message to user
-            $userNotification = new Notification;
-            $userNotification->detail = "Your bankslip for booking " . $booking->id . " is approved.";
-            $userNotification->link = "/booking/" . $booking->id . "/transfer";
-            $userNotification->user_id = $booking->user_id;
-            $userNotification->save();
+            // TODO : Add notification message to user
+
         }
         else{
             $booking->admin_status = 5;
-            // Add notification message to user
-            $userNotification = new Notification;
-            $userNotification->detail = "Your bankslip for booking " . $booking->id . " is approved.";
-            $userNotification->link = "/booking/" . $booking->id . "/supplier";
-            $userNotification->user_id = $booking->user_id;
-            $userNotification->save();
+            // TODO : Add notification message to user
+
         }
         $booking->save();
 
@@ -989,12 +974,6 @@ class BookingController extends Controller
         $booking->admin_status = 6; // upload invoice
         $booking->save();
 
-        $adminNotification = new Notification;
-        $adminNotification->detail = "Purchase Order for booking " . $booking->id . " is uploaded.";
-        $adminNotification->link = "/booking/" . $booking->id . "/upload-invoice";
-        $adminNotification->user_id = User::withRole('admin')->first()->id;
-        $adminNotification->save();
-
         return response()->json($purchase_order,200);
     }
 
@@ -1012,11 +991,6 @@ class BookingController extends Controller
 		$booking->admin_status = 7;  // completed
         
         if($booking->save()){
-            $adminNotification = new Notification;
-            $adminNotification->detail = "Invoice for booking " . $booking->id . " is uploaded.";
-            $adminNotification->link = "/booking/" . $booking->id . "/complete";
-            $adminNotification->user_id = $booking->user_id;
-            $adminNotification->save();
             return response()->json(['message'=>"Success"],200);
         }
     }

From 2ad56b02a6665ebaccd73eecd0cfb1e8b7cb8484 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 10:58:54 +0800
Subject: [PATCH 06/10] removed notification seeder updated boardcasting config
 added rate updated notification file

---
 app/Notifications/RateUpdated.php          | 61 ++++++++++++++++++++++
 app/Providers/BroadcastServiceProvider.php |  4 +-
 composer.json                              |  1 +
 config/app.php                             |  2 +-
 config/broadcasting.php                    |  3 +-
 database/seeds/DatabaseSeeder.php          |  1 -
 6 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 app/Notifications/RateUpdated.php

diff --git a/app/Notifications/RateUpdated.php b/app/Notifications/RateUpdated.php
new file mode 100644
index 00000000..65781b64
--- /dev/null
+++ b/app/Notifications/RateUpdated.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Notification;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class RateUpdated extends Notification
+{
+    use Queueable;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+                    ->line('The introduction to the notification.')
+                    ->action('Notification Action', url('/'))
+                    ->line('Thank you for using our application!');
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
index 352cce44..7a5e15ab 100644
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
@@ -14,8 +14,8 @@ class BroadcastServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Broadcast::routes();
-
+        //Broadcast::routes();
+        Broadcast::routes(["middleware" => ["auth:api"]]);
         require base_path('routes/channels.php');
     }
 }
diff --git a/composer.json b/composer.json
index 3ae12a1a..97b020e5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.6",
+        "pusher/pusher-php-server": "~3.0",
         "tymon/jwt-auth": "^1.0.0-rc.2",
         "zizaco/entrust": "dev-master"
     },
diff --git a/config/app.php b/config/app.php
index 3d40b81c..1c1d20d4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -165,7 +165,7 @@ return [
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
+        App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 5eecd2b2..3ca45eaa 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -36,7 +36,8 @@ return [
             'secret' => env('PUSHER_APP_SECRET'),
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
-                //
+                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'encrypted' => true,
             ],
         ],
 
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index e0ba98e9..ebc04e05 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -28,7 +28,6 @@ class DatabaseSeeder extends Seeder
         $this->call(SettingActiveBankSeeder::class);
         $this->call(SettingTaxRateSeeder::class);
         $this->call(SettingBillingChargeSeeder::class);
-        $this->call(NotificationSeeder::class);
         DB::statement('SET FOREIGN_KEY_CHECKS=1;');
     }
 }

From 330fd3336b4c0db5deb10bb3ae10b9b12282a095 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 11:00:46 +0800
Subject: [PATCH 07/10] added laravel-echo and pusher library to frontend

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 33534d51..1f7f1eff 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,10 @@
     "element-ui": "^2.4.4",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
+    "laravel-echo": "^1.4.0",
     "npm": "^6.0.1",
     "popper.js": "^1.14.1",
+    "pusher-js": "^4.3.0",
     "sweetalert2": "^7.15.1",
     "vform": "^1.0.0",
     "vue": "^2.5.16",

From d295b5d9b49e168f6bc8484f4706041032e3ed15 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 17:08:15 +0800
Subject: [PATCH 08/10] removed some .env-example duplication config updated
 rate updated event added listener to user home page

---
 .env-example                                  |  5 --
 app/Events/RateUpdated.php                    | 47 ++++++++++++++
 app/Notifications/RateUpdated.php             | 61 -------------------
 app/Observers/RateObserver.php                | 21 +++++++
 app/Providers/AppServiceProvider.php          |  3 +
 app/Providers/BroadcastServiceProvider.php    |  1 +
 .../assets/js/components/LocaleDropdown.vue   |  1 +
 resources/assets/js/components/Navbar.vue     | 25 +++-----
 resources/assets/js/middleware/admin.js       |  1 -
 resources/assets/js/pages/home.vue            | 34 +++++++++++
 routes/channels.php                           |  2 +-
 11 files changed, 118 insertions(+), 83 deletions(-)
 create mode 100644 app/Events/RateUpdated.php
 delete mode 100644 app/Notifications/RateUpdated.php
 create mode 100644 app/Observers/RateObserver.php

diff --git a/.env-example b/.env-example
index 4271cefe..5c17b459 100644
--- a/.env-example
+++ b/.env-example
@@ -13,11 +13,6 @@ DB_DATABASE=default
 DB_USERNAME=default
 DB_PASSWORD=secret
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
diff --git a/app/Events/RateUpdated.php b/app/Events/RateUpdated.php
new file mode 100644
index 00000000..58f49817
--- /dev/null
+++ b/app/Events/RateUpdated.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use App\Rate;
+
+class RateUpdated implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $rate;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Rate $rate)
+    {
+        $this->rate  = $rate;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new Channel('rate-updated');
+        //return new PrivateChannel('rate-updated');
+    }
+
+    public function broadcastWith() {
+        return [
+          'rate' => $this->rate,
+        ];
+      }
+
+}
diff --git a/app/Notifications/RateUpdated.php b/app/Notifications/RateUpdated.php
deleted file mode 100644
index 65781b64..00000000
--- a/app/Notifications/RateUpdated.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Notifications;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
-
-class RateUpdated extends Notification
-{
-    use Queueable;
-
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['mail'];
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        return (new MailMessage)
-                    ->line('The introduction to the notification.')
-                    ->action('Notification Action', url('/'))
-                    ->line('Thank you for using our application!');
-    }
-
-    /**
-     * Get the array representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function toArray($notifiable)
-    {
-        return [
-            //
-        ];
-    }
-}
diff --git a/app/Observers/RateObserver.php b/app/Observers/RateObserver.php
new file mode 100644
index 00000000..14e55867
--- /dev/null
+++ b/app/Observers/RateObserver.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Observers;
+
+use App\Rate;
+use App\User;
+use App\Events\RateUpdated;
+
+class RateObserver
+{
+    /**
+     * Handle the rate "created" event.
+     *
+     * @param  \App\Rate  $rate
+     * @return void
+     */
+    public function created(Rate $rate)
+    {
+        event(new RateUpdated($rate));   
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 970793f7..341eaa5e 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,6 +5,8 @@ namespace App\Providers;
 use Laravel\Dusk\DuskServiceProvider;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
+use App\Observers\RateObserver;
+use App\Rate;
 
 
 class AppServiceProvider extends ServiceProvider
@@ -21,6 +23,7 @@ class AppServiceProvider extends ServiceProvider
             Schema::defaultStringLength(191);
         }
         */
+        Rate::observe(RateObserver::class);
         Schema::defaultStringLength(191);
     }
 
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
index 7a5e15ab..7852f779 100644
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
@@ -16,6 +16,7 @@ class BroadcastServiceProvider extends ServiceProvider
     {
         //Broadcast::routes();
         Broadcast::routes(["middleware" => ["auth:api"]]);
+
         require base_path('routes/channels.php');
     }
 }
diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 7b490660..0e411ddf 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -210,6 +210,7 @@ export default {
         })
 
       },
+
   }
    
 }
diff --git a/resources/assets/js/components/Navbar.vue b/resources/assets/js/components/Navbar.vue
index e7d999fe..46544951 100644
--- a/resources/assets/js/components/Navbar.vue
+++ b/resources/assets/js/components/Navbar.vue
@@ -108,11 +108,6 @@ export default {
   computed: mapGetters({
     user: 'auth/user'
   }),
-  mounted(){
-    if(this.user){
-      //this.getNotification(this.url)
-    }
-  },
   methods: {
     async logout(){
       // Log out the user.
@@ -121,15 +116,15 @@ export default {
       // Redirect to login.
       this.$router.push({ name: 'login' });
     },
-    refreshNoti() {
-      axios.get(this.url).then(response => {
-        this.bookingTable = response.data.data
-        this.notification = response.data.message.data;
-        this.bellBadge = response.data.unread_message.length;
-        this.makePagination(response.data.message);
-        console.log(response.data);
-      })
-    },
+    // refreshNoti() {
+    //   axios.get(this.url).then(response => {
+    //     this.bookingTable = response.data.data
+    //     this.notification = response.data.message.data;
+    //     this.bellBadge = response.data.unread_message.length;
+    //     this.makePagination(response.data.message);
+    //     console.log(response.data);
+    //   })
+    // },
     // getNotification(url){
     //   this.notification = [];
     //   this.loadingNotification=true;
@@ -191,7 +186,7 @@ export default {
     // },
     navigateTo(nav) {
       window.location.href = nav;
-    }
+    }  
   }
 }
 </script>
diff --git a/resources/assets/js/middleware/admin.js b/resources/assets/js/middleware/admin.js
index f2ccc855..3a0c97b3 100644
--- a/resources/assets/js/middleware/admin.js
+++ b/resources/assets/js/middleware/admin.js
@@ -1,7 +1,6 @@
 import store from '~/store'
 
 export default (to, from, next) => {
-  console.log(store.getters['auth/role'])
   if (store.getters['auth/role'] !== 'admin') {
     next({ name: 'home' })
   } else {
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index c02353aa..ff154287 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -402,6 +402,8 @@ import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
 import store from '~/store'
 import axios from 'axios'
+import Echo from "laravel-echo"
+import Pusher from "pusher-js"
 
 export default {
   middleware: ['auth'],
@@ -526,8 +528,40 @@ export default {
     this.initBooking();
     this.getRate();
     this.getCompleteBooking();
+    this.listen();
   },
   methods: {
+    // listen to update rate changes 
+    listen(){
+      window.Echo = new Echo({
+          broadcaster: 'pusher',
+          key: '20cae353616471c0c765',
+          cluster: 'ap1',
+          encrypted: true,
+          auth: {
+              headers: {
+                  Authorization: 'Bearer ' + localStorage.getItem("token")
+              },
+          },
+        
+      });
+  
+      window.Echo.channel('rate-updated')
+      .listen('RateUpdated', response => {
+        if (! ('Notification' in window)) {
+              alert('Web Notification is not supported');
+              return;
+        }
+
+        this.$message({
+          showClose: true,
+          message: 'New rate updated at ' + response.rate.created_at,
+          duration: 20000
+        });
+
+      });
+      
+    },
     getBooking(){
       let $this = this
       axios.get(this.url).then(response => {
diff --git a/routes/channels.php b/routes/channels.php
index f16a20b9..6babdff1 100644
--- a/routes/channels.php
+++ b/routes/channels.php
@@ -12,5 +12,5 @@
 */
 
 Broadcast::channel('App.User.{id}', function ($user, $id) {
-    return (int) $user->id === (int) $id;
+    return true;
 });

From 57331363c07c43fbf2160a8d956cee0c5f3d8f84 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 17:11:39 +0800
Subject: [PATCH 09/10] update realtime rate on user home page

---
 resources/assets/js/pages/home.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index ff154287..d38f393b 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -552,13 +552,12 @@ export default {
               alert('Web Notification is not supported');
               return;
         }
-
         this.$message({
           showClose: true,
           message: 'New rate updated at ' + response.rate.created_at,
           duration: 20000
         });
-
+        this.rate = response.rate      
       });
       
     },

From f7c0fdc6904640df4035ee39726c2b5cce91e387 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 16 Aug 2018 17:52:37 +0800
Subject: [PATCH 10/10] fix test

---
 app/Http/Controllers/BookingController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index d3028c35..d1bb15ac 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -626,7 +626,7 @@ class BookingController extends Controller
 
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
-        return response()->json($adminNotification,200);
+        return response()->json(["success"=>true],200);
     }
 
     public function uploadPurchaseOrder(Request $request, $id)