Refactored and cleaned up code

2023-09-13 23:35:22 -04:00
parent 68a442bed2
commit 4673a5ea07
16 changed files with 332 additions and 353 deletions
--- a/weather-ui/src/app/layout.tsx
+++ b/weather-ui/src/app/layout.tsx
@@ -1,31 +1,33 @@
 import React from 'react';
 import RecoilRootWrapper from '@app/recoil-root-wrapper';
-
-import '@fortawesome/fontawesome-svg-core/styles.css';
-// Prevent fontawesome from adding its CSS since we did it manually above:
-import { config } from '@fortawesome/fontawesome-svg-core';
-config.autoAddCss = false;
+import Sidebar from '@/components/Sidebar';
+import Topbar from '@/components/Topbar';
 import 'styles/globals.css';
-import Link from 'next/link';
-
 import 'styles/leaflet.css';
+import StyledComponentsRegistry from '@/lib/AntdRegistry';
+import { Inter } from 'next/font/google';
+
+const inter = Inter({ subsets: ['latin'] });
+
+export const metadata = {
+  title: 'Create Next App',
+  description: 'Generated by create next app',
+};

 export default function RootLayout({ children }: { children: React.ReactNode }) {
  return (
-    <html lang='en'>
+    <html lang='en' className='h-full bg-white'>
      <head>
        <title>Aviation Weather</title>
      </head>
-      <body className='bg-gray-600'>
-        <div className='flex justify-between bg-gray-700 px-4 py-1 sm:px-6 select-none'>
-          <Link href={'/'}>
-            <h3 className='text-lg font-bold leading-6 text-gray-200'>Aviation Weather</h3>
-          </Link>
-          <Link className='text-base text-gray-200' href={'/profile'}>
-            Profile
-          </Link>
-        </div>
-        <RecoilRootWrapper>{children}</RecoilRootWrapper>
+      <body className={`${inter.className} wrapper h-full`}>
+        <RecoilRootWrapper>
+          <StyledComponentsRegistry>
+            <Topbar />
+            <Sidebar />
+            {children}
+          </StyledComponentsRegistry>
+        </RecoilRootWrapper>
      </body>
    </html>
  );
--- a/weather-ui/src/app/page.tsx
+++ b/weather-ui/src/app/page.tsx
@@ -1,12 +1,6 @@
 import React from 'react';
-import Metar from '@/components/Metar';
+import Metar from '@/components/Metars';

 export default function Page() {
-  return (
-    <>
-      <div>
-        <Metar />
-      </div>
-    </>
-  );
+  return <Metar />;
 }
--- a/weather-ui/src/app/recoil-root-wrapper.tsx
+++ b/weather-ui/src/app/recoil-root-wrapper.tsx
@@ -4,5 +4,5 @@ import { RecoilRoot } from 'recoil';
 import React, { ReactNode } from 'react';

 export default function RecoilRootWrapper({ children }: { children: ReactNode }) {
-    return <RecoilRoot>{children}</RecoilRoot>
-};
+  return <RecoilRoot>{children}</RecoilRoot>;
+}
--- a/weather-ui/src/components/MetarMap.tsx
+++ b/weather-ui/src/components/MetarMap.tsx
@@ -1,197 +0,0 @@
-'use client';
-import { getAirports } from '@/js/api/airport';
-import { Airport } from '@/js/api/airport.types';
-import { getMetars } from '@/js/api/metar';
-import { Metar } from '@/js/api/metar.types';
-import { faArrowsSpin, faLocationArrow, faLocationPin } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { DivIcon, LatLngBounds } from 'leaflet';
-import Link from 'next/link';
-import { useEffect, useState } from 'react';
-import ReactDOMServer from 'react-dom/server';
-import { MapContainer, Marker, Popup, TileLayer, Tooltip, useMap, useMapEvents } from 'react-leaflet';
-
-export default function Map() {
-  return (
-    <MapContainer
-      center={[38.7209, -77.5133]}
-      zoom={8}
-      maxZoom={12}
-      minZoom={1}
-      style={{ height: '96.5vh' }}
-      className='overflow-y-hidden overflow-x-hidden'
-      attributionControl={false}
-    >
-      <MapTiles />
-    </MapContainer>
-  );
-}
-
-function MapTiles() {
-  const [airports, setAirports] = useState<Airport[]>([]);
-  const [zoomLevel, setZoomLevel] = useState(8);
-  // const [dragging, setDragging] = useState(false);
-  const map = useMap();
-
-  const mapEvents = useMapEvents({
-    zoomend: async () => {
-      setZoomLevel(mapEvents.getZoom());
-      await updateAirports(mapEvents.getBounds());
-    },
-    movestart: () => {
-      // setDragging(true);
-    },
-    moveend: async () => {
-      // setDragging(false);
-      await updateAirports(mapEvents.getBounds());
-    }
-  });
-
-  async function updateAirports(bounds: LatLngBounds) {
-    const ne = bounds.getNorthEast();
-    const sw = bounds.getSouthWest();
-    const _airports = await getAirports({
-      bounds: {
-        northEast: { lat: ne.lat, lon: ne.lng },
-        southWest: { lat: sw.lat, lon: sw.lng }
-      },
-      limit: 100,
-      page: 1
-    });
-    const metars = await getMetars(_airports);
-    metars.forEach((metar) => {
-      _airports.forEach((airport) => {
-        if (metar.station_id == airport.icao) {
-          airport.metar = metar;
-        }
-      });
-    });
-    setAirports(_airports);
-  }
-
-  function metarBGColor(metar: Metar | undefined) {
-    if (metar?.flight_category == 'VFR') {
-      return 'bg-emerald-600';
-    } else if (metar?.flight_category == 'MVFR') {
-      return 'bg-blue-600';
-    } else if (metar?.flight_category == 'IFR') {
-      return 'bg-red-600';
-    } else if (metar?.flight_category == 'LIFR') {
-      return 'bg-purple-600';
-    } else {
-      return 'bg-black';
-    }
-  }
-
-  function metarTextColor(metar: Metar | undefined) {
-    if (metar?.flight_category == 'VFR') {
-      return 'text-emerald-700';
-    } else if (metar?.flight_category == 'MVFR') {
-      return 'text-blue-700';
-    } else if (metar?.flight_category == 'IFR') {
-      return 'text-red-700';
-    } else if (metar?.flight_category == 'LIFR') {
-      return 'text-purple-700';
-    } else {
-      return 'text-black/50';
-    }
-  }
-
-  function windColor(metar: Metar | undefined) {
-    if (Number(metar?.wind_speed_kt) <= 9) {
-      return 'bg-green-300';
-    } else if (Number(metar?.wind_speed_kt) > 9) {
-      return 'bg-orange-300';
-    } else if (Number(metar?.wind_speed_kt) > 12) {
-      return 'bg-red-300';
-    }
-  }
-
-  function iconSize() {
-    if (zoomLevel <= 4) {
-      return 'text-xs';
-    } else if (zoomLevel <= 5) {
-      return 'text-sm';
-    } else if (zoomLevel <= 6) {
-      return 'text-base';
-    } else if (zoomLevel <= 7) {
-      return 'text-lg';
-    } else if (zoomLevel <= 9) {
-      return 'text-2xl';
-    } else if (zoomLevel <= 11) {
-      return 'text-3xl';
-    } else if (zoomLevel >= 12) {
-      return 'text-4xl';
-    }
-  }
-
-  function icon(airport: Airport) {
-    return new DivIcon({
-      html: ReactDOMServer.renderToString(
-        <FontAwesomeIcon icon={faLocationPin} className={`${iconSize()} ${metarTextColor(airport.metar)}`} />
-      ),
-      className: 'metar-marker-icon'
-    });
-  }
-
-  useEffect(() => {
-    updateAirports(map.getBounds());
-  }, []);
-
-  return (
-    <>
-      <TileLayer
-        attribution='&copy; <a href="https://www.osm.org/copyright">OpenStreetMap</a> contributors'
-        url='http://{s}.tile.osm.org/{z}/{x}/{y}.png'
-      />
-      {airports.map((airport) => (
-        <Marker key={airport.icao} position={[airport.point.y, airport.point.x]} icon={icon(airport)}>
-          <Tooltip className='metar-tooltip' direction='top' offset={[5, -5]} opacity={1}>
-            <b>{airport.icao}</b> - {airport.full_name}
-          </Tooltip>
-          <Popup>
-            <div className='min-w-0 flex-1 select-none'>
-              <Link href={`/airport/${airport.icao}`}>
-                <h1 className='text-base text-gray-900 pb-1'>
-                  <span className='font-semibold'>{airport.icao}</span> {airport.full_name}
-                </h1>
-              </Link>
-              <hr />
-              <p className='text-sm font-medium text-gray-500'>{airport.metar?.raw_text}</p>
-              <div className='mt-2 flex'>
-                <span
-                  className={`flex inline-block text-sm text-white ${metarBGColor(
-                    airport.metar
-                  )} py-2 px-4 rounded-full`}
-                >
-                  {airport.metar?.flight_category ? airport.metar?.flight_category : 'UNKN'}
-                </span>
-                <div className='flex inline-block px-2'>
-                  <span className={`text-sm text-black ${windColor(airport.metar)} py-2 px-2 rounded-full`}>
-                    {airport.metar && airport.metar.wind_dir_degrees && Number(airport.metar.wind_dir_degrees) > 0 ? (
-                      <FontAwesomeIcon
-                        className='pr-1'
-                        icon={faLocationArrow}
-                        style={{ rotate: `${-45 + 180 + Number(airport.metar.wind_dir_degrees)}deg` }}
-                      />
-                    ) : (
-                      <></>
-                    )}
-                    {airport.metar && airport.metar.wind_dir_degrees && airport.metar.wind_dir_degrees == 'VRB' ? (
-                      <FontAwesomeIcon className='pr-1' icon={faArrowsSpin} />
-                    ) : (
-                      <></>
-                    )}
-                    {airport.metar?.wind_speed_kt != undefined && airport.metar?.wind_speed_kt > 0
-                      ? `${airport.metar?.wind_speed_kt} KT`
-                      : 'CALM'}
-                  </span>
-                </div>
-              </div>
-            </div>
-          </Popup>
-        </Marker>
-      ))}
-    </>
-  );
-}
--- a/weather-ui/src/components/Metars/MapTiles.tsx
+++ b/weather-ui/src/components/Metars/MapTiles.tsx
@@ -0,0 +1,133 @@
+'use client';
+
+import { getAirports } from '@/js/api/airport';
+import { Airport } from '@/js/api/airport.types';
+import { getMetars } from '@/js/api/metar';
+import { Metar } from '@/js/api/metar.types';
+import { FaLocationPin } from 'react-icons/fa6';
+import { DivIcon, LatLngBounds } from 'leaflet';
+import { useEffect, useState } from 'react';
+import ReactDOMServer from 'react-dom/server';
+import { Marker, TileLayer, Tooltip, useMap, useMapEvents } from 'react-leaflet';
+import MetarDialog from './MetarDialog';
+
+export default function MapTiles() {
+  const [isOpen, setIsOpen] = useState(false);
+  const [airports, setAirports] = useState<Airport[]>([]);
+  const [selectedAirport, setSelectedAirport] = useState<Airport | undefined>();
+  const [zoomLevel, setZoomLevel] = useState(8);
+  // const [dragging, setDragging] = useState(false);
+  const map = useMap();
+
+  const mapEvents = useMapEvents({
+    zoomend: async () => {
+      setZoomLevel(mapEvents.getZoom());
+      await updateAirports(mapEvents.getBounds());
+    },
+    movestart: () => {
+      // setDragging(true);
+    },
+    moveend: async () => {
+      // setDragging(false);
+      await updateAirports(mapEvents.getBounds());
+    }
+  });
+
+  function handleOpen(airport: Airport) {
+    setSelectedAirport(airport);
+    setIsOpen(true);
+  }
+
+  async function updateAirports(bounds: LatLngBounds) {
+    const ne = bounds.getNorthEast();
+    const sw = bounds.getSouthWest();
+    const _airports = await getAirports({
+      bounds: {
+        northEast: { lat: ne.lat, lon: ne.lng },
+        southWest: { lat: sw.lat, lon: sw.lng }
+      },
+      limit: 100,
+      page: 1
+    });
+    const metars = await getMetars(_airports);
+    metars.forEach((metar) => {
+      _airports.forEach((airport) => {
+        if (metar.station_id == airport.icao) {
+          airport.metar = metar;
+        }
+      });
+    });
+    setAirports(_airports);
+  }
+
+  function metarTextColor(metar: Metar | undefined) {
+    if (metar?.flight_category == 'VFR') {
+      return 'text-emerald-700';
+    } else if (metar?.flight_category == 'MVFR') {
+      return 'text-blue-700';
+    } else if (metar?.flight_category == 'IFR') {
+      return 'text-red-700';
+    } else if (metar?.flight_category == 'LIFR') {
+      return 'text-purple-700';
+    } else {
+      return 'text-black/50';
+    }
+  }
+
+  function iconSize() {
+    if (zoomLevel <= 4) {
+      return 'text-xs';
+    } else if (zoomLevel <= 5) {
+      return 'text-sm';
+    } else if (zoomLevel <= 6) {
+      return 'text-base';
+    } else if (zoomLevel <= 7) {
+      return 'text-lg';
+    } else if (zoomLevel <= 9) {
+      return 'text-2xl';
+    } else if (zoomLevel <= 11) {
+      return 'text-3xl';
+    } else if (zoomLevel >= 12) {
+      return 'text-4xl';
+    }
+  }
+
+  function icon(airport: Airport) {
+    return new DivIcon({
+      html: ReactDOMServer.renderToString(
+        <FaLocationPin className={`${iconSize()} ${metarTextColor(airport.metar)}`} />
+      ),
+      className: 'metar-marker-icon'
+    });
+  }
+
+  useEffect(() => {
+    updateAirports(map.getBounds());
+  }, []);
+
+  return (
+    <>
+      {selectedAirport && <MetarDialog isOpen={isOpen} onClose={() => setIsOpen(false)} airport={selectedAirport} />}
+      <TileLayer
+        attribution='&copy; <a href="https://www.osm.org/copyright">OpenStreetMap</a> contributors'
+        url='http://{s}.tile.osm.org/{z}/{x}/{y}.png'
+      />
+      {airports.map((airport) => (
+        <Marker
+          key={airport.icao}
+          position={[airport.point.y, airport.point.x]}
+          icon={icon(airport)}
+          eventHandlers={{
+            click: () => handleOpen(airport)
+          }}
+        >
+          {!isOpen && (
+            <Tooltip className='metar-tooltip' direction='top' offset={[5, -5]} opacity={1}>
+              <b>{airport.icao}</b> - {airport.full_name}
+            </Tooltip>
+          )}
+        </Marker>
+      ))}
+    </>
+  );
+}
--- a/weather-ui/src/components/Metars/MetarDialog.tsx
+++ b/weather-ui/src/components/Metars/MetarDialog.tsx
@@ -0,0 +1,71 @@
+import { Airport } from '@/js/api/airport.types';
+import { Metar } from '@/js/api/metar.types';
+import { FaArrowsSpin, FaLocationArrow } from 'react-icons/fa6';
+import { Modal } from 'antd';
+
+interface MetarDialogProps {
+  airport: Airport;
+  isOpen: boolean;
+  onClose(): void;
+}
+
+export default function MetarDialog({ airport, isOpen, onClose }: MetarDialogProps) {
+  function metarBGColor(metar: Metar | undefined) {
+    if (metar?.flight_category == 'VFR') {
+      return 'bg-emerald-600';
+    } else if (metar?.flight_category == 'MVFR') {
+      return 'bg-blue-600';
+    } else if (metar?.flight_category == 'IFR') {
+      return 'bg-red-600';
+    } else if (metar?.flight_category == 'LIFR') {
+      return 'bg-purple-600';
+    } else {
+      return 'bg-black';
+    }
+  }
+
+  function windColor(metar: Metar | undefined) {
+    if (Number(metar?.wind_speed_kt) <= 9) {
+      return 'bg-green-300';
+    } else if (Number(metar?.wind_speed_kt) > 9) {
+      return 'bg-orange-300';
+    } else if (Number(metar?.wind_speed_kt) > 12) {
+      return 'bg-red-300';
+    }
+  }
+  return (
+    <Modal title={`${airport.icao} ${airport.full_name}`} open={isOpen} onCancel={onClose} footer={[]}>
+      <div className='min-w-0 flex-1 select-none'>
+        <hr />
+        <p className='text-sm font-medium text-gray-500'>{airport.metar?.raw_text}</p>
+        <div className='mt-2 flex'>
+          <span
+            className={`flex inline-block text-sm text-white ${metarBGColor(airport.metar)} py-2 px-4 rounded-full`}
+          >
+            {airport.metar?.flight_category ? airport.metar?.flight_category : 'UNKN'}
+          </span>
+          <div className='flex inline-block px-2'>
+            <span className={`text-sm text-black ${windColor(airport.metar)} py-2 px-2 rounded-full`}>
+              {airport.metar && airport.metar.wind_dir_degrees && Number(airport.metar.wind_dir_degrees) > 0 ? (
+                <FaLocationArrow
+                  className='pr-1'
+                  style={{ rotate: `${-45 + 180 + Number(airport.metar.wind_dir_degrees)}deg` }}
+                />
+              ) : (
+                <></>
+              )}
+              {airport.metar && airport.metar.wind_dir_degrees && airport.metar.wind_dir_degrees == 'VRB' ? (
+                <FaArrowsSpin className='pr-1' />
+              ) : (
+                <></>
+              )}
+              {airport.metar?.wind_speed_kt != undefined && airport.metar?.wind_speed_kt > 0
+                ? `${airport.metar?.wind_speed_kt} KT`
+                : 'CALM'}
+            </span>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+}
--- a/weather-ui/src/components/Metars/MetarMap.tsx
+++ b/weather-ui/src/components/Metars/MetarMap.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { MapContainer } from 'react-leaflet';
+import MapTiles from './MapTiles';
+
+export default function Map({ className = '' }: { className?: string }) {
+  return (
+    <>
+      <MapContainer
+        center={[38.7209, -77.5133]}
+        zoom={8}
+        maxZoom={12}
+        minZoom={1}
+        id='map-container'
+        style={{ height: '94.5vh' }}
+        className={`${className} overflow-y-hidden overflow-x-hidden`}
+        attributionControl={false}
+      >
+        <MapTiles />
+      </MapContainer>
+    </>
+  );
+}
--- a/weather-ui/src/components/Metars/index.tsx
+++ b/weather-ui/src/components/Metars/index.tsx
@@ -1,8 +1,8 @@
 import { Metar } from '@/js/api/metar.types';
 import dynamic from 'next/dynamic';

-export default async function Metar() {
-  const Map = dynamic(() => import('@/components/MetarMap'), {
+export default async function Metar({ className = '' }: { className?: string }) {
+  const Map = dynamic(() => import('@/components/Metars/MetarMap'), {
    loading: () => (
      <div className='grid min-h-full place-items-center px-6 py-24 sm:py-32 lg:px-8'>
        <div className='text-center'>
@@ -12,6 +12,5 @@ export default async function Metar() {
    ),
    ssr: false
  });
-
-  return <Map />;
+  return <Map className={className} />;
 }
--- a/weather-ui/src/components/Sidebar/Sidebar.css
+++ b/weather-ui/src/components/Sidebar/Sidebar.css
@@ -0,0 +1,11 @@
+.sidebar {
+  width: 62px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .option-group {
+    display: flex;
+    flex-direction: column;
+  }
+}
--- a/weather-ui/src/components/Sidebar/index.tsx
+++ b/weather-ui/src/components/Sidebar/index.tsx
@@ -0,0 +1,5 @@
+import './Sidebar.css';
+
+export default function Sidebar() {
+  return <div className=''></div>;
+}
--- a/weather-ui/src/components/Topbar/index.tsx
+++ b/weather-ui/src/components/Topbar/index.tsx
@@ -0,0 +1,27 @@
+'use client';
+
+import { Avatar } from 'antd';
+import Search from 'antd/es/input/Search';
+import { useRouter } from 'next/navigation';
+import { AiOutlineUser } from 'react-icons/ai';
+
+export default function Topbar() {
+  const router = useRouter();
+
+  function onSearch(value: string) {
+    router.push(`/airports/${value}`);
+  }
+
+  return (
+    <nav className='w-screen flex bg-gray-700 text-gray-200'>
+      <Search
+        placeholder='Search Airports...'
+        onSearch={onSearch}
+        enterButton
+        className='p-2'
+        style={{ width: '20em' }}
+      />
+      <Avatar shape='square' size={48} icon={<AiOutlineUser />} />
+    </nav>
+  );
+}
--- a/weather-ui/src/lib/AntdRegistry.tsx
+++ b/weather-ui/src/lib/AntdRegistry.tsx
@@ -0,0 +1,14 @@
+'use client';
+
+import React from 'react';
+import { createCache, extractStyle, StyleProvider } from '@ant-design/cssinjs';
+import type Entity from '@ant-design/cssinjs/es/Cache';
+import { useServerInsertedHTML } from 'next/navigation';
+
+const StyledComponentsRegistry = ({ children }: { children: React.ReactNode }) => {
+  const cache = React.useMemo<Entity>(() => createCache(), [createCache]);
+  useServerInsertedHTML(() => <style id='antd' dangerouslySetInnerHTML={{ __html: extractStyle(cache, true) }} />);
+  return <StyleProvider cache={cache}>{children}</StyleProvider>;
+};
+
+export default StyledComponentsRegistry;