From 87cd91b0f84800c765bf84dccf97392c8af0c88c Mon Sep 17 00:00:00 2001 From: Dan Ditomaso Date: Thu, 3 Jul 2025 07:10:12 -0400 Subject: [PATCH] refactor: add svgs to sub folder (#687) --- packages/web/index.html | 2 +- packages/web/public/{ => devices}/diy.svg | 0 .../heltec-ht62-esp32c3-sx1262.svg | 0 .../heltec-mesh-node-t114-case.svg | 0 .../{ => devices}/heltec-mesh-node-t114.svg | 0 .../public/{ => devices}/heltec-v3-case.svg | 0 .../web/public/{ => devices}/heltec-v3.svg | 0 .../heltec-vision-master-e213.svg | 0 .../heltec-vision-master-e290.svg | 0 .../heltec-vision-master-t190.svg | 0 .../heltec-wireless-paper-V1_0.svg | 0 .../{ => devices}/heltec-wireless-paper.svg | 0 .../heltec-wireless-tracker-V1-0.svg | 0 .../{ => devices}/heltec-wireless-tracker.svg | 0 .../public/{ => devices}/heltec-wsl-v3.svg | 0 .../public/{ => devices}/nano-g2-ultra.svg | 0 packages/web/public/{ => devices}/pico.svg | 0 .../web/public/{ => devices}/promicro.svg | 0 .../public/{ => devices}/rak-wismeshtap.svg | 0 .../web/public/{ => devices}/rak11310.svg | 0 packages/web/public/{ => devices}/rak2560.svg | 0 packages/web/public/{ => devices}/rak4631.svg | 0 .../web/public/{ => devices}/rak4631_case.svg | 0 .../web/public/{ => devices}/rpipicow.svg | 0 .../seeed-sensecap-indicator.svg | 0 .../public/{ => devices}/seeed-xiao-s3.svg | 0 .../web/public/{ => devices}/station-g2.svg | 0 packages/web/public/{ => devices}/t-deck.svg | 0 packages/web/public/{ => devices}/t-echo.svg | 0 .../web/public/{ => devices}/t-watch-s3.svg | 0 .../public/{ => devices}/tbeam-s3-core.svg | 0 packages/web/public/{ => devices}/tbeam.svg | 0 .../web/public/{ => devices}/tlora-c6.svg | 0 .../{ => devices}/tlora-t3s3-epaper.svg | 0 .../public/{ => devices}/tlora-t3s3-v1.svg | 0 .../public/{ => devices}/tlora-v2-1-1_6.svg | 0 .../public/{ => devices}/tlora-v2-1-1_8.svg | 0 .../public/{ => devices}/tracker-t1000-e.svg | 0 packages/web/public/{ => devices}/unknown.svg | 0 .../{ => devices}/wio-tracker-wm1110.svg | 0 .../public/{ => devices}/wm1110_dev_kit.svg | 0 packages/web/public/logo.svg | 16 ++++++++++++++++ packages/web/public/logo_black.svg | 12 ++++++++++++ packages/web/public/logo_white.svg | 12 ++++++++++++ packages/web/public/site.webmanifest | 2 +- packages/web/src/components/Sidebar.tsx | 19 ++++++------------- .../src/components/generic/DeviceImage.tsx | 2 +- 47 files changed, 49 insertions(+), 16 deletions(-) rename packages/web/public/{ => devices}/diy.svg (100%) rename packages/web/public/{ => devices}/heltec-ht62-esp32c3-sx1262.svg (100%) rename packages/web/public/{ => devices}/heltec-mesh-node-t114-case.svg (100%) rename packages/web/public/{ => devices}/heltec-mesh-node-t114.svg (100%) rename packages/web/public/{ => devices}/heltec-v3-case.svg (100%) rename packages/web/public/{ => devices}/heltec-v3.svg (100%) rename packages/web/public/{ => devices}/heltec-vision-master-e213.svg (100%) rename packages/web/public/{ => devices}/heltec-vision-master-e290.svg (100%) rename packages/web/public/{ => devices}/heltec-vision-master-t190.svg (100%) rename packages/web/public/{ => devices}/heltec-wireless-paper-V1_0.svg (100%) rename packages/web/public/{ => devices}/heltec-wireless-paper.svg (100%) rename packages/web/public/{ => devices}/heltec-wireless-tracker-V1-0.svg (100%) rename packages/web/public/{ => devices}/heltec-wireless-tracker.svg (100%) rename packages/web/public/{ => devices}/heltec-wsl-v3.svg (100%) rename packages/web/public/{ => devices}/nano-g2-ultra.svg (100%) rename packages/web/public/{ => devices}/pico.svg (100%) rename packages/web/public/{ => devices}/promicro.svg (100%) rename packages/web/public/{ => devices}/rak-wismeshtap.svg (100%) rename packages/web/public/{ => devices}/rak11310.svg (100%) rename packages/web/public/{ => devices}/rak2560.svg (100%) rename packages/web/public/{ => devices}/rak4631.svg (100%) rename packages/web/public/{ => devices}/rak4631_case.svg (100%) rename packages/web/public/{ => devices}/rpipicow.svg (100%) rename packages/web/public/{ => devices}/seeed-sensecap-indicator.svg (100%) rename packages/web/public/{ => devices}/seeed-xiao-s3.svg (100%) rename packages/web/public/{ => devices}/station-g2.svg (100%) rename packages/web/public/{ => devices}/t-deck.svg (100%) rename packages/web/public/{ => devices}/t-echo.svg (100%) rename packages/web/public/{ => devices}/t-watch-s3.svg (100%) rename packages/web/public/{ => devices}/tbeam-s3-core.svg (100%) rename packages/web/public/{ => devices}/tbeam.svg (100%) rename packages/web/public/{ => devices}/tlora-c6.svg (100%) rename packages/web/public/{ => devices}/tlora-t3s3-epaper.svg (100%) rename packages/web/public/{ => devices}/tlora-t3s3-v1.svg (100%) rename packages/web/public/{ => devices}/tlora-v2-1-1_6.svg (100%) rename packages/web/public/{ => devices}/tlora-v2-1-1_8.svg (100%) rename packages/web/public/{ => devices}/tracker-t1000-e.svg (100%) rename packages/web/public/{ => devices}/unknown.svg (100%) rename packages/web/public/{ => devices}/wio-tracker-wm1110.svg (100%) rename packages/web/public/{ => devices}/wm1110_dev_kit.svg (100%) create mode 100644 packages/web/public/logo.svg create mode 100644 packages/web/public/logo_black.svg create mode 100644 packages/web/public/logo_white.svg diff --git a/packages/web/index.html b/packages/web/index.html index d48d430a..f21e342e 100644 --- a/packages/web/index.html +++ b/packages/web/index.html @@ -7,7 +7,7 @@ - + + + +Created with Fabric.js 4.6.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/web/public/logo_black.svg b/packages/web/public/logo_black.svg new file mode 100644 index 00000000..e0f9bb19 --- /dev/null +++ b/packages/web/public/logo_black.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/web/public/logo_white.svg b/packages/web/public/logo_white.svg new file mode 100644 index 00000000..b1bcd575 --- /dev/null +++ b/packages/web/public/logo_white.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/web/public/site.webmanifest b/packages/web/public/site.webmanifest index a5f2d0ca..dc9509b9 100644 --- a/packages/web/public/site.webmanifest +++ b/packages/web/public/site.webmanifest @@ -5,7 +5,7 @@ "description": "Meshtastic Web App", "icons": [ { - "src": "/Logo.svg", + "src": "/logo.svg", "sizes": "any", "type": "image/svg+xml" } diff --git a/packages/web/src/components/Sidebar.tsx b/packages/web/src/components/Sidebar.tsx index a55d89e8..ddef36aa 100644 --- a/packages/web/src/components/Sidebar.tsx +++ b/packages/web/src/components/Sidebar.tsx @@ -1,4 +1,5 @@ -import React, { useEffect, useState, useTransition } from "react"; +import type React from "react"; +import { useEffect, useState, useTransition } from "react"; import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.tsx"; import { Subtle } from "@components/UI/Typography/Subtle.tsx"; import { useDevice } from "@core/stores/deviceStore.ts"; @@ -101,7 +102,7 @@ export const Sidebar = ({ children }: SidebarProps) => { setDisplayedNodeCount(currentNodeCountValue); }); } - }, [currentNodeCountValue, displayedNodeCount, startNodeCountTransition]); + }, [currentNodeCountValue, displayedNodeCount]); const pages: NavLink[] = [ { @@ -146,7 +147,7 @@ export const Sidebar = ({ children }: SidebarProps) => { )} > {t("app.logo")} @@ -163,10 +164,7 @@ export const Sidebar = ({ children }: SidebarProps) => { - + {pages.map((link) => { return ( { })} -
+
{children}
diff --git a/packages/web/src/components/generic/DeviceImage.tsx b/packages/web/src/components/generic/DeviceImage.tsx index b80ebbac..ef96a429 100644 --- a/packages/web/src/components/generic/DeviceImage.tsx +++ b/packages/web/src/components/generic/DeviceImage.tsx @@ -47,7 +47,7 @@ const hardwareModelToFilename: { [key: string]: string } = { }; export const DeviceImage = ({ deviceType, className }: DeviceImageProps) => { - const getPath = (device: string) => `/${device}`; + const getPath = (device: string) => `/devices/${device}`; const device = hardwareModelToFilename[deviceType] || "unknown.svg"; return {device}; };