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

Compare commits

base: Rumperuu:5ca3afcb5f94a06c492cf49296daf36e479fb282
Branches Tags
Rumperuu:main
...
compare: Rumperuu:dab2031d49457b010a6aae71df2f60fdad88905c
Branches Tags
Rumperuu:main

3 commits
5ca3afcb5f ... dab2031d49

Author SHA1 Message Date
Ben Goldsworthy dab2031d49 Merge branch 'main' of ssh://code.bengoldsworthy.net:222/Rumperuu/Where-in-the-World-is-Ben into main 2022-10-29 23:27:31 +00:00
Ben Goldsworthy 3f8a675c32 Align styling with bengoldsworthy.net 2022-10-29 23:24:06 +00:00
Ben Goldsworthy 739f2c86bf Move head to partial 2022-10-29 23:23:02 +00:00
5 changed files with 50 additions and 53 deletions
Show stats Expand all files Collapse all files

31
public/css/app.css
View file

@ -1,11 +1,19 @@
:root {
--dark: #020202;
--light: #fffff0;
}
/*
* Typography
*/
body {
font-family: Verdana, Arial, sans-serif;
/*font-family: Verdana, Arial, sans-serif;*/
font-size: 16px;
margin: 0;
color: var(--dark, #020202);
background-color: var(--light, #fffff0);
font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
}
.page-title {
@ -36,6 +44,15 @@ details h2 {
font-size: 0.8em;
}
#allCheckinsLink {
opacity: 0.7;
color: var(--dark, #020202);
}
#allCheckinsLink:hover {
opacity: 1;
}
/*
* Layout
*/
@ -44,7 +61,6 @@ body {
border: 5px solid black;
box-sizing: border-box;
height: 100vh;
/* overflow: hidden;*/
display: grid;
grid-template-rows: auto 1fr;
grid-template-columns: 100%;
@ -55,8 +71,8 @@ body {
.page-header {
grid-area: header;
background-color: #a4ecfc;
border-bottom: 5px solid black;
padding-top: 1em;
}
.other-links {
@ -73,10 +89,9 @@ body {
}
.other-links li {
background-color: #5adefc;
float: left;
margin-left: 1.5em;
border: 2px solid white;
border: 2px solid var(--dark);
border-radius: 1em;
}
@ -85,7 +100,7 @@ body {
}
.other-links li:hover {
background-color: #2389a0;
background-color: #ddddd2;
}
.other-links li p {
@ -94,7 +109,7 @@ body {
}
.other-links li p a {
color: #fff;
color: var(--dark, #020202);
font-weight: bold;
text-decoration: none;
}
@ -185,6 +200,8 @@ body {
max-height: 45vh;
margin-top: 1em;
display: block;
background-color: white;
border: 2px solid var(--dark, #020202);
}
/*

15
resources/views/no-trip.blade.php
View file

@ -1,19 +1,6 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<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>
@include('partials.head')
<body>

14
resources/views/partials/head.blade.php Normal file
View file

@ -0,0 +1,14 @@
<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>

15
resources/views/past-trips.blade.php
View file

@ -1,19 +1,6 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<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>
@include('partials.head');
<body>
<header class="page-header">

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

@ -1,19 +1,6 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<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>
@include('partials.head')
<body>
<header class="page-header">
@ -90,13 +77,16 @@
@foreach($trip->locations as $location)
[{{ $location->latitude }}, {{ $location->longitude }}],
@endforeach
]).addTo(map);
], {
color: '#3d3d3d'
}).addTo(map);
/*
* Populate all the checkins and popup texts.
*/
var checkinMarkers = [];
var marker = null, popupMarkup = null;
L.Icon.Default.imagePath = "https://track.bengoldsworthy.net/images/";
@foreach($trip->checkins as $checkin)
marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map);
@ -132,13 +122,15 @@
* TODO: Revisit once fixed with other popups.
*/
var currLocationMarker = L.icon({
iconUrl: 'current-location-icon.png',
iconUrl: 'images/current-location-icon.png',
iconSize: [30, 45],
});
var currLocation = L.marker(
[{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}],
{icon: currLocationMarker}
[{{ end($trip->locations)->latitude }}, {{ end($trip->locations)->longitude }}],
{
icon: currLocationMarker
}
).addTo(map).setZIndexOffset(1000);
currLocation.bindPopup('<p>Current location</p>').openPopup();