Compare commits
No commits in common. "dab2031d49457b010a6aae71df2f60fdad88905c" and "5ca3afcb5f94a06c492cf49296daf36e479fb282" have entirely different histories.
dab2031d49
...
5ca3afcb5f
|
@ -1,19 +1,11 @@
|
||||||
:root {
|
|
||||||
--dark: #020202;
|
|
||||||
--light: #fffff0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Typography
|
* Typography
|
||||||
*/
|
*/
|
||||||
|
|
||||||
body {
|
body {
|
||||||
/*font-family: Verdana, Arial, sans-serif;*/
|
font-family: Verdana, Arial, sans-serif;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
color: var(--dark, #020202);
|
|
||||||
background-color: var(--light, #fffff0);
|
|
||||||
font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-title {
|
.page-title {
|
||||||
|
@ -44,15 +36,6 @@ details h2 {
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#allCheckinsLink {
|
|
||||||
opacity: 0.7;
|
|
||||||
color: var(--dark, #020202);
|
|
||||||
}
|
|
||||||
|
|
||||||
#allCheckinsLink:hover {
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Layout
|
* Layout
|
||||||
*/
|
*/
|
||||||
|
@ -61,6 +44,7 @@ body {
|
||||||
border: 5px solid black;
|
border: 5px solid black;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
|
/* overflow: hidden;*/
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: auto 1fr;
|
grid-template-rows: auto 1fr;
|
||||||
grid-template-columns: 100%;
|
grid-template-columns: 100%;
|
||||||
|
@ -71,8 +55,8 @@ body {
|
||||||
|
|
||||||
.page-header {
|
.page-header {
|
||||||
grid-area: header;
|
grid-area: header;
|
||||||
|
background-color: #a4ecfc;
|
||||||
border-bottom: 5px solid black;
|
border-bottom: 5px solid black;
|
||||||
padding-top: 1em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.other-links {
|
.other-links {
|
||||||
|
@ -89,9 +73,10 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.other-links li {
|
.other-links li {
|
||||||
|
background-color: #5adefc;
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 1.5em;
|
margin-left: 1.5em;
|
||||||
border: 2px solid var(--dark);
|
border: 2px solid white;
|
||||||
border-radius: 1em;
|
border-radius: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,7 +85,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.other-links li:hover {
|
.other-links li:hover {
|
||||||
background-color: #ddddd2;
|
background-color: #2389a0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.other-links li p {
|
.other-links li p {
|
||||||
|
@ -109,7 +94,7 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.other-links li p a {
|
.other-links li p a {
|
||||||
color: var(--dark, #020202);
|
color: #fff;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
@ -200,8 +185,6 @@ body {
|
||||||
max-height: 45vh;
|
max-height: 45vh;
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
display: block;
|
display: block;
|
||||||
background-color: white;
|
|
||||||
border: 2px solid var(--dark, #020202);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,6 +1,19 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||||
@include('partials.head')
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
<title>Tracking | Ben Goldsworthy</title>
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
|
||||||
|
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
|
||||||
|
crossorigin=""/>
|
||||||
|
<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
|
||||||
|
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
|
||||||
|
crossorigin=""></script>
|
||||||
|
<link rel="stylesheet" href="/css/app.css" />
|
||||||
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
|
|
||||||
<title>Tracking | Ben Goldsworthy</title>
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
|
|
||||||
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
|
|
||||||
crossorigin=""/>
|
|
||||||
<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
|
|
||||||
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
|
|
||||||
crossorigin=""></script>
|
|
||||||
<link rel="stylesheet" href="/css/app.css" />
|
|
||||||
</head>
|
|
|
@ -1,6 +1,19 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||||
@include('partials.head');
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
<title>Tracking | Ben Goldsworthy</title>
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
|
||||||
|
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
|
||||||
|
crossorigin=""/>
|
||||||
|
<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
|
||||||
|
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
|
||||||
|
crossorigin=""></script>
|
||||||
|
<link rel="stylesheet" href="/css/app.css" />
|
||||||
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="page-header">
|
<header class="page-header">
|
||||||
|
|
|
@ -1,6 +1,19 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||||
@include('partials.head')
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
<title>Tracking | Ben Goldsworthy</title>
|
||||||
|
|
||||||
|
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
|
||||||
|
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
|
||||||
|
crossorigin=""/>
|
||||||
|
<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
|
||||||
|
integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
|
||||||
|
crossorigin=""></script>
|
||||||
|
<link rel="stylesheet" href="/css/app.css" />
|
||||||
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="page-header">
|
<header class="page-header">
|
||||||
|
@ -77,16 +90,13 @@
|
||||||
@foreach($trip->locations as $location)
|
@foreach($trip->locations as $location)
|
||||||
[{{ $location->latitude }}, {{ $location->longitude }}],
|
[{{ $location->latitude }}, {{ $location->longitude }}],
|
||||||
@endforeach
|
@endforeach
|
||||||
], {
|
]).addTo(map);
|
||||||
color: '#3d3d3d'
|
|
||||||
}).addTo(map);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Populate all the checkins and popup texts.
|
* Populate all the checkins and popup texts.
|
||||||
*/
|
*/
|
||||||
var checkinMarkers = [];
|
var checkinMarkers = [];
|
||||||
var marker = null, popupMarkup = null;
|
var marker = null, popupMarkup = null;
|
||||||
L.Icon.Default.imagePath = "https://track.bengoldsworthy.net/images/";
|
|
||||||
@foreach($trip->checkins as $checkin)
|
@foreach($trip->checkins as $checkin)
|
||||||
marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map);
|
marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map);
|
||||||
|
|
||||||
|
@ -122,15 +132,13 @@
|
||||||
* TODO: Revisit once fixed with other popups.
|
* TODO: Revisit once fixed with other popups.
|
||||||
*/
|
*/
|
||||||
var currLocationMarker = L.icon({
|
var currLocationMarker = L.icon({
|
||||||
iconUrl: 'images/current-location-icon.png',
|
iconUrl: 'current-location-icon.png',
|
||||||
iconSize: [30, 45],
|
iconSize: [30, 45],
|
||||||
});
|
});
|
||||||
|
|
||||||
var currLocation = L.marker(
|
var currLocation = L.marker(
|
||||||
[{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}],
|
[{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}],
|
||||||
{
|
{icon: currLocationMarker}
|
||||||
icon: currLocationMarker
|
|
||||||
}
|
|
||||||
).addTo(map).setZIndexOffset(1000);
|
).addTo(map).setZIndexOffset(1000);
|
||||||
currLocation.bindPopup('<p>Current location</p>').openPopup();
|
currLocation.bindPopup('<p>Current location</p>').openPopup();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue