Feature/enhancements deploy

.github/workflows/docker-image.yml

@@ -0,0 +1,57 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ feature/enhancements ]
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Docker login Docker Build Docker Push
+        id: create-docker-image
+        env:
+          DOCKER_USER: ${{secrets.DOCKER_USER}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+          DOCKER_REGISTRY: ${{secrets.DOCKER_REGISTRY}}
+          DOCKER_REPOSITORY: ${{secrets.DOCKER_REPOSITORY}}
+          ECS_TASK_DEFINITION: ${{secrets.ECS_TASK_DEFINITION}}
+          GIT_HASH: ${{ github.sha }}
+        run: |
+          # Build a docker container and
+          # push it to Docker Hub so that it can
+          # be deployed to ECS.
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          docker pull $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} || echo 'Cache not available'
+          docker build --cache-from $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/} -t $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH .
+          docker tag $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}
+          docker push $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}
+          docker push $DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH
+          echo "::set-output name=image::$DOCKER_REGISTRY/$DOCKER_REPOSITORY:${GITHUB_REF##*/}.$GIT_HASH"
+          echo $ECS_TASK_DEFINITION > task-definition.json
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Fill in the nginx image ID in the Amazon ECS task definition
+        id: fill-task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: task-definition.json
+          container-name: ${{ secrets.CONTAINER_NAME }}
+          image: ${{ steps.create-docker-image.outputs.image }}
+
+      - name: Deploy Amazon ECS task definition
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        with:
+          task-definition: ${{ steps.fill-task-def.outputs.task-definition }}
+          service: ${{ secrets.ECS_SERVICE }}
+          cluster: ${{ secrets.ECS_CLUSTER }}
+          wait-for-service-stability: true

app/Http/Controllers/FilterController.php

@@ -1,5 +1,6 @@
 <?php namespace App\Http\Controllers;
 
+use Carbon\Carbon;
 use App\Http\Services\APIService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -83,7 +84,6 @@ public function gIndex(Request $request)
             'description' => sprintf($descp, $title),
         ];
         $showCountry             = true;
-
         return view(
             'site.groupDemo',
             compact(

app/Http/Services/APIService.php

@@ -263,7 +263,6 @@ public function filterRecentSearch($filter)
     {
         extract($filter);
         $per_page = !empty($per_page) ? $per_page : 25;
-
         redirectIfOldAnnotationCategory($annotation_category);
 
         $query = [
@@ -287,13 +286,11 @@ public function filterRecentSearch($filter)
             'annotated'           => $annotated,
 
         ];
-
         if ($filter['download']) {
             $this->downloadAPI('contracts/search', $query);
         }
 
         $contract = $this->apiCall('contracts/recent', $query);
-
         if ($contract) {
             return $contract;
         }
@@ -312,7 +309,6 @@ public function filterGroupSearch($filter)
     {
         extract($filter);
         $per_page = !empty($per_page) ? $per_page : 25;
-
         redirectIfOldAnnotationCategory($annotation_category);
 
         $query = [

app/Http/Services/LocalizationService.php

@@ -3,6 +3,7 @@
 use App\Http\Services\Admin\OptionService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Translation\Translator;
 
 /**
@@ -81,8 +82,13 @@ public function getLanguage($lang = null)
 
         $browserLang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : '';
 
-        if (!isset($_COOKIE[$this->key]) && array_key_exists($browserLang, $availableLang)) {
+        if(is_int($browserLang)||is_string($browserLang)) {
+            if (!isset($_COOKIE[$this->key]) && array_key_exists($browserLang, $availableLang)) {
             $lang = $browserLang;
+            }
+        } else {
+            Log::warning("INVALID HTTP_ACCEPT_LANGUAGE");
+            Log::warning(json_encode($browserLang));
         }
 
         if (is_null($lang)) {

resources/views/contract/detail.blade.php

@@ -155,7 +155,7 @@
 								<label for="">@lang('global.type_contract')</label>
                                 <span class="contract-type-list">@if(isset($contract->metadata->contract_type) && !empty($contract->metadata->contract_type) && is_array($contract->metadata->contract_type))
 										@foreach($contract->metadata->contract_type as $contractype)
-											<a href="{{route("search",['contract_type'=>$contractype])}}">{{_l('codelist/contract_type',$contractype) }}</a>
+											<a href="{{route("search/group",['contract_type'=>$contractype])}}">{{_l('codelist/contract_type',$contractype) }}</a>
 										@endforeach
 									@endif
                                 </span>
@@ -255,7 +255,7 @@ class="view-annotation disabled"><span>@if(site()->isRCCategorySite()) @lang('gl
 							<li class="col-xs-12 col-sm-4 col-md-4 col-lg-4">
 								<label for="">@lang('contract.company_name')</label>
                                 <span>@if(isset($company->company->name) && !empty($company->company->name)) <a
-											href="{{route("search",['company_name'=>$company->company->name])}}">{{$company->company->name}} </a> @else
+											href="{{route("search/group",['company_name'=>$company->company->name])}}">{{$company->company->name}} </a> @else
 										- @endif</span>
 							</li>
 							<li class="col-xs-12 col-sm-4 col-md-4 col-lg-4">
@@ -295,7 +295,7 @@ class="view-annotation disabled"><span>@if(site()->isRCCategorySite()) @lang('gl
 								<label for="">@lang('contract.corporate_grouping')</label>
                                 <span>
 									@if(isset($company->company->corporate_grouping) && !empty($company->company->corporate_grouping))
-										<a href="{{route("search",
+										<a href="{{route("search/group",
 										['corporate_group'=>$company->company->corporate_grouping])}}">{{$company->company->corporate_grouping}} </a>
 									@else
 										-

resources/views/country/detail.blade.php

@@ -28,7 +28,7 @@
             <div class="filter-wrapper">
                 <div class="col-lg-12">
                     <div class="filter-country-wrap">
-                        <form action="{{url('search')}}" method="GET" class="search-form filter-form">
+                        <form action="{{url('search/group')}}" method="GET" class="search-form filter-form">
                             <div class="form-group">
                                 <button type="submit" class="btn btn-filter-search pull-left"></button>
                                 <input type="text" name="q" class="form-control pull-left"
@@ -72,7 +72,7 @@
                         <ul>
                             @foreach($resources as $resource)
                                 <li>
-                                    <span><a href="{{route("search")}}?q=&country%5B%5D={{$country}}&resource%5B%5D={{urlencode($resource->resource)}}">{{_l("resources",$resource->resource)}}</a></span>
+                                    <span><a href="{{route("search/group")}}?q=&country%5B%5D={{$country}}&resource%5B%5D={{urlencode($resource->resource)}}">{{_l("resources",$resource->resource)}}</a></span>
                                     <span class="count pull-right">{{$resource->contract}}</span>
                                 </li>
                             @endforeach

resources/views/resource/detail.blade.php

@@ -18,7 +18,7 @@
 			<div class="filter-wrapper">
 				<div class="col-lg-12">
 					<div class="filter-country-wrap">
-						<form action="{{url('search')}}" method="get" class="search-form filter-form">
+						<form action="{{url('search/group')}}" method="get" class="search-form filter-form">
 							<div class="form-group">
 								<button type="submit" class="btn btn-filter-search pull-left"></button>
 								<input type="text" name="q" class="form-control pull-left"
@@ -64,7 +64,7 @@
 							<ul>
 								@foreach($countries as $country)
 									<li>
-										<span><a href="{{route("search")}}?q=&resource%5B%5D={{urlencode($resource)}}&country%5B%5D={{urlencode($country->code)}}">{{trans('country')[strtoupper(ucfirst($country->code))]}}</a></span>
+										<span><a href="{{route("search/group")}}?q=&resource%5B%5D={{urlencode($resource)}}&country%5B%5D={{urlencode($country->code)}}">{{trans('country')[strtoupper(ucfirst($country->code))]}}</a></span>
 										<span class="count pull-right">{{$country->contract}}</span>
 									</li>
 								@endforeach

resources/views/site/filter.blade.php

@@ -1,3 +1,8 @@
+<?php
+    header("Status: 301 Moved Permanently");
+    header("Location:./search/group?". $_SERVER['QUERY_STRING']);
+    die();
+?>
 @extends('layout.app-full')
 
 @section('content')

resources/views/site/home-country.blade.php

@@ -30,7 +30,7 @@ class="pull-left trigger">
 				<div class="petroleum-mineral">
 					{!! site()->meta('tagline') !!}
 					<div class="clearfix">
-						<form action="{{route('search')}}" method="GET" class="search-form" role="search">
+						<form action="{{route('search/group')}}" method="GET" class="search-form" role="search">
 							<div class="form-group clearfix">
 								<input type="text" name="q" class="form-control"
 									   placeholder="@lang('global.search') {{$contracts}} @lang('global.contracts') @lang('global.associated_documents')">
@@ -40,7 +40,7 @@ class="pull-left trigger">
 							</div>
 						</form>
 						<div class="advance-search">
-							<a href="{{url('search')}}">@lang('global.advanced_search')</a>
+							<a href="{{url('search/group')}}">@lang('global.advanced_search')</a>
 						</div>
 					</div>
 				</div>