From d6e93d039d94d7db7a46d4db0a2b8d05e4c2845a Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:12:45 -0500 Subject: [PATCH] Make all corners less rounded on mobile (#11068) * make corners less rounded on mobile * fix live dashboard classes --- web/src/components/camera/CameraImage.tsx | 2 +- .../components/camera/ResizingCameraImage.tsx | 2 +- web/src/components/card/AnimatedEventCard.tsx | 2 +- web/src/components/card/ExportCard.tsx | 12 ++++++------ web/src/components/menu/GeneralSettings.tsx | 8 ++++++-- web/src/components/overlay/ExportDialog.tsx | 4 +++- .../components/player/BirdseyeLivePlayer.tsx | 16 +++++++++++----- web/src/components/player/HlsVideoPlayer.tsx | 2 +- web/src/components/player/LivePlayer.tsx | 12 ++++++------ web/src/components/player/PreviewPlayer.tsx | 8 ++++---- web/src/components/settings/MotionTuner.tsx | 2 +- web/src/components/timeline/EventSegment.tsx | 2 +- web/src/pages/Exports.tsx | 2 +- web/src/pages/SubmitPlus.tsx | 4 ++-- web/src/views/events/EventView.tsx | 6 +++--- web/src/views/live/LiveDashboardView.tsx | 4 ++-- web/src/views/system/CameraMetrics.tsx | 8 ++++---- web/src/views/system/GeneralMetrics.tsx | 18 +++++++++--------- web/src/views/system/StorageMetrics.tsx | 8 ++++---- 19 files changed, 67 insertions(+), 55 deletions(-) diff --git a/web/src/components/camera/CameraImage.tsx b/web/src/components/camera/CameraImage.tsx index 1f2c28ade..ab0bfdf08 100644 --- a/web/src/components/camera/CameraImage.tsx +++ b/web/src/components/camera/CameraImage.tsx @@ -40,7 +40,7 @@ export default function CameraImage({ {enabled ? ( { setHasLoaded(true); diff --git a/web/src/components/camera/ResizingCameraImage.tsx b/web/src/components/camera/ResizingCameraImage.tsx index b7a9b8369..f19c40ff3 100644 --- a/web/src/components/camera/ResizingCameraImage.tsx +++ b/web/src/components/camera/ResizingCameraImage.tsx @@ -100,7 +100,7 @@ export default function CameraImage({ > {enabled ? (
{previews ? ( diff --git a/web/src/components/card/ExportCard.tsx b/web/src/components/card/ExportCard.tsx index 86ec9c7ce..f7dd7f588 100644 --- a/web/src/components/card/ExportCard.tsx +++ b/web/src/components/card/ExportCard.tsx @@ -104,7 +104,7 @@ export default function ExportCard({
setHovered(true) @@ -123,7 +123,7 @@ export default function ExportCard({ > {hovered && ( <> -
+
{exportedRecording.thumb_path.length > 0 ? ( setLoading(false)} /> ) : ( -
+
)} )} {loading && ( - + )} -
+
{exportedRecording.name.replaceAll("_", " ")}
diff --git a/web/src/components/menu/GeneralSettings.tsx b/web/src/components/menu/GeneralSettings.tsx index bc45f650f..aed5f2173 100644 --- a/web/src/components/menu/GeneralSettings.tsx +++ b/web/src/components/menu/GeneralSettings.tsx @@ -210,7 +210,9 @@ export default function GeneralSettings({ className }: GeneralSettings) { {colorSchemes.map((scheme) => ( diff --git a/web/src/components/overlay/ExportDialog.tsx b/web/src/components/overlay/ExportDialog.tsx index a608528bb..60de90468 100644 --- a/web/src/components/overlay/ExportDialog.tsx +++ b/web/src/components/overlay/ExportDialog.tsx @@ -130,7 +130,9 @@ export default function ExportDialog({ + ); } else if (liveMode == "mse") { if ("MediaSource" in window || "ManagedMediaSource" in window) { player = ( - + ); } else { player = ( @@ -39,7 +45,7 @@ export default function BirdseyeLivePlayer({ } else if (liveMode == "jsmpeg") { player = ( -
-
+
+
{player}
); diff --git a/web/src/components/player/HlsVideoPlayer.tsx b/web/src/components/player/HlsVideoPlayer.tsx index 5f0348d88..54bc8c8c9 100644 --- a/web/src/components/player/HlsVideoPlayer.tsx +++ b/web/src/components/player/HlsVideoPlayer.tsx @@ -164,7 +164,7 @@ export default function HlsVideoPlayer({ >
) : ( )}
diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx index c8ddd1822..7cd6bbcd6 100644 --- a/web/src/views/live/LiveDashboardView.tsx +++ b/web/src/views/live/LiveDashboardView.tsx @@ -175,7 +175,7 @@ export default function LiveDashboardView({ )}
{includeBirdseye && birdseyeConfig?.enabled && ( Overview
{statsHistory.length != 0 ? ( -
+
DPS
) : ( - + )}
@@ -214,7 +214,7 @@ export default function CameraMetrics({
{Object.keys(cameraCpuSeries).includes(camera.name) ? ( -
+
CPU
)} {Object.keys(cameraFpsSeries).includes(camera.name) ? ( -
+
DPS
{statsHistory.length != 0 ? ( -
+
Detector Inference Speed
{detInferenceTimeSeries.map((series) => ( ) : ( - + )} {statsHistory.length != 0 ? ( <> {detTempSeries && ( -
+
Detector Temperature
{detTempSeries.map((series) => ( )} {statsHistory.length != 0 ? ( -
+
Detector CPU Usage
{detCpuSeries.map((series) => ( )} {statsHistory.length != 0 ? ( -
+
Detector Memory Usage
{detMemSeries.map((series) => (
{statsHistory.length != 0 ? ( -
+
GPU Usage
{gpuSeries.map((series) => ( {gpuMemSeries && ( -
+
GPU Memory
{gpuMemSeries.map((series) => (
{statsHistory.length != 0 ? ( -
+
Process CPU Usage
{otherProcessCpuSeries.map((series) => ( )} {statsHistory.length != 0 ? ( -
+
Process Memory Usage
{otherProcessMemSeries.map((series) => (
Overview
-
+
Recordings
-
+
/tmp/cache
-
+
/dev/shm
{Object.keys(cameraStorage).map((camera) => ( -
+
{camera.replaceAll("_", " ")}