Merge branch 'master' of http://projectcs.sci.ubu.ac.th/Kittisak162/co-op-search

app/Http/Controllers/AuthController.php

@@ -57,7 +57,7 @@ class AuthController extends Controller
     public function getAuthenticatedUser()
     {
         try {
-            if(!user == JWTAuth::parseToken()->authenticate()) {
+            if(! $user = JWTAuth::parseToken()->authenticate()) {
                 return response()->json(['user_not_found'], 404);
             }
         } catch(Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {

resources/js/components/Toolbar.vue

@@ -29,7 +29,7 @@
           <v-btn v-if="!responsive" flat color="black" class="mx-0 px-0 body-2 font-weight-bold">
             <span class="body-2 font-weight-bold">เกี่ยวกับเรา</span>
           </v-btn>
-          <v-btn v-if="!responsive" flat color="black" class="mx-0 px-0 body-2 font-weight-bold">
+          <v-btn v-if="!responsive" flat color="black" class="m x-0 px-0 body-2 font-weight-bold">
             <span class="body-2 font-weight-bold">เกี่ยวกับเรา</span>
           </v-btn>
           <v-btn v-if="!responsive" flat color="black" class="mx-0 px-0 body-2 font-weight-bold">

routes/api.php

@@ -16,5 +16,5 @@ use Illuminate\Http\Request;
 Route::group(['prefix' => 'auth'], function ($router) {
     Route::post('register', 'AuthController@register');
     Route::post('login', 'AuthController@login');
-    Route::post('current', 'AuthController@getAuthenticatedUser');
+    Route::get('current', 'AuthController@getAuthenticatedUser');
 });
\ No newline at end of file