Fixing case when task not found

app/Http/Controllers/ApiController.php

@@ -61,7 +61,7 @@ class ApiController extends Controller
 		$days = ($request->input('days', 15) - 1);
 
 		$task = Task::with(['group'])
-			->find($id)
+			->findOrFail($id)
 		;
 
 		if (! is_null($task)) {

resources/views/app.vue

@@ -34,16 +34,15 @@
             getTasks: function() {
                 this.$http.get('/api/getTasks')
                 .then(response => this.$store.commit('setTasks', response.data))
-                .then(() => {
-                    this.refreshed_time = this.moment();
-                    this.loading.hide()
-                })
                 .catch(error => {
                     this.loading.hide()
                     clearTimeout(this.refresh)
                     window.alert('An error occurred when getting tasks. Automatic refresh has been disabled. You should fix and reload this page.')
                 })
-                this.refreshed_time = this.moment();
+                .then(() => {
+                    this.refreshed_time = this.moment();
+                    this.loading.hide()
+                })
             }
         },
         beforeRouteLeave(to, from, next) {

resources/views/taskdetails.vue

@@ -179,6 +179,9 @@
 						}, 10000)
 					}
 				})
+				.catch(error => {
+					//TODO: do something
+				})
 				.then(() => {
 					this.loader.hide()
 				})

routes/web.php

@@ -13,10 +13,10 @@
 |
 */
 
-$router->group(['prefix' => 'api/'], function () use ($router) {
-    $router->get('getTasks/',  ['uses' => 'ApiController@getTasks']);
-    $router->post('getTask/{id}',  ['uses' => 'ApiController@getTaskDetails']);
-    $router->patch('toggleTaskStatus/{id}',  ['uses' => 'ApiController@toggleTaskStatus']);
+$router->group(['prefix' => '/api'], function () use ($router) {
+    $router->get('/getTasks/',  ['uses' => 'ApiController@getTasks']);
+    $router->post('/getTask/{id}',  ['uses' => 'ApiController@getTaskDetails']);
+    $router->patch('/toggleTaskStatus/{id}',  ['uses' => 'ApiController@toggleTaskStatus']);
 });
 
 $router->get('/{route:.*}/', function () {