Update frontend colors to match style guide (#10188)

* Get main background colors going

* Finish sidebar

* Get light mode colors working

* Adjust icons

* Adjust icons

* remove unused

* Fix mobile colors
This commit is contained in:
Nicolas Mowen
2024-03-02 08:00:50 -07:00
committed by GitHub
parent 64f142a5dd
commit 837f30cbf0
11 changed files with 76 additions and 74 deletions

View File

@@ -28,7 +28,7 @@ export default function Statusbar() {
}, [stats]);
return (
<div className="absolute left-0 bottom-0 right-0 w-full h-8 flex items-center px-4">
<div className="absolute left-0 bottom-0 right-0 w-full h-8 flex items-center px-4 bg-primary z-10 text-secondary-foreground">
{cpuPercent && (
<div className="flex items-center text-sm mr-4">
<MdCircle

View File

@@ -8,12 +8,12 @@ import { isDesktop } from "react-device-detect";
const variants = {
primary: {
active: "font-bold text-primary-foreground bg-primary",
inactive: "text-muted-foreground bg-muted",
active: "font-bold text-primary-foreground bg-selected",
inactive: "text-secondary-foreground bg-secondary",
},
secondary: {
active: "font-bold text-primary",
inactive: "text-muted-foreground",
inactive: "text-secondary-foreground",
},
};

View File

@@ -1,4 +1,4 @@
import { LuCalendar, LuCheck, LuFilter, LuVideo } from "react-icons/lu";
import { LuCheck, LuVideo } from "react-icons/lu";
import { Button } from "../ui/button";
import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
import useSWR from "swr";
@@ -15,7 +15,7 @@ import { Calendar } from "../ui/calendar";
import { ReviewFilter } from "@/types/review";
import { getEndOfDayTimestamp } from "@/utils/dateUtil";
import { useFormattedTimestamp } from "@/hooks/use-date-utils";
import { isMobile } from "react-device-detect";
import { FaCalendarAlt, FaFilter, FaVideo } from "react-icons/fa";
const ATTRIBUTES = ["amazon", "face", "fedex", "license_plate", "ups"];
@@ -123,12 +123,8 @@ function CamerasFilterButton({
}}
>
<DropdownMenuTrigger asChild>
<Button
size={isMobile ? "sm" : "default"}
className="mx-1 capitalize"
variant="secondary"
>
<LuVideo className="md:mr-[10px]" />
<Button size="sm" className="mx-1 capitalize" variant="secondary">
<FaVideo className="md:mr-[10px] text-muted-foreground" />
<div className="hidden md:block">
{selectedCameras == undefined
? "All Cameras"
@@ -212,12 +208,8 @@ function CalendarFilterButton({
}}
>
<PopoverTrigger asChild>
<Button
size={isMobile ? "sm" : "default"}
className="mx-1"
variant="secondary"
>
<LuCalendar className="md:mr-[10px]" />
<Button size="sm" className="mx-1" variant="secondary">
<FaCalendarAlt className="md:mr-[10px] text-muted-foreground" />
<div className="hidden md:block">
{day == undefined ? "Last 24 Hours" : selectedDate}
</div>
@@ -254,12 +246,8 @@ function GeneralFilterButton({
return (
<Popover>
<PopoverTrigger asChild>
<Button
size={isMobile ? "sm" : "default"}
className="mx-1"
variant="secondary"
>
<LuFilter className="md:mr-[10px]" />
<Button size="sm" className="mx-1" variant="secondary">
<FaFilter className="md:mr-[10px] text-muted-foreground" />
<div className="hidden md:block">Filter</div>
</Button>
</PopoverTrigger>
@@ -373,7 +361,7 @@ function FilterCheckBox({
}: FilterCheckBoxProps) {
return (
<Button
className="capitalize flex justify-between items-center cursor-pointer w-full"
className="capitalize flex justify-between items-center cursor-pointer w-full text-primary-foreground"
variant="ghost"
onClick={() => onCheckedChange(!isChecked)}
>

View File

@@ -11,11 +11,11 @@ import { isDesktop } from "react-device-detect";
const variants = {
primary: {
active: "font-bold text-primary-foreground bg-primary",
inactive: "text-muted-foreground bg-muted",
active: "font-bold text-white bg-selected",
inactive: "text-muted-foreground bg-secondary",
},
secondary: {
active: "font-bold text-primary",
active: "font-bold text-selected",
inactive: "text-muted-foreground",
},
};

View File

@@ -5,7 +5,7 @@ import NavItem from "./NavItem";
function Sidebar() {
return (
<aside className="absolute w-[52px] z-10 left-o inset-y-0 overflow-y-auto scrollbar-hidden py-4 flex flex-col justify-between">
<aside className="absolute w-[52px] z-10 left-o inset-y-0 overflow-y-auto scrollbar-hidden py-4 flex flex-col justify-between bg-primary">
<span tabIndex={0} className="sr-only" />
<div className="w-full flex flex-col gap-0 items-center">
<Logo className="w-8 h-8 mb-6" />

View File

@@ -1,21 +1,22 @@
import { LuConstruction, LuFileUp, LuFlag, LuVideo } from "react-icons/lu";
import { FaCompactDisc, FaFlag, FaVideo } from "react-icons/fa";
import { LuConstruction } from "react-icons/lu";
export const navbarLinks = [
{
id: 1,
icon: LuVideo,
icon: FaVideo,
title: "Live",
url: "/",
},
{
id: 2,
icon: LuFlag,
icon: FaFlag,
title: "Events",
url: "/events",
},
{
id: 3,
icon: LuFileUp,
icon: FaCompactDisc,
title: "Export",
url: "/export",
},

View File

@@ -247,7 +247,7 @@ export default function EventView({
return (
<div className="flex flex-col size-full">
<div className="h-8 relative flex justify-between items-center mb-2">
<div className="h-10 relative flex justify-between items-center mb-2">
{isMobile && (
<Logo className="absolute inset-y-0 inset-x-1/2 -translate-x-1/2 h-8" />
)}

View File

@@ -101,7 +101,7 @@ export default function LiveCameraView({ camera }: LiveCameraViewProps) {
</Button>
<TooltipProvider>
<div
className={`flex flex-row items-center gap-1 mr-1 *:rounded-lg ${isMobile ? "landscape:flex-col" : ""}`}
className={`flex flex-row items-center gap-2 mr-1 *:rounded-lg ${isMobile ? "landscape:flex-col" : ""}`}
>
<CameraFeatureToggle
className="p-2 md:p-0"

View File

@@ -81,17 +81,23 @@ export default function LiveDashboardView({
<div />
<div className="flex items-center gap-1">
<Button
className={layout == "grid" ? "text-blue-600 bg-blue-200" : ""}
className={
layout == "grid"
? "text-selected bg-blue-900 focus:bg-blue-900 bg-opacity-60 focus:bg-opacity-60"
: "text-muted-foreground bg-muted"
}
size="xs"
variant="secondary"
onClick={() => setLayout("grid")}
>
<CiGrid31 className="m-1" />
</Button>
<Button
className={layout == "list" ? "text-blue-600 bg-blue-200" : ""}
className={
layout == "list"
? "text-selected bg-blue-900 focus:bg-blue-900 bg-opacity-60 focus:bg-opacity-60"
: "text-muted-foreground bg-muted"
}
size="xs"
variant="secondary"
onClick={() => setLayout("list")}
>
<CiGrid2H className="m-1" />