Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
Change user update indicator (#450)
Luke Vellae21574b03228
diff --git a/src/components/standard-layout.tsx b/src/components/standard-layout.tsxindex f6e1224d3..174dac331 100644--- a/src/components/standard-layout.tsx+++ b/src/components/standard-layout.tsx@@ -21,6 +21,7 @@ import Login from "./icons/login.svg";import Logout from "./icons/logout.svg";import Pencil from "./icons/pencil.svg";import Question from "./icons/question-mark-circle.svg";+import Spinner from "./icons/spinner.svg";import Support from "./icons/support.svg";import Twitter from "./icons/twitter.svg";import ModalProvider, { useModalContext } from "./modal/modal-provider";@@ -37,7 +38,7 @@ const HomeLink = () => {};const MobileNavigation: React.VoidFunctionComponent = () => {- const { user } = useUser();+ const { user, isUpdating } = useUser();const { t } = useTranslation(["common", "app"]);return (<div@@ -70,7 +71,11 @@ const MobileNavigation: React.VoidFunctionComponent = () => {className="group inline-flex w-full items-center space-x-2 rounded-lg px-2 py-1 text-left transition-colors hover:bg-slate-500/10 active:bg-slate-500/20"><div className="relative shrink-0">- <UserCircle className="w-5 opacity-75 group-hover:text-primary-500 group-hover:opacity-100" />+ {isUpdating ? (+ <Spinner className="h-5 animate-spin" />+ ) : (+ <UserCircle className="w-5 opacity-75 group-hover:text-primary-500 group-hover:opacity-100" />+ )}</div><div className="hidden max-w-[120px] truncate font-medium xs:block">{user.shortName}@@ -237,7 +242,7 @@ const UserDropdown: React.VoidFunctionComponent<DropdownProps> = ({const StandardLayout: React.VoidFunctionComponent<{children?: React.ReactNode;}> = ({ children, ...rest }) => {- const { user } = useUser();+ const { user, isUpdating } = useUser();const { t } = useTranslation(["common", "app"]);return (@@ -309,7 +314,11 @@ const StandardLayout: React.VoidFunctionComponent<{><div className="flex w-full items-center space-x-3"><div className="relative">- <UserCircle className="h-5 opacity-75 group-hover:text-primary-500 group-hover:opacity-100" />+ {isUpdating ? (+ <Spinner className="h-5 animate-spin" />+ ) : (+ <UserCircle className="h-5 opacity-75 group-hover:text-primary-500 group-hover:opacity-100" />+ )}</div><div className="grow overflow-hidden"><div className="truncate font-medium leading-snug text-slate-600">diff --git a/src/components/user-provider.tsx b/src/components/user-provider.tsxindex e9ffb4c8c..c72514712 100644--- a/src/components/user-provider.tsx+++ b/src/components/user-provider.tsx@@ -12,6 +12,7 @@ export const UserContext =React.createContext<{user: UserSession & { shortName: string };refresh: () => void;+ isUpdating: boolean;logout: () => void;ownsObject: (obj: { userId: string | null }) => boolean;} | null>(null);@@ -82,9 +83,7 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {});});- const shortName = isFetching- ? t("loading")- : user+ const shortName = user? user.isGuest === false? user.name: user.id.substring(0, 10)@@ -97,6 +96,7 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {return (<UserContext.Providervalue={{+ isUpdating: isFetching,user: { ...user, shortName },refresh: () => {return queryClient.whoami.invalidate();