Merge remote-tracking branch 'origin/main' into main

Author: LaSpruca

src/css/global.scss

@@ -19,20 +19,37 @@ h3 {
 .leaflet-top {
   top: 93px !important;
 }
+@media all and (max-width: 1430px) {
 
+  .leaflet-top {
+    top: 128px !important;
+  }
+}
 @media all and (max-width: 1200px) {
 
   .leaflet-top {
     top: 170px !important;
   }
 }
+@media all and (max-width: 940px) {
+
+  .leaflet-top {
+    top: 220px !important;
+  }
+}
 
 @media all and (max-width: 770px) {
 
   .leaflet-top {
     top: 255px !important;
   }
 }
+@media all and (max-width: 440px) {
+
+  .leaflet-top {
+    top: 210px !important;
+  }
+}
 
 .leaflet-control-attribution {
   bottom: 100px !important;

src/lib/components/NotificationModel.svelte

@@ -5,6 +5,8 @@
 	let notificationsEnabled: boolean = false;
 	let notificationDenied = false;
 	let notificationsSupported = 'Notification' in window;
+	let errorText = '';
+
 
 	setInterval(updatePermissionStatus, 1000);
 	updatePermissionStatus();
@@ -17,7 +19,6 @@
 		}
 	});
 
-	let errorText = '';
 
 
 	function updatePermissionStatus() {

src/lib/components/ResultHeading.svelte

@@ -10,7 +10,8 @@
 		<div class="notificationRequesterWrapper">
 			<NotificationRequester />
 		</div>
-		<img class="results-info__icon" src="/icons/icon.svg" alt="Toi" width="128" height="128" />
+		<a href="/"><img class="results-info__icon" src="/icons/icon.svg" alt="Toi" width="128" height="128" /></a>
+		
 		<h3 class="results-info__title">Showing Results</h3>
 		<div class="results-info__body">
 			<span class="results-info__body__marker"

src/lib/components/SearchBox.svelte

@@ -27,7 +27,7 @@
 </script>
 
 <div class='wrapper'>
-	<label>Address/Location</label>
+	<label>Filter by Address/Location</label>
 	<input type='text' bind:value={searchTerm} placeholder='Enter Address/Location'>
 </div>
 

src/routes/map.svelte

@@ -51,6 +51,12 @@
 	<header class="header" id="header">
 		<ResultHeading dates={dateValues} />
 		<SearchBox geoData={$geoData} probablePlaces={(p) => (places = p?.map((e) => e.index))} />
+		<div class="copyright-notice">
+			<a class="copyright-notice__text" href="https://github.com/minhealthnz/nz-covid-data">
+				Locations of Interest from New Zealand Government
+			</a>
+	
+		</div>
 		<div class="update-block">
 			{#if typeof $lastUpdate !== 'undefined'}
 				<p class="update-block__text">Last Updated {$lastUpdate.toLocaleString()}</p>
@@ -60,12 +66,15 @@
 				<p class="update-block__text">Number of locations of interest: {$loiCount}</p>
 			{/if}
 		</div>
+
 	</header>
 	{#if $geoData != null}
 		<LeafletMap geoData={$geoData} dateRange={dateValues} filteredPlaces={places} />
 	{/if}
+
 	<footer>
 		<DateSlider bind:dateRange={dateValues} />
+
 	</footer>
 </main>
 
@@ -103,19 +112,40 @@
 
 	.update-block {
 		position: absolute;
-		top: calc(100% + 1em);
+		top: calc(100% + 3em);
 		right: 1em;
 		display: flex;
 		flex-flow: column;
     background: #333;
     border-radius: 0.5em;
   }
 
+
 	.update-block__text {
 		font-size: 0.75em;
 		display: block;
 		color: white;
 		padding: 0.5em;
 		margin: 0;
 	}
+
+	.copyright-notice {
+	position: absolute;
+	top: calc(100% + 1em);
+			// bottom: calc(100% + 2em);
+		z-index: 4;
+		right: 1em;
+		display: flex;
+		flex-flow: column;
+		background: #333;
+		border-radius: 0.5em;
+  }
+  .copyright-notice__text {
+		font-size: 0.75em;
+		display: block;
+		color: white;
+		padding: 0.5em;
+		margin: 0;
+
+	}
 </style>