From 878575a88bb714e87628f8af2b009130eff31d68 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 13 Dec 2018 20:17:22 +0800
Subject: [PATCH 1/5] Add outlet listing api endpoint

---
 app/Http/Controllers/Api/OutletController.php | 18 ++++++++++++++++++
 app/Http/Resources/Outlet.php                 | 19 +++++++++++++++++++
 app/Http/Resources/OutletCollection.php       | 19 +++++++++++++++++++
 app/Outlet.php                                |  4 ++++
 routes/api.php                                |  7 +++++++
 tests/Feature/Api/OutletListingTest.php       | 26 ++++++++++++++++++++++++++
 6 files changed, 93 insertions(+)
 create mode 100644 app/Http/Controllers/Api/OutletController.php
 create mode 100644 app/Http/Resources/Outlet.php
 create mode 100644 app/Http/Resources/OutletCollection.php
 create mode 100644 tests/Feature/Api/OutletListingTest.php

diff --git a/app/Http/Controllers/Api/OutletController.php b/app/Http/Controllers/Api/OutletController.php
new file mode 100644
index 0000000..5409e6c
--- /dev/null
+++ b/app/Http/Controllers/Api/OutletController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Outlet;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\OutletCollection;
+
+class OutletController extends Controller
+{
+    public function index(Request $request)
+    {
+        $outlets = Outlet::all();
+
+        return new OutletCollection($outlets);
+    }
+}
diff --git a/app/Http/Resources/Outlet.php b/app/Http/Resources/Outlet.php
new file mode 100644
index 0000000..fabc7a7
--- /dev/null
+++ b/app/Http/Resources/Outlet.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class Outlet extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}
diff --git a/app/Http/Resources/OutletCollection.php b/app/Http/Resources/OutletCollection.php
new file mode 100644
index 0000000..9108282
--- /dev/null
+++ b/app/Http/Resources/OutletCollection.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class OutletCollection extends ResourceCollection
+{
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}
diff --git a/app/Outlet.php b/app/Outlet.php
index 14f9c85..912b540 100644
--- a/app/Outlet.php
+++ b/app/Outlet.php
@@ -11,6 +11,10 @@ class Outlet extends Model
         'name', 'address', 'latitude', 'longitude', 'creator_id',
     ];
 
+    public $appends = [
+        'coordinate', 'map_popup_content',
+    ];
+
     public function getNameLinkAttribute()
     {
         $title = __('app.show_detail_title', [
diff --git a/routes/api.php b/routes/api.php
index c641ca5..ea4244f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -16,3 +16,10 @@ use Illuminate\Http\Request;
 Route::middleware('auth:api')->get('/user', function (Request $request) {
     return $request->user();
 });
+
+Route::group(['as' => 'api.', 'namespace' => 'Api'], function () {
+    /*
+     * Outlets Endpoints
+     */
+    Route::get('outlets', 'OutletController@index')->name('outlets.index');
+});
diff --git a/tests/Feature/Api/OutletListingTest.php b/tests/Feature/Api/OutletListingTest.php
new file mode 100644
index 0000000..35f6a86
--- /dev/null
+++ b/tests/Feature/Api/OutletListingTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Api;
+
+use App\Outlet;
+use Tests\BrowserKitTest as TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class OutletListingTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function guest_can_retrieve_outlet_list()
+    {
+        $outlet = factory(Outlet::class)->create();
+
+        $this->getJson(route('api.outlets.index'));
+
+        $this->seeJson([
+            'name'       => $outlet->name,
+            'address'    => $outlet->address,
+            'coordinate' => $outlet->coordinate,
+        ]);
+    }
+}

From d46b0f3d8be30f6003bc49d4484cf2c9883fc30d Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 13 Dec 2018 22:53:25 +0800
Subject: [PATCH 2/5] Add interactive map on outlet markers/locations

---
 app/Http/Controllers/Api/OutletController.php | 25 +++++++++++
 app/Http/Controllers/OutletMapController.php  | 13 ++++++
 resources/views/layouts/app.blade.php         |  1 +
 resources/views/outlets/map.blade.php         | 61 +++++++++++++++++++++++++++
 routes/api.php                                |  1 +
 routes/web.php                                |  1 +
 6 files changed, 102 insertions(+)
 create mode 100644 app/Http/Controllers/OutletMapController.php
 create mode 100644 resources/views/outlets/map.blade.php

diff --git a/app/Http/Controllers/Api/OutletController.php b/app/Http/Controllers/Api/OutletController.php
index 5409e6c..9c3d04d 100644
--- a/app/Http/Controllers/Api/OutletController.php
+++ b/app/Http/Controllers/Api/OutletController.php
@@ -6,6 +6,7 @@ use App\Outlet;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\OutletCollection;
+use App\Http\Resources\Outlet as OutletResource;
 
 class OutletController extends Controller
 {
@@ -15,4 +16,28 @@ class OutletController extends Controller
 
         return new OutletCollection($outlets);
     }
+
+    public function geoJSON(Request $request)
+    {
+        $outlets = Outlet::all();
+
+        $geoJSONdata = $outlets->map(function ($outlet) {
+            return [
+                'type'       => 'Feature',
+                'properties' => new OutletResource($outlet),
+                'geometry'   => [
+                    'type'        => 'Point',
+                    'coordinates' => [
+                        $outlet->longitude,
+                        $outlet->latitude,
+                    ],
+                ],
+            ];
+        });
+
+        return response()->json([
+            'type'     => 'FeatureCollection',
+            'features' => $geoJSONdata,
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/OutletMapController.php b/app/Http/Controllers/OutletMapController.php
new file mode 100644
index 0000000..e162087
--- /dev/null
+++ b/app/Http/Controllers/OutletMapController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class OutletMapController extends Controller
+{
+    public function index(Request $request)
+    {
+        return view('outlets.map');
+    }
+}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 615791f..bd508e0 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -37,6 +37,7 @@
                     <!-- Right Side Of Navbar -->
                     <ul class="navbar-nav ml-auto">
                         <!-- Authentication Links -->
+                        <li class="nav-item"><a class="nav-link" href="{{ route('outlet_map.index') }}">{{ __('outlet.list') }}</a></li>
                         @guest
                             <li class="nav-item">
                                 <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
diff --git a/resources/views/outlets/map.blade.php b/resources/views/outlets/map.blade.php
new file mode 100644
index 0000000..5eeb5c1
--- /dev/null
+++ b/resources/views/outlets/map.blade.php
@@ -0,0 +1,61 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="card">
+        <div class="card-header">{{ __('outlet.list') }}</div>
+
+        <div class="card-body" id="mapid"></div>
+    </div>
+</div>
+@endsection
+
+@section('styles')
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.1/dist/leaflet.css"
+    integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ=="
+    crossorigin=""/>
+
+<style>
+    #mapid { min-height: 500px; }
+</style>
+@endsection
+@push('scripts')
+<!-- Make sure you put this AFTER Leaflet's CSS -->
+<script src="https://unpkg.com/leaflet@1.3.1/dist/leaflet.js"
+    integrity="sha512-/Nsx9X4HebavoBvEBuyp3I7od5tA0UzAxs+j83KgC8PU0kgB4XiK4Lfe4y4cgBtaRJQEIFCW+oC506aPT2L1zw=="
+    crossorigin=""></script>
+
+<script>
+    var map = L.map('mapid').setView(['-3.333333', '114.583333'], 12);
+    var baseUrl = "{{ url('/') }}";
+
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    }).addTo(map);
+
+    axios.get('{{ route('api.outlets.geojson') }}')
+    .then(function (response) {
+        console.log(response.data);
+        L.geoJSON(response.data, {
+            pointToLayer: function(geoJsonPoint, latlng) {
+                var myIcon = L.icon({
+                    iconUrl: baseUrl + '/images/marker-icon-green.png',
+                    shadowUrl: baseUrl + '/images/marker-shadow.png',
+                    iconSize: [25, 41],
+                    iconAnchor: [12, 41],
+                    popupAnchor: [1, -34],
+                    shadowSize: [41, 41],
+                    className: 'marker-icon-green',
+                });
+                return L.marker(latlng, { icon: myIcon });
+            }
+        })
+        .bindPopup(function (layer) {
+            return layer.feature.properties.map_popup_content;
+        }).addTo(map);
+    })
+    .catch(function (error) {
+        console.log(error);
+    });
+</script>
+@endpush
diff --git a/routes/api.php b/routes/api.php
index ea4244f..5a25e86 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -22,4 +22,5 @@ Route::group(['as' => 'api.', 'namespace' => 'Api'], function () {
      * Outlets Endpoints
      */
     Route::get('outlets', 'OutletController@index')->name('outlets.index');
+    Route::get('outlets-geojson', 'OutletController@geoJSON')->name('outlets.geojson');
 });
diff --git a/routes/web.php b/routes/web.php
index b936799..393bab8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,4 +22,5 @@ Route::get('/home', 'HomeController@index')->name('home');
 /*
  * Outlets Routes
  */
+Route::get('/our_outlets', 'OutletMapController@index')->name('outlet_map.index');
 Route::resource('outlets', 'OutletController');

From c7f73c9013a6cf9b74470e2c5fd963bcc90ac160 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 15 Dec 2018 22:19:01 +0800
Subject: [PATCH 3/5] Merge outlet geojson into index action

---
 app/Http/Controllers/Api/OutletController.php |  8 --------
 resources/views/outlets/map.blade.php         |  2 +-
 routes/api.php                                |  1 -
 tests/Feature/Api/OutletListingTest.php       | 23 +++++++++++++++++++----
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Api/OutletController.php b/app/Http/Controllers/Api/OutletController.php
index 9c3d04d..006f77c 100644
--- a/app/Http/Controllers/Api/OutletController.php
+++ b/app/Http/Controllers/Api/OutletController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;
 use App\Outlet;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\OutletCollection;
 use App\Http\Resources\Outlet as OutletResource;
 
 class OutletController extends Controller
@@ -14,13 +13,6 @@ class OutletController extends Controller
     {
         $outlets = Outlet::all();
 
-        return new OutletCollection($outlets);
-    }
-
-    public function geoJSON(Request $request)
-    {
-        $outlets = Outlet::all();
-
         $geoJSONdata = $outlets->map(function ($outlet) {
             return [
                 'type'       => 'Feature',
diff --git a/resources/views/outlets/map.blade.php b/resources/views/outlets/map.blade.php
index 5eeb5c1..41a0a85 100644
--- a/resources/views/outlets/map.blade.php
+++ b/resources/views/outlets/map.blade.php
@@ -33,7 +33,7 @@
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     }).addTo(map);
 
-    axios.get('{{ route('api.outlets.geojson') }}')
+    axios.get('{{ route('api.outlets.index') }}')
     .then(function (response) {
         console.log(response.data);
         L.geoJSON(response.data, {
diff --git a/routes/api.php b/routes/api.php
index 5a25e86..ea4244f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -22,5 +22,4 @@ Route::group(['as' => 'api.', 'namespace' => 'Api'], function () {
      * Outlets Endpoints
      */
     Route::get('outlets', 'OutletController@index')->name('outlets.index');
-    Route::get('outlets-geojson', 'OutletController@geoJSON')->name('outlets.geojson');
 });
diff --git a/tests/Feature/Api/OutletListingTest.php b/tests/Feature/Api/OutletListingTest.php
index 35f6a86..2a44046 100644
--- a/tests/Feature/Api/OutletListingTest.php
+++ b/tests/Feature/Api/OutletListingTest.php
@@ -17,10 +17,25 @@ class OutletListingTest extends TestCase
 
         $this->getJson(route('api.outlets.index'));
 
-        $this->seeJson([
-            'name'       => $outlet->name,
-            'address'    => $outlet->address,
-            'coordinate' => $outlet->coordinate,
+        $this->seeJsonSubset([
+            'type'     => 'FeatureCollection',
+            'features' => [
+                [
+                    'type'       => 'Feature',
+                    'properties' => [
+                        'name'       => $outlet->name,
+                        'address'    => $outlet->address,
+                        'coordinate' => $outlet->coordinate,
+                    ],
+                    'geometry'   => [
+                        'type'        => 'Point',
+                        'coordinates' => [
+                            $outlet->longitude,
+                            $outlet->latitude,
+                        ],
+                    ],
+                ],
+            ],
         ]);
     }
 }

From 11ab9e5bcf0b2ac1937466a59b8bb2fc85885537 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 15 Dec 2018 23:24:16 +0800
Subject: [PATCH 4/5] Update map setView config

---
 resources/views/outlets/map.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/outlets/map.blade.php b/resources/views/outlets/map.blade.php
index 41a0a85..957a0db 100644
--- a/resources/views/outlets/map.blade.php
+++ b/resources/views/outlets/map.blade.php
@@ -26,7 +26,7 @@
     crossorigin=""></script>
 
 <script>
-    var map = L.map('mapid').setView(['-3.333333', '114.583333'], 12);
+    var map = L.map('mapid').setView(['-3.313695', '114.590148'], 13);
     var baseUrl = "{{ url('/') }}";
 
     L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {

From 2877411ac11383fd04385c60b76da273d0c837a5 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sun, 16 Dec 2018 19:36:38 +0800
Subject: [PATCH 5/5] Update outlets map menu to our outlets

Remove container div from map view
---
 resources/lang/en/menu.php            | 5 +++++
 resources/views/layouts/app.blade.php | 2 +-
 resources/views/outlets/map.blade.php | 8 ++------
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 resources/lang/en/menu.php

diff --git a/resources/lang/en/menu.php b/resources/lang/en/menu.php
new file mode 100644
index 0000000..908a18c
--- /dev/null
+++ b/resources/lang/en/menu.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'our_outlets' => 'Our Outlets',
+];
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index bd508e0..dad4c4d 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -37,7 +37,7 @@
                     <!-- Right Side Of Navbar -->
                     <ul class="navbar-nav ml-auto">
                         <!-- Authentication Links -->
-                        <li class="nav-item"><a class="nav-link" href="{{ route('outlet_map.index') }}">{{ __('outlet.list') }}</a></li>
+                        <li class="nav-item"><a class="nav-link" href="{{ route('outlet_map.index') }}">{{ __('menu.our_outlets') }}</a></li>
                         @guest
                             <li class="nav-item">
                                 <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
diff --git a/resources/views/outlets/map.blade.php b/resources/views/outlets/map.blade.php
index 957a0db..abc45b3 100644
--- a/resources/views/outlets/map.blade.php
+++ b/resources/views/outlets/map.blade.php
@@ -1,12 +1,8 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
-    <div class="card">
-        <div class="card-header">{{ __('outlet.list') }}</div>
-
-        <div class="card-body" id="mapid"></div>
-    </div>
+<div class="card">
+    <div class="card-body" id="mapid"></div>
 </div>
 @endsection