From 7dc7fa39cdde9f072e6e32f5df9a2131a12c1ee5 Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 6 May 2022 06:37:07 -0500 Subject: [PATCH] fixing issues with the routes and now getting more things flowing --- packages/api/index.ts | 2 +- packages/desktop/src/components/Logo/index.tsx | 6 ++++-- packages/desktop/src/components/header/index.tsx | 4 ++-- packages/desktop/src/controller/nirvanaApi.ts | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/api/index.ts b/packages/api/index.ts index ede3878..b30d03d 100644 --- a/packages/api/index.ts +++ b/packages/api/index.ts @@ -28,7 +28,7 @@ app.get("/", (req: Request, res: Response) => { res.send("hello world."); }); -app.use("/api", (req: Request, res: Response) => { +app.use("/api/status", (req: Request, res: Response) => { res.json(new NirvanaResponse("wohoo, server is healthy")); }); diff --git a/packages/desktop/src/components/Logo/index.tsx b/packages/desktop/src/components/Logo/index.tsx index bf89a2a..8cd36ee 100644 --- a/packages/desktop/src/components/Logo/index.tsx +++ b/packages/desktop/src/components/Logo/index.tsx @@ -3,9 +3,11 @@ export type LogoType = "primary" | "small"; export default function Logo({ className, type, + grayscale = false, }: { className?: string; type?: LogoType; + grayscale?: boolean; }) { if (type === "small") { return ( @@ -15,7 +17,7 @@ export default function Logo({ viewBox="0 0 85 107" fill="none" xmlns="http://www.w3.org/2000/svg" - className={className} + className={`${className} ${grayscale ? "text-black grayscale" : ""}`} > - +
- +
diff --git a/packages/desktop/src/controller/nirvanaApi.ts b/packages/desktop/src/controller/nirvanaApi.ts index 55f7407..f959174 100644 --- a/packages/desktop/src/controller/nirvanaApi.ts +++ b/packages/desktop/src/controller/nirvanaApi.ts @@ -57,7 +57,7 @@ export default class NirvanaApi { } async function serverCheck(): Promise { - return await NirvanaApi.fetch(`/`, "GET", false); + return await NirvanaApi.fetch(`/status`, "GET", false); } async function login(reqLoginTokens: {