Completed
Pull Request — develop (#76)
by Neil
07:56
created
app/Http/Middleware/Authenticate.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
         if (Auth::guard($guard)->guest()) {
21 21
             if ($request->ajax() || $request->wantsJson()) {
22 22
                 return response('Unauthorized.', 401);
23
-            } else {
23
+            }
24
+            else {
24 25
                 return redirect()->guest('login');
25 26
             }
26 27
         }
Please login to merge, or discard this patch.
app/Console/Commands/DeleteUser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     public function handle()
63 63
     {
64 64
         $user = $this->argument('user');
65
-        $user_list = User::select('username')->where('username', 'like', '%' . $user . '%')->orWhere('realname', 'like', '%' . $user . '%')->get();
65
+        $user_list = User::select('username')->where('username', 'like', '%'.$user.'%')->orWhere('realname', 'like', '%'.$user.'%')->get();
66 66
         $names = [];
67 67
 
68 68
         if (count($user_list) < 1) {
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
         else {
79 79
             $name = $names[0];
80 80
         }
81
-        if ($this->confirm('Do you wish to remove ' . $name . '?')) {
81
+        if ($this->confirm('Do you wish to remove '.$name.'?')) {
82 82
             User::where('username', $name)->delete();
83 83
             $this->info('User deleted.');
84 84
         }
Please login to merge, or discard this patch.
app/Api/Controllers/UsersWidgetController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace App\Api\Controllers;
4 4
 
5
-use App\Models\User;
6 5
 use App\Models\Widgets;
7 6
 use Illuminate\Http\Request;
8 7
 
Please login to merge, or discard this patch.
app/Api/Controllers/WidgetController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     /**
16 16
      * Display a listing of all widgets
17 17
      *
18
-     * @return \Illuminate\Http\Response
18
+     * @return \Illuminate\Database\Eloquent\Collection
19 19
      */
20 20
     public function index(Request $request)
21 21
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace App\Api\Controllers;
4 4
 
5
-use App\Models\User;
6 5
 use App\Models\Widgets;
7 6
 use Illuminate\Http\Request;
8 7
 
Please login to merge, or discard this patch.
app/Http/Controllers/HomeController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,6 @@
 block discarded – undo
7 7
 use Illuminate\Http\Request;
8 8
 use App\Models\Dashboard;
9 9
 use JWTAuth;
10
-use Tymon\JWTAuth\Exceptions\JWTException;
11 10
 
12 11
 class HomeController extends Controller
13 12
 {
Please login to merge, or discard this patch.
app/Api/Controllers/DashboardWidgetController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public function store(Request $request)
47 47
     {
48
-        $row                         = UsersWidgets::where('user_id', $request->user()->user_id)->where('dashboard_id', $request->dashboard_id)->max('row')+1;
48
+        $row                         = UsersWidgets::where('user_id', $request->user()->user_id)->where('dashboard_id', $request->dashboard_id)->max('row') + 1;
49 49
         $user_widget                 = new UsersWidgets;
50 50
         $user_widget->user_id        = $request->user()->user_id;
51 51
         $user_widget->widget_id      = $request->widget_id;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
     public function show(Request $request, $id)
74 74
     {
75 75
         $widget  = Widgets::find($id);
76
-        $content = $this->api->be(auth()->user())->get('/api/dashboard-widget/' . $id . '/content');
76
+        $content = $this->api->be(auth()->user())->get('/api/dashboard-widget/'.$id.'/content');
77 77
         return array('widget' => $widget, 'content' => $content);
78 78
     }
79 79
 
Please login to merge, or discard this patch.
app/Api/Controllers/DashboardController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             'name' => 'required|max:255',
56 56
             'access' => 'required',
57 57
         ]);
58
-        if($validation->passes())
58
+        if ($validation->passes())
59 59
         {
60 60
             $dashboard = new dashboard;
61 61
             $dashboard->user_id        = $request->user()->user_id;
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
                     $duplicate_widgets = Dashboard::find($request->copy_from)->widgets()->get();
69 69
                     foreach ($duplicate_widgets as $new_widget)
70 70
                     {
71
-                        UsersWidgets::create([  'user_id'      => $request->user()->user_id,
71
+                        UsersWidgets::create(['user_id'      => $request->user()->user_id,
72 72
                                                 'widget_id'    => $new_widget->widget_id,
73 73
                                                 'col'          => $new_widget->col,
74 74
                                                 'row'          => $new_widget->row,
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         }
90 90
         else {
91 91
             $errors = $validation->errors();
92
-            return response()->json($errors,422);
92
+            return response()->json($errors, 422);
93 93
         }
94 94
     }
95 95
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
             'name' => 'required|max:255',
135 135
             'access' => 'required',
136 136
         ]);
137
-        if($validation->passes())
137
+        if ($validation->passes())
138 138
         {
139 139
             $dashboard = Dashboard::find($id);
140 140
             $dashboard->dashboard_name = $request->name;
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
         }
150 150
         else {
151 151
             $errors = $validation->errors();
152
-            return response()->json($errors,422);
152
+            return response()->json($errors, 422);
153 153
         }
154 154
     }
155 155
 
Please login to merge, or discard this patch.