diff --git a/IES-Bandung/app/Http/Controllers/VendorUserController.php b/IES-Bandung/app/Http/Controllers/VendorUserController.php index b6f01c33fd0c3299e9fc322bfd46ab439f7c0444..ccc03ca16d231a339db4a17fa969011fd79d1a82 100644 --- a/IES-Bandung/app/Http/Controllers/VendorUserController.php +++ b/IES-Bandung/app/Http/Controllers/VendorUserController.php @@ -19,11 +19,11 @@ class VendorUserController extends Controller public function viewProfile($username) { $editable = Auth::check() ? Auth::user()['username'] === $username : false; - $user = User::where('username', $username)->first(); - $vendorDBID = $this->VendorUserModel->getFullProfile($user->id)["vendorDBID"]; + $userId = Auth::user()['id']; + $user = $this->VendorUserModel->getFullProfile($userId); $objects = ObjectSell:: join('ObjectType', 'ObjectSell.objectTypeID', '=', 'ObjectType.objectTypeID')-> - where('vendorDBID', '=', $vendorDBID)-> + where('vendorDBID', '=', $user->vendorDBID)-> select('ObjectSell.*', 'ObjectType.objectTypeName')-> get(); diff --git a/IES-Bandung/public/img/pasar.png b/IES-Bandung/public/img/pasar.png new file mode 100644 index 0000000000000000000000000000000000000000..048d8036e654e8514f31e71e22f4123e32a79659 Binary files /dev/null and b/IES-Bandung/public/img/pasar.png differ diff --git a/IES-Bandung/resources/views/auth/login.blade.php b/IES-Bandung/resources/views/auth/login.blade.php index 2223974e1e9db7cbb24a743209e03933d13d5ae7..c2bb8aca2cc7fb99bc16ad3884ef21a8c785cd84 100755 --- a/IES-Bandung/resources/views/auth/login.blade.php +++ b/IES-Bandung/resources/views/auth/login.blade.php @@ -6,7 +6,9 @@ <div class="container w-xxl w-auto-xs" > <div class="header-signin"> <div class="wrapper-lg text-center"> - <img src="img/logo-bdg.png" alt=""> + <a class="navbar-brand text-lt"> + <img src="http://localhost:8888/img/ecohub.png" alt="." class="large-logo"> + </a> <p class="m-t-sm m-b-none">Integrated Economy System Bandung<br />Web App</p> </div> </div> diff --git a/IES-Bandung/resources/views/vendorUser.blade.php b/IES-Bandung/resources/views/vendorUser.blade.php index 242a24fee854bd313e4283e9b383317c2e62f2ad..590212e0d00146392ea2c7ab4e973223d9b298e9 100755 --- a/IES-Bandung/resources/views/vendorUser.blade.php +++ b/IES-Bandung/resources/views/vendorUser.blade.php @@ -32,10 +32,10 @@ <div class="clear m-b"> <div class="m-b-sm m-t-sm"> <span class="text22 text-white font-semibold">{{ $user->fullName }}</span> - <small class="m-l-sm text-info"><a href="#">@kangburhan</a></small> + <small class="m-l-sm text-info"><a href="#">{{ $user->email }}</a></small> </div> <div class=""> - <span class="text12 m-b-md text-grey"><i class="text-white fa fa-map-marker text14 m-r-xs"></i> Pasar Baru, Bandung</span> + <span class="text12 m-b-md text-grey"><i class="text-white fa fa-map-marker text14 m-r-xs"></i> {{ $user->vendingPlace }}</span> </div> <p class="m-b m-t-sm"> <a href class="m-r-sm text-white btn-icon"><i class="text16 fa fa-twitter"></i></a> @@ -54,7 +54,7 @@ <small class="text-10 text-grey">Pembeli</small> </a> <a href class="inline padder-v padder-md"> - <span class="h3 block font-bold m-b-xs">47</span> + <span class="h3 block font-bold m-b-xs">{{ count($objects) }}</span> <small class="text-10 text-grey">Barang Dagangan</small> </a> <a href class="inline padder-v padder-md">