administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-12-06 13:34:13 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Tweaks (#20393)

Browse Source 
* don't fetch trigger status if no triggers defined

* settings sidebar tweaks

* padding tweaks

* fix
This commit is contained in:
Josh Hawkins 2025-10-08 16:02:38 -05:00 committed by GitHub
parent 6df950bb78
commit 7181f3db5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/pages/Settings.tsx
View File

@ -448,9 +448,9 @@ export default function Settings() {
</div>
)}
</div>
<SidebarProvider className="md:h-dvh md:pb-24">
<Sidebar variant="inset" className="relative mb-8 pt-0">
<SidebarContent className="border-r-[1px] border-secondary bg-background pt-2">
<SidebarProvider>
<Sidebar variant="inset" className="relative mb-8 pl-0 pt-0">
<SidebarContent className="scrollbar-container mb-20 overflow-y-auto border-r-[1px] border-secondary bg-background py-2">
<SidebarMenu>
{settingsGroups.map((group) => {
const filteredItems = group.items.filter((item) =>
@ -463,7 +463,7 @@ export default function Settings() {
<SidebarMenu>
<SidebarMenuItem>
<SidebarMenuButton
className="ml-0 pl-0"
className="ml-0"
isActive={pageToggle === filteredItems[0].key}
onClick={() => {
if (
@ -490,7 +490,7 @@ export default function Settings() {
<>
<SidebarGroupLabel
className={cn(
"ml-0 cursor-default pl-0 text-sm",
"ml-2 cursor-default pl-0 text-sm",
filteredItems.some(
(item) => pageToggle === item.key,
)
@ -500,7 +500,7 @@ export default function Settings() {
>
{group.label}
</SidebarGroupLabel>
<SidebarMenuSub className="mx-1 border-0">
<SidebarMenuSub className="mx-2 border-0">
{filteredItems.map((item) => (
<SidebarMenuSubItem key={item.key}>
<SidebarMenuSubButton

10
web/src/views/settings/AuthenticationView.tsx
View File

@ -405,7 +405,7 @@ export default function AuthenticationView({
// Users section
const UsersSection = (
<>
<div className="mb-5 flex flex-row items-center justify-between gap-2 md:pr-2">
<div className="mb-5 flex flex-row items-center justify-between gap-2 md:mr-3">
<div className="flex flex-col items-start">
<Heading as="h4" className="mb-2">
{t("users.management.title")}
@ -425,7 +425,7 @@ export default function AuthenticationView({
</Button>
</div>
<div className="mb-6 flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
<div className="scrollbar-container flex-1 overflow-hidden rounded-lg border border-border bg-background_alt md:mr-2">
<div className="scrollbar-container flex-1 overflow-hidden rounded-lg border border-border bg-background_alt md:mr-3">
<div className="h-full overflow-auto">
<Table>
<TableHeader className="sticky top-0 bg-muted/50">
@ -594,7 +594,7 @@ export default function AuthenticationView({
// Roles section
const RolesSection = (
<>
<div className="mb-5 flex flex-row items-center justify-between gap-2 md:pr-2">
<div className="mb-5 flex flex-row items-center justify-between gap-2 md:mr-3">
<div className="flex flex-col items-start">
<Heading as="h4" className="mb-2">
{t("roles.management.title")}
@ -614,7 +614,7 @@ export default function AuthenticationView({
</Button>
</div>
<div className="mb-6 flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
<div className="scrollbar-container flex-1 overflow-hidden rounded-lg border border-border bg-background_alt md:mr-2">
<div className="scrollbar-container flex-1 overflow-hidden rounded-lg border border-border bg-background_alt md:mr-3">
<div className="h-full overflow-auto">
<Table>
<TableHeader className="sticky top-0 bg-muted/50">
@ -784,7 +784,7 @@ export default function AuthenticationView({
return (
<div className="flex size-full flex-col">
<Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mr-2 md:mt-0">
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mr-3 md:mt-0">
{section === "users" && UsersSection}
{section === "roles" && RolesSection}
{!section && (

4
web/src/views/settings/MasksAndZonesView.tsx
View File

@ -433,7 +433,7 @@ export default function MasksAndZonesView({
{cameraConfig && editingPolygons && (
<div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mr-2 md:mt-0 md:w-3/12">
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mr-3 md:mt-0 md:w-3/12">
{editPane == "zone" && (
<ZoneEditPane
polygons={editingPolygons}
@ -696,7 +696,7 @@ export default function MasksAndZonesView({
</div>
<div
ref={containerRef}
className="flex max-h-[50%] md:h-dvh md:max-h-full md:w-7/12 md:grow"
className="flex max-h-[50%] md:mr-3 md:h-dvh md:max-h-full md:w-7/12 md:grow"
>
<div className="mx-auto flex size-full flex-row justify-center">
{cameraConfig &&

4
web/src/views/settings/MotionTunerView.tsx
View File

@ -191,7 +191,7 @@ export default function MotionTunerView({
return (
<div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mr-2 md:mt-0 md:w-3/12">
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mr-3 md:mt-0 md:w-3/12">
<Heading as="h4" className="mb-2">
{t("motionDetectionTuner.title")}
</Heading>
@ -325,7 +325,7 @@ export default function MotionTunerView({
</div>
{cameraConfig ? (
<div className="flex max-h-[70%] md:h-dvh md:max-h-full md:w-7/12 md:grow">
<div className="flex max-h-[70%] md:mr-3 md:h-dvh md:max-h-full md:w-7/12 md:grow">
<div className="size-full min-h-10">
<AutoUpdatingCameraImage
camera={cameraConfig.name}

2
web/src/views/settings/NotificationsSettingsView.tsx
View File

@ -385,7 +385,7 @@ export default function NotificationView({
<>
<div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto p-2 md:order-none">
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto px-2 md:order-none">
<div
className={cn(
isAdmin && "grid w-full grid-cols-1 gap-4 md:grid-cols-2",

8
web/src/views/settings/TriggerView.tsx
View File

@ -78,7 +78,11 @@ export default function TriggerView({
const { data: config, mutate: updateConfig } =
useSWR<FrigateConfig>("config");
const { data: trigger_status, mutate } = useSWR(
`/triggers/status/${selectedCamera}`,
config?.cameras[selectedCamera]?.semantic_search?.triggers &&
Object.keys(config.cameras[selectedCamera].semantic_search.triggers)
.length > 0
? `/triggers/status/${selectedCamera}`
: null,
{
revalidateOnFocus: false,
},
@ -414,7 +418,7 @@ export default function TriggerView({
return (
<div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mr-3 md:mt-0">
{!isSemanticSearchEnabled ? (
<div className="mb-5 flex flex-row items-center justify-between gap-2">
<div className="flex flex-col items-start">