fixed merged conflict

routes/api.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Http\Request;
-
+use App\Company;
 /*
 |--------------------------------------------------------------------------
 | API Routes
@@ -23,13 +23,18 @@ use Illuminate\Http\Request;
 //});
 
 Route::post('register', 'AuthController@register');
+/* Authentication */
 Route::post('login', 'AuthController@login');
-Route::post('recover', 'AuthController@recover');
+Route::post('password/recover', 'AuthController@recover');
+Route::post('password/reset', 'AuthController@reset');
+Route::post('send-verification', 'AuthController@sendVerification');
+Route::post('verify-phone', 'AuthController@verifyPhone');
 
 Route::group(['middleware' => ['jwt.auth']], function() {
     Route::get('logout', 'AuthController@logout');
-    Route::get('test', function(){
-        return response()->json(['foo'=>'bar']);
+    Route::patch('user', 'AuthController@updateUser');
+    Route::get('test', function(Request $request){
+        return response()->json(['user'=> $request->user()]);
     });
 
     /*Delivery-Info in profile menu*/
@@ -37,4 +42,11 @@ Route::group(['middleware' => ['jwt.auth']], function() {
     Route::post('/deliveryinfo', 'DeliveryinfoController@store');
     Route::put('/deliveryinfo/{com_id}', 'DeliveryinfoController@update');
     Route::delete('/deliveryinfo/{com_id}', 'DeliveryinfoController@destroy');
+
+    
+    /* Company */
+    Route::patch('/company', 'CompanyController@update'); //update company information
+    Route::post('/company/company_profile/', 'CompanyController@companyProfile');//upload company profile picture
+    Route::post('/company/reg_cert/', 'CompanyController@regCert'); //upload registration certificaate
 });
+

routes/web.php

@@ -22,5 +22,6 @@
 
 
 
+//Route::post('login', 'AuthController@login');
 Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.request');
 Route::post('password/reset', 'Auth\ResetPasswordController@postReset')->name('password.reset');