diff --git a/app/Http/Controllers/ContractAdminController.php b/app/Http/Controllers/ContractAdminController.php index 89dad9ea2..3292946c3 100644 --- a/app/Http/Controllers/ContractAdminController.php +++ b/app/Http/Controllers/ContractAdminController.php @@ -21,12 +21,12 @@ class ContractAdminController extends Controller public function displayContractDashboard() { - return view('contracts/admin/display'); + return view('contracts/admin/contractpanel'); } public function displayNewContract() { - return view('contracts/admin/new'); + return view('contracts/admin/newcontract'); } public function storeNewContract() { diff --git a/app/Http/Controllers/ContractController.php b/app/Http/Controllers/ContractController.php index 728fc1426..af50868a4 100644 --- a/app/Http/Controllers/ContractController.php +++ b/app/Http/Controllers/ContractController.php @@ -19,18 +19,23 @@ class ContractController extends Controller $this->middleware('role:User'); } - public function displayContracts() { + public function displayPublicContracts() { - return view('contracts/display'); + return view('contracts/publiccontract'); + } + + public function displayPrivateContracts() { + + return view ('contracts/privatecontract'); } public function storeBid(Request $request) { - return redirect('contracts/display'); + return redirect('contracts/publiccontract'); } public function deleteBid(Request $request) { - return redirect('contracts/display'); + return redirect('contracts/publiccontract'); } } diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index f8c6619e0..16ba175bb 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -56,7 +56,8 @@