fix tooltip provider and add active tracking outline

This commit is contained in:
Josh Hawkins 2024-02-09 11:07:00 -06:00
parent e70039177a
commit 77c84a2dfb
5 changed files with 175 additions and 186 deletions

View File

@ -8,7 +8,6 @@ import SettingsNavItems from "./settings/SettingsNavItems";
import { import {
Tooltip, Tooltip,
TooltipContent, TooltipContent,
TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
@ -23,7 +22,6 @@ function Sidebar({
<aside className="w-[52px] z-10 h-screen sticky top-0 overflow-y-auto scrollbar-hidden py-4 flex flex-col justify-between"> <aside className="w-[52px] z-10 h-screen sticky top-0 overflow-y-auto scrollbar-hidden py-4 flex flex-col justify-between">
<div className="w-full flex flex-col gap-0 items-center"> <div className="w-full flex flex-col gap-0 items-center">
<Logo className="w-8 h-8 mb-6" /> <Logo className="w-8 h-8 mb-6" />
<TooltipProvider>
{navbarLinks.map((item) => ( {navbarLinks.map((item) => (
<SidebarItem <SidebarItem
key={item.id} key={item.id}
@ -34,7 +32,6 @@ function Sidebar({
onClick={() => setSheetOpen(false)} onClick={() => setSheetOpen(false)}
/> />
))} ))}
</TooltipProvider>
</div> </div>
<SettingsNavItems className="hidden md:flex flex-col items-center" /> <SettingsNavItems className="hidden md:flex flex-col items-center" />
</aside> </aside>

View File

@ -151,9 +151,16 @@ export default function LivePlayer({
} else { } else {
player = <ActivityIndicator />; player = <ActivityIndicator />;
} }
// box - shadow: 0px 0px 10px 0px rgba(240, 62, 62, 1) inset;
return ( return (
<div className={`relative flex justify-center w-full ${className}`}> <div
className={`relative flex justify-center w-full outline ${
activeTracking
? "outline-destructive outline-1 rounded-2xl shadow-[0_0_6px_1px] shadow-destructive"
: "outline-0"
} transition-all duration-500 ${className}`}
>
{(showStillWithoutActivity == false || activeMotion || activeTracking) && {(showStillWithoutActivity == false || activeMotion || activeTracking) &&
player} player}
@ -188,14 +195,6 @@ export default function LivePlayer({
<div className="ml-1 text-white text-xs">Sound</div> <div className="ml-1 text-white text-xs">Sound</div>
</Chip> </Chip>
)} )}
<Chip
in={activeTracking}
className={`bg-gradient-to-br from-gray-400 to-gray-500 bg-gray-500/90 `}
>
<MdSelectAll className="w-4 h-4 text-object" />
<div className="ml-1 text-white text-xs">Tracking</div>
</Chip>
</div> </div>
<Chip className="absolute right-2 top-2 bg-gradient-to-br from-gray-300/50 to-gray-500/90"> <Chip className="absolute right-2 top-2 bg-gradient-to-br from-gray-300/50 to-gray-500/90">

View File

@ -55,7 +55,6 @@ import {
import { import {
Tooltip, Tooltip,
TooltipContent, TooltipContent,
TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@/components/ui/tooltip"; } from "@/components/ui/tooltip";
import ActivityIndicator from "../ui/activity-indicator"; import ActivityIndicator from "../ui/activity-indicator";
@ -98,11 +97,10 @@ export default function SettingsNavItems({ className }: SettingsNavItemsProps) {
return ( return (
<> <>
<div className={className}> <div className={className}>
<TooltipProvider>
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild> <DropdownMenuTrigger>
<Tooltip> <Tooltip>
<TooltipTrigger> <TooltipTrigger asChild>
<Button size="icon" variant="ghost"> <Button size="icon" variant="ghost">
<LuSettings /> <LuSettings />
</Button> </Button>
@ -152,9 +150,7 @@ export default function SettingsNavItems({ className }: SettingsNavItemsProps) {
<span>Configuration editor</span> <span>Configuration editor</span>
</DropdownMenuItem> </DropdownMenuItem>
</Link> </Link>
<DropdownMenuLabel className="mt-3"> <DropdownMenuLabel className="mt-3">Appearance</DropdownMenuLabel>
Appearance
</DropdownMenuLabel>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuSub> <DropdownMenuSub>
<DropdownMenuSubTrigger> <DropdownMenuSubTrigger>
@ -255,7 +251,6 @@ export default function SettingsNavItems({ className }: SettingsNavItemsProps) {
<p>Account</p> <p>Account</p>
</TooltipContent> </TooltipContent>
</Tooltip> </Tooltip>
</TooltipProvider>
</div> </div>
{restartDialogOpen && ( {restartDialogOpen && (
<AlertDialog <AlertDialog

View File

@ -3,6 +3,7 @@ import { ThemeProvider } from "@/context/theme-provider";
import { RecoilRoot } from "recoil"; import { RecoilRoot } from "recoil";
import { ApiProvider } from "@/api"; import { ApiProvider } from "@/api";
import { IconContext } from "react-icons"; import { IconContext } from "react-icons";
import { TooltipProvider } from "@/components/ui/tooltip";
type TProvidersProps = { type TProvidersProps = {
children: ReactNode; children: ReactNode;
@ -13,9 +14,11 @@ function providers({ children }: TProvidersProps) {
<RecoilRoot> <RecoilRoot>
<ApiProvider> <ApiProvider>
<ThemeProvider defaultTheme="light" storageKey="frigate-ui-theme"> <ThemeProvider defaultTheme="light" storageKey="frigate-ui-theme">
<TooltipProvider>
<IconContext.Provider value={{ size: "20" }}> <IconContext.Provider value={{ size: "20" }}>
{children} {children}
</IconContext.Provider> </IconContext.Provider>
</TooltipProvider>
</ThemeProvider> </ThemeProvider>
</ApiProvider> </ApiProvider>
</RecoilRoot> </RecoilRoot>

View File

@ -24,13 +24,8 @@ module.exports = {
"accordion-up": "accordion-up 0.2s ease-out", "accordion-up": "accordion-up 0.2s ease-out",
}, },
aspectRatio: { aspectRatio: {
"wide": "32 / 9", wide: "32 / 9",
"tall": "9 / 16", tall: "9 / 16",
},
borderRadius: {
lg: "var(--radius)",
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
}, },
colors: { colors: {
border: "hsl(var(--border))", border: "hsl(var(--border))",