From d5bd0f189c4f38b6acbf2591006a93793aba1dec Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Sun, 28 Apr 2019 04:34:16 -0500
Subject: [PATCH] contract blade

---
 app/Http/Controllers/ContractController.php          | 11 ++++-------
 resources/views/contracts/privatecontracts.blade.php |  9 ---------
 resources/views/contracts/publiccontracts.blade.php  |  2 +-
 routes/web.php                                       |  3 ++-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/ContractController.php b/app/Http/Controllers/ContractController.php
index b67b45a07..080450e55 100644
--- a/app/Http/Controllers/ContractController.php
+++ b/app/Http/Controllers/ContractController.php
@@ -26,8 +26,8 @@ class ContractController extends Controller
     /**
      * Controller function to display the bids placed on contracts
      */
-    public function displayBids($contractId) {
-        $bids = Bids::where(['contract_id' => $contractId, 'character_name' => auth()->user()->getName()])->get();
+    public function displayBids($id) {
+        $bids = Bids::where(['contract_id' => $id, 'character_name' => auth()->user()->getName()])->get();
 
         return view('contracts.bids')->with('bids', $bids);
     }
@@ -107,12 +107,9 @@ class ContractController extends Controller
      * Controller function to display a page to allow a bid
      * 
      */
-    public function displayBid(Request $request) {
-        $this->validate($request, [
-            'contract_id',
-        ]);
+    public function displayNewBid($id) {
 
-        $contractId = $request->contract_id;
+        $contractId = $id;
 
         return view('contracts.enterbid')->with('contractId', $contractId);
     }
diff --git a/resources/views/contracts/privatecontracts.blade.php b/resources/views/contracts/privatecontracts.blade.php
index b30d67ce3..eb4a0e8db 100644
--- a/resources/views/contracts/privatecontracts.blade.php
+++ b/resources/views/contracts/privatecontracts.blade.php
@@ -26,15 +26,6 @@
                                 {!! Form::close() !!}
                             </div>
                         </div>
-                        <p align="text-left">
-                            
-                        </p>
-                        <p align="text-center">
-                            
-                        </p>
-                        <p align="text-right">
-                            
-                        </p>
                     </div>
                     <div class="card-body">
                         <div class="container">
diff --git a/resources/views/contracts/publiccontracts.blade.php b/resources/views/contracts/publiccontracts.blade.php
index 64e5216f0..f2b967531 100644
--- a/resources/views/contracts/publiccontracts.blade.php
+++ b/resources/views/contracts/publiccontracts.blade.php
@@ -20,7 +20,7 @@
                                 Type: Public
                             </div>
                             <div class="col-sm" align="right">
-                                <a href="/contracts/display/bid/{{$contract['contract_id']}}" class="btn btn-primary" role="button">Bid on Contract</a>
+                                <a href="/contracts/display/newbid/{{$contract['contract_id']}}" class="btn btn-primary" role="button">Bid on Contract</a>
                                 <!--
                                 {!! Form::open(['action' => 'ContractController@displayBid', 'method' => 'POST']) !!}
                                 {{ Form::hidden('contract_id', $contract['contract_id']) }}
diff --git a/routes/web.php b/routes/web.php
index 7474d98d8..b4736bbf1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -78,8 +78,9 @@ Route::group(['middleware' => ['auth']], function(){
     Route::get('/contracts/display/all', 'ContractController@displayContracts');
     Route::get('/contracts/display/public', 'ContractController@displayPublicContracts');
     Route::get('/contracts/display/private', 'ContractController@displayPrivateContracts');
-    Route::get('/contracts/display/bid/{id}', 'ContractController@displayBid');
+    Route::get('/contracts/display/newbid/{id}', 'ContractController@displayNewBid');
     Route::get('/contracts/modify/bid/{id}', 'ContractController@displayModifyBid');
+    Route::get('/contracts/display/bids/{id}', 'ContractController@displayBids');
     Route::post('/contracts/modify/bid', 'ContractController@modifyBid');
     Route::post('/contracts/bids/store', 'ContractController@storeBid');
     Route::post('/contracts/bids/delete', 'ContractController@deleteBid');