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

Compare commits

base: Rumperuu:f7e6810edaf744f6dcc7c502fe22cdd264e444b2
Branches Tags
Rumperuu:main
..
compare: Rumperuu:045a42c250ed421e84f774f8619d7625934dcce1
Branches Tags
Rumperuu:main

3 commits
f7e6810eda ... 045a42c250

Author SHA1 Message Date
Rumperuu
045a42c250 Move trip URL to .env 2022-08-24 10:41:43 +00:00
Rumperuu
08beeced35 Fix details toggling 2022-08-24 10:41:23 +00:00
Rumperuu
838dda07c4 Fix mobile map height 2022-08-24 10:40:58 +00:00
4 changed files with 22 additions and 8 deletions
Show stats Expand all files Collapse all files

2
config/app.php
View file

@ -58,6 +58,8 @@ return [
'asset_url' => env('ASSET_URL'), 'asset_url' => env('ASSET_URL'),
'trip' => env('TRIP'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Timezone | Application Timezone

4
public/css/app.css
View file

@ -24,7 +24,7 @@
} }
#map { #map {
min-height: 800px; height: 400px;
grid-column-start: 1; grid-column-start: 1;
grid-column-end: 3; grid-column-end: 3;
} }
@ -44,6 +44,8 @@ details h2 {
} }
#map { #map {
height: auto;
min-height: 800px;
grid-column-end: 2; grid-column-end: 2;
} }

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

@ -12,10 +12,10 @@
<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js" <script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ==" integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
crossorigin=""></script> crossorigin=""></script>
<link rel="stylesheet" href="{{ url('/css/app.css') }}" /> <link rel="stylesheet" href="/css/app.css" />
</head> </head>
<body class="antialiased"> <body>
<header> <header>
<h1>Where in the World is Ben?</h1> <h1>Where in the World is Ben?</h1>
@ -32,8 +32,8 @@
<section id="checkinList"> <section id="checkinList">
<ol> <ol>
@foreach($trip->checkins as $checkin) @foreach($trip->checkins as $checkin)
<li id="{{ $checkin->id }}" onClick="openCheckin(this.id)"> <li>
<details> <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>{{ $checkin->date }}</span></summary>
{{ $checkin->note ?? "[No note]" }} {{ $checkin->note ?? "[No note]" }}
</details> </details>
@ -71,8 +71,18 @@
checkinMarkers[{{ $checkin->id }}] = marker; checkinMarkers[{{ $checkin->id }}] = marker;
@endforeach @endforeach
function openCheckin(checkinId) { function toggleCheckin(isOpen, checkinId) {
checkinMarkers[checkinId].openPopup(); if (isOpen) {
var checkins = document.querySelectorAll('details');
checkinMarkers[checkinId].openPopup();
checkins.forEach(checkin => {
if (checkin.id != checkinId && checkin.open) checkin.open = false;
});
} else {
checkinMarkers[checkinId].closePopup();
}
} }
</script> </script>
</footer> </footer>

2
routes/web.php
View file

@ -20,7 +20,7 @@ Route::get('/', function () {
'timeout' => 3.0 'timeout' => 3.0
]); ]);
$response = $client->get('trip/q0mwldvenxq09p2x18nj/user/zmld8ko6qy7d9j3xvq10/json'); $response = $client->get('trip/'.config('app.trip').'/user/zmld8ko6qy7d9j3xvq10/json');
if ($response->getStatusCode() == 200) { if ($response->getStatusCode() == 200) {
$data = json_decode($response->getBody()); $data = json_decode($response->getBody());