From 0c930a24ea5b1b74479a0e7a157d41d5634471eb Mon Sep 17 00:00:00 2001 From: Benjamin Sherriff Date: Wed, 30 Aug 2023 16:24:17 -0400 Subject: [PATCH] Cleanup --- README.md | 2 +- docker-compose.yml | 15 +++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- src/app/layout.tsx | 8 ++++++++ src/app/page.tsx | 3 --- src/app/user/page.tsx | 3 +++ src/components/MetarMap.tsx | 7 ++++--- 8 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 docker-compose.yml create mode 100644 src/app/user/page.tsx diff --git a/README.md b/README.md index 9284b7e..73b30a9 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PCS UI +# Aviation Weather # Getting Started The main installed packages are the following: diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..f5e8ad6 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ +version: '3' + +services: + db: + image: postgres:latest + container_name: aviation-weather_db + environment: + POSTGRES_USER: ${POSTRGRES_USER} + POSTGRESS_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DB} + volumes: + - ./data:/var/lib/postgresql/data + ports: + -'5432:5432' + restart: unless-stopped \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 12e4fe3..0416968 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "pcs-ui", + "name": "aviation-weather", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "pcs-ui", + "name": "aviation-weather", "version": "0.1.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", diff --git a/package.json b/package.json index e0bc1ea..7bb983f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "pcs-ui", + "name": "aviation-weather", "version": "0.1.0", "private": true, "scripts": { diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 44cc3b2..aa5ddf4 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -7,12 +7,20 @@ import '@fortawesome/fontawesome-svg-core/styles.css'; import { config } from '@fortawesome/fontawesome-svg-core'; config.autoAddCss = false; /* eslint-disable import/first */ import 'styles/globals.css'; +import Link from 'next/link'; export default function RootLayout({ children }: { children: React.ReactNode }) { return ( + + Aviation Weather + +
+

Aviation Weather

+ Profile +
{children} diff --git a/src/app/page.tsx b/src/app/page.tsx index 27a6769..dfce97f 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -26,9 +26,6 @@ export default function Page() { return <> -
-

Metar Map

-
diff --git a/src/app/user/page.tsx b/src/app/user/page.tsx new file mode 100644 index 0000000..70eba03 --- /dev/null +++ b/src/app/user/page.tsx @@ -0,0 +1,3 @@ +export default function Profile() { + +} \ No newline at end of file diff --git a/src/components/MetarMap.tsx b/src/components/MetarMap.tsx index aa0b952..4ec38cd 100644 --- a/src/components/MetarMap.tsx +++ b/src/components/MetarMap.tsx @@ -4,6 +4,7 @@ import { Metar } from '@/js/weather'; import { faArrowsSpin, faLocationArrow, faLocationPin } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { DivIcon } from 'leaflet'; +import Link from 'next/link'; import { useEffect, useState } from 'react'; import ReactDOMServer from 'react-dom/server'; import { MapContainer, Marker, Popup, TileLayer, Tooltip, useMapEvents } from 'react-leaflet'; @@ -117,9 +118,9 @@ function MapTiles({ airports }: {airports: Airport[] }) { {airport.icao}
- {/* */} -

{airport.icao} {airport.name}

- {/* */} + +

{airport.icao} {airport.name}

+

{airport.metar?.raw_text}