diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 3ac2596..0c445e5 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -159,6 +159,7 @@ class AuthController extends Controller return response()->json(['success'=> true, 'message'=> 'Profile updated.'], 200); } + public function show() { return response()->json(['user' => Auth::user()]); diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index b522c5b..0df596a 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -57,7 +57,7 @@ class CompanyController extends Controller public function company() { - return response()->json(['user' => Auth::user()]); + return response()->json(['company' => Auth::user()->company()->first()]); } public function companyProfile(Request $request) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 109c2bc..1ce7e13 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -13,7 +13,7 @@ class DatabaseSeeder extends Seeder { $this->call(LaratrustSeeder::class); $this->call(UsersTableSeeder::class); - $this->call(DeliveryInfoSeeder::class); + //$this->call(DeliveryInfoSeeder::class); $this->call(CompanySeeder::class); } } diff --git a/public/company-profile.html b/public/company-profile.html index 6bb6eaf..8cff3dd 100644 --- a/public/company-profile.html +++ b/public/company-profile.html @@ -141,6 +141,35 @@ diff --git a/public/home.html b/public/home.html index bbddbe1..73e853a 100644 --- a/public/home.html +++ b/public/home.html @@ -55,43 +55,39 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
- -
-
- +
@@ -616,7 +612,7 @@