Merge with HAJ MAHDI (A)

app/Http/Controllers/AuthController.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Cache;
 use Laravel\Lumen\Routing\Controller;
 use Laravel\Socialite\Facades\Socialite;
 use Illuminate\Session\TokenMismatchException;
+use phpDocumentor\Reflection\Location;
 use Symfony\Component\HttpFoundation\Response;
 
 class AuthController extends Controller
@@ -69,7 +70,7 @@ class AuthController extends Controller
 
         $user = User::where('email', $request->email)->first();
         if ($user && Hash::check($request->password, $user->password)) {
-            Auth::viaRequest('api', fn() => $user);
+            Auth::setUser($user);
 
             return [
                 'auth' => $this->createFingerPrint(),
@@ -252,11 +253,11 @@ class AuthController extends Controller
     public function createFingerPrint()
     {
         $attributes = [
-            'agent' => \request()->getAgent(),
-            'ip' => \request()->getClientIp(),
-            'os' => \request()->getOS(),
-            'latitude' => \request()->getLocation()->getAttribute('lat'),
-            'longitude' => \request()->getLocation()->getAttribute('lon'),
+            'agent' => request()->getAgent(),
+            'ip' => request()->getClientIp(),
+            'os' => request()->getOS(),
+            'latitude' => 5,
+            'longitude' => 5,
         ];
 
         $values = [

app/Http/Controllers/CreditController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Transaction;
+use App\Models\Transaction;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Spatie\QueryBuilder\QueryBuilder;

app/Http/Controllers/FileController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\File;
-use App\Project;
+use App\Models\File;
+use App\Models\Project;
+use App\Rules\maxBound;
 use App\Models\Business;
-use App\Rules\MaxBound;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;

app/Http/Controllers/InvoiceController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Cost;
+use App\Models\Cost;
 use App\Models\Business;
 use Illuminate\Http\Request;
 use Spatie\QueryBuilder\QueryBuilder;

app/Http/Controllers/ProjectController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Project;
+use App\Models\Project;
 use App\Models\Business;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;

app/Http/Controllers/SprintController.php

@@ -1,10 +1,8 @@
 <?php
 
-
 namespace App\Http\Controllers;
 
-
-use App\Sprint;
+use App\Models\Sprint;
 use App\Models\Business;
 use Illuminate\Http\Request;
 

app/Http/Controllers/StatusController.php

@@ -1,10 +1,8 @@
 <?php
 
-
 namespace App\Http\Controllers;
 
-
-use App\Status;
+use App\Models\Status;
 use App\Models\Business;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

app/Http/Controllers/SystemController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\System;
+use App\Models\System;
 use App\Models\Business;
 use Illuminate\Http\Request;
 

app/Http/Controllers/TagController.php

@@ -1,12 +1,9 @@
 <?php
 
-
 namespace App\Http\Controllers;
 
-
-use App\Tag;
+use App\Models\Tag;
 use App\Models\Business;
-use App\Workflow;
 use Illuminate\Http\Request;
 
 class TagController extends Controller

app/Http/Controllers/TaskController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\TagTask;
 use Carbon\Carbon;
 use App\Models\Task;
 use App\Models\Work;
+use App\Models\TagTask;
 use App\Rules\maxBound;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;

app/Http/Controllers/TaskFileController.php

@@ -3,12 +3,11 @@
 namespace App\Http\Controllers;
 
 use Auth;
-use App\File;
-use App\Task;
-use App\Project;
+use App\Models\File;
+use App\Models\Task;
+use App\Models\Project;
 use App\Models\Business;
 use Illuminate\Http\Request;
-use mysql_xdevapi\Exception;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\FileResource;
 use Symfony\Component\HttpFoundation\Response;

app/Http/Controllers/WorkflowController.php

@@ -1,14 +1,10 @@
 <?php
 
-
 namespace App\Http\Controllers;
 
-
-use App\Status;
 use App\Models\Business;
-use App\Workflow;
+use App\Models\Workflow;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 
 class WorkflowController extends Controller
 {

app/Models/Business.php

@@ -2,14 +2,14 @@
 
 namespace App\Models;
 
-use App\File;
+use App\Models\File;
 use App\Models\Model;
 use App\Models\SoftDeletes;
+use App\Models\ReportableRelation;
 use Illuminate\Validation\Rule;
 use Illuminate\Http\UploadedFile;
 use Spatie\MediaLibrary\HasMedia;
 use Illuminate\Support\Facades\Cache;
-use App\HiLib\Models\ReportableRelation;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 

app/Models/Project.php

@@ -2,13 +2,13 @@
 
 namespace App\Models;
 
-use App\File;
+use App\Models\File;
 use App\Models\Model;
 use App\Models\SoftDeletes;
+use App\Models\ReportableRelation;
 use Illuminate\Validation\Rule;
 use Illuminate\Http\UploadedFile;
 use Spatie\MediaLibrary\HasMedia;
-use App\HiLib\Models\ReportableRelation;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 

app/Models/ReportableRelation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Utilities\Models;
+namespace App\Models;
 
 use Anik\Amqp\Exchange;
 use Anik\Amqp\Facades\Amqp;

app/Models/Task.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\ReportableRelation;
 use Carbon\Carbon;
 use App\Models\Tag;
 use App\Models\User;
@@ -13,7 +14,6 @@ use App\Models\TagTask;
 use App\Models\Business;
 use Illuminate\Validation\Rule;
 use Illuminate\Support\Facades\DB;
-use App\HiLib\Models\ReportableRelation;
 use Illuminate\Validation\Rules\RequiredIf;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 

app/Models/User.php

@@ -2,15 +2,15 @@
 
 namespace App\Models;
 
-use App\File;
+use App\Models\File;
 use App\Models\Model;
 use App\Models\SoftDeletes;
+use App\Models\ReportableRelation;
 use Illuminate\Validation\Rule;
 use Illuminate\Http\UploadedFile;
 use Spatie\MediaLibrary\HasMedia;
 use Illuminate\Auth\Authenticatable;
 use Laravel\Lumen\Auth\Authorizable;
-use App\HiLib\Models\ReportableRelation;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;

bootstrap/app.php

@@ -52,4 +52,11 @@ $app->singleton(
 |
 */
 
+$app->router->group([
+    'namespace' => 'App\Http\Controllers',
+    'prefix' => '/user/v1/'
+], function ($router) {
+    require __DIR__.'/../routes/api.php';
+});
+
 return $app;