fix: show open checkin on map

ignore backup folder
lint: run linter
2024-03-14 20:11:55 +01:00 · 2024-03-14 20:11:07 +01:00 · 2024-03-14 19:31:28 +01:00 · 2024-03-14 19:25:31 +01:00 · 2024-03-14 19:24:18 +01:00 · 2024-02-18 16:36:27 +00:00
6 changed files with 64 additions and 54 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@
 /public/*/videos
 /public/*/audio
 /storage/*.key
+/backup
 /vendor
 .phpunit.result.cache
 Homestead.json
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@ -30,7 +30,7 @@ class Kernel extends ConsoleKernel
                 });

        $schedule->command('digest:send --fortnightly')
-                 ->twiceMonthly(1,16,'13:00')
+                 ->twiceMonthly(1, 16, '13:00')
                 ->onFailure(function () {
                     Log::error("Fortnightly email digest send failed");
                 });
--- a/app/Http/Controllers/TrackerController.php
+++ b/app/Http/Controllers/TrackerController.php
@ -49,7 +49,8 @@ class TrackerController extends Controller
            return view(
                'error',
                [
-                    'message' => "App timed out whilst downloading trip data from Wayward's servers. They may be down currently."
+                    'message' => "App timed out whilst downloading trip data" .
+                    " from Wayward's servers. They may be down currently."
                ]
            );
        }
@ -145,7 +146,7 @@ class TrackerController extends Controller
        // Otherwise, download the trip data from the Wayward API.
        if ($forceDownload) {
            Log::debug("Forcing download for '{$tripFileName}'.");
-            Storage::disk('local')->delete($tripFileName); 
+            Storage::disk('local')->delete($tripFileName);
        } else {
            Log::debug("No cached trip file found for '{$tripFileName}'.");
        }
@ -230,9 +231,9 @@ class TrackerController extends Controller
            $dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));
            $lng += $dlng;

-            array_push($points, (object)[ 
+            array_push($points, (object)[
                'id' => $id++,
-                'latitude' => $lat/100000, 
+                'latitude' => $lat/100000,
                'longitude' => $lng/100000
            ]);
        }
--- a/package.json
+++ b/package.json
@ -2,8 +2,12 @@
    "private": true,
    "scripts": {
        "dev": "vite",
-        "build": "vite build && rsync --delete -rP app artisan bootstrap composer.* config database lang public resources routes storage tests vendor ovhvps:~/track",
-        "sync": "rsync -rP ./public/ ovhvps:~/track/public",
+        "build": "vite build",
+        "deploy": "rsync --delete -rP app artisan bootstrap composer.* config database lang resources routes storage tests ovhvps:~/track",
+        "deploy:public": "rsync --delete -rP public ovhvps:~/track",
+        "deploy:dependencies": "rsync --delete -rP vendor ovhvps:~/track",
+        "deploy:full": "npm run deploy && npm run deploy:public && npm run deploy:dependencies && npm run deploy:finish",
+        "deploy:finish": "ssh ovhvps 'cd track && docker compose down && docker system prune -f && docker compose up -d --build'",
        "lint": "npm run lint:php; npm run lint:css",
        "lint:fix": "npm run lint:php:fix; npm run lint:css:fix",
        "lint:php": "./vendor/bin/phpcs",
--- a/resources/views/partials/head.blade.php
+++ b/resources/views/partials/head.blade.php
@ -18,6 +18,8 @@
    <script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
        integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
        crossorigin=""></script>
+    <script src='https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/Leaflet.fullscreen.min.js'></script>
+    <link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css' rel='stylesheet' />

    @vite(['resources/css/app.css', 'resources/js/app.js'])
 </head>
--- a/resources/views/tracker.blade.php
+++ b/resources/views/tracker.blade.php
@ -16,9 +16,9 @@
            <section class="trip-meta">
                <p>
                    <span> Tracking started: {!! render_date_difference($trip->date_start) !!}</span> |
-                    <span class="{{ ($trip->is_active) ? "positive" : "negative" }}">{{ ($trip->is_active) ? "Active" : "Ended" }}</span> | 
+                    <span class="{{ ($trip->is_active) ? "positive" : "negative" }}">{{ ($trip->is_active) ? "Active" : "Ended" }}</span> |
                    @if ($trip->is_active)
-                    <span class="{{ ($trip->is_tracking) ? "positive" : "negative" }}">{{ ($trip->is_tracking) ? "Currently tracking" : "Not currently tracking" }}</span> 
+                    <span class="{{ ($trip->is_tracking) ? "positive" : "negative" }}">{{ ($trip->is_tracking) ? "Currently tracking" : "Not currently tracking" }}</span>
                    @endif
                    <span class="small">(Last update: {!! render_date_difference($trip->updated_at) !!})</span>
                </p>
@ -52,7 +52,7 @@
                /*
                 * Initialise the map
                 */
-                var map = L.map('map');
+                var map = L.map('map', { fullscreenControl: true });
                L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
                    maxZoom: 19,
                    attribution: 'OpenStreetMap'
@ -82,7 +82,7 @@

                /*
                 * Populate all the checkins and popup texts.
-                 *
+                 */
                var checkinMarkers = [];
                var marker = null, popupMarkup = null;
                var markerIcon = L.icon({
@ -94,43 +94,44 @@
                    shadowUrl: "images/marker-shadow.png",
                    tooltipAnchor: [16, -28]
                });
-                @foreach($trip->checkins as $checkin)
-                marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}],
-                {
-                    icon: markerIcon
-                }).addTo(map);
-                
-                @php $popupContent = null; @endphp
-                @php
-                  $embed = null;
-                if (preg_match("/\[\[([^\]]+)\]\]/", $checkin->note, $filepath)) {
-                  if (preg_match("/\.webm/", $filepath[1])) {
-                    $embed = '<video class="popup__video" controls>';
-                    $embed .= '<source src="' . url("/videos/" . $filepath[1]) . '" type="video/webm">';
-                    $embed .= '<p>Your browser doesn\'t support HTML video. Here is a <a href="' . url("/videos/" . $filepath[1]) . '">link to the video</a> instead.</p>';
-                    $embed .= '</video>'; 
-                  } elseif (preg_match("/\.ogg/", $filepath[1])) {
-                    $embed = '<audio class="popup__audio" controls>';
-                    $embed .= '<source src="' . url("/audio/" . $filepath[1]) . '" type="audio/ogg">';
-                    $embed .= '<p>Download <a href="' . url("/audio/" . $filepath[1]) . '">OGG</a> audio.</p>';
-                    $embed .= '</audio>'; 
-                  }
-                  $checkin->note = preg_replace("/\[\[[^\]]+\]\]/", $embed, $checkin->note);
-                }
-                @endphp

-                @php $popupContent ='<p class="popup__note">' . $checkin->note . '</p>'; @endphp
-                  
-                popupMarkup = `<h2 class="popup__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>`;
-                popupMarkup += `{!! $popupContent !!}`;
-                @if($checkin->image_url)
-                  popupMarkup += '<img class="popup__image" src="{{ $checkin->image_url }}">';
-                @endif
-                marker.bindPopup(popupMarkup).openPopup();
-                
-                checkinMarkers[{{ $checkin->id }}] = marker;
+                @foreach($trip->checkins as $checkin)
+                    marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}],
+                    {
+                        icon: markerIcon
+                    });
+
+                    @php
+                        $popupContent = null;
+                        $embed = null;
+                        if (preg_match("/\[\[([^\]]+)\]\]/", $checkin->note, $filepath)) {
+                            if (preg_match("/\.webm/", $filepath[1])) {
+                                $embed = '<video class="popup__video" controls>';
+                                $embed .= '<source src="' . url("/videos/" . $filepath[1]) . '" type="video/webm">';
+                                $embed .= '<p>Your browser doesn\'t support HTML video. Here is a <a href="';
+                                $embed .= url("/videos/" . $filepath[1]) . '">link to the video</a> instead.</p>';
+                                $embed .= '</video>';
+                            } elseif (preg_match("/\.ogg/", $filepath[1])) {
+                                $embed = '<audio class="popup__audio" controls>';
+                                $embed .= '<source src="' . url("/audio/" . $filepath[1]) . '" type="audio/ogg">';
+                                $embed .= '<p>Download <a href="' . url("/audio/" . $filepath[1]) . '">OGG</a> audio.</p>';
+                                $embed .= '</audio>';
+                            }
+                            $checkin->note = preg_replace("/\[\[[^\]]+\]\]/", $embed, $checkin->note);
+                        }
+                        $popupContent ='<p class="popup__note">' . $checkin->note . '</p>';
+                    @endphp
+
+                    popupMarkup = `<h2 class="popup__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>`;
+                    popupMarkup += `{!! $popupContent !!}`;
+                    @if($checkin->image_url)
+                    popupMarkup += '<img class="popup__image" src="{{ $checkin->image_url }}">';
+                    @endif
+                    marker.bindPopup(popupMarkup).openPopup();
+
+                    checkinMarkers[{{ $checkin->id }}] = marker;
                @endforeach
-                */
+
                /*
                 * Fit the map to the last 25 locations, and then zoom out
                 * (to help provide context).
@ -139,11 +140,11 @@
                @if ($trip->is_active)
                    @foreach(array_slice(array_reverse($trip->checkins), 0, 25) as $checkin)
                    [{{ $checkin->location->latitude }}, {{$checkin->location->longitude }}],
-                    @endforeach    
+                    @endforeach
                @else
                    @foreach($trip->locations as $location)
                    [{{ $location->latitude }}, {{$location->longitude }}],
-                    @endforeach    
+                    @endforeach
                @endif
                ]);
                @if ($trip->is_active) map.zoomOut(2.5); @endif
@ -152,7 +153,6 @@
                 * Add the current location marker.
                 *
                 * If this goes before the `fitBounds()`, it ends up uncentered.
-                 * TODO: Revisit once fixed with other popups.
                 */
                var currLocationMarker = L.icon({
                    iconUrl: 'images/current-location-icon.png',
@ -165,24 +165,26 @@
                        icon: currLocationMarker
                    }
                ).addTo(map).setZIndexOffset(1000);
-                currLocation.bindPopup('<p>Current location</p>').openPopup();
+                @if($trip->is_active) currLocation.bindPopup('<p>Current location</p>').openPopup(); @endif

                /*
                 * Changes the currently-selected popup.
                 */
                function toggleCheckin(isOpen, checkinId) {
                    if (isOpen) {
-                        var checkins = document.querySelectorAll('details');
+                        const checkins = document.querySelectorAll('details');

                        checkinMarkers[checkinId].openPopup();
+                        checkinMarkers[checkinId].addTo(map);

-                        checkins.forEach(checkin => {
+                        for (checkin of checkins) {
                            if (checkin.id != checkinId && checkin.open) checkin.open = false;
-                        });
-                        console.log(checkinMarkers[checkinId].getLatLng());
+                        }
+
                        map.setView(new L.LatLng(checkinMarkers[checkinId].getLatLng().lat + 0.03, checkinMarkers[checkinId].getLatLng().lng));
                    } else {
                        checkinMarkers[checkinId].closePopup();
+                        checkinMarkers[checkinId].removeFrom(map);
                    }
                }
            </script>
Author	SHA1	Message	Date
Ben Goldsworthy	28971a8876	fix: show open checkin on map	2024-03-14 20:11:55 +01:00
Ben Goldsworthy	56bc41f207	ignore backup folder	2024-03-14 20:11:07 +01:00
Ben Goldsworthy	fa80def46c	lint: run linter	2024-03-14 19:31:28 +01:00
Ben Goldsworthy	26cf793943	feat: add fullscreen map	2024-03-14 19:25:31 +01:00
Ben Goldsworthy	ad30ee40d4	build: update deployment commands	2024-03-14 19:24:18 +01:00
Ben Goldsworthy	a5525800d1	build: update deployment scripts	2024-02-18 16:36:27 +00:00