diff --git a/frontend/index.html b/frontend/index.html index 1c96e02a3..82af60aaa 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -124,6 +124,14 @@ + + {% if (frappe.session.user != "Guest " and frappe.session.user != "Guest") %} + + + + + {% endif %} diff --git a/frontend/src/components/layout/AuthContainer.tsx b/frontend/src/components/layout/AuthContainer.tsx index 6b22290d7..fafbe9538 100644 --- a/frontend/src/components/layout/AuthContainer.tsx +++ b/frontend/src/components/layout/AuthContainer.tsx @@ -1,5 +1,5 @@ import { PropsWithChildren, useContext } from 'react' -import { Box, Flex, Heading, Text } from '@radix-ui/themes'; +import { Box, Flex, Heading } from '@radix-ui/themes'; import { FullPageLoader } from "./Loaders/FullPageLoader"; import { Link } from 'react-router-dom'; import { UserContext } from '@/utils/auth/UserProvider'; @@ -10,7 +10,7 @@ const AuthContainer = ({ children, ...props }: PropsWithChildren) => { return ( - + { isLoading ? : diff --git a/frontend/src/utils/auth/ProtectedRoute.tsx b/frontend/src/utils/auth/ProtectedRoute.tsx index adfd96b32..bfd68bbae 100644 --- a/frontend/src/utils/auth/ProtectedRoute.tsx +++ b/frontend/src/utils/auth/ProtectedRoute.tsx @@ -1,14 +1,20 @@ import { useContext } from 'react' import { Navigate, Outlet } from 'react-router-dom' -import { FullPageLoader } from '@/components/layout/Loaders/FullPageLoader' import { UserContext } from './UserProvider' +import { Flex, Text } from '@radix-ui/themes' +import { Stack } from '@/components/layout/Stack' export const ProtectedRoute = () => { const { currentUser, isLoading } = useContext(UserContext) if (isLoading) { - return + return + + raven + Setting up your workspace... + + } else if (!currentUser || currentUser === 'Guest') { return diff --git a/frontend/src/utils/users/UserListProvider.tsx b/frontend/src/utils/users/UserListProvider.tsx index 94a1ae30d..d9457b70e 100644 --- a/frontend/src/utils/users/UserListProvider.tsx +++ b/frontend/src/utils/users/UserListProvider.tsx @@ -1,9 +1,9 @@ import { useFrappeDocTypeEventListener, useFrappeGetCall, useSWRConfig } from "frappe-react-sdk"; import { PropsWithChildren, createContext, useEffect, useMemo, useState } from "react"; import { ErrorBanner } from "@/components/layout/AlertBanner/ErrorBanner"; -import { FullPageLoader } from "@/components/layout/Loaders/FullPageLoader"; -import { Box, Flex, Link } from "@radix-ui/themes"; +import { Box, Flex, Link, Text } from "@radix-ui/themes"; import { RavenUser } from "@/types/Raven/RavenUser"; +import { Stack } from "@/components/layout/Stack"; export const UserListContext = createContext<{ users: UserFields[], enabledUsers: UserFields[] }>({ @@ -53,7 +53,12 @@ export const UserListProvider = ({ children }: PropsWithChildren) => { }, [data]) if (isLoading) { - return + return + + raven + Setting up your workspace... + + } if (usersError) { return