From e4b9ccad5de2a859b499471a31400300709c1425 Mon Sep 17 00:00:00 2001 From: braddf Date: Fri, 7 Jul 2023 10:27:44 +0100 Subject: [PATCH] Change branding; test live API --- lib/components/icons/NavbarIcons.tsx | 100 +-------------------------- lib/components/navigation/NavBar.tsx | 8 +-- lib/sites.ts | 10 +-- package.json | 2 +- pages/_app.tsx | 2 +- pages/logout.tsx | 4 +- public/favicon.ico | Bin 15086 -> 4110 bytes public/quartz-logo.svg | 64 +++++++++++++++++ 8 files changed, 79 insertions(+), 111 deletions(-) create mode 100644 public/quartz-logo.svg diff --git a/lib/components/icons/NavbarIcons.tsx b/lib/components/icons/NavbarIcons.tsx index ed1cc887..ce286c2a 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 99a7901a..7690732a 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 ff5fae00..0737f5d0 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 e6c994fe..96515ea5 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 f2103d2eab00602286a70555637ec9aaa121f127..e1bf62e99ceab076cd4f10daa14ca32d09ee8892 100644 GIT binary patch literal 4110 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 literal 15086 zcmdU#PmdHu7>8>ea8HE2upw}84w8t8fz!%`VD=_oVm*3LqvA~hb28DJc+s;aav&z& zO_&HL{RCcQB1D6U5sgt2SK8;9=^EQ%XS!#)dz$LxH#J@L{`uA0Rozu@cL*Dy7tWpy zl>Ko1R0umEgnmCi-wNS->b59tfAvrZ?;-FUGN^=Cfc4|!*-6pl@2T6_5%3~-6MP1~ z0Y8Diz&|>lVc?z6Fw%U+dhfSmK@E||5^^|_qRFX{vB+u-IC$UVkRZrk(vK-(42 z#4{=SYr2%%m4o|$hzCSxh%K2`NO;q$>wk6 z??E5;K$7|MoPW~qFY-Pl`~FD&9*iNcgJa2eY1x{gPkmQ@Z!}^3|6lZzeScc)3H?~t z`|Hd4D*A5fe|{~J{C=Pq1NzYeuKCQnyY{a0{f0KQ)%y1v#XiLU_>DR2PQIVXve9Oi zg)qg#5T5b;K?p}JhavPV2Yg3lDRF)tSzZlc-||8TsG%4FYAF6!jy&HCVQ5K&XUl>0 zeC04(THWL^(AWWfhSndzYh*pVXZsWT8T%dMKuE@MnZ{|D$1TP&#udRytS52zJFPx= z2~5A!+Tvt|gR$iE!m<21_yT+feg`qn=YQ*LQ%2cZ_jhSx!};i5_!Dpk{0+*USIQ`> zj=C$&KlDz3_ks6-GN1F>)z!v{Wx|g94!8}Pc;~GRZTWd$>4DrX@LJC6)2j8_++9R~ zcCS|(z9VOC9~cMfPlB&Olx?fj$H`(GICr1^!5VzWKIv<^&*uL*P-mP+yH!hloihfM z&hd{yRo$lK^r`RX!JQ8L>r>y}FRR?wn(BA7qtDmC4G`v4Mh=#6 zXl?(UJvf?WgN=-Q!&Pz*7fdIZS{RX~7?Nrb15yYPq2!2imcv|sge`4qTOaz;r@qZo zn3m{+X`Z4ab3i;c!OP$}xCdOz3jbSY8(Ege59*JDYv5Nf?_Oe?GRKP+JO^Kbd3v+; z%8qSNJ`J=vD^qr^j=C4YFDvM)qweP`=tgep-mRgpuGc5pTeghXcUiqCuYO(rb>mm} v`qdggj$>l5^7xJOAh)s7{3+O2dj38n2Rvd%56R{Y%(sGhM{HMC9d-W&IJ)er diff --git a/public/quartz-logo.svg b/public/quartz-logo.svg new file mode 100644 index 00000000..d254c098 --- /dev/null +++ b/public/quartz-logo.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +