Compare commits
3 commits
bc523d59a9
...
12bfb800ce
Author | SHA1 | Date | |
---|---|---|---|
12bfb800ce | |||
1b0b240de3 | |||
1e0f82d435 |
5 changed files with 41 additions and 4 deletions
|
@ -7,6 +7,8 @@ APP_URL=
|
||||||
CURRENT_TRIP_ID=
|
CURRENT_TRIP_ID=
|
||||||
PAST_TRIP_IDS=
|
PAST_TRIP_IDS=
|
||||||
|
|
||||||
|
PRIVACY_LAT_LONS=
|
||||||
|
|
||||||
MAIL_MAILER=mailjet
|
MAIL_MAILER=mailjet
|
||||||
MAILJET_APIKEY=
|
MAILJET_APIKEY=
|
||||||
MAILJET_APISECRET=
|
MAILJET_APISECRET=
|
||||||
|
|
|
@ -90,7 +90,8 @@ class TrackerController extends Controller
|
||||||
'trip' => $tripData,
|
'trip' => $tripData,
|
||||||
'showAllCheckins' => ($viewMode === 'all'),
|
'showAllCheckins' => ($viewMode === 'all'),
|
||||||
'fromCheckin' => $fromCheckin,
|
'fromCheckin' => $fromCheckin,
|
||||||
'toCheckin' => $toCheckin
|
'toCheckin' => $toCheckin,
|
||||||
|
'cherryPicked' => !!$cherryPickedCheckins
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,6 +76,8 @@ return [
|
||||||
|
|
||||||
'past_trip_ids' => explode(',', env('PAST_TRIP_IDS')),
|
'past_trip_ids' => explode(',', env('PAST_TRIP_IDS')),
|
||||||
|
|
||||||
|
'privacy_lat_lons' => explode(';', env('PRIVACY_LAT_LONS')),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Digest Mailing Lists
|
| Digest Mailing Lists
|
||||||
|
|
|
@ -16,6 +16,22 @@ body {
|
||||||
font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
|
font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:where(:root) {
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
text-decoration-skip-ink: auto;
|
||||||
|
color: #020202;
|
||||||
|
text-decoration: underline;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
text-decoration: none;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.page-title {
|
.page-title {
|
||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
|
@ -30,11 +30,11 @@
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
</section>
|
</section>
|
||||||
<section id="checkinList">
|
<section id="checkinList">
|
||||||
<h2 class="section__title">@if ($showAllCheckins) Posts @else Recent Posts @endif</h2>
|
<h2 class="section__title">@if ($showAllCheckins) Posts @elseif ($cherryPicked || $toCheckin || $fromCheckin) Selected Posts @else Recent Posts @endif</h2>
|
||||||
<p style="font-weight: bold; text-align: center;">Want to receive a regular email digest of updates?</p>
|
<p style="font-weight: bold; text-align: center;">Want to receive a regular email digest of updates?</p>
|
||||||
<p style="text-align: center;">Ask me and I'll add you to the list: weekly, fortnightly and monthly options available (or daily if you're really keen).</p>
|
<p style="text-align: center;">Ask me and I'll add you to the list: weekly, fortnightly and monthly options available (or daily if you're really keen).</p>
|
||||||
<ol @if(!($showAllCheckins || $toCheckin || $fromCheckin)) start="{{ count($trip->checkins) }}" reversed @endif>
|
<ol @if(!($showAllCheckins || $toCheckin || $fromCheckin || $cherryPicked)) start="{{ count($trip->checkins) }}" @if(!$cherryPicked) reversed @endif @endif>
|
||||||
@if($showAllCheckins || $toCheckin || $fromCheckin)
|
@if($showAllCheckins || $toCheckin || $fromCheckin || $cherryPicked)
|
||||||
@php $checkinsList = $trip->checkins @endphp
|
@php $checkinsList = $trip->checkins @endphp
|
||||||
@else
|
@else
|
||||||
@php $checkinsList = array_slice(array_reverse($trip->checkins), 0, 10) @endphp
|
@php $checkinsList = array_slice(array_reverse($trip->checkins), 0, 10) @endphp
|
||||||
|
@ -65,6 +65,22 @@
|
||||||
L.polyline([
|
L.polyline([
|
||||||
@foreach(array_slice($trip->locations, $idx, 100) as $location)
|
@foreach(array_slice($trip->locations, $idx, 100) as $location)
|
||||||
@if(!in_array($location->id, config('app.current_trip_ignore')))
|
@if(!in_array($location->id, config('app.current_trip_ignore')))
|
||||||
|
|
||||||
|
@php
|
||||||
|
// Privacy zones
|
||||||
|
$privacyLatLons = config('app.privacy_lat_lons');
|
||||||
|
$latLon = explode(',', $privacyLatLons[0]);
|
||||||
|
if (
|
||||||
|
!(
|
||||||
|
( $location->latitude - $latLon[0] > 0.01 ) || ( $location->latitude - $latLon[0] < -0.01 ) ||
|
||||||
|
( $location->longitude - $latLon[1] > 0.01 ) || ( $location->longitude - $latLon[1] < -0.01 )
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
$location->latitude = $location->latitude + ((rand(0,2)-1)/100);
|
||||||
|
$location->longitude = $location->longitude + ((rand(0,2)-1)/100);
|
||||||
|
}
|
||||||
|
@endphp
|
||||||
|
|
||||||
[{{ $location->latitude }}, {{ $location->longitude }}],
|
[{{ $location->latitude }}, {{ $location->longitude }}],
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue