From 4312243161ca4716010006dbca12c3f63c3687f2 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 24 Apr 2019 23:54:26 -0500
Subject: [PATCH] contract framework

---
 app/Http/Controllers/ContractAdminController.php |  4 ++--
 app/Http/Controllers/ContractController.php      | 13 +++++++++----
 resources/views/layouts/navbar.blade.php         |  3 ++-
 routes/web.php                                   |  3 ++-
 4 files changed, 15 insertions(+), 8 deletions(-)

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 @@
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contracts</a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
-                    <a class="dropdown-item" href="/contracts/display">Display Contracts</a>
+                    <a class="dropdown-item" href="/contracts/display/public">Display Public Contracts</a>
+                    <a class="dropdown-item" href="/contracts/display/private">Display Private Contracts</a>
                     @if(auth()->user()->hasPermission('contract.admin'))
                     <a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
                     <a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
diff --git a/routes/web.php b/routes/web.php
index 6e144c2c8..75009f535 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -75,7 +75,8 @@ Route::group(['middleware' => ['auth']], function(){
     Route::post('redirectToProvider', 'EsiScopeController@redirectToProvider');
 
     //Contract Controller display pages
-    Route::get('/contracts/display', 'ContractController@displayContracts');
+    Route::get('/contracts/display/public', 'ContractController@displayPublicContracts');
+    Route::get('/contracts/display/private', 'ContractController@displayPrivateContracts');
     Route::post('/contracts/bids/store', 'ContractController@storeBid');
     Route::post('/contracts/bids/delete', 'ContractController@deleteBid');