Merge branch 'auth_stuff' into staging_environment

src/pages/Login.tsx

@@ -26,15 +26,13 @@ export default function Login(props: Props) {
     const options: RedirectLoginOptions = {
       authorizationParams: {}  // Initialize here
     };
-    console.log(location)
+    
     if (location && location.search) {
       let parsed = queryString.parse(location.search);
 
-      console.log(parsed.signup)
       if (parsed.signup === "true") {
         // if (options.authorizationParams) options.authorizationParams.screen_hint = "signup"; // 'signup' tells Auth0 to show the signup tab
         options.authorizationParams!.screen_hint = "signup"; // 'signup' tells Auth0 to show the signup tab
-        console.log(options)
       }
 
       if (parsed.email && parsed.email !== "") {

src/providers/auth.tsx

@@ -1,16 +1,40 @@
-import { useAuth0 } from "@auth0/auth0-react";
+import { RedirectLoginOptions, useAuth0 } from "@auth0/auth0-react";
+import queryString from "query-string";
 import { PropsWithChildren, useEffect } from "react";
 
 interface Props extends PropsWithChildren<any>{
     setToken: React.Dispatch<React.SetStateAction<string | undefined>>
+    prevPath?: string
 }
 
 export default function AuthWrapper(props: Props) {
   const { children, setToken } = props;
   const { isLoading, loginWithRedirect, isAuthenticated, getAccessTokenSilently } = useAuth0();
 
+
   useEffect(() => {
-        if (!isAuthenticated && !isLoading) {
+    const url = new URL(window.location.href);
+
+    const isManualLoginPage = url.pathname === "/login";
+    console.log(isManualLoginPage)
+
+    if (isManualLoginPage) {
+      const options: RedirectLoginOptions = {
+        authorizationParams: {}  // Initialize here
+      };
+
+      let parsed = queryString.parse(url.search);
+      if (parsed.signup === "true") {
+        options.authorizationParams!.screen_hint = "signup"; 
+      }
+
+      if (parsed.email && parsed.email !== "") {
+        options.authorizationParams!.login_hint = parsed.email.toString(); // prefill email
+      }
+      console.log(options)
+      loginWithRedirect(options)
+
+    } else if (!isAuthenticated && !isLoading) {
       loginWithRedirect();
     }
   }, [isAuthenticated, loginWithRedirect, isLoading]);

src/user/UserMenu.tsx

@@ -1,11 +1,10 @@
-import { Avatar, Box, Button, Checkbox, Divider, IconButton, ListItemIcon, ListItemText, Menu, MenuItem, PaletteColor, Theme, Tooltip, useTheme } from "@mui/material";
+import { Avatar, Box, Button, Checkbox, Divider, ListItemIcon, ListItemText, Menu, MenuItem, PaletteColor, Theme, Tooltip, useTheme } from "@mui/material";
 import { useGlobalState } from "../providers/StateContainer";
 import { getSecondaryColour, getSignatureAccentColour } from "../services/whiteLabel";
 import { makeStyles } from "@mui/styles";
 import { LockOpen, Person, Lock, Settings, SupervisedUserCircle as TeamIcon, ExitToApp, PersonAdd } from "@mui/icons-material";
 import { useState } from "react";
 import UserTeamName from "./UserTeamName";
-import ThemeIcon from "../common/ThemeIcon";
 import { useAuth0 } from "@auth0/auth0-react";
 import UserSettings from "./UserSettings";
 import UserAvatar from "./UserAvatar";