Revert "Improvement/refactor firebase files (#81)" (#91)

This reverts commit f51b66b.
WardAnalytics · Mar 1, 2024 · 5e4cdb9 · 5e4cdb9
1 parent d40bd10
commit 5e4cdb9
Show file tree

Hide file tree

Showing 23 changed files with 165 additions and 1,237 deletions.
diff --git a/index.html b/index.html
@@ -4,17 +4,17 @@
 <head>
   <meta charset="UTF-8" />
   <meta name="description" content="Creating the next-gen of crypto compliance" />
-  <meta name="keywords" content="aml, kyt, chainalysis, elliptic, blockchain, ethereum, explorer, compliance, mica" />
+  <meta name="keywords" content="blockchain, compliance, graph, analytics, crypto" />
   <link rel="icon" type="image/x-icon" href="./src/assets/ward-logo-icon-blue.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta property="og:title" content="Ward Analytics" />
-  <meta property="og:description" content="The next-gen blockchain graph explorer" />
+  <meta property="og:description" content="A next-gen blockchain graph explorer" />
   <meta property="og:image"
     content="https://firebasestorage.googleapis.com/v0/b/graphapp-bca04.appspot.com/o/banner-ward.jpg?alt=media&token=af84a606-e7d9-4883-8284-aab906b9bac3" />
   <title>Ward Analytics - Graph</title>
   <link
     href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;400;500;600;700;800;900&family=Roboto&display=swap"
-    rel="stylesheet" />
+    rel="stylesheet">
 </head>
 
 <body>

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,4 +1,4 @@
-import { FC } from "react";
+import { FC, useMemo } from "react";
 import { QueryClientProvider } from "react-query";
 import useCustomQueryClient from "./hooks/useCustomQueryClient";
 
@@ -12,7 +12,15 @@ import { HelmetProvider } from 'react-helmet-async';
 
 const App: FC = () => {
   const queryClient = useCustomQueryClient();
-  const { userID, isAuthenticated } = useAuthState();
+  const { user, isAuthenticated } = useAuthState();
+
+  const userID = useMemo(() => {
+    if (user) {
+      return user.uid;
+    }
+
+    return "";
+  }, [user]);
 
   // Ensure that context is never scoped outside of the current instance of the app
   const helmetContext = {};
@@ -23,7 +31,7 @@ const App: FC = () => {
         <QueryClientProvider client={queryClient}>
           <MobileWarningTemplate className="h-screen w-screen sm:hidden" />
           <div className="hidden h-fit w-fit sm:block">
-            {isAuthenticated ? <PrivateApp userID={userID!} /> : <PublicApp />}
+            {isAuthenticated ? <PrivateApp userID={userID} /> : <PublicApp />}
           </div>
         </QueryClientProvider>
       </HelmetProvider>

diff --git a/src/components/auth/AuthInput.tsx b/src/components/auth/AuthInput.tsx
@@ -1,29 +1,25 @@
-import clsx from "clsx";
-import { useMemo } from "react";
 import { useFormContext } from "react-hook-form";
 
 interface AuthInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
   label: string;
   name: string;
-  className?: string;
 }
 
-const AuthInput = ({ label, name, className, ...rest }: AuthInputProps) => {
+const AuthInput = ({ label, name, ...rest }: AuthInputProps) => {
   const {
     register,
     formState: { errors },
   } = useFormContext();
 
-  const error = useMemo(() => errors[name], [errors, name]);
+  const error = errors[name];
 
   return (
-    <div className={clsx("w-full", className)}>
+    <div>
       <label
         htmlFor={label}
-        className="mb-2 block gap-x-1 text-sm font-medium text-gray-900 dark:text-white"
+        className="mb-2 block text-sm font-medium text-gray-900 dark:text-white"
       >
-        <span>{label}</span>
-        {rest.required && <span className="text-red-500">*</span>}
+        {label}
       </label>
       <input
         {...register(name)}

diff --git a/src/components/auth/AuthInputCombobox.tsx b/src/components/auth/AuthInputCombobox.tsx
diff --git a/src/components/auth/AuthInputSelect.tsx b/src/components/auth/AuthInputSelect.tsx