Merge pull request #1 from ECLK/master

pull

.env

@@ -4,7 +4,8 @@ APP_KEY=base64:sBNbJThk+cKYWyRAisG8KYkFAkv527csvLTIMlRcP8I=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
-NOMINETION_API=https://jsonplaceholder.typicode.com/users
+NOMINETION_API=https://apim-gateway.ecdev.opensource.lk/nominations/0.9/
+NOMINETION_API_KEY=45c03f99-c08c-39cb-a46b-ce3d322f0479
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1

.gitignore

@@ -0,0 +1,26 @@
+/vendor/
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+
+# Laravel 5 & Lumen specific with changed public path
+public_html/storage
+public_html/hot
+
+storage/*.key
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
+.phpunit.result.cache
+storage/framework/views/ae5a9a730500788d3a7068e5205c4fdaa854b85b.php
+storage/logs/laravel.log
+storage/logs/laravel.log

app/Http/Controllers/FormController.php

@@ -3,42 +3,37 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use GuzzleHttp\Client;
 
 class FormController extends Controller
 {
     public function viewPE9()
     {
-        $client = new Client();
-    	$response = $client->request('GET', env('NOMINETION_API'));
-    	$statusCode = $response->getStatusCode();
-        // $body = $response->getBody();
+        $client = resolve('nomination.client');
+        $response = $client->request('GET', 'teams');
+        $statusCode = $response->getStatusCode();
         $body = $response->getBody()->getContents();
         $obj = json_decode($body);
-        //dd($body);
         return view('pe9')->with('Fdata',$obj);
 
     }
 
     public function viewPE30()
     {
-        $client = new Client();
-    	$response = $client->request('GET', env('NOMINETION_API'));
+        $client = resolve('nomination.client');
+    	$response = $client->request('GET','elections/electionStatus/APPROVE');
     	$statusCode = $response->getStatusCode();
         $body = $response->getBody()->getContents();
         $obj = json_decode($body);
         return view('pe30x1x2')->with('Fdata',$obj);
-
     }
+
     public function getDistrict(Request $request){
         $client = new Client();
     	$response = $client->request('GET', env('NOMINETION_API').'?id='.$request->id);
     	$statusCode = $response->getStatusCode();
         $body = $response->getBody()->getContents();
         $data = json_decode($body);
         return response()->json($data);
-
-
       }
 
       public function getBallot(Request $request){

app/Providers/NominationClientServiceProvider.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use GuzzleHttp\Client;
+
+class NominationClientServiceProvider extends ServiceProvider
+{
+
+    public function register()
+    {
+        $this->app->bind('nomination.client', function () {
+            $config = [
+                'base_uri' => env('NOMINETION_API'),
+                'headers' => [
+                    'Authorization' => 'Bearer ' . env('NOMINETION_API_KEY')
+                ]
+            ];
+            return new Client($config);
+        });
+    }
+}

bootstrap/cache/services.php

@@ -28,6 +28,7 @@
     24 => 'App\\Providers\\AuthServiceProvider',
     25 => 'App\\Providers\\EventServiceProvider',
     26 => 'App\\Providers\\RouteServiceProvider',
+    27 => 'App\\Providers\\NominationClientServiceProvider',
   ),
   'eager' => 
   array (
@@ -45,6 +46,7 @@
     11 => 'App\\Providers\\AuthServiceProvider',
     12 => 'App\\Providers\\EventServiceProvider',
     13 => 'App\\Providers\\RouteServiceProvider',
+    14 => 'App\\Providers\\NominationClientServiceProvider',
   ),
   'deferred' => 
   array (

config/app.php

@@ -176,7 +176,7 @@
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
+        App\Providers\NominationClientServiceProvider::class,
     ],
 
     /*

storage/framework/views/c8801fa03f67d6c5677972a7c9ad18a52a5420e2.php

@@ -17,6 +17,8 @@
   <link href="https://fonts.googleapis.com/css?family=Raleway:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Lora:400,400i,700,700i" rel="stylesheet">
 
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+
   <!-- Custom styles for this template -->
   <link href="css/business-casual.min.css" rel="stylesheet">
 
@@ -102,6 +104,9 @@
     </div>
   </footer>
 
+  <?php echo $__env->yieldPushContent('scripts'); ?>
+
+
   <!-- Bootstrap core JavaScript -->
   <script src="vendor/jquery/jquery.min.js"></script>
   <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>