resolved conflicts

OneBusAway · Jul 30, 2024 · 55b9038 · 55b9038
2 parents aadf828 + d313dcb
commit 55b9038
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/components/navigation/ModalPane.svelte b/src/components/navigation/ModalPane.svelte
@@ -33,7 +33,7 @@
 <style lang="postcss">
 	.modal-pane {
 		@apply absolute bottom-0 left-0 z-40 w-full bg-transparent px-2 shadow-lg md:max-w-prose;
-		@apply rounded-lg bg-[#F3F2F8] dark:bg-black border-b-[1px] border-[#C6C6C8] dark:border-[1px] dark:border-[#C6C6C8] dark:border-opacity-15;
+		@apply rounded-lg border-b-[1px] border-[#C6C6C8] bg-[#F3F2F8] dark:border-[1px] dark:border-[#C6C6C8] dark:border-opacity-15 dark:bg-black;
 	}
 
 	.close-button {

diff --git a/src/lib/RestAPI/arrivalsAndDeparturesForStop.js b/src/lib/RestAPI/arrivalsAndDeparturesForStop.js
@@ -3,7 +3,7 @@ import { error, json } from '@sveltejs/kit';
 import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
 import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
 
-export default async function(stopID) {
+export default async function (stopID) {
 	const apiURL = `${baseURL}/api/where/arrivals-and-departures-for-stop/${stopID}.json?key=${apiKey}`;
 	const response = await fetch(apiURL);
 

diff --git a/src/lib/RestAPI/stop.js b/src/lib/RestAPI/stop.js
@@ -3,7 +3,7 @@ import { error, json } from '@sveltejs/kit';
 import { PUBLIC_OBA_SERVER_URL as baseURL } from '$env/static/public';
 import { PRIVATE_OBA_API_KEY as apiKey } from '$env/static/private';
 
-export default async function(stopID) {
+export default async function (stopID) {
 	const apiURL = `${baseURL}/api/where/stop/${stopID}.json?key=${apiKey}`;
 	const response = await fetch(apiURL);
 

diff --git a/src/routes/stops/[stopID]/+page.server.js b/src/routes/stops/[stopID]/+page.server.js
@@ -2,15 +2,15 @@ import stopAPI from '$lib/RestAPI/stop.js';
 import arrivalDepartureAPI from '$lib/RestAPI/arrivalsAndDeparturesForStop.js';
 
 export async function load({ params }) {
-  const stopID = params.stopID;
-  const stopResponse = await stopAPI(stopID);
-  const stopBody = await stopResponse.json();
-  const arrivalsAndDeparturesResponse = await arrivalDepartureAPI(stopID)
-  const arrivalsAndDeparturesResponseJSON = await arrivalsAndDeparturesResponse.json();
+	const stopID = params.stopID;
+	const stopResponse = await stopAPI(stopID);
+	const stopBody = await stopResponse.json();
+	const arrivalsAndDeparturesResponse = await arrivalDepartureAPI(stopID);
+	const arrivalsAndDeparturesResponseJSON = await arrivalsAndDeparturesResponse.json();
 
-  return {
-    stopID: params.stopID,
-    stopData: stopBody.data,
-    arrivalsAndDeparturesResponse: arrivalsAndDeparturesResponseJSON
-  }
+	return {
+		stopID: params.stopID,
+		stopData: stopBody.data,
+		arrivalsAndDeparturesResponse: arrivalsAndDeparturesResponseJSON
+	};
 }
diff --git a/src/routes/stops/[stopID]/+page.svelte b/src/routes/stops/[stopID]/+page.svelte
@@ -5,6 +5,6 @@
 	const arrivalsAndDeparturesResponse = data.arrivalsAndDeparturesResponse;
 </script>
 
-<div class='pt-20 px-8 max-w-5xl mx-auto'>
+<div class="mx-auto max-w-5xl px-8 pt-20">
 	<StopPane {stop} {arrivalsAndDeparturesResponse} />
 </div>