diff --git a/app/Http/Controllers/ContractAdminController.php b/app/Http/Controllers/ContractAdminController.php new file mode 100644 index 000000000..89dad9ea2 --- /dev/null +++ b/app/Http/Controllers/ContractAdminController.php @@ -0,0 +1,46 @@ +middleware('auth'); + $this->middleware('role:User'); + } + + public function displayContractDashboard() { + + return view('contracts/admin/display'); + } + + public function displayNewContract() { + + return view('contracts/admin/new'); + } + + public function storeNewContract() { + + return redirect('contracts/admin/display'); + } + + public function storeAcceptContract(Request $request) { + + return redirect('contracts/admin/display'); + } + + public function deleteContract(Request $request) { + + return redirect('contracts/admin/display'); + } +} diff --git a/app/Http/Controllers/ContractController.php b/app/Http/Controllers/ContractController.php index f06189806..728fc1426 100644 --- a/app/Http/Controllers/ContractController.php +++ b/app/Http/Controllers/ContractController.php @@ -16,7 +16,7 @@ class ContractController extends Controller { public function __construct() { $this->middleware('auth'); - $this->middleware('permission:ContractAdmin'); + $this->middleware('role:User'); } public function displayContracts() { @@ -24,13 +24,13 @@ class ContractController extends Controller return view('contracts/display'); } - public function displayEnterBid() { - - return redirect('contracts/display'); - } - public function storeBid(Request $request) { return redirect('contracts/display'); } + + public function deleteBid(Request $request) { + + return redirect('contracts/display'); + } } diff --git a/resources/views/contracts/admin/contractpanel.blade.php b/resources/views/contracts/admin/contractpanel.blade.php index e69de29bb..98b174758 100644 --- a/resources/views/contracts/admin/contractpanel.blade.php +++ b/resources/views/contracts/admin/contractpanel.blade.php @@ -0,0 +1,47 @@ +@extends('layouts.b4') +@section('content') +
+

Test Dashboard

+
+
+
+
+
+
+
+ New Contracts +
+
+ + + + + + + + + + + + + + + +
NumberNameItemsEnd Date
1Name2 Nags24-04-2019
+
+
+
+
+
+
+
+
+
+ Current Top Bid +
+
+ Some corporation and the price +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/contracts/admin/newcontract.blade.php b/resources/views/contracts/admin/newcontract.blade.php new file mode 100644 index 000000000..c0a189486 --- /dev/null +++ b/resources/views/contracts/admin/newcontract.blade.php @@ -0,0 +1,46 @@ +@extends('layouts.b4') +@section('content') +
+

Test Page

+
+
+
+
+
+
+
+ New Contracts +
+
+ {!! Form::open(['action' => 'ContractAdminController@storeNewContract', 'method' => 'POST']) !!} +
+ {{ Form::label('name', 'Contract Name') }} + {{ Form::text('name', '', ['class' => 'form-control', 'placeholder' => '1.0B']) }} +
+
+ {{ Form::label('description', 'Description') }} + {{ Form::textbox('description', '', ['class' => 'form-control']) }} +
+
+ {{ Form::label('date', 'End Date') }} + {{ Form::text('date', '', ['class' => 'form-control', 'placeholder' => '4/24/2019']) }} +
+ {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} + {!! Form::close() !!} +
+
+
+
+
+
+
+
+
+ Current Top Bid +
+
+ Some corporation and the price +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/contracts/enterbid.blade.php b/resources/views/contracts/enterbid.blade.php new file mode 100644 index 000000000..4bef0898a --- /dev/null +++ b/resources/views/contracts/enterbid.blade.php @@ -0,0 +1,28 @@ +@extends('layouts.b4') +@section('content') +
+

Test Page - Enter Bid

+
+
+
+
+
+
+
+ Enter Bid +
+
+ {!! Form::open(['action' => 'ContractController@storeBid', 'method' => 'POST']) !!} +
+ {{ Form::label('bid', 'Bid') }} + {{ Form::text('bid', '', ['class' => 'form-control', 'placeholder' => '1.0B']) }} +
+ {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }} + {!! Form::close() !!} +
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/contracts/privatecontract.blade.php b/resources/views/contracts/privatecontract.blade.php index e69de29bb..3a9b47827 100644 --- a/resources/views/contracts/privatecontract.blade.php +++ b/resources/views/contracts/privatecontract.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.b4') +@section('content') +
+

Test Page

+
+
+
+
+
+
+
+ New Contracts +
+
+ + + + + + + + + + + + + + + +
NumberNameItemsEnd Date
1Name2 Nags24-04-2019
+
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/contracts/publiccontract.blade.php b/resources/views/contracts/publiccontract.blade.php index e69de29bb..5130232b2 100644 --- a/resources/views/contracts/publiccontract.blade.php +++ b/resources/views/contracts/publiccontract.blade.php @@ -0,0 +1,47 @@ +@extends('layouts.b4') +@section('content') +
+

Test Page

+
+
+
+
+
+
+
+ New Contracts +
+
+ + + + + + + + + + + + + + + +
NumberNameItemsEnd Date
1Name2 Nags24-04-2019
+
+
+
+
+
+
+
+
+
+ Current Top Bid +
+
+ Some corporation and the price +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 93aef0b09..fd2fbe7fa 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -23,7 +23,7 @@ @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
  • - +
    Wiki Registration @@ -33,7 +33,7 @@ @endif @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
  • - +
    Buyback Program
    @@ -41,7 +41,7 @@ @endif @if(auth()->user()->hasPermission('structure.operator'))
  • - +
    Current Taxes Register Structure @@ -52,6 +52,18 @@
    • @endif + @if(auth()->user()->hasRole('User') +
  • + +
    + Display Contracts + @if(auth()->user()->hasPermission('contract.admin')) + Admin Dashboard + New Contract + @endif +
    +
    • + @endif