Rumperuu/Where-in-the-World-is-Ben
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Compare commits

base: Rumperuu:12bfb800ce352ccd2395d62538ec853a81c62c8a
Branches Tags
Rumperuu:main
..
compare: Rumperuu:bc523d59a9ddc178b83224bd79709a3c3dded3d3
Branches Tags
Rumperuu:main

No commits in common. "12bfb800ce352ccd2395d62538ec853a81c62c8a" and "bc523d59a9ddc178b83224bd79709a3c3dded3d3" have entirely different histories.
12bfb800ce ... bc523d59a9

5 changed files with 4 additions and 41 deletions
Show stats Expand all files Collapse all files

2
.env.example
View file

@ -7,8 +7,6 @@ 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=

3
app/Http/Controllers/TrackerController.php
View file

@ -90,8 +90,7 @@ class TrackerController extends Controller
'trip' => $tripData, 'trip' => $tripData,
'showAllCheckins' => ($viewMode === 'all'), 'showAllCheckins' => ($viewMode === 'all'),
'fromCheckin' => $fromCheckin, 'fromCheckin' => $fromCheckin,
'toCheckin' => $toCheckin, 'toCheckin' => $toCheckin
'cherryPicked' => !!$cherryPickedCheckins
] ]
); );
} }

2
config/app.php
View file

@ -76,8 +76,6 @@ 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
resources/css/app.css
View file

@ -16,22 +16,6 @@ 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;

22
resources/views/tracker.blade.php
View file

@ -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 @elseif ($cherryPicked || $toCheckin || $fromCheckin) Selected Posts @else Recent Posts @endif</h2> <h2 class="section__title">@if ($showAllCheckins) 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 || $cherryPicked)) start="{{ count($trip->checkins) }}" @if(!$cherryPicked) reversed @endif @endif> <ol @if(!($showAllCheckins || $toCheckin || $fromCheckin)) start="{{ count($trip->checkins) }}" reversed @endif>
@if($showAllCheckins || $toCheckin || $fromCheckin || $cherryPicked) @if($showAllCheckins || $toCheckin || $fromCheckin)
@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,22 +65,6 @@
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