From e58b650eb18f6e2533a474a94fc238ba4e0513e5 Mon Sep 17 00:00:00 2001
From: Rumperuu <me+git@bengoldsworthy.net>
Date: Mon, 29 Aug 2022 21:34:48 +0000
Subject: [PATCH] Amend date formats, map zoom

---
 resources/views/tracker.blade.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/views/tracker.blade.php b/resources/views/tracker.blade.php
index ed9757d..3c5dbf4 100644
--- a/resources/views/tracker.blade.php
+++ b/resources/views/tracker.blade.php
@@ -20,10 +20,10 @@
         <header>
             <h1>Where in the World is Ben?</h1>
             <p>
-                <span> Tracking started: {{ $trip->date_start }}</span> |
+                <span> Tracking started: {{ date('j M Y (G:H)', strtotime($trip->date_start)) }}</span> |
                 <span class="{{ ($trip->is_active) ? "positive" : "negative" }}">{{ ($trip->is_active) ? "Active" : "Ended" }}</span> | 
                 <span class="{{ ($trip->is_tracking) ? "positive" : "negative" }}">{{ ($trip->is_tracking) ? "Currently tracking" : "Not currently tracking" }}</span> 
-                <span class="small">(Last update: {{ $trip->updated_at }})</span>
+                <span class="small">(Last update: {{ date('j M Y (G:H)', strtotime($trip->updated_at)) }})</span>
             </p>
         </header>
 
@@ -34,7 +34,7 @@
                 @foreach($trip->checkins as $checkin)
                 <li>
                     <details id="{{ $checkin->id }}" ontoggle="toggleCheckin(this.open, this.id)">
-                        <summary><h2>{{ $checkin->title ?? "[No title]" }}</h2> <span>{{ $checkin->date }}</span></summary>
+                        <summary><h2>{{ $checkin->title ?? "[No title]" }}</h2> <span>{{ date('j M Y (G:H)', strtotime($checkin->date)) }}</span></summary>
                         {{ $checkin->note ?? "[No note]" }}
                     </details>
                 </li>
@@ -45,7 +45,7 @@
 
         <footer>
             <script>
-                var map = L.map('map').setView([{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}], 10);
+                var map = L.map('map').setView([{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}], 7);
                 L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
                     maxZoom: 19,
                     attribution: 'OpenStreetMap'
@@ -70,6 +70,11 @@
                 
                 checkinMarkers[{{ $checkin->id }}] = marker;
                 @endforeach
+
+                var currLocation = L.marker(
+                    [{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}], 
+                ).addTo(map).setZIndexOffset(1000);
+                currLocation.bindPopup('<p>Current location</p>').openPopup();
                 
                 function toggleCheckin(isOpen, checkinId) {
                     if (isOpen) {