diff --git a/lib/components/icons/NavbarIcons.tsx b/lib/components/icons/NavbarIcons.tsx index ed1cc88..ce286c2 100644 --- a/lib/components/icons/NavbarIcons.tsx +++ b/lib/components/icons/NavbarIcons.tsx @@ -1,104 +1,8 @@ import { FC } from 'react'; +import Image from "next/image"; export const NowcastingLogo: FC = () => ( - - - - - - - - - - - - - - - - - - - - - - - - - - + {'Quartz ); export const HamburgerIcon: FC = () => ( diff --git a/lib/components/navigation/NavBar.tsx b/lib/components/navigation/NavBar.tsx index 99a7901..7690732 100644 --- a/lib/components/navigation/NavBar.tsx +++ b/lib/components/navigation/NavBar.tsx @@ -45,7 +45,7 @@ const NavBar: FC = () => { <> setIsSideBarOpen(false)} />
@@ -56,13 +56,13 @@ const NavBar: FC = () => { isSideBarOpen || sites.length === 0 ? 'pointer-events-none opacity-0' : 'opacity-100' - } invisible flex flex-col justify-center text-gray-600 transition-all md:visible`} + } invisible flex flex-col justify-center text-gray-600 transition-all z-10 md:visible`} > )} - -
+
+
site.site_uuid); + const siteUUIDs = sites.slice(0,3).map((site) => site.site_uuid); const { data: manyForecastData, @@ -194,7 +194,7 @@ export function withSites({ getServerSideProps }: WithSitesOptions = {}) { }; } - const { site_list: allSites } = (await fetch( + const { site_list: allSites }: { site_list: Site[] } = (await fetch( `${process.env.NEXT_PUBLIC_API_BASE_URL_GET}/sites`, { headers: { @@ -202,10 +202,10 @@ export function withSites({ getServerSideProps }: WithSitesOptions = {}) { }, credentials: 'include', } - ).then((res) => res.json())) as { site_list: Site[] }; + ).then((res) => res.json())); // TODO: Paginate this globally somehow. Right now there is too much site data being fetched on the aggregate dashboard - const sites = allSites.slice(0, 100); + const sites = allSites.slice(0, 3); const otherProps: any = await getServerSideProps?.({ ...ctx, diff --git a/package.json b/package.json index ff5fae0..0737f5d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev -p 3002", "build": "next build", "start": "next start", "lint": "next lint", diff --git a/pages/_app.tsx b/pages/_app.tsx index e6c994f..96515ea 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -41,7 +41,7 @@ const App: AppType = ({ Component, pageProps }) => { > - Sites | Nowcasting + Sites | Quartz Solar { rel="noreferrer" > Nowcasting logo diff --git a/public/favicon.ico b/public/favicon.ico index f2103d2..e1bf62e 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/quartz-logo.svg b/public/quartz-logo.svg new file mode 100644 index 0000000..d254c09 --- /dev/null +++ b/public/quartz-logo.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +