Browse Source

Overhaul (#83)

* WIP Layout Refactor

* New Connection Dialog

* WIP form overhaul

* Fix remaining config pages
pull/101/head
Sacha Weatherstone 3 years ago
committed by GitHub
parent
commit
e59fe138f1
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 62
      package.json
  2. 1705
      pnpm-lock.yaml
  3. 46
      src/App.tsx
  4. 2
      src/DeviceWrapper.tsx
  5. 20
      src/Nav/BottomNav.tsx
  6. 37
      src/Nav/NavBar.tsx
  7. 3
      src/Nav/NavSpacer.tsx
  8. 69
      src/Nav/PageNav.tsx
  9. 6
      src/PageRouter.tsx
  10. 258
      src/components/CommandPalette.tsx
  11. 28
      src/components/CommandPalette/GroupView.tsx
  12. 13
      src/components/CommandPalette/NoResults.tsx
  13. 40
      src/components/CommandPalette/PaletteTransition.tsx
  14. 19
      src/components/CommandPalette/SearchBox.tsx
  15. 71
      src/components/CommandPalette/SearchResult.tsx
  16. 104
      src/components/Dashboard.tsx
  17. 107
      src/components/DeviceSelector.tsx
  18. 22
      src/components/DeviceSelectorButton.tsx
  19. 74
      src/components/Dialog/DeviceNameDialog.tsx
  20. 29
      src/components/Dialog/DialogManager.tsx
  21. 141
      src/components/Dialog/ImportDialog.tsx
  22. 97
      src/components/Dialog/NewDevice.tsx
  23. 121
      src/components/Dialog/QRDialog.tsx
  24. 88
      src/components/Dialog/RebootDialog.tsx
  25. 86
      src/components/Dialog/ShutdownDialog.tsx
  26. 134
      src/components/Drawer/Metrics.tsx
  27. 3
      src/components/Drawer/Notifications.tsx
  28. 170
      src/components/Drawer/Sensor.tsx
  29. 66
      src/components/Drawer/index.tsx
  30. 238
      src/components/DynamicForm.tsx
  31. 43
      src/components/NewDevice.tsx
  32. 118
      src/components/PageComponents/AppConfig/Map.tsx
  33. 109
      src/components/PageComponents/Channel.tsx
  34. 113
      src/components/PageComponents/Config/Bluetooth.tsx
  35. 131
      src/components/PageComponents/Config/Device.tsx
  36. 180
      src/components/PageComponents/Config/Display.tsx
  37. 287
      src/components/PageComponents/Config/LoRa.tsx
  38. 273
      src/components/PageComponents/Config/Network.tsx
  39. 295
      src/components/PageComponents/Config/Position.tsx
  40. 167
      src/components/PageComponents/Config/Power.tsx
  41. 105
      src/components/PageComponents/Config/User.tsx
  42. 4
      src/components/PageComponents/Connect/BLE.tsx
  43. 6
      src/components/PageComponents/Connect/HTTP.tsx
  44. 4
      src/components/PageComponents/Connect/Serial.tsx
  45. 77
      src/components/PageComponents/Map/MapControlls.tsx
  46. 2
      src/components/PageComponents/Messages/ChannelChat.tsx
  47. 25
      src/components/PageComponents/Messages/Message.tsx
  48. 16
      src/components/PageComponents/Messages/MessageInput.tsx
  49. 10
      src/components/PageComponents/Messages/NewLocationMessage.tsx
  50. 10
      src/components/PageComponents/Messages/WaypointMessage.tsx
  51. 132
      src/components/PageComponents/ModuleConfig/Audio.tsx
  52. 219
      src/components/PageComponents/ModuleConfig/CannedMessage.tsx
  53. 349
      src/components/PageComponents/ModuleConfig/ExternalNotification.tsx
  54. 157
      src/components/PageComponents/ModuleConfig/MQTT.tsx
  55. 102
      src/components/PageComponents/ModuleConfig/RangeTest.tsx
  56. 192
      src/components/PageComponents/ModuleConfig/Serial.tsx
  57. 148
      src/components/PageComponents/ModuleConfig/StoreForward.tsx
  58. 115
      src/components/PageComponents/ModuleConfig/Telemetry.tsx
  59. 144
      src/components/Sidebar.tsx
  60. 42
      src/components/Topbar.tsx
  61. 53
      src/components/UI/Button.tsx
  62. 156
      src/components/UI/Command.tsx
  63. 128
      src/components/UI/Dialog.tsx
  64. 24
      src/components/UI/Input.tsx
  65. 21
      src/components/UI/Label.tsx
  66. 234
      src/components/UI/Menubar.tsx
  67. 29
      src/components/UI/Popover.tsx
  68. 111
      src/components/UI/Select.tsx
  69. 29
      src/components/UI/Seperator.tsx
  70. 17
      src/components/UI/Sidebar/SidebarSection.tsx
  71. 29
      src/components/UI/Sidebar/sidebarButton.tsx
  72. 27
      src/components/UI/Switch.tsx
  73. 53
      src/components/UI/Tabs.tsx
  74. 128
      src/components/UI/Toast.tsx
  75. 29
      src/components/UI/Tooltip.tsx
  76. 9
      src/components/UI/Typography/Blockquote.tsx
  77. 9
      src/components/UI/Typography/Code.tsx
  78. 9
      src/components/UI/Typography/H1.tsx
  79. 9
      src/components/UI/Typography/H2.tsx
  80. 9
      src/components/UI/Typography/H3.tsx
  81. 17
      src/components/UI/Typography/H4.tsx
  82. 15
      src/components/UI/Typography/Link.tsx
  83. 7
      src/components/UI/Typography/P.tsx
  84. 7
      src/components/UI/Typography/Subtle.tsx
  85. 77
      src/components/Widgets/BatteryWidget.tsx
  86. 39
      src/components/Widgets/DeviceWidget.tsx
  87. 44
      src/components/Widgets/PeersWidget.tsx
  88. 21
      src/components/Widgets/PositionWidget.tsx
  89. 6
      src/components/form/BitwiseSelect.tsx
  90. 35
      src/components/form/Button.tsx
  91. 22
      src/components/form/Form.tsx
  92. 31
      src/components/form/IconButton.tsx
  93. 6
      src/components/form/InfoWrapper.tsx
  94. 4
      src/components/form/Input.tsx
  95. 61
      src/components/form/Select.tsx
  96. 41
      src/components/form/Toggle.tsx
  97. 48
      src/components/generic/Dialog.tsx
  98. 97
      src/components/generic/TabbedContent.tsx
  99. 6
      src/components/generic/Table/index.tsx
  100. 49
      src/components/generic/VerticalTabbedContent.tsx

62
package.json

@ -20,69 +20,73 @@
"homepage": "https://meshtastic.org", "homepage": "https://meshtastic.org",
"dependencies": { "dependencies": {
"@emeraldpay/hashicon-react": "^0.5.2", "@emeraldpay/hashicon-react": "^0.5.2",
"@headlessui/react": "^1.7.8",
"@heroicons/react": "^2.0.14",
"@hookform/error-message": "^2.0.1", "@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^2.9.10", "@hookform/resolvers": "^2.9.11",
"@meshtastic/meshtasticjs": "2.0.15-0", "@meshtastic/meshtasticjs": "2.0.20-1",
"@primer/octicons-react": "^17.11.1", "@radix-ui/react-dialog": "^1.0.2",
"@radix-ui/react-label": "^2.0.0",
"@radix-ui/react-menubar": "^1.0.0",
"@radix-ui/react-popover": "^1.0.3",
"@radix-ui/react-select": "^1.2.0",
"@radix-ui/react-separator": "^1.0.1",
"@radix-ui/react-switch": "^1.0.1",
"@radix-ui/react-tabs": "^1.0.2",
"@radix-ui/react-toast": "^1.1.2",
"@radix-ui/react-tooltip": "^1.0.3",
"@tailwindcss/typography": "^0.5.9", "@tailwindcss/typography": "^0.5.9",
"@turf/turf": "^6.5.0", "@turf/turf": "^6.5.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"chart.js": "^4.2.0",
"chartjs-adapter-date-fns": "^3.0.0",
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"class-validator": "^0.14.0", "class-validator": "^0.14.0",
"date-fns": "^2.29.3", "class-variance-authority": "^0.4.0",
"clsx": "^1.2.1",
"cmdk": "^0.1.22",
"geodesy": "^2.4.0", "geodesy": "^2.4.0",
"i18next": "^22.4.9",
"immer": "^9.0.19", "immer": "^9.0.19",
"lucide-react": "^0.112.0",
"mapbox-gl": "npm:empty-npm-package@^1.0.0", "mapbox-gl": "npm:empty-npm-package@^1.0.0",
"maplibre-gl": "2.4.0", "maplibre-gl": "2.4.0",
"pretty-ms": "^8.0.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-hook-form": "^7.42.1", "react-hook-form": "^7.43.1",
"react-hot-toast": "^2.4.0",
"react-i18next": "^12.1.4",
"react-json-tree": "^0.18.0",
"react-map-gl": "^7.0.21", "react-map-gl": "^7.0.21",
"react-qrcode-logo": "^2.8.0", "react-qrcode-logo": "^2.8.0",
"rfc4648": "^1.5.2", "rfc4648": "^1.5.2",
"tailwind-merge": "^1.9.1",
"tailwindcss-animate": "^1.0.5",
"timeago-react": "^3.0.5", "timeago-react": "^3.0.5",
"zustand": "4.3.2" "zustand": "4.3.3"
}, },
"devDependencies": { "devDependencies": {
"@tailwindcss/forms": "^0.5.3", "@tailwindcss/forms": "^0.5.3",
"@types/chrome": "^0.0.210", "@types/chrome": "^0.0.212",
"@types/geodesy": "^2.2.3", "@types/geodesy": "^2.2.3",
"@types/node": "^18.11.18", "@types/node": "^18.13.0",
"@types/react": "^18.0.27", "@types/react": "^18.0.28",
"@types/react-dom": "^18.0.10", "@types/react-dom": "^18.0.10",
"@types/w3c-web-serial": "^1.0.3", "@types/w3c-web-serial": "^1.0.3",
"@types/web-bluetooth": "^0.0.16", "@types/web-bluetooth": "^0.0.16",
"@typescript-eslint/eslint-plugin": "^5.49.0", "@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.49.0", "@typescript-eslint/parser": "^5.51.0",
"@vitejs/plugin-react": "^3.0.1", "@vitejs/plugin-react": "^3.1.0",
"autoprefixer": "^10.4.13", "autoprefixer": "^10.4.13",
"eslint": "^8.33.0", "eslint": "^8.34.0",
"eslint-config-prettier": "^8.6.0", "eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-typescript": "^3.5.3", "eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-react": "^7.32.1", "eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-hooks": "^4.6.0",
"gzipper": "^7.2.0", "gzipper": "^7.2.0",
"postcss": "^8.4.21", "postcss": "^8.4.21",
"prettier": "^2.8.3", "prettier": "^2.8.4",
"prettier-plugin-tailwindcss": "^0.2.2", "prettier-plugin-tailwindcss": "^0.2.2",
"rollup-plugin-visualizer": "^5.9.0", "rollup-plugin-visualizer": "^5.9.0",
"tailwindcss": "^3.2.4", "tailwindcss": "^3.2.6",
"tar": "^6.1.13", "tar": "^6.1.13",
"tslib": "^2.5.0", "tslib": "^2.5.0",
"typescript": "^4.9.4", "typescript": "^4.9.5",
"vite": "^4.0.4", "vite": "^4.1.1",
"vite-plugin-environment": "^1.1.3", "vite-plugin-environment": "^1.1.3",
"vite-plugin-pwa": "^0.14.1" "vite-plugin-pwa": "^0.14.4"
} }
} }

1705
pnpm-lock.yaml

File diff suppressed because it is too large

46
src/App.tsx

@ -2,41 +2,45 @@ import { MapProvider } from "react-map-gl";
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { DeviceWrapper } from "@app/DeviceWrapper.js"; import { DeviceWrapper } from "@app/DeviceWrapper.js";
import { PageRouter } from "@app/PageRouter.js"; import { PageRouter } from "@app/PageRouter.js";
import { CommandPalette } from "@components/CommandPalette/Index.js"; import { CommandPalette } from "@components/CommandPalette.js";
import { DeviceSelector } from "@components/DeviceSelector.js"; import { DeviceSelector } from "@components/DeviceSelector.js";
import { DialogManager } from "@components/Dialog/DialogManager.js"; import { DialogManager } from "@components/Dialog/DialogManager.js";
import { NewDevice } from "@components/NewDevice.js"; import { Dashboard } from "@app/components/Dashboard.js";
import { Sidebar } from "@components/Sidebar.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDeviceStore } from "@core/stores/deviceStore.js";
import { Drawer } from "@components/Drawer/index.js";
import { ThemeController } from "@components/generic/ThemeController.js"; import { ThemeController } from "@components/generic/ThemeController.js";
import { BottomNav } from "@app/Nav/BottomNav.js"; import { NewDeviceDialog } from "./components/Dialog/NewDevice.js";
export const App = (): JSX.Element => { export const App = (): JSX.Element => {
const { getDevice } = useDeviceStore(); const { getDevice } = useDeviceStore();
const { selectedDevice, darkMode, accent } = useAppStore(); const { selectedDevice, setConnectDialogOpen, connectDialogOpen } =
useAppStore();
const device = getDevice(selectedDevice); const device = getDevice(selectedDevice);
return ( return (
<ThemeController> <ThemeController>
<NewDeviceDialog
open={connectDialogOpen}
onOpenChange={(open) => {
setConnectDialogOpen(open);
}}
/>
<MapProvider> <MapProvider>
<DeviceWrapper device={device}> <DeviceWrapper device={device}>
<div className="flex bg-backgroundSecondary"> <div className="flex min-h-screen flex-col bg-backgroundPrimary text-textPrimary">
<DeviceSelector /> <div className="flex flex-grow">
<div className="flex flex-grow flex-col"> <DeviceSelector />
{device ? ( <div className="flex flex-grow flex-col">
<div className="flex flex-grow"> {device ? (
<DialogManager /> <div className="flex flex-grow">
<CommandPalette /> <DialogManager />
<Sidebar /> <CommandPalette />
<PageRouter /> <PageRouter />
</div> </div>
) : ( ) : (
<NewDevice /> <Dashboard />
)} )}
<BottomNav>{device && <Drawer />}</BottomNav> </div>
</div> </div>
</div> </div>
</DeviceWrapper> </DeviceWrapper>

2
src/DeviceWrapper.tsx

@ -1,4 +1,4 @@
import { DeviceContext } from "@core/providers/useDevice.js"; import { DeviceContext } from "@core/stores/deviceStore.js";
import type { Device } from "@core/stores/deviceStore.js"; import type { Device } from "@core/stores/deviceStore.js";
import type { ReactNode } from "react"; import type { ReactNode } from "react";

20
src/Nav/BottomNav.tsx

@ -1,20 +0,0 @@
import { GitBranchIcon } from "@primer/octicons-react";
import type { ReactNode } from "react";
export interface BottomNavProps {
children: ReactNode;
}
export const BottomNav = ({ children }: BottomNavProps): JSX.Element => {
return (
<div className="flex bg-backgroundPrimary">
<div className="flex h-8 cursor-pointer select-none gap-1 bg-accent px-1 text-textPrimary hover:brightness-hover active:brightness-press">
<GitBranchIcon className="my-auto w-4" />
<span className="my-auto font-mono text-sm">
{process.env.COMMIT_HASH}
</span>
</div>
{children}
</div>
);
};

37
src/Nav/NavBar.tsx

@ -1,37 +0,0 @@
import { Button } from "@app/components/form/Button.js";
import { ChevronRightIcon, HomeIcon } from "@primer/octicons-react";
export interface NavBarProps {
breadcrumb: string[];
actions?: {
label: string;
onClick: () => void;
}[];
}
export const NavBar = ({ breadcrumb, actions }: NavBarProps): JSX.Element => {
return (
<div className="flex rounded-md bg-backgroundSecondary p-2">
<ol className="my-auto ml-2 flex gap-4 text-textSecondary">
<li className="cursor-pointer hover:brightness-disabled">
<HomeIcon className="h-5 w-5 flex-shrink-0" />
</li>
{breadcrumb.map((breadcrumb, index) => (
<li key={index} className="my-auto flex gap-4">
<ChevronRightIcon className="h-5 w-5 flex-shrink-0 brightness-disabled" />
<span className="cursor-pointer text-sm font-medium hover:brightness-disabled">
{breadcrumb}
</span>
</li>
))}
</ol>
<div className="ml-auto">
{actions?.map((Action, index) => (
<Button key={index} onClick={Action.onClick}>
{Action.label}
</Button>
))}
</div>
</div>
);
};

3
src/Nav/NavSpacer.tsx

@ -1,3 +0,0 @@
export const NavSpacer = (): JSX.Element => {
return <div className="h-1 w-10 rounded-full bg-accentMuted" />;
};

69
src/Nav/PageNav.tsx

@ -1,69 +0,0 @@
import type { ComponentType, SVGProps } from "react";
import { useDevice } from "@core/providers/useDevice.js";
import type { Page } from "@core/stores/deviceStore.js";
import {
BeakerIcon,
ChatBubbleBottomCenterTextIcon,
Cog8ToothIcon,
MapIcon,
Square3Stack3DIcon,
UsersIcon
} from "@heroicons/react/24/outline";
export const PageNav = (): JSX.Element => {
const { activePage, setActivePage } = useDevice();
interface NavLink {
name: string;
icon: ComponentType<SVGProps<SVGSVGElement>>;
page: Page;
}
const pages: NavLink[] = [
{
name: "Messages",
icon: ChatBubbleBottomCenterTextIcon,
page: "messages"
},
{
name: "Map",
icon: MapIcon,
page: "map"
},
{
name: "Config",
icon: Cog8ToothIcon,
page: "config"
},
{
name: "Channels",
icon: Square3Stack3DIcon,
page: "channels"
},
{
name: "Peers",
icon: UsersIcon,
page: "peers"
}
];
return (
<div className="flex text-textPrimary">
{pages.map((Link) => (
<div
key={Link.name}
onClick={() => {
setActivePage(Link.page);
}}
className={`border-x-4 border-backgroundPrimary bg-backgroundPrimary py-5 px-4 hover:brightness-hover active:brightness-press ${
Link.page === activePage
? "border-l-accent text-textPrimary"
: "text-textSecondary hover:text-textPrimary"
}`}
>
<Link.icon className="w-4" />
</div>
))}
</div>
);
};

6
src/PageRouter.tsx

@ -1,4 +1,4 @@
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { ChannelsPage } from "@pages/Channels.js"; import { ChannelsPage } from "@pages/Channels.js";
import { ConfigPage } from "@pages/Config/index.js"; import { ConfigPage } from "@pages/Config/index.js";
import { MapPage } from "@pages/Map.js"; import { MapPage } from "@pages/Map.js";
@ -8,12 +8,12 @@ import { PeersPage } from "@pages/Peers.js";
export const PageRouter = (): JSX.Element => { export const PageRouter = (): JSX.Element => {
const { activePage } = useDevice(); const { activePage } = useDevice();
return ( return (
<div className="flex-grow overflow-y-auto bg-backgroundPrimary"> <>
{activePage === "messages" && <MessagesPage />} {activePage === "messages" && <MessagesPage />}
{activePage === "map" && <MapPage />} {activePage === "map" && <MapPage />}
{activePage === "config" && <ConfigPage />} {activePage === "config" && <ConfigPage />}
{activePage === "channels" && <ChannelsPage />} {activePage === "channels" && <ChannelsPage />}
{activePage === "peers" && <PeersPage />} {activePage === "peers" && <PeersPage />}
</div> </>
); );
}; };

258
src/components/CommandPalette/Index.tsx → src/components/CommandPalette.tsx

@ -1,52 +1,49 @@
import { ComponentType, Fragment, SVGProps, useEffect, useState } from "react"; import { useEffect } from "react";
import { toast } from "react-hot-toast";
import { useDevice } from "@core/providers/useDevice.js";
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDevice, useDeviceStore } from "@core/stores/deviceStore.js";
import { GroupView } from "@components/CommandPalette/GroupView.js"; import { useCommandState } from "cmdk";
import { NoResults } from "@components/CommandPalette/NoResults.js";
import { PaletteTransition } from "@components/CommandPalette/PaletteTransition.js";
import { SearchBox } from "@components/CommandPalette/SearchBox.js";
import { SearchResult } from "@components/CommandPalette/SearchResult.js";
import { Hashicon } from "@emeraldpay/hashicon-react"; import { Hashicon } from "@emeraldpay/hashicon-react";
import { Combobox, Dialog, Transition } from "@headlessui/react";
import { import {
ArchiveBoxXMarkIcon, LucideIcon,
ArrowDownOnSquareStackIcon,
ArrowPathIcon,
ArrowPathRoundedSquareIcon,
ArrowsRightLeftIcon,
BeakerIcon,
BugAntIcon,
Cog8ToothIcon,
CubeTransparentIcon,
DevicePhoneMobileIcon,
InboxIcon,
LinkIcon, LinkIcon,
TrashIcon,
MapIcon, MapIcon,
MoonIcon, MoonIcon,
PlusIcon, PlusIcon,
PowerIcon, PowerIcon,
EraserIcon,
RefreshCwIcon,
FactoryIcon,
ArrowLeftRightIcon,
BugIcon,
SettingsIcon,
SmartphoneIcon,
MessageSquareIcon,
QrCodeIcon, QrCodeIcon,
QueueListIcon, LayersIcon,
Square3Stack3DIcon, PaletteIcon,
SwatchIcon,
TrashIcon,
UsersIcon, UsersIcon,
WindowIcon, LayoutIcon,
XCircleIcon XCircleIcon,
} from "@heroicons/react/24/outline"; BoxSelectIcon
import { Blur } from "@components/generic/Blur.js"; } from "lucide-react";
import { ThemeController } from "@components/generic/ThemeController.js"; import {
CommandDialog,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList
} from "@components/UI/Command.js";
export interface Group { export interface Group {
label: string; label: string;
icon: ComponentType<SVGProps<SVGSVGElement>>; icon: LucideIcon;
commands: Command[]; commands: Command[];
} }
export interface Command { export interface Command {
label: string; label: string;
icon: ComponentType<SVGProps<SVGSVGElement>>; icon: LucideIcon;
action?: () => void; action?: () => void;
subItems?: SubItem[]; subItems?: SubItem[];
tags?: string[]; tags?: string[];
@ -59,11 +56,9 @@ export interface SubItem {
} }
export const CommandPalette = (): JSX.Element => { export const CommandPalette = (): JSX.Element => {
const [query, setQuery] = useState("");
const { const {
commandPaletteOpen, commandPaletteOpen,
setCommandPaletteOpen, setCommandPaletteOpen,
devices,
setSelectedDevice, setSelectedDevice,
removeDevice, removeDevice,
selectedDevice, selectedDevice,
@ -72,7 +67,6 @@ export const CommandPalette = (): JSX.Element => {
setAccent setAccent
} = useAppStore(); } = useAppStore();
const { getDevices } = useDeviceStore(); const { getDevices } = useDeviceStore();
const { setDialogOpen, setActivePage, connection } = useDevice(); const { setDialogOpen, setActivePage, connection } = useDevice();
const groups: Group[] = [ const groups: Group[] = [
@ -82,7 +76,7 @@ export const CommandPalette = (): JSX.Element => {
commands: [ commands: [
{ {
label: "Messages", label: "Messages",
icon: InboxIcon, icon: MessageSquareIcon,
action() { action() {
setActivePage("messages"); setActivePage("messages");
} }
@ -96,7 +90,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Config", label: "Config",
icon: Cog8ToothIcon, icon: SettingsIcon,
action() { action() {
setActivePage("config"); setActivePage("config");
}, },
@ -104,7 +98,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Channels", label: "Channels",
icon: Square3Stack3DIcon, icon: LayersIcon,
action() { action() {
setActivePage("channels"); setActivePage("channels");
} }
@ -120,11 +114,11 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Manage", label: "Manage",
icon: DevicePhoneMobileIcon, icon: SmartphoneIcon,
commands: [ commands: [
{ {
label: "Switch Node", label: "Switch Node",
icon: ArrowsRightLeftIcon, icon: ArrowLeftRightIcon,
subItems: getDevices().map((device) => { subItems: getDevices().map((device) => {
return { return {
label: label:
@ -133,7 +127,7 @@ export const CommandPalette = (): JSX.Element => {
)?.data.user?.longName ?? device.hardware.myNodeNum.toString(), )?.data.user?.longName ?? device.hardware.myNodeNum.toString(),
icon: ( icon: (
<Hashicon <Hashicon
size={18} size={16}
value={device.hardware.myNodeNum.toString()} value={device.hardware.myNodeNum.toString()}
/> />
), ),
@ -154,7 +148,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Contextual", label: "Contextual",
icon: CubeTransparentIcon, icon: BoxSelectIcon,
commands: [ commands: [
{ {
label: "QR Code", label: "QR Code",
@ -162,14 +156,14 @@ export const CommandPalette = (): JSX.Element => {
subItems: [ subItems: [
{ {
label: "Generator", label: "Generator",
icon: <QueueListIcon className="w-4" />, icon: <QrCodeIcon size={16} />,
action() { action() {
setDialogOpen("QR", true); setDialogOpen("QR", true);
} }
}, },
{ {
label: "Import", label: "Import",
icon: <ArrowDownOnSquareStackIcon className="w-4" />, icon: <QrCodeIcon size={16} />,
action() { action() {
setDialogOpen("import", true); setDialogOpen("import", true);
} }
@ -194,7 +188,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Schedule Reboot", label: "Schedule Reboot",
icon: ArrowPathIcon, icon: RefreshCwIcon,
action() { action() {
setDialogOpen("reboot", true); setDialogOpen("reboot", true);
} }
@ -203,44 +197,32 @@ export const CommandPalette = (): JSX.Element => {
label: "Reset Peers", label: "Reset Peers",
icon: TrashIcon, icon: TrashIcon,
action() { action() {
if (connection) { connection?.resetPeers();
void toast.promise(connection.resetPeers(), {
loading: "Resetting...",
success: "Succesfully reset peers",
error: "No response received"
});
}
} }
}, },
{ {
label: "Factory Reset", label: "Factory Reset",
icon: ArrowPathRoundedSquareIcon, icon: FactoryIcon,
action() { action() {
if (connection) { connection?.factoryReset();
void toast.promise(connection.factoryReset(), {
loading: "Resetting...",
success: "Succesfully factory peers",
error: "No response received"
});
}
} }
} }
] ]
}, },
{ {
label: "Debug", label: "Debug",
icon: BugAntIcon, icon: BugIcon,
commands: [ commands: [
{ {
label: "Reconfigure", label: "Reconfigure",
icon: ArrowPathIcon, icon: RefreshCwIcon,
action() { action() {
void connection?.configure(); void connection?.configure();
} }
}, },
{ {
label: "[WIP] Clear Messages", label: "[WIP] Clear Messages",
icon: ArchiveBoxXMarkIcon, icon: EraserIcon,
action() { action() {
alert("This feature is not implemented"); alert("This feature is not implemented");
} }
@ -249,7 +231,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Application", label: "Application",
icon: WindowIcon, icon: LayoutIcon,
commands: [ commands: [
{ {
label: "Toggle Dark Mode", label: "Toggle Dark Mode",
@ -260,7 +242,7 @@ export const CommandPalette = (): JSX.Element => {
}, },
{ {
label: "Accent Color", label: "Accent Color",
icon: SwatchIcon, icon: PaletteIcon,
subItems: [ subItems: [
{ {
label: "Red", label: "Red",
@ -359,102 +341,72 @@ export const CommandPalette = (): JSX.Element => {
} }
]; ];
const handleKeydown = (e: KeyboardEvent) => {
if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
setCommandPaletteOpen(true);
}
};
useEffect(() => { useEffect(() => {
const handleKeydown = (e: KeyboardEvent) => {
if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
setCommandPaletteOpen(true);
}
};
window.addEventListener("keydown", handleKeydown); window.addEventListener("keydown", handleKeydown);
return () => window.removeEventListener("keydown", handleKeydown); return () => window.removeEventListener("keydown", handleKeydown);
}, []); }, []);
const filtered =
query === ""
? []
: groups
.map((group) => {
return {
...group,
commands: group.commands.filter((command) => {
const nameIncludes = `${group.label} ${command.label}`
.toLowerCase()
.includes(query.toLowerCase());
const tagsInclude = (
command.tags
?.map((t) => t.includes(query.toLowerCase()))
.filter(Boolean) ?? []
).length;
const subItemsInclude = (
command.subItems
?.map((s) =>
s.label.toLowerCase().includes(query.toLowerCase())
)
.filter(Boolean) ?? []
).length;
return nameIncludes || tagsInclude || subItemsInclude;
})
};
})
.filter((group) => group.commands.length);
return ( return (
<Transition.Root <CommandDialog
show={commandPaletteOpen} open={commandPaletteOpen}
as={Fragment} onOpenChange={setCommandPaletteOpen}
afterLeave={() => setQuery("")}
appear
> >
<Dialog <CommandInput placeholder="Type a command or search..." />
as="div" <CommandList>
className="relative z-10" <CommandEmpty>No results found.</CommandEmpty>
onClose={setCommandPaletteOpen} {groups.map((group) => (
> <CommandGroup heading={group.label}>
<ThemeController> {group.commands.map((command) => (
<Blur /> <>
<PaletteTransition> <CommandItem
<Dialog.Panel className="mx-auto max-w-2xl transform overflow-hidden rounded-md bg-backgroundPrimary transition-all"> onSelect={() => {
<Combobox<Command | string> command.action && command.action();
onChange={(input) => {
if (typeof input === "string") {
setQuery(input);
} else if (input.action) {
setCommandPaletteOpen(false); setCommandPaletteOpen(false);
input.action(); }}
} >
}} <command.icon size={16} className="mr-2" />
> {command.label}
<SearchBox setQuery={setQuery} /> </CommandItem>
{command.subItems &&
command.subItems.map((subItem) => (
<SubItem
label={subItem.label}
icon={subItem.icon}
action={subItem.action}
/>
))}
</>
))}
</CommandGroup>
))}
</CommandList>
</CommandDialog>
);
};
{query === "" || filtered.length > 0 ? ( const SubItem = ({
<Combobox.Options label,
static icon,
className="max-h-80 scroll-py-2 divide-y divide-opacity-10 overflow-y-auto bg-backgroundSecondary" action
> }: {
<li className="p-2"> label: string;
<ul className="flex flex-col gap-2 text-sm text-textSecondary"> icon: React.ReactNode;
{filtered.map((group, index) => ( action: () => void;
<SearchResult key={index} group={group} /> }) => {
))} const search = useCommandState((state) => state.search);
{query === "" && if (!search) return null;
groups.map((group, index) => (
<GroupView key={index} group={group} /> return (
))} <CommandItem onSelect={action}>
</ul> {icon}
</li> {label}
</Combobox.Options> </CommandItem>
) : (
query !== "" && filtered.length === 0 && <NoResults />
)}
</Combobox>
</Dialog.Panel>
</PaletteTransition>
</ThemeController>
</Dialog>
</Transition.Root>
); );
}; };

28
src/components/CommandPalette/GroupView.tsx

@ -1,28 +0,0 @@
import type { Group } from "@components/CommandPalette/Index.js";
import { Combobox } from "@headlessui/react";
import { ChevronRightIcon } from "@heroicons/react/24/outline";
export interface GroupViewProps {
group: Group;
}
export const GroupView = ({ group }: GroupViewProps): JSX.Element => {
return (
<Combobox.Option
value={group.label}
className={({ active }) =>
`flex cursor-default select-none items-center rounded-md px-3 py-2 ${
active ? "bg-backgroundPrimary text-textPrimary" : ""
}`
}
>
{({ active }) => (
<>
<group.icon className="h-6 w-6" />
<span className="ml-3 flex-auto truncate">{group.label}</span>
{active && <ChevronRightIcon className="h-5 text-textSecondary" />}
</>
)}
</Combobox.Option>
);
};

13
src/components/CommandPalette/NoResults.tsx

@ -1,13 +0,0 @@
import { Mono } from "@components/generic/Mono.js";
import { CommandLineIcon } from "@heroicons/react/24/outline";
export const NoResults = (): JSX.Element => {
return (
<div className="py-14 px-14 text-center">
<CommandLineIcon className="mx-auto h-6 text-textSecondary" />
<Mono className="tracking-tighter">
Query does not match any avaliable commands
</Mono>
</div>
);
};

40
src/components/CommandPalette/PaletteTransition.tsx

@ -1,40 +0,0 @@
import { Fragment, ReactNode } from "react";
import { Transition } from "@headlessui/react";
export interface PaletteTransitionProps {
children: ReactNode;
}
export const PaletteTransition = ({
children
}: PaletteTransitionProps): JSX.Element => {
return (
<>
<Transition.Child
as={Fragment}
enter="ease-out duration-200"
enterFrom="opacity-0"
enterTo="opacity-100"
leave="ease-in duration-100"
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<div className="bg-gray-500 fixed inset-0 bg-opacity-25 transition-opacity" />
</Transition.Child>
<div className="fixed inset-0 z-10 overflow-y-auto p-4 sm:p-6 md:p-20">
<Transition.Child
as={Fragment}
enter="ease-out duration-200"
enterFrom="opacity-0 scale-95"
enterTo="opacity-100 scale-100"
leave="ease-in duration-100"
leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"
>
{children}
</Transition.Child>
</div>
</>
);
};

19
src/components/CommandPalette/SearchBox.tsx

@ -1,19 +0,0 @@
import { Combobox } from "@headlessui/react";
import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
export interface SearchBoxProps {
setQuery: (query: string) => void;
}
export const SearchBox = ({ setQuery }: SearchBoxProps): JSX.Element => {
return (
<div className="relative">
<MagnifyingGlassIcon className="pointer-events-none absolute top-3.5 left-4 h-5 w-5 text-textSecondary" />
<Combobox.Input
className="h-12 w-full border-0 bg-transparent pl-11 pr-4 text-sm text-textPrimary placeholder-textSecondary focus:ring-0"
placeholder="Search..."
onChange={(event) => setQuery(event.target.value)}
/>
</div>
);
};

71
src/components/CommandPalette/SearchResult.tsx

@ -1,71 +0,0 @@
import type { Group } from "@components/CommandPalette/Index.js";
import { Combobox } from "@headlessui/react";
import { ChevronRightIcon } from "@heroicons/react/24/outline";
export interface SearchResultProps {
group: Group;
}
export const SearchResult = ({ group }: SearchResultProps): JSX.Element => {
return (
<div className="rounded-md border-2 border-backgroundPrimary py-2">
<div className="flex items-center px-3 py-2">
<group.icon className="text-gray-900 h-6 w-6 flex-none text-opacity-40" />
<span className="ml-3 flex-auto truncate">{group.label}</span>
</div>
{group.commands.map((command, index) => (
<div key={index}>
<Combobox.Option
value={command}
className={({ active }) =>
`mr-2 ml-4 flex cursor-pointer select-none items-center rounded-md px-3 py-1 ${
active ? "text-gray-900 bg-backgroundPrimary" : ""
}`
}
>
{({ active }) => (
<>
<command.icon
className={`text-gray-900 h-4 flex-none text-opacity-40 ${
active ? "text-opacity-100" : ""
}`}
/>
<span className="ml-3">{command.label}</span>
{active && (
<ChevronRightIcon className="text-gray-400 ml-auto h-4" />
)}
</>
)}
</Combobox.Option>
{command.subItems && (
<div className=" ml-9 border-l">
{command.subItems?.map((item, index) => (
<Combobox.Option
key={index}
value={item}
className={({ active }) =>
`mx-2 flex cursor-pointer select-none items-center rounded-md px-3 py-1 ${
active
? "text-gray-900 bg-backgroundPrimary bg-opacity-5"
: ""
}`
}
>
{({ active }) => (
<>
{item.icon}
<span className="ml-3">{item.label}</span>
{active && (
<ChevronRightIcon className="text-gray-400 ml-auto h-4" />
)}
</>
)}
</Combobox.Option>
))}
</div>
)}
</div>
))}
</div>
);
};

104
src/components/Dashboard.tsx

@ -0,0 +1,104 @@
import { useAppStore } from "@app/core/stores/appStore.js";
import { Button } from "@components/UI/Button.js";
import {
PlusIcon,
ListPlusIcon,
UsersIcon,
MapPinIcon,
CalendarIcon,
BluetoothIcon,
UsbIcon,
NetworkIcon
} from "lucide-react";
import { Subtle } from "./UI/Typography/Subtle.js";
import { H3 } from "./UI/Typography/H3.js";
import { useDeviceStore } from "@app/core/stores/deviceStore.js";
import { useMemo } from "react";
import { Separator } from "./UI/Seperator.js";
export const Dashboard = () => {
const { setConnectDialogOpen } = useAppStore();
const { getDevices } = useDeviceStore();
const devices = useMemo(() => getDevices(), [getDevices]);
return (
<div className="flex flex-col gap-3 p-3">
<div className="flex items-center justify-between">
<div className="space-y-1">
<H3>Connected Devices</H3>
<Subtle>Manage, connect and disconnect devices</Subtle>
</div>
</div>
<Separator />
<div className="flex h-[450px] rounded-md border border-dashed border-slate-200 p-3 dark:border-slate-700">
{devices.length ? (
<ul role="list" className="grow divide-y divide-gray-200">
{devices.map((device) => {
return (
<li key={device.id}>
<div className="px-4 py-4 sm:px-6">
<div className="flex items-center justify-between">
<p className="truncate text-sm font-medium text-accent">
{device.nodes.filter(
(n) => n.data.num === device.hardware.myNodeNum
)[0]?.data.user?.longName ?? "UNK"}
</p>
<div className="inline-flex w-24 justify-center gap-2 rounded-full bg-slate-100 py-1 text-xs font-semibold text-slate-900 transition-colors hover:bg-slate-700 hover:text-slate-50">
{device.connection?.connType === "ble" && (
<>
<BluetoothIcon size={16} />
BLE
</>
)}
{device.connection?.connType === "serial" && (
<>
<UsbIcon size={16} />
Serial
</>
)}
{device.connection?.connType === "http" && (
<>
<NetworkIcon size={16} />
Network
</>
)}
</div>
</div>
<div className="mt-2 sm:flex sm:justify-between">
<div className="flex gap-2 text-sm text-gray-500">
<UsersIcon
size={20}
className="text-gray-400"
aria-hidden="true"
/>
{device.nodes.length === 0
? 0
: device.nodes.length - 1}
</div>
</div>
</div>
</li>
);
})}
</ul>
) : (
<div className="m-auto flex flex-col gap-3 text-center">
<ListPlusIcon size={48} className="mx-auto text-textSecondary" />
<H3>No Devices</H3>
<Subtle>Connect atleast one device to get started</Subtle>
<Button
className="gap-2"
onClick={() => setConnectDialogOpen(true)}
>
<PlusIcon size={16} />
New Connection
</Button>
</div>
)}
</div>
</div>
);
};

107
src/components/DeviceSelector.tsx

@ -1,69 +1,84 @@
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDeviceStore } from "@core/stores/deviceStore.js";
import { NavSpacer } from "@app/Nav/NavSpacer.js";
import { PageNav } from "@app/Nav/PageNav.js";
import { Hashicon } from "@emeraldpay/hashicon-react"; import { Hashicon } from "@emeraldpay/hashicon-react";
import { PlusIcon } from "@heroicons/react/24/outline"; import {
import { MoonIcon, SunIcon } from "@primer/octicons-react"; PlusIcon,
HomeIcon,
LanguagesIcon,
SunIcon,
MoonIcon,
GithubIcon,
TerminalIcon
} from "lucide-react";
import { Separator } from "./UI/Seperator.js";
import { Code } from "./UI/Typography/Code.js";
import { DeviceSelectorButton } from "./DeviceSelectorButton.js";
export const DeviceSelector = (): JSX.Element => { export const DeviceSelector = (): JSX.Element => {
const { getDevices } = useDeviceStore(); const { getDevices } = useDeviceStore();
const { selectedDevice, setSelectedDevice, darkMode, setDarkMode } = const {
useAppStore(); selectedDevice,
setSelectedDevice,
darkMode,
setDarkMode,
setCommandPaletteOpen,
setConnectDialogOpen
} = useAppStore();
return ( return (
<div className="flex h-full w-14 items-center gap-3 bg-backgroundPrimary pt-3 [writing-mode:vertical-rl]"> <nav className="flex flex-col justify-between border-r-[0.5px] border-slate-300 bg-transparent pt-2 dark:border-slate-700">
<div className="flex items-center gap-3"> <div className="flex flex-col overflow-y-hidden">
<span className="flex font-bold text-textPrimary"> <ul className="flex w-20 grow flex-col items-center space-y-4 bg-transparent py-4 px-5">
<DeviceSelectorButton
active={selectedDevice === 0}
onClick={() => {
setSelectedDevice(0);
}}
>
<HomeIcon />
</DeviceSelectorButton>
{getDevices().map((device) => ( {getDevices().map((device) => (
<div <DeviceSelectorButton
key={device.id} key={device.id}
onClick={() => { onClick={() => {
setSelectedDevice(device.id); setSelectedDevice(device.id);
}} }}
className={`cursor-pointer border-x-4 border-backgroundPrimary bg-backgroundPrimary py-3 px-2 hover:brightness-hover active:brightness-press ${ active={selectedDevice === device.id}
selectedDevice === device.id ? "border-l-accent" : ""
}`}
> >
<Hashicon <Hashicon
size={32} size={24}
value={device.hardware.myNodeNum.toString()} value={device.hardware.myNodeNum.toString()}
/> />
</div> </DeviceSelectorButton>
))} ))}
<div <Separator />
onClick={() => { <button
setSelectedDevice(0); onClick={() => setConnectDialogOpen(true)}
}} className="transition-all duration-300 hover:text-accent"
className={`cursor-pointer border-x-4 border-backgroundPrimary bg-backgroundPrimary py-4 px-3 hover:brightness-hover active:brightness-press ${
selectedDevice === 0 ? "border-l-accent" : ""
}`}
> >
<PlusIcon className="w-6" /> <PlusIcon />
</div> </button>
</span> </ul>
</div> </div>
<div className="flex w-20 flex-col items-center space-y-5 bg-transparent px-5 pb-5">
{selectedDevice !== 0 && ( <button
<> className="transition-all hover:text-accent"
<NavSpacer /> onClick={() => setDarkMode(!darkMode)}
<PageNav /> >
</> {darkMode ? <SunIcon /> : <MoonIcon />}
)} </button>
<button
<NavSpacer /> className="transition-all hover:text-accent"
onClick={() => setCommandPaletteOpen(true)}
<div >
onClick={() => setDarkMode(!darkMode)} <TerminalIcon />
className="bg-backgroundPrimary py-5 px-4 text-textSecondary hover:text-textPrimary hover:brightness-hover active:brightness-press" </button>
> <button className="transition-all hover:text-accent">
{darkMode ? <SunIcon className="w-4" /> : <MoonIcon className="w-4" />} <LanguagesIcon />
</button>
<Separator />
<Code>{process.env.COMMIT_HASH}</Code>
</div> </div>
</nav>
<img
src={darkMode ? "Logo_White.svg" : "Logo_Black.svg"}
className="mt-auto px-2 py-3"
/>
</div>
); );
}; };

22
src/components/DeviceSelectorButton.tsx

@ -0,0 +1,22 @@
import { cn } from "@app/core/utils/cn.js";
export interface DeviceSelectorButtonProps {
active: boolean;
onClick: () => void;
children?: React.ReactNode;
}
export const DeviceSelectorButton = ({
active,
onClick,
children
}: DeviceSelectorButtonProps): JSX.Element => (
<li className="aspect-w-1 aspect-h-1 relative w-full" onClick={onClick}>
{active && (
<div className="absolute -left-2 h-10 w-1.5 rounded-full bg-accent" />
)}
<div className="flex aspect-square cursor-pointer flex-col items-center justify-center">
{children}
</div>
</li>
);

74
src/components/Dialog/DeviceNameDialog.tsx

@ -0,0 +1,74 @@
import { Input } from "@components/UI/Input.js";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { Button } from "@components/UI/Button.js";
import { useDevice } from "@app/core/stores/deviceStore.js";
import { useForm } from "react-hook-form";
import { Protobuf } from "@meshtastic/meshtasticjs";
import { Label } from "../UI/Label.js";
export interface User {
longName: string;
shortName: string;
}
export interface DeviceNameDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
}
export const DeviceNameDialog = ({
open,
onOpenChange
}: DeviceNameDialogProps): JSX.Element => {
const { hardware, nodes, connection, setDialogOpen } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
const { register, handleSubmit } = useForm<User>({
values: {
longName: myNode?.data.user?.longName ?? "Unknown",
shortName: myNode?.data.user?.shortName ?? "Unknown"
}
});
const onSubmit = handleSubmit((data) => {
connection?.setOwner(
new Protobuf.User({
...myNode?.data.user,
...data
})
);
setDialogOpen("deviceName", false);
});
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent>
<DialogHeader>
<DialogTitle>Change Device Name</DialogTitle>
<DialogDescription>
The Device will restart once the config is saved.
</DialogDescription>
</DialogHeader>
<div className="gap-4">
<form onSubmit={onSubmit}>
<Label>Long Name</Label>
<Input {...register("longName")} />
<Label>Short Name</Label>
<Input maxLength={4} {...register("shortName")} />
</form>
</div>
<DialogFooter>
<Button onClick={() => onSubmit()}>Save</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
};

29
src/components/Dialog/DialogManager.tsx

@ -1,41 +1,48 @@
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { QRDialog } from "@components/Dialog/QRDialog.js"; import { QRDialog } from "@components/Dialog/QRDialog.js";
import { RebootDialog } from "@components/Dialog/RebootDialog.js"; import { RebootDialog } from "@components/Dialog/RebootDialog.js";
import { ShutdownDialog } from "@components/Dialog/ShutdownDialog.js"; import { ShutdownDialog } from "@components/Dialog/ShutdownDialog.js";
import { ImportDialog } from "@components/Dialog/ImportDialog.js"; import { ImportDialog } from "@components/Dialog/ImportDialog.js";
import { DeviceNameDialog } from "./DeviceNameDialog.js";
export const DialogManager = (): JSX.Element => { export const DialogManager = (): JSX.Element => {
const { channels, config, dialog, setDialogOpen } = useDevice(); const { channels, config, dialog, setDialogOpen } = useDevice();
return ( return (
<> <>
<QRDialog <QRDialog
isOpen={dialog.QR} open={dialog.QR}
close={() => { onOpenChange={(open) => {
setDialogOpen("QR", false); setDialogOpen("QR", open);
}} }}
channels={channels.map((ch) => ch.config)} channels={channels.map((ch) => ch.config)}
loraConfig={config.lora} loraConfig={config.lora}
/> />
<ImportDialog <ImportDialog
isOpen={dialog.import} open={dialog.import}
close={() => { onOpenChange={(open) => {
setDialogOpen("import", false); setDialogOpen("import", open);
}} }}
channels={channels.map((ch) => ch.config)} channels={channels.map((ch) => ch.config)}
loraConfig={config.lora} loraConfig={config.lora}
/> />
<ShutdownDialog <ShutdownDialog
isOpen={dialog.shutdown} open={dialog.shutdown}
close={() => { onOpenChange={() => {
setDialogOpen("shutdown", false); setDialogOpen("shutdown", false);
}} }}
/> />
<RebootDialog <RebootDialog
isOpen={dialog.reboot} open={dialog.reboot}
close={() => { onOpenChange={() => {
setDialogOpen("reboot", false); setDialogOpen("reboot", false);
}} }}
/> />
<DeviceNameDialog
open={dialog.deviceName}
onOpenChange={(open) => {
setDialogOpen("deviceName", open);
}}
/>
</> </>
); );
}; };

141
src/components/Dialog/ImportDialog.tsx

@ -2,24 +2,29 @@ import { useEffect, useState } from "react";
import { toByteArray } from "base64-js"; import { toByteArray } from "base64-js";
import { Checkbox } from "@components/form/Checkbox.js"; import { Checkbox } from "@components/form/Checkbox.js";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
import { Dialog } from "@components/generic/Dialog.js"; import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { Select } from "@components/form/Select.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { Toggle } from "@components/form/Toggle.js"; import { Toggle } from "@components/form/Toggle.js";
import { Button } from "@components/form/Button.js"; import { Button } from "@components/UI/Button.js";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
export interface ImportDialogProps { export interface ImportDialogProps {
isOpen: boolean; open: boolean;
close: () => void; onOpenChange: (open: boolean) => void;
loraConfig?: Protobuf.Config_LoRaConfig; loraConfig?: Protobuf.Config_LoRaConfig;
channels: Protobuf.Channel[]; channels: Protobuf.Channel[];
} }
export const ImportDialog = ({ export const ImportDialog = ({
isOpen, open,
close onOpenChange
}: ImportDialogProps): JSX.Element => { }: ImportDialogProps): JSX.Element => {
const [QRCodeURL, setQRCodeURL] = useState<string>(""); const [QRCodeURL, setQRCodeURL] = useState<string>("");
const [channelSet, setChannelSet] = useState<Protobuf.ChannelSet>(); const [channelSet, setChannelSet] = useState<Protobuf.ChannelSet>();
@ -68,69 +73,73 @@ export const ImportDialog = ({
}; };
return ( return (
<Dialog <Dialog open={open} onOpenChange={onOpenChange}>
title={"Import Channel Set"} <DialogContent>
description={"The current LoRa configuration will be overridden."} <DialogHeader>
isOpen={isOpen} <DialogTitle>Import Channel Set</DialogTitle>
close={close} <DialogDescription>
> The current LoRa configuration will be overridden.
<div className="flex flex-col gap-3"> </DialogDescription>
<Input </DialogHeader>
label="Channel Set/QR Code URL" <div className="flex flex-col gap-3">
value={QRCodeURL} <Input
suffix={validURL ? "✅" : "❌"} label="Channel Set/QR Code URL"
onChange={(e) => { value={QRCodeURL}
setQRCodeURL(e.target.value); suffix={validURL ? "✅" : "❌"}
}} onChange={(e) => {
/> setQRCodeURL(e.target.value);
{validURL && ( }}
<div className="flex flex-col gap-3"> />
<div className="flex w-full gap-2"> {validURL && (
<div className="w-36"> <div className="flex flex-col gap-3">
<Toggle <div className="flex w-full gap-2">
className="flex-col gap-2" <div className="w-36">
label="Use Preset?" <Toggle
label="Use Preset?"
disabled
checked={channelSet?.loraConfig?.usePreset ?? true}
/>
</div>
{/* <Select
label="Modem Preset"
disabled disabled
checked={channelSet?.loraConfig?.usePreset ?? true} value={channelSet?.loraConfig?.modemPreset}
/> >
{renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)}
</Select> */}
</div> </div>
<Select {/* <Select
label="Modem Preset" label="Region"
disabled disabled
value={channelSet?.loraConfig?.modemPreset} value={channelSet?.loraConfig?.region}
> >
{renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)} {renderOptions(Protobuf.Config_LoRaConfig_RegionCode)}
</Select> </Select> */}
</div>
<Select
label="Region"
disabled
value={channelSet?.loraConfig?.region}
>
{renderOptions(Protobuf.Config_LoRaConfig_RegionCode)}
</Select>
<span className="text-md block font-medium text-textPrimary"> <span className="text-md block font-medium text-textPrimary">
Channels: Channels:
</span> </span>
<div className="flex w-40 flex-col gap-1"> <div className="flex w-40 flex-col gap-1">
{channelSet?.settings.map((channel, index) => ( {channelSet?.settings.map((channel, index) => (
<Checkbox <Checkbox
key={index} key={index}
label={ label={
channel.name.length channel.name.length
? channel.name ? channel.name
: `Channel: ${channel.id}` : `Channel: ${channel.id}`
} }
/> />
))} ))}
</div>
</div> </div>
</div> )}
)} </div>
<Button onClick={() => apply()} disabled={!validURL}> <DialogFooter>
Apply <Button onClick={apply} disabled={!validURL}>
</Button> Apply
</div> </Button>
</DialogFooter>
</DialogContent>
</Dialog> </Dialog>
); );
}; };

97
src/components/Dialog/NewDevice.tsx

@ -0,0 +1,97 @@
import { Input } from "@components/form/Input.js";
import {
Dialog,
DialogContent,
DialogDescription,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "../UI/Tabs.js";
import { Subtle } from "../UI/Typography/Subtle.js";
import { Link } from "../UI/Typography/Link.js";
import { HTTP } from "../PageComponents/Connect/HTTP.js";
import { BLE } from "../PageComponents/Connect/BLE.js";
import { Serial } from "../PageComponents/Connect/Serial.js";
const tabs = [
{
label: "HTTP",
element: HTTP,
disabled: false,
disabledMessage: "Unsuported connection method"
},
{
label: "Bluetooth",
element: BLE,
disabled: !navigator.bluetooth,
disabledMessage:
"Web Bluetooth is currently only supported by Chromium-based browsers",
disabledLink:
"https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API#browser_compatibility"
},
{
label: "Serial",
element: Serial,
disabled: !navigator.serial,
disabledMessage:
"WebSerial is currently only supported by Chromium based browsers: https://developer.mozilla.org/en-US/docs/Web/API/Web_Bluetooth_API#browser_compatibility"
}
];
export interface NewDeviceProps {
open: boolean;
onOpenChange: (open: boolean) => void;
}
export const NewDeviceDialog = ({
open,
onOpenChange
}: NewDeviceProps): JSX.Element => {
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent>
<DialogHeader>
<DialogTitle>Connect New Device</DialogTitle>
</DialogHeader>
<Tabs defaultValue="HTTP">
<TabsList>
{tabs.map((tab) => (
<TabsTrigger value={tab.label} disabled={tab.disabled}>
{tab.label}
</TabsTrigger>
))}
</TabsList>
{tabs.map((tab) => (
<TabsContent value={tab.label}>
{tab.disabled ? (
<p className="text-sm text-slate-500 dark:text-slate-400">
{tab.disabledMessage}
</p>
) : (
<tab.element />
)}
</TabsContent>
))}
</Tabs>
{(!navigator.bluetooth || !navigator.serial) && (
<>
<Subtle>
Web Bluetooth and Web Serial are currently only supported by
Chromium-based browsers.
</Subtle>
<Subtle>
Read more:&nbsp;
<Link href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Bluetooth_API#browser_compatibility">
Web Bluetooth
</Link>
&nbsp;
<Link href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API#browser_compatibility">
Web Serial
</Link>
</Subtle>
</>
)}
</DialogContent>
</Dialog>
);
};

121
src/components/Dialog/QRDialog.tsx

@ -1,23 +1,29 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { fromByteArray } from "base64-js"; import { fromByteArray } from "base64-js";
import { toast } from "react-hot-toast";
import { QRCode } from "react-qrcode-logo"; import { QRCode } from "react-qrcode-logo";
import { Checkbox } from "@components/form/Checkbox.js"; import { Checkbox } from "@components/form/Checkbox.js";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
import { Dialog } from "@components/generic/Dialog.js"; import {
import { ClipboardIcon } from "@heroicons/react/24/outline"; Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { ClipboardIcon } from "lucide-react";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
export interface QRDialogProps { export interface QRDialogProps {
isOpen: boolean; open: boolean;
close: () => void; onOpenChange: (open: boolean) => void;
loraConfig?: Protobuf.Config_LoRaConfig; loraConfig?: Protobuf.Config_LoRaConfig;
channels: Protobuf.Channel[]; channels: Protobuf.Channel[];
} }
export const QRDialog = ({ export const QRDialog = ({
isOpen, open,
close, onOpenChange,
loraConfig, loraConfig,
channels channels
}: QRDialogProps): JSX.Element => { }: QRDialogProps): JSX.Element => {
@ -44,58 +50,57 @@ export const QRDialog = ({
}, [channels, selectedChannels, loraConfig]); }, [channels, selectedChannels, loraConfig]);
return ( return (
<Dialog <Dialog open={open} onOpenChange={onOpenChange}>
title={"Generate QR Code"} <DialogContent>
description={"The current LoRa configuration will also be shared."} <DialogHeader>
isOpen={isOpen} <DialogTitle>Generate QR Code</DialogTitle>
close={close} <DialogDescription>
> The current LoRa configuration will also be shared.
<div className="flex gap-3 px-4 py-5 sm:p-6"> </DialogDescription>
<div className="flex w-40 flex-col gap-1"> </DialogHeader>
{channels.map((channel) => ( <div className="grid gap-4 py-4">
<Checkbox <div className="flex gap-3 px-4 py-5 sm:p-6">
key={channel.index} <div className="flex w-40 flex-col gap-1">
disabled={ {channels.map((channel) => (
channel.index === 0 || <Checkbox
channel.role === Protobuf.Channel_Role.DISABLED key={channel.index}
} label={
label={ channel.settings?.name.length
channel.settings?.name.length ? channel.settings.name
? channel.settings.name : channel.role === Protobuf.Channel_Role.PRIMARY
: channel.role === Protobuf.Channel_Role.PRIMARY ? "Primary"
? "Primary" : `Channel: ${channel.index}`
: `Channel: ${channel.index}` }
} checked={selectedChannels.includes(channel.index)}
checked={selectedChannels.includes(channel.index)} onChange={() => {
onChange={() => { if (selectedChannels.includes(channel.index)) {
if (selectedChannels.includes(channel.index)) { setSelectedChannels(
setSelectedChannels( selectedChannels.filter((c) => c !== channel.index)
selectedChannels.filter((c) => c !== channel.index) );
); } else {
} else { setSelectedChannels([...selectedChannels, channel.index]);
setSelectedChannels([...selectedChannels, channel.index]); }
} }}
}} />
/> ))}
))} </div>
<QRCode value={QRCodeURL} size={200} qrStyle="dots" />
</div>
</div> </div>
<QRCode value={QRCodeURL} size={200} qrStyle="dots" /> <DialogFooter>
</div> <Input
label="Sharable URL"
<div className="sm:px-6"> value={QRCodeURL}
<Input disabled
label="Sharable URL" action={{
value={QRCodeURL} icon: <ClipboardIcon size={16} />,
disabled action() {
action={{ void navigator.clipboard.writeText(QRCodeURL);
icon: <ClipboardIcon className="h-4" />, }
action() { }}
void navigator.clipboard.writeText(QRCodeURL); />
toast.success("Copied URL to Clipboard"); </DialogFooter>
} </DialogContent>
}}
/>
</div>
</Dialog> </Dialog>
); );
}; };

88
src/components/Dialog/RebootDialog.tsx

@ -1,56 +1,64 @@
import { useState } from "react"; import { useState } from "react";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { Dialog } from "@components/generic/Dialog.js"; import {
import { ArrowPathIcon, ClockIcon } from "@heroicons/react/24/outline"; Dialog,
import { Button } from "@components/form/Button.js"; DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { ClockIcon, RefreshCwIcon } from "lucide-react";
import { Button } from "@components/UI/Button.js";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
export interface RebootDialogProps { export interface RebootDialogProps {
isOpen: boolean; open: boolean;
close: () => void; onOpenChange: (open: boolean) => void;
} }
export const RebootDialog = ({ export const RebootDialog = ({
isOpen, open,
close onOpenChange
}: RebootDialogProps): JSX.Element => { }: RebootDialogProps): JSX.Element => {
const { connection, setDialogOpen } = useDevice(); const { connection, setDialogOpen } = useDevice();
const [time, setTime] = useState<number>(5); const [time, setTime] = useState<number>(5);
return ( return (
<Dialog <Dialog open={open} onOpenChange={onOpenChange}>
title={"Schedule Reboot"} <DialogContent>
description={"Reboot the connected node after x minutes."} <DialogHeader>
isOpen={isOpen} <DialogTitle>Schedule Reboot</DialogTitle>
close={close} <DialogDescription>
> Reboot the connected node after x minutes.
<div className="flex gap-2 p-4"> </DialogDescription>
<Input </DialogHeader>
type="number" <div className="flex gap-2 p-4">
value={time} <Input
onChange={(e) => setTime(parseInt(e.target.value))} type="number"
action={{ value={time}
icon: <ClockIcon className="w-4" />, onChange={(e) => setTime(parseInt(e.target.value))}
action() { action={{
connection icon: <ClockIcon size={16} />,
?.reboot(time * 60) action() {
.then(() => setDialogOpen("reboot", false)); connection
} ?.reboot(time * 60)
}} .then(() => setDialogOpen("reboot", false));
/> }
<Button }}
className="w-24" />
onClick={() => { <Button
connection?.reboot(2).then(() => setDialogOpen("reboot", false)); className="w-24"
}} onClick={() => {
> connection?.reboot(2).then(() => setDialogOpen("reboot", false));
<span> }}
<ArrowPathIcon className="w-4" /> >
</span> <RefreshCwIcon size={16} />
Now Now
</Button> </Button>
</div> </div>
</DialogContent>
</Dialog> </Dialog>
); );
}; };

86
src/components/Dialog/ShutdownDialog.tsx

@ -1,56 +1,66 @@
import { useState } from "react"; import { useState } from "react";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { Dialog } from "@components/generic/Dialog.js"; import {
import { ClockIcon, PowerIcon } from "@heroicons/react/24/outline"; Dialog,
import { Button } from "@components/form/Button.js"; DialogContent,
DialogDescription,
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { ClockIcon, PowerIcon } from "lucide-react";
import { Button } from "@components/UI/Button.js";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
export interface ShutdownDialogProps { export interface ShutdownDialogProps {
isOpen: boolean; open: boolean;
close: () => void; onOpenChange: (open: boolean) => void;
} }
export const ShutdownDialog = ({ export const ShutdownDialog = ({
isOpen, open,
close onOpenChange
}: ShutdownDialogProps): JSX.Element => { }: ShutdownDialogProps): JSX.Element => {
const { connection, setDialogOpen } = useDevice(); const { connection, setDialogOpen } = useDevice();
const [time, setTime] = useState<number>(5); const [time, setTime] = useState<number>(5);
return ( return (
<Dialog <Dialog open={open} onOpenChange={onOpenChange}>
title={"Schedule Shutdown"} <DialogContent>
description={"Turn off the connected node after x minutes."} <DialogHeader>
isOpen={isOpen} <DialogTitle>Schedule Shutdown</DialogTitle>
close={close} <DialogDescription>
> Turn off the connected node after x minutes.
<div className="flex gap-2 p-4"> </DialogDescription>
<Input </DialogHeader>
type="number"
value={time} <div className="flex gap-2 p-4">
onChange={(e) => setTime(parseInt(e.target.value))} <Input
action={{ type="number"
icon: <ClockIcon className="w-4" />, value={time}
action() { onChange={(e) => setTime(parseInt(e.target.value))}
action={{
icon: <ClockIcon size={16} />,
action() {
connection
?.shutdown(time * 60)
.then(() => setDialogOpen("shutdown", false));
}
}}
/>
<Button
className="w-24"
onClick={() => {
connection connection
?.shutdown(time * 60) ?.shutdown(2)
.then(() => setDialogOpen("shutdown", false)); .then(() => setDialogOpen("shutdown", false));
} }}
}} >
/> <PowerIcon size={16} />
<Button <span>Now</span>
className="w-24" </Button>
onClick={() => { </div>
connection </DialogContent>
?.shutdown(2)
.then(() => setDialogOpen("shutdown", false));
}}
>
<PowerIcon className="w-4" />
<span>Now</span>
</Button>
</div>
</Dialog> </Dialog>
); );
}; };

134
src/components/Drawer/Metrics.tsx

@ -1,134 +0,0 @@
import "chartjs-adapter-date-fns";
import {
Chart as ChartJS,
Filler,
Legend,
LinearScale,
LineElement,
PointElement,
TimeSeriesScale,
Tooltip
} from "chart.js";
import { Line } from "react-chartjs-2";
import { useDevice } from "@core/providers/useDevice.js";
export const Metrics = (): JSX.Element => {
const { nodes, hardware } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
ChartJS.register(
LinearScale,
PointElement,
LineElement,
Tooltip,
Filler,
Legend,
TimeSeriesScale
);
return (
<div className="flex h-full w-full flex-grow">
<Line
className="h-full w-full flex-grow"
options={{
responsive: true,
maintainAspectRatio: false,
interaction: {
mode: "index",
intersect: false
},
line: {
datasets: {
tension: 0.5
}
},
scales: {
x: {
type: "timeseries",
ticks: {
display: false
}
},
y: {
ticks: {
display: false
}
},
y1: {
display: false
},
y2: {
display: false
},
y3: {
display: false
}
},
plugins: {}
}}
data={{
labels: [],
datasets: [
{
fill: true,
label: "airUtilTx",
yAxisID: "y",
data: myNode?.deviceMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.airUtilTx
};
}),
backgroundColor: "rgba(102, 126, 234, 0.25)",
borderColor: "rgba(102, 126, 234, 1)",
pointBackgroundColor: "rgba(102, 126, 234, 1)"
},
{
fill: true,
label: "channelUtilization",
yAxisID: "y1",
data: myNode?.deviceMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.channelUtilization
};
}),
backgroundColor: "rgba(237, 100, 166, 0.25)",
borderColor: "rgba(237, 100, 166, 1)",
pointBackgroundColor: "rgba(237, 100, 166, 1)"
},
{
fill: true,
label: "batteryLevel",
yAxisID: "y2",
data: myNode?.deviceMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.batteryLevel
};
}),
backgroundColor: "rgba(113, 234, 102, 0.25)",
borderColor: "rgba(113, 234, 102, 1)",
pointBackgroundColor: "rgba(113, 234, 102, 1)"
},
{
fill: true,
label: "voltage",
yAxisID: "y3",
data: myNode?.deviceMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.voltage
};
}),
backgroundColor: "rgba(234, 166, 102, 0.25)",
borderColor: "rgba(234, 166, 102, 1)",
pointBackgroundColor: "rgba(234, 166, 102, 1)"
}
]
}}
/>
</div>
);
};

3
src/components/Drawer/Notifications.tsx

@ -1,3 +0,0 @@
export const Notifications = (): JSX.Element => {
return <div></div>;
};

170
src/components/Drawer/Sensor.tsx

@ -1,170 +0,0 @@
import "chartjs-adapter-date-fns";
import {
Chart as ChartJS,
Filler,
Legend,
LinearScale,
LineElement,
PointElement,
TimeSeriesScale,
Tooltip
} from "chart.js";
import { Line } from "react-chartjs-2";
import { useDevice } from "@core/providers/useDevice.js";
export const Sensor = (): JSX.Element => {
const { nodes, hardware } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
ChartJS.register(
LinearScale,
PointElement,
LineElement,
Tooltip,
Filler,
Legend,
TimeSeriesScale
);
return (
<div className="flex h-full w-full flex-grow">
<Line
className="h-full w-full flex-grow"
options={{
responsive: true,
maintainAspectRatio: false,
interaction: {
mode: "index",
intersect: false
},
line: {
datasets: {
tension: 0.5
}
},
scales: {
x: {
type: "timeseries",
ticks: {
display: false
}
},
y: {
ticks: {
display: false
}
},
y1: {
display: false
},
y2: {
display: false
},
y3: {
display: false
},
y4: {
display: false
},
y5: {
display: false
}
},
plugins: {}
}}
data={{
labels: [],
datasets: [
{
fill: true,
label: "barometricPressure",
yAxisID: "y",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.barometricPressure
};
}),
backgroundColor: "rgba(102, 126, 234, 0.25)",
borderColor: "rgba(102, 126, 234, 1)",
pointBackgroundColor: "rgba(102, 126, 234, 1)"
},
{
fill: true,
label: "current",
yAxisID: "y1",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.current
};
}),
backgroundColor: "rgba(237, 100, 166, 0.25)",
borderColor: "rgba(237, 100, 166, 1)",
pointBackgroundColor: "rgba(237, 100, 166, 1)"
},
{
fill: true,
label: "gasResistance",
yAxisID: "y2",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.gasResistance
};
}),
backgroundColor: "rgba(113, 234, 102, 0.25)",
borderColor: "rgba(113, 234, 102, 1)",
pointBackgroundColor: "rgba(113, 234, 102, 1)"
},
{
fill: true,
label: "relativeHumidity",
yAxisID: "y3",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.relativeHumidity
};
}),
backgroundColor: "rgba(234, 166, 102, 0.25)",
borderColor: "rgba(234, 166, 102, 1)",
pointBackgroundColor: "rgba(234, 166, 102, 1)"
},
{
fill: true,
label: "temperature",
yAxisID: "y4",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.temperature
};
}),
backgroundColor: "rgba(38, 255, 212, 0.25)",
borderColor: "rgba(38, 255, 212, 1)",
pointBackgroundColor: "rgba(38, 255, 212, 1)"
},
{
fill: true,
label: "voltage",
yAxisID: "y5",
data: myNode?.environmentMetrics.map((metric) => {
return {
x: metric.timestamp,
y: metric.metric.voltage
};
}),
backgroundColor: "rgba(247, 255, 15, 0.25)",
borderColor: "rgba(247, 255, 15, 1)",
pointBackgroundColor: "rgba(247, 255, 15, 1)"
}
]
}}
/>
</div>
);
};

66
src/components/Drawer/index.tsx

@ -1,66 +0,0 @@
import { useState } from "react";
import { Metrics } from "@components/Drawer/Metrics.js";
import { Notifications } from "@components/Drawer/Notifications.js";
import { Sensor } from "@components/Drawer/Sensor.js";
import type { TabType } from "@components/generic/TabbedContent.js";
import { Tab } from "@headlessui/react";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
export const Drawer = (): JSX.Element => {
const [drawerOpen, setDrawerOpen] = useState(false);
const tabs: TabType[] = [
{ label: "Notifications", element: Notifications },
{ label: "Metrics", element: Metrics },
{ label: "Sensor", element: Sensor }
];
return (
<Tab.Group as="div">
<Tab.List className="flex w-full">
{tabs.map((tab, index) => (
<Tab key={index}>
{({ selected }) => (
<div
onClick={() => {
setDrawerOpen(true);
}}
className={`flex h-full cursor-pointer border-b-4 px-1 first:pl-2 last:pr-2 hover:text-textPrimary ${
selected
? "border-accent text-textPrimary"
: "border-backgroundPrimary text-textSecondary"
}`}
>
<span className="m-auto select-none">{tab.label}</span>
</div>
)}
</Tab>
))}
<div className="ml-auto flex h-8">
<div
onClick={() => {
setDrawerOpen(!drawerOpen);
}}
className="flex cursor-pointer px-2"
>
<div className="m-auto text-textSecondary">
{drawerOpen ? (
<ChevronDownIcon className="h-4" />
) : (
<ChevronUpIcon className="h-4" />
)}
</div>
</div>
</div>
</Tab.List>
<Tab.Panels className={`${drawerOpen ? "flex" : "hidden"}`}>
{tabs.map((tab, index) => (
<Tab.Panel key={index} className="flex h-40 flex-grow">
{tab.element}
</Tab.Panel>
))}
</Tab.Panels>
</Tab.Group>
);
};

238
src/components/DynamicForm.tsx

@ -0,0 +1,238 @@
import {
Controller,
DeepPartial,
FieldValues,
Path,
SubmitHandler,
useForm
} from "react-hook-form";
import { Input } from "./UI/Input.js";
import { Label } from "./UI/Label.js";
import { ErrorMessage } from "@hookform/error-message";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue
} from "./UI/Select.js";
import { Switch } from "./UI/Switch.js";
import { H4 } from "./UI/Typography/H4.js";
import { Subtle } from "./UI/Typography/Subtle.js";
interface DisabledBy<T> {
fieldName: Path<T>;
selector?: number;
invert?: boolean;
}
interface BasicFieldProps<T> {
name: Path<T>;
label: string;
description?: string;
active?: boolean;
required?: boolean;
disabledBy?: DisabledBy<T>[];
}
interface InputFieldProps<T> extends BasicFieldProps<T> {
type: "text" | "number" | "password";
suffix?: string;
}
interface SelectFieldProps<T> extends BasicFieldProps<T> {
type: "select" | "multiSelect";
enumValue: {
[s: string]: string | number;
};
formatEnumName?: boolean;
}
interface ToggleFieldProps<T> extends BasicFieldProps<T> {
type: "toggle";
}
export interface FormProps<T extends FieldValues> {
onSubmit: SubmitHandler<T>;
defaultValues?: DeepPartial<T>;
fieldGroups: {
label: string;
description: string;
fields: (InputFieldProps<T> | SelectFieldProps<T> | ToggleFieldProps<T>)[];
}[];
}
export function DynamicForm<T extends FieldValues>({
fieldGroups,
onSubmit,
defaultValues
}: FormProps<T>) {
const { register, handleSubmit, control, getValues } = useForm<T>({
mode: "onChange",
defaultValues: defaultValues
});
const isDisabled = (disabledBy?: DisabledBy<T>[]): boolean => {
if (!disabledBy) return false;
return disabledBy.some((field) => {
const value = getValues(field.fieldName);
if (typeof value === "boolean") return field.invert ? value : !value;
if (typeof value === "number")
return field.invert
? field.selector !== value
: field.selector === value;
return false;
});
};
return (
<form
className="space-y-8 divide-y divide-gray-200"
onChange={handleSubmit(onSubmit)}
>
{fieldGroups.map((fieldGroup) => (
<div className="space-y-8 divide-y divide-gray-200 sm:space-y-5">
<div>
<H4 className="font-medium">{fieldGroup.label}</H4>
<Subtle>{fieldGroup.description}</Subtle>
</div>
{fieldGroup.fields.map((field) => {
const fieldWrapperData: FieldWrapperProps = {
label: field.label,
description: field.description,
disabled: isDisabled(field.disabledBy)
};
switch (field.type) {
case "text":
return (
<FieldWrapper {...fieldWrapperData}>
<Input
disabled={fieldWrapperData.disabled}
{...register(field.name)}
/>
</FieldWrapper>
);
case "number":
return (
<FieldWrapper {...fieldWrapperData}>
<Input
type="number"
disabled={fieldWrapperData.disabled}
{...register(field.name)}
/>
</FieldWrapper>
);
case "password":
return (
<FieldWrapper {...fieldWrapperData}>
<Input
type="password"
disabled={fieldWrapperData.disabled}
{...register(field.name)}
/>
</FieldWrapper>
);
case "toggle":
return (
<FieldWrapper {...fieldWrapperData}>
<Controller
name={field.name}
control={control}
render={({ field: { value, onChange, ...rest } }) => (
<Switch
checked={value}
onCheckedChange={onChange}
disabled={fieldWrapperData.disabled}
{...rest}
/>
)}
/>
</FieldWrapper>
);
case "select":
const optionsEnumValues = field.enumValue
? Object.entries(field.enumValue).filter(
(value) => typeof value[1] === "number"
)
: [];
return (
<FieldWrapper {...fieldWrapperData}>
<Controller
name={field.name}
control={control}
render={({ field: { value, onChange, ...rest } }) => (
<Select
onValueChange={(e) => onChange(parseInt(e))}
disabled={fieldWrapperData.disabled}
value={value?.toString()}
{...rest}
>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
{optionsEnumValues.map(([name, value], index) => (
<SelectItem key={index} value={value.toString()}>
{field.formatEnumName
? name
.replace(/_/g, " ")
.toLowerCase()
.split(" ")
.map(
(s) =>
s.charAt(0).toUpperCase() +
s.substring(1)
)
.join(" ")
: name}
</SelectItem>
))}
</SelectContent>
</Select>
)}
/>
</FieldWrapper>
);
case "multiSelect":
return <FieldWrapper {...fieldWrapperData}>tmp</FieldWrapper>;
}
})}
</div>
))}
</form>
);
}
interface FieldWrapperProps {
label: string;
description?: string;
disabled?: boolean;
children?: React.ReactNode;
}
const FieldWrapper = ({
label,
description,
disabled,
children
}: FieldWrapperProps): JSX.Element => (
<div className="pt-6 sm:pt-5">
<div role="group" aria-labelledby="label-notifications">
<div className="sm:grid sm:grid-cols-3 sm:items-baseline sm:gap-4">
<Label>{label}</Label>
<div className="sm:col-span-2">
<div className="max-w-lg">
<p className="text-sm text-gray-500">{description}</p>
<div className="mt-4 space-y-4">
<div className="flex items-center">{children}</div>
</div>
</div>
</div>
</div>
</div>
</div>
);

43
src/components/NewDevice.tsx

@ -1,43 +0,0 @@
import React from "react";
import { TabbedContent, TabType } from "@components/generic/TabbedContent.js";
import { BLE } from "@components/PageComponents/Connect/BLE.js";
import { HTTP } from "@components/PageComponents/Connect/HTTP.js";
import { Serial } from "@components/PageComponents/Connect/Serial.js";
import { useAppStore } from "@core/stores/appStore.js";
import { MoonIcon, SunIcon } from "@heroicons/react/24/outline";
export const NewDevice = () => {
const { darkMode, setDarkMode } = useAppStore();
const tabs: TabType[] = [
{
label: "Bluetooth",
element: BLE,
disabled: !navigator.bluetooth,
disabledMessage:
"Web Bluetooth is currently only supported by Chromium-based browsers",
disabledLink:
"https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API#browser_compatibility"
},
{
label: "HTTP",
element: HTTP,
disabled: false,
disabledMessage: "Unsuported connection method"
},
{
label: "Serial",
element: Serial,
disabled: !navigator.serial,
disabledMessage:
"WebSerial is currently only supported by Chromium based browsers: https://developer.mozilla.org/en-US/docs/Web/API/Web_Bluetooth_API#browser_compatibility"
}
];
return (
<div className="m-auto h-96 w-96">
<TabbedContent tabs={tabs} />
</div>
);
};

118
src/components/PageComponents/AppConfig/Map.tsx

@ -1,118 +0,0 @@
import { Controller, useFieldArray, useForm } from "react-hook-form";
import { Button } from "@components/form/Button.js";
import { IconButton } from "@components/form/IconButton.js";
import { InfoWrapper } from "@components/form/InfoWrapper.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { useAppStore } from "@core/stores/appStore.js";
import { MapValidation } from "@app/validation/appConfig/map.js";
import { Form } from "@components/form/Form";
import { TrashIcon } from "@heroicons/react/24/outline";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
export const Map = (): JSX.Element => {
const { rasterSources, setRasterSources } = useAppStore();
const {
register,
handleSubmit,
formState: { errors, isDirty },
control,
reset
} = useForm<MapValidation>({
defaultValues: {
// wmsSources: wmsSources ?? [
// {
// url: "",
// tileSize: 512,
// type: "raster"
// }
// ]
},
resolver: classValidatorResolver(MapValidation)
});
const { fields, append, remove, insert } = useFieldArray({
control,
name: "rasterSources"
});
const onSubmit = handleSubmit((data) => {
setRasterSources(data.rasterSources);
});
// useEffect(() => {
// reset(rasterSources);
// }, [reset, rasterSources]);
return (
<Form onSubmit={onSubmit}>
<InfoWrapper label="WMS Sources">
<div className="flex flex-col gap-2">
{fields.map((field, index) => (
<div key={field.id} className="flex w-full gap-2">
<Controller
name={`rasterSources.${index}.enabled`}
control={control}
render={({ field: { value, ...rest } }) => (
<Toggle checked={value} {...rest} />
)}
/>
<Input
placeholder="Name"
error={
errors.rasterSources
? errors.rasterSources[index]?.title?.message
: undefined
}
{...register(`rasterSources.${index}.title`)}
/>
<Input
placeholder="Tile Size"
type="number"
error={
errors.rasterSources
? errors.rasterSources[index]?.tileSize?.message
: undefined
}
{...register(`rasterSources.${index}.tileSize`, {
valueAsNumber: true
})}
/>
<Input
placeholder="URL"
error={
errors.rasterSources
? errors.rasterSources[index]?.tiles?.message
: undefined
}
{...register(`rasterSources.${index}.tiles`)}
/>
<IconButton
className="shrink-0"
icon={<TrashIcon className="w-4" />}
onClick={() => {
remove(index);
}}
/>
</div>
))}
<Button
onClick={() => {
append({
enabled: true,
title: "",
tiles: [
"https://img.nj.gov/imagerywms/Natural2015?bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:3857&transparent=true&width=256&height=256&layers=Natural2015"
],
tileSize: 512
});
}}
>
New Source
</Button>
</div>
</InfoWrapper>
</Form>
);
};

109
src/components/PageComponents/Channel.tsx

@ -1,21 +1,13 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { fromByteArray, toByteArray } from "base64-js"; import { fromByteArray, toByteArray } from "base64-js";
import { Controller, useForm } from "react-hook-form"; import { Controller, useForm } from "react-hook-form";
import { toast } from "react-hot-toast";
import { ChannelSettingsValidation } from "@app/validation/channelSettings.js"; import { ChannelSettingsValidation } from "@app/validation/channelSettings.js";
import { Form } from "@components/form/Form";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js"; import { Toggle } from "@components/form/Toggle.js";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { import { RefreshCwIcon, EyeIcon, EyeOffIcon } from "lucide-react";
ArrowPathIcon,
EyeIcon,
EyeSlashIcon
} from "@heroicons/react/24/outline";
import { classValidatorResolver } from "@hookform/resolvers/class-validator"; import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { NavBar } from "@app/Nav/NavBar.js";
export interface SettingsPanelProps { export interface SettingsPanelProps {
channel: Protobuf.Channel; channel: Protobuf.Channel;
@ -61,62 +53,41 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
}, [channel, reset]); }, [channel, reset]);
const onSubmit = handleSubmit((data) => { const onSubmit = handleSubmit((data) => {
if (connection) { connection
void toast.promise( ?.setChannel(
connection new Protobuf.Channel({
.setChannel( role:
new Protobuf.Channel({ channel?.role === Protobuf.Channel_Role.PRIMARY
role: ? Protobuf.Channel_Role.PRIMARY
channel?.role === Protobuf.Channel_Role.PRIMARY : data.enabled
? Protobuf.Channel_Role.PRIMARY ? Protobuf.Channel_Role.SECONDARY
: data.enabled : Protobuf.Channel_Role.DISABLED,
? Protobuf.Channel_Role.SECONDARY index: channel?.index,
: Protobuf.Channel_Role.DISABLED, settings: {
index: channel?.index, ...data,
settings: { psk: toByteArray(data.psk ?? "")
...data, }
psk: toByteArray(data.psk ?? "") })
} )
}) .then(() =>
) addChannel({
.then(() => config: new Protobuf.Channel({
addChannel({ index: channel.index,
config: new Protobuf.Channel({ role: channel.role,
index: channel.index, settings: {
role: channel.role, ...data,
settings: { psk: toByteArray(data.psk ?? "")
...data, }
psk: toByteArray(data.psk ?? "") }),
} lastInterraction: new Date(),
}), messages: []
lastInterraction: new Date(), })
messages: []
})
),
{
loading: "Saving...",
success: "Saved Channel",
error: "No response received"
}
); );
}
}); });
return ( return (
<div className="flex flex-grow flex-col gap-2"> <div className="p-3">
<NavBar <form onSubmit={onSubmit}>
breadcrumb={["Channels", channel?.index.toString()]}
actions={[
{
label: "Apply",
async onClick() {
await onSubmit();
}
}
]}
/>
<Form onSubmit={onSubmit}>
{channel?.index !== 0 && ( {channel?.index !== 0 && (
<> <>
<Controller <Controller
@ -139,7 +110,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
/> />
</> </>
)} )}
<Select {/* <Select
label="Key Size" label="Key Size"
description="Desired size of generated key." description="Desired size of generated key."
value={keySize} value={keySize}
@ -147,7 +118,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
setKeySize(parseInt(e.target.value) as 128 | 256); setKeySize(parseInt(e.target.value) as 128 | 256);
}} }}
action={{ action={{
icon: <ArrowPathIcon className="h-4" />, icon: <RefreshCwIcon size={16} />,
action: () => { action: () => {
const key = new Uint8Array(keySize / 8); const key = new Uint8Array(keySize / 8);
crypto.getRandomValues(key); crypto.getRandomValues(key);
@ -159,18 +130,14 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
> >
<option value={128}>128 Bit</option> <option value={128}>128 Bit</option>
<option value={256}>256 Bit</option> <option value={256}>256 Bit</option>
</Select> </Select> */}
<Input <Input
width="100%" width="100%"
label="Pre-Shared Key" label="Pre-Shared Key"
description="Channel key to encrypt data" description="Channel key to encrypt data"
type={pskHidden ? "password" : "text"} type={pskHidden ? "password" : "text"}
action={{ action={{
icon: pskHidden ? ( icon: pskHidden ? <EyeIcon size={16} /> : <EyeOffIcon size={16} />,
<EyeIcon className="w-4" />
) : (
<EyeSlashIcon className="w-4" />
),
action: () => { action: () => {
setPskHidden(!pskHidden); setPskHidden(!pskHidden);
} }
@ -202,7 +169,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
/> />
)} )}
/> />
</Form> </form>
</div> </div>
); );
}; };

113
src/components/PageComponents/Config/Bluetooth.tsx

@ -1,30 +1,12 @@
import { useEffect } from "react"; import type { BluetoothValidation } from "@app/validation/config/bluetooth.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { BluetoothValidation } from "@app/validation/config/bluetooth.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Bluetooth = (): JSX.Element => { export const Bluetooth = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, control, reset } = const onSubmit = (data: BluetoothValidation) => {
useForm<BluetoothValidation>({
mode: "onChange",
defaultValues: config.bluetooth,
resolver: classValidatorResolver(BluetoothValidation)
});
useEffect(() => {
reset(config.bluetooth);
}, [reset, config.bluetooth]);
const onSubmit = handleSubmit((data) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -33,47 +15,56 @@ export const Bluetooth = (): JSX.Element => {
} }
}) })
); );
}); };
const pairingMode = useWatch({
control,
name: "mode",
defaultValue: Protobuf.Config_BluetoothConfig_PairingMode.RANDOM_PIN
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<BluetoothValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={config.bluetooth}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Bluetooth Settings",
label="Enabled" description: "Settings for the Bluetooth module",
description="Enable or disable Bluetooth" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "enabled",
)} label: "Enabled",
/> description: "Enable or disable Bluetooth"
<Select },
label="Pairing mode" {
description="Pin selection behaviour." type: "select",
{...register("mode", { valueAsNumber: true })} name: "mode",
> label: "Pairing mode",
{renderOptions(Protobuf.Config_BluetoothConfig_PairingMode)} description: "Pin selection behaviour.",
</Select> enumValue: Protobuf.Config_BluetoothConfig_PairingMode,
formatEnumName: true,
<Input disabledBy: [
disabled={ {
pairingMode !== Protobuf.Config_BluetoothConfig_PairingMode.FIXED_PIN fieldName: "enabled"
}
]
},
{
type: "number",
name: "fixedPin",
label: "Pin",
description: "Pin to use when pairing",
disabledBy: [
{
fieldName: "mode",
selector:
Protobuf.Config_BluetoothConfig_PairingMode.FIXED_PIN,
invert: true
},
{
fieldName: "enabled"
}
]
}
]
} }
label="Pin" ]}
description="Pin to use when pairing" />
type="number"
{...register("fixedPin", {
valueAsNumber: true
})}
/>
</Form>
); );
}; };

131
src/components/PageComponents/Config/Device.tsx

@ -1,28 +1,12 @@
import { useEffect } from "react"; import type { DeviceValidation } from "@app/validation/config/device.js";
import { Controller, useForm } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { DeviceValidation } from "@app/validation/config/device.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Device = (): JSX.Element => { export const Device = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, control, reset } = useForm<DeviceValidation>({
mode: "onChange",
defaultValues: config.device,
resolver: classValidatorResolver(DeviceValidation)
});
useEffect(() => { const onSubmit = (data: DeviceValidation) => {
reset(config.device);
}, [reset, config.device]);
const onSubmit = handleSubmit((data) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -31,53 +15,68 @@ export const Device = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<DeviceValidation>
<Select onSubmit={onSubmit}
label="Role" defaultValues={config.device}
description="What role the device performs on the mesh" fieldGroups={[
{...register("role", { valueAsNumber: true })} {
> label: "Device Settings",
{renderOptions(Protobuf.Config_DeviceConfig_Role)} description: "Settings for the device",
</Select> fields: [
<Controller {
name="serialEnabled" type: "select",
control={control} name: "role",
render={({ field: { value, ...rest } }) => ( label: "Role",
<Toggle description: "What role the device performs on the mesh",
label="Serial Output Enabled" enumValue: Protobuf.Config_DeviceConfig_Role,
description="Disable the device's serial console" formatEnumName: true
checked={value} },
{...rest} {
/> type: "toggle",
)} name: "serialEnabled",
/> label: "Serial Output Enabled",
<Controller description: "Disable the device's serial console"
name="debugLogEnabled" },
control={control} {
render={({ field: { value, ...rest } }) => ( type: "toggle",
<Toggle name: "debugLogEnabled",
label="Enabled Debug Log" label: "Enabled Debug Log",
description="Output debugging information to the device's serial port (auto disables when serial client is connected)" description:
checked={value} "Output debugging information to the device's serial port (auto disables when serial client is connected)"
{...rest} },
/> {
)} type: "number",
/> name: "buttonGpio",
<Input label: "Button Pin",
label="Button Pin" description: "Button pin override"
description="Button pin override" },
type="number" {
{...register("buttonGpio", { valueAsNumber: true })} type: "number",
/> name: "buzzerGpio",
<Input label: "Buzzer Pin",
label="Buzzer Pin" description: "Buzzer pin override"
description="Buzzer pin override" },
type="number" {
{...register("buzzerGpio", { valueAsNumber: true })} type: "select",
/> name: "rebroadcastMode",
</Form> label: "Rebroadcast Mode",
description: "How to handle rebroadcasting",
enumValue: Protobuf.Config_DeviceConfig_RebroadcastMode,
formatEnumName: true
},
{
type: "number",
name: "nodeInfoBroadcastSecs",
label: "Node Info Broadcast Interval",
description: "How often to broadcast node info",
suffix: "Seconds"
}
]
}
]}
/>
); );
}; };

180
src/components/PageComponents/Config/Display.tsx

@ -1,30 +1,12 @@
import { useEffect } from "react"; import type { DisplayValidation } from "@app/validation/config/display.js";
import { Controller, useForm } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { DisplayValidation } from "@app/validation/config/display.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Display = (): JSX.Element => { export const Display = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, reset, control } = useForm<DisplayValidation>(
{
mode: "onChange",
defaultValues: config.display,
resolver: classValidatorResolver(DisplayValidation)
}
);
useEffect(() => {
reset(config.display);
}, [reset, config.display]);
const onSubmit = handleSubmit((data) => { const onSubmit = (data: DisplayValidation) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -33,88 +15,80 @@ export const Display = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<DisplayValidation>
<Input onSubmit={onSubmit}
label="Screen Timeout" defaultValues={config.display}
description="Turn off the display after this long" fieldGroups={[
suffix="Seconds" {
type="number" label: "Display Settings",
{...register("screenOnSecs", { valueAsNumber: true })} description: "Settings for the device display",
/> fields: [
<Input {
label="Carousel Delay" type: "number",
description="How fast to cycle through windows" name: "screenOnSecs",
suffix="Seconds" label: "Screen Timeout",
type="number" description: "Turn off the display after this long"
{...register("autoScreenCarouselSecs", { valueAsNumber: true })} },
/> {
<Select type: "select",
label="GPS Display Units" name: "gpsFormat",
description="Coordinate display format" label: "GPS Display Units",
{...register("gpsFormat", { valueAsNumber: true })} description: "Coordinate display format",
> enumValue: Protobuf.Config_DisplayConfig_GpsCoordinateFormat
{renderOptions(Protobuf.Config_DisplayConfig_GpsCoordinateFormat)} },
</Select> {
<Controller type: "number",
name="compassNorthTop" name: "autoScreenCarouselSecs",
control={control} label: "Carousel Delay",
render={({ field: { value, ...rest } }) => ( description: "How fast to cycle through windows"
<Toggle },
label="Compass North Top" {
description="Fix north to the top of compass" type: "toggle",
checked={value} name: "compassNorthTop",
{...rest} label: "Compass North Top",
/> description: "Fix north to the top of compass"
)} },
/> {
<Controller type: "toggle",
name="flipScreen" name: "flipScreen",
control={control} label: "Flip Screen",
render={({ field: { value, ...rest } }) => ( description: "Flip display 180 degrees"
<Toggle },
label="Flip Screen" {
description="Flip display 180 degrees" type: "select",
checked={value} name: "units",
{...rest} label: "Display Units",
/> description: "Display metric or imperial units",
)} enumValue: Protobuf.Config_DisplayConfig_DisplayUnits,
/> formatEnumName: true
<Select },
label="Display Units" {
description="Display metric or imperial units" type: "select",
{...register("units", { valueAsNumber: true })} name: "oled",
> label: "OLED Type",
{renderOptions(Protobuf.Config_DisplayConfig_DisplayUnits)} description: "Type of OLED screen attached to the device",
</Select> enumValue: Protobuf.Config_DisplayConfig_OledType
<Select },
label="OLED Type" {
description="Type of OLED screen attached to the device" type: "select",
{...register("oled", { valueAsNumber: true })} name: "displaymode",
> label: "Display Mode",
{renderOptions(Protobuf.Config_DisplayConfig_OledType)} description: "Screen layout variant",
</Select> enumValue: Protobuf.Config_DisplayConfig_DisplayMode,
<Select formatEnumName: true
label="Display Mode" },
description="Screen layout variant" {
{...register("displaymode", { valueAsNumber: true })} type: "toggle",
> name: "headingBold",
{renderOptions(Protobuf.Config_DisplayConfig_DisplayMode)} label: "Bold Heading",
</Select> description: "Bolden the heading text"
<Controller }
name="headingBold" ]
control={control} }
render={({ field: { value, ...rest } }) => ( ]}
<Toggle />
label="Bold Heading"
description="Bolden the heading text"
checked={value}
{...rest}
/>
)}
/>
</Form>
); );
}; };

287
src/components/PageComponents/Config/LoRa.tsx

@ -1,36 +1,12 @@
import { useEffect } from "react"; import type { LoRaValidation } from "@app/validation/config/lora.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { FormSection } from "@components/form/FormSection.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { LoRaValidation } from "@app/validation/config/lora.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const LoRa = (): JSX.Element => { export const LoRa = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, control, reset } = useForm<LoRaValidation>({ const onSubmit = (data: LoRaValidation) => {
mode: "onChange",
defaultValues: config.lora,
resolver: classValidatorResolver(LoRaValidation)
});
const usePreset = useWatch({
control,
name: "usePreset",
defaultValue: true
});
useEffect(() => {
reset(config.lora);
}, [reset, config.lora]);
const onSubmit = handleSubmit((data) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -39,121 +15,148 @@ export const LoRa = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<LoRaValidation>
<FormSection title="Modem Settings"> onSubmit={onSubmit}
<Controller defaultValues={config.lora}
name="usePreset" fieldGroups={[
control={control} {
render={({ field: { value, ...rest } }) => ( label: "Mesh Settings",
<Toggle description: "Settings for the LoRa mesh",
label="Use Preset" fields: [
description="Use one of the predefined modem presets" {
checked={value} type: "select",
{...rest} name: "region",
/> label: "Region",
)} description: "Sets the region for your node",
/> enumValue: Protobuf.Config_LoRaConfig_RegionCode
{usePreset ? ( },
<Select {
label="Preset" type: "number",
description="Modem preset to use" name: "hopLimit",
{...register("modemPreset", { valueAsNumber: true })} label: "Hop Limit",
> description: "Maximum number of hops"
{renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)} },
</Select> {
) : ( type: "number",
<> name: "channelNum",
<Input label: "Channel Number",
label="Bandwidth" description: "LoRa channel number"
description="Channel bandwidth in MHz" }
type="number" ]
suffix="MHz" },
{...register("bandwidth", { {
valueAsNumber: true label: "Waveform Settings",
})} description: "Settings for the LoRa waveform",
/> fields: [
<Input {
label="Spread Factor" type: "toggle",
description="Indicates the number of chirps per symbol" name: "usePreset",
type="number" label: "Use Preset",
suffix="CPS" description: "Use one of the predefined modem presets"
{...register("spreadFactor", { },
valueAsNumber: true {
})} type: "select",
/> name: "modemPreset",
<Input label: "Modem Preset",
label="Coding Rate" description: "Modem preset to use",
description="The denominator of the coding rate" enumValue: Protobuf.Config_LoRaConfig_ModemPreset,
type="number" formatEnumName: true,
{...register("codingRate", { disabledBy: [
valueAsNumber: true {
})} fieldName: "usePreset"
/> }
</> ]
)} },
</FormSection> {
<FormSection title="Radio Settings"> type: "number",
<Controller name: "bandwidth",
name="txEnabled" label: "Bandwidth",
control={control} description: "Channel bandwidth in MHz",
render={({ field: { value, ...rest } }) => ( suffix: "MHz",
<Toggle disabledBy: [
label="Transmit Enabled" {
description="Enable/Disable transmit (TX) from the LoRa radio" fieldName: "usePreset",
checked={value} invert: true
{...rest} }
/> ]
)} },
/> {
<Select type: "number",
label="Region" name: "spreadFactor",
description="Sets the region for your node" label: "Spreading Factor",
{...register("region", { valueAsNumber: true })} description: "Indicates the number of chirps per symbol",
> suffix: "CPS",
{renderOptions(Protobuf.Config_LoRaConfig_RegionCode)} disabledBy: [
</Select> {
<Input fieldName: "usePreset",
label="Transmit Power" invert: true
description="Max transmit power in dBm" }
type="number" ]
{...register("txPower", { valueAsNumber: true })} },
/> {
<Input type: "number",
label="Channel Number" name: "codingRate",
description="LoRa channel number" label: "Coding Rate",
type="number" description: "The denominator of the coding rate",
{...register("channelNum", { valueAsNumber: true })} disabledBy: [
/> {
<Input fieldName: "usePreset",
label="Frequency Offset" invert: true
description="Frequency offset to correct for crystal calibration errors" }
suffix="Hz" ]
type="number" }
{...register("frequencyOffset", { valueAsNumber: true })} ]
/> },
<Controller {
name="overrideDutyCycle" label: "Radio Settings",
control={control} description: "Settings for the LoRa radio",
render={({ field: { value, ...rest } }) => ( fields: [
<Toggle {
label="Override Duty Cycle" type: "toggle",
description="Description" name: "txEnabled",
checked={value} label: "Tramsmit Enabled",
{...rest} description: "Enable/Disable transmit (TX) from the LoRa radio"
/> },
)} {
/> type: "number",
</FormSection> name: "txPower",
<Input label: "Transmit Power",
label="Hop Limit" description: "Max transmit power",
description="Maximum number of hops" suffix: "dBm"
suffix="Hops" },
type="number" {
{...register("hopLimit", { valueAsNumber: true })} type: "toggle",
/> name: "overrideDutyCycle",
</Form> label: "Override Duty Cycle",
description: "Override Duty Cycle"
},
{
type: "number",
name: "frequencyOffset",
label: "Frequency Offset",
description:
"Frequency offset to correct for crystal calibration errors",
suffix: "Hz"
},
{
type: "toggle",
name: "sx126xRxBoostedGain",
label: "Boosted RX Gain",
description: "Boosted RX gain"
},
{
type: "number",
name: "overrideFrequency",
label: "Override Frequency",
description: "Override frequency",
suffix: "Hz"
}
]
}
]}
/>
); );
}; };

273
src/components/PageComponents/Config/Network.tsx

@ -1,51 +1,12 @@
import { useEffect } from "react"; import type { NetworkValidation } from "@app/validation/config/network.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { FormSection } from "@components/form/FormSection.js";
import { Input } from "@components/form/Input.js";
import { IPInput } from "@components/form/IPInput.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { NetworkValidation } from "@app/validation/config/network.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { ErrorMessage } from "@hookform/error-message";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Network = (): JSX.Element => { export const Network = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, control, reset } = useForm<NetworkValidation>(
{
mode: "onChange",
defaultValues: config.network,
resolver: classValidatorResolver(NetworkValidation)
}
);
const wifiEnabled = useWatch({
control,
name: "wifiEnabled",
defaultValue: false
});
const ethEnabled = useWatch({
control,
name: "ethEnabled",
defaultValue: false
});
const ethMode = useWatch({ const onSubmit = (data: NetworkValidation) => {
control,
name: "addressMode",
defaultValue: Protobuf.Config_NetworkConfig_AddressMode.DHCP
});
useEffect(() => {
reset(config.network);
}, [reset, config.network]);
const onSubmit = handleSubmit((data) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -54,97 +15,143 @@ export const Network = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<NetworkValidation>
<FormSection title="WiFi Config"> onSubmit={onSubmit}
<Controller defaultValues={config.network}
name="wifiEnabled" fieldGroups={[
control={control} {
render={({ field: { value, ...rest } }) => ( label: "WiFi Config",
<Toggle description: "WiFi radio configuration",
label="Enabled" fields: [
description="Enable or disable the WiFi radio" {
checked={value} type: "toggle",
{...rest} name: "wifiEnabled",
/> label: "Enabled",
)} description: "Enable or disable the WiFi radio"
/> },
<Input {
label="SSID" type: "text",
description="Network name" name: "wifiSsid",
disabled={!wifiEnabled} label: "SSID",
{...register("wifiSsid", { disabled: !wifiEnabled })} description: "Network name",
/> disabledBy: [
<Input {
label="PSK" fieldName: "wifiEnabled"
type="password" }
description="Network password" ]
disabled={!wifiEnabled} },
{...register("wifiPsk", { disabled: !wifiEnabled })} {
/> type: "password",
</FormSection> name: "wifiPsk",
<FormSection title="Ethernet Config"> label: "PSK",
<Controller description: "Network password",
name="ethEnabled" disabledBy: [
control={control} {
render={({ field: { value, ...rest } }) => ( fieldName: "wifiEnabled"
<Toggle }
label="Enabled" ]
description="Enable or disbale the Ethernet port" }
checked={value} ]
{...rest} },
/> {
)} label: "Ethernet Config",
/> description: "Ethernet port configuration",
</FormSection> fields: [
<FormSection title="IP Config"> {
<Select type: "toggle",
label="Address Mode" name: "ethEnabled",
description="Address assignment selection" label: "Enabled",
disabled={!(ethEnabled || wifiEnabled)} description: "Enable or disable the Ethernet port"
{...register("addressMode", { }
valueAsNumber: true ]
})} },
> {
{renderOptions(Protobuf.Config_NetworkConfig_AddressMode)} label: "IP Config",
</Select> description: "IP configuration",
{ethMode === Protobuf.Config_NetworkConfig_AddressMode.STATIC && ( fields: [
<> {
<IPInput type: "select",
label="IP" name: "addressMode",
description="IP Address" label: "Address Mode",
{...register("ipv4Config.ip", { valueAsNumber: true })} description: "Address assignment selection",
/> enumValue: Protobuf.Config_NetworkConfig_AddressMode
<IPInput },
label="Gateway" {
description="Default Gateway" type: "text",
{...register("ipv4Config.gateway", { valueAsNumber: true })} name: "ipv4Config.ip",
/> label: "IP",
<IPInput description: "IP Address",
label="Subnet" disabledBy: [
description="Subnet Mask" {
{...register("ipv4Config.subnet", { valueAsNumber: true })} fieldName: "addressMode",
/> selector: Protobuf.Config_NetworkConfig_AddressMode.DHCP
<IPInput }
label="DNS" ]
description="DNS Server" },
{...register("ipv4Config.dns", { valueAsNumber: true })} {
/> type: "text",
</> name: "ipv4Config.gateway",
)} label: "Gateway",
</FormSection> description: "Default Gateway",
<Input disabledBy: [
label="NTP Server" {
description="NTP server for time synchronization" fieldName: "addressMode",
{...register("ntpServer")} selector: Protobuf.Config_NetworkConfig_AddressMode.DHCP
/> }
<Input ]
label="Rsyslog Server" },
description="Rsyslog server for external logging" {
{...register("rsyslogServer")} type: "text",
/> name: "ipv4Config.subnet",
</Form> label: "Subnet",
description: "Subnet Mask",
disabledBy: [
{
fieldName: "addressMode",
selector: Protobuf.Config_NetworkConfig_AddressMode.DHCP
}
]
},
{
type: "text",
name: "ipv4Config.dns",
label: "DNS",
description: "DNS Server",
disabledBy: [
{
fieldName: "addressMode",
selector: Protobuf.Config_NetworkConfig_AddressMode.DHCP
}
]
}
]
},
{
label: "NTP Config",
description: "NTP configuration",
fields: [
{
type: "text",
name: "ntpServer",
label: "NTP Server"
}
]
},
{
label: "Rsyslog Config",
description: "Rsyslog configuration",
fields: [
{
type: "text",
name: "rsyslogServer",
label: "Rsyslog Server"
}
]
}
]}
/>
); );
}; };

295
src/components/PageComponents/Config/Position.tsx

@ -1,230 +1,97 @@
import { useEffect } from "react"; import type { PositionValidation } from "@app/validation/config/position.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { BitwiseSelect } from "@components/form/BitwiseSelect.js";
import { FormSection } from "@components/form/FormSection.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { PositionValidation } from "@app/validation/config/position.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Position = (): JSX.Element => { export const Position = (): JSX.Element => {
const { config, nodes, hardware, setWorkingConfig } = useDevice(); const { config, nodes, hardware, setWorkingConfig } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum); const onSubmit = (data: PositionValidation) => {
const { register, handleSubmit, reset, control } =
useForm<PositionValidation>({
mode: "onChange",
defaultValues: {
fixedAlt: myNode?.data.position?.altitude,
fixedLat: (myNode?.data.position?.latitudeI ?? 0) / 1e7,
fixedLng: (myNode?.data.position?.longitudeI ?? 0) / 1e7,
...config.position
},
resolver: classValidatorResolver(PositionValidation)
});
const fixedPositionEnabled = useWatch({
control,
name: "fixedPosition",
defaultValue: false
});
useEffect(() => {
reset({
fixedAlt: myNode?.data.position?.altitude,
fixedLat: (myNode?.data.position?.latitudeI ?? 0) / 1e7,
fixedLng: (myNode?.data.position?.longitudeI ?? 0) / 1e7,
...config.position
});
}, [reset, config.position, myNode?.data.position]);
const onSubmit = handleSubmit((data) => {
const { fixedAlt, fixedLat, fixedLng, ...rest } = data;
const configHasChanged = !Protobuf.Config_PositionConfig.equals(
config.position,
new Protobuf.Config_PositionConfig(rest)
);
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
case: "position", case: "position",
value: rest value: data
} }
}) })
); );
};
// if (connection) {
// void toast.promise(
// connection
// .setPosition(
// new Protobuf.Position({
// altitude: fixedAlt,
// latitudeI: fixedLat * 1e7,
// longitudeI: fixedLng * 1e7
// })
// )
// .then(() => reset({ ...data })),
// {
// loading: "Saving...",
// success: "Saved Position Config, Restarting Node",
// error: "No response received"
// }
// );
// if (configHasChanged) {
// void toast.promise(
// connection
// .setConfig(
// new Protobuf.Config({
// payloadVariant: {
// case: "position",
// value: rest
// }
// })
// )
// .then(() =>
// setConfig(
// new Protobuf.Config({
// payloadVariant: {
// case: "position",
// value: rest
// }
// })
// )
// ),
// {
// loading: "Saving...",
// success: "Saved Position Config, Restarting Node",
// error: "No response received"
// }
// );
// }
// }
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<PositionValidation>
<Controller onSubmit={onSubmit}
name="gpsEnabled" defaultValues={config.position}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Position settings",
label="GPS Enabled" description: "Settings for the position module",
description="Enable the internal GPS module" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "positionBroadcastSmartEnabled",
)} label: "Enable Smart Position",
/> description:
<Controller "Only send position when there has been a meaningful change in location"
name="positionBroadcastSmartEnabled" },
control={control} {
render={({ field: { value, ...rest } }) => ( type: "toggle",
<Toggle name: "fixedPosition",
label="Enable Smart Position" label: "Fixed Position",
description="Only send position when there has been a meaningful change in location" description:
checked={value} "Don't report GPS position, but a manually-specified one"
{...rest} },
/> {
)} type: "toggle",
/> name: "gpsEnabled",
<Controller label: "GPS Enabled",
name="positionFlags" description: "Enable the internal GPS module"
control={control} },
render={({ field, fieldState }): JSX.Element => { {
const { value, onChange } = field; type: "multiSelect",
const { error } = fieldState; name: "positionFlags",
label: "Position Flags",
return ( description: "Configuration options for Position messages",
<BitwiseSelect enumValue: Protobuf.Config_PositionConfig_PositionFlags
label="Position Flags" },
description="Configuration options for POSITION messages" {
selected={value} type: "number",
decodeEnun={Protobuf.Config_PositionConfig_PositionFlags} name: "rxGpio",
onChange={onChange} label: "Receive Pin",
/> description: "GPS Module RX pin override"
); },
}} {
/> type: "number",
<FormSection title="Fixed Position"> name: "txGpio",
<Controller label: "Transmit Pin",
name="fixedPosition" description: "GPS Module TX pin override"
control={control} }
render={({ field: { value, ...rest } }) => ( ]
<Toggle },
label="Enabled" {
description="Don't report GPS position, but a manually-specified one" label: "Intervals",
checked={value} description: "How often to send position updates",
{...rest} fields: [
/> {
)} type: "number",
/> name: "positionBroadcastSecs",
{fixedPositionEnabled && ( label: "Broadcast Interval",
<> description: "How often your position is sent out over the mesh"
<Input },
suffix="m" {
label="Altitude" type: "number",
type="number" name: "gpsUpdateInterval",
disabled={!fixedPositionEnabled} label: "GPS Update Interval",
{...register("fixedAlt", { valueAsNumber: true })} description: "How often a GPS fix should be acquired"
/> },
<Input {
suffix="°" type: "number",
label="Latitude" name: "gpsAttemptTime",
type="number" label: "Fix Attempt Duration",
disabled={!fixedPositionEnabled} description: "How long the device will try to get a fix for"
{...register("fixedLat", { valueAsNumber: true })} }
/> ]
<Input }
suffix="°" ]}
label="Longitude" />
type="number"
disabled={!fixedPositionEnabled}
{...register("fixedLng", { valueAsNumber: true })}
/>
</>
)}
</FormSection>
<FormSection title="Intervals">
<Input
suffix="Seconds"
label="Broadcast Interval"
description="How often your position is sent out over the mesh"
type="number"
{...register("positionBroadcastSecs", { valueAsNumber: true })}
/>
<Input
suffix="Seconds"
label="GPS Update Interval"
description="How often a GPS fix should be acquired"
type="number"
{...register("gpsUpdateInterval", { valueAsNumber: true })}
/>
<Input
suffix="Seconds"
label="Fix Attempt Duration"
description="How long the device will try to get a fix for"
type="number"
{...register("gpsAttemptTime", { valueAsNumber: true })}
/>
</FormSection>
<Input
label="RX Pin"
description="GPS Module RX pin override"
type="number"
{...register("rxGpio", { valueAsNumber: true })}
/>
<Input
label="TX Pin"
description="GPS Module TX pin override"
type="number"
{...register("txGpio", { valueAsNumber: true })}
/>
</Form>
); );
}; };

167
src/components/PageComponents/Config/Power.tsx

@ -1,27 +1,12 @@
import { useEffect } from "react"; import type { PowerValidation } from "@app/validation/config/power.js";
import { Controller, useForm } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { FormSection } from "@components/form/FormSection.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { PowerValidation } from "@app/validation/config/power.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Power = (): JSX.Element => { export const Power = (): JSX.Element => {
const { config, setWorkingConfig } = useDevice(); const { config, setWorkingConfig } = useDevice();
const { register, handleSubmit, reset, control } = useForm<PowerValidation>({
mode: "onChange",
defaultValues: config.power,
resolver: classValidatorResolver(PowerValidation)
});
useEffect(() => { const onSubmit = (data: PowerValidation) => {
reset(config.power);
}, [reset, config.power]);
const onSubmit = handleSubmit((data) => {
setWorkingConfig( setWorkingConfig(
new Protobuf.Config({ new Protobuf.Config({
payloadVariant: { payloadVariant: {
@ -30,72 +15,86 @@ export const Power = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<PowerValidation>
<Input onSubmit={onSubmit}
label="Shutdown on battery delay" defaultValues={config.power}
description="Automatically shutdown node after this long when on battery, 0 for indefinite" fieldGroups={[
suffix="Seconds" {
type="number" label: "Power Config",
{...register("onBatteryShutdownAfterSecs", { valueAsNumber: true })} description: "Settings for the power module",
/> fields: [
<Controller {
name="isPowerSaving" type: "toggle",
control={control} name: "isPowerSaving",
render={({ field: { value, ...rest } }) => ( label: "Enable power saving mode",
<Toggle description:
label="Enable power saving mode" "Select if powered from a low-current source (i.e. solar), to minimize power consumption as much as possible."
description="Select if powered from a low-current source (i.e. solar), to minimize power consumption as much as possible." },
checked={value} {
{...rest} type: "number",
/> name: "onBatteryShutdownAfterSecs",
)} label: "Shutdown on battery delay",
/> description:
<Input "Automatically shutdown node after this long when on battery, 0 for indefinite",
label="ADC Multiplier Override ratio" suffix: "Seconds"
description="Used for tweaking battery voltage reading" },
type="number" {
{...register("adcMultiplierOverride", { valueAsNumber: true })} type: "number",
/> name: "adcMultiplierOverride",
<FormSection title="Sleep Settings"> label: "ADC Multiplier Override ratio",
<Input description: "Used for tweaking battery voltage reading"
label="Minimum Wake Time" },
description="Minimum amount of time the device will stay awake for after receiving a packet" {
suffix="Seconds" type: "number",
type="number" name: "waitBluetoothSecs",
{...register("minWakeSecs", { valueAsNumber: true })} label: "No Connection Bluetooth Disabled",
/> description:
<Input "If the device does not receive a Bluetooth connection, the BLE radio will be disabled after this long",
label="Mesh SDS Timeout" suffix: "Seconds"
description="The device will enter super deep sleep after this time" }
suffix="Seconds" ]
type="number" },
{...register("meshSdsTimeoutSecs", { valueAsNumber: true })} {
/> label: "Sleep Settings",
<Input description: "Sleep settings for the power module",
label="Super Deep Sleep Duration" fields: [
description="How long the device will be in super deep sleep for" {
suffix="Seconds" type: "number",
type="number" name: "meshSdsTimeoutSecs",
{...register("sdsSecs", { valueAsNumber: true })} label: "Mesh SDS Timeout",
/> description:
<Input "The device will enter super deep sleep after this time",
label="Light Sleep Duration" suffix: "Seconds"
description="How long the device will be in light sleep for" },
suffix="Seconds" {
type="number" type: "number",
{...register("lsSecs", { valueAsNumber: true })} name: "sdsSecs",
/> label: "Super Deep Sleep Duration",
</FormSection> description:
<Input "How long the device will be in super deep sleep for",
label="No Connection Bluetooth Disabled" suffix: "Seconds"
description="If the device does not receive a Bluetooth connection, the BLE radio will be disabled after this long" },
suffix="Seconds" {
type="number" type: "number",
{...register("waitBluetoothSecs", { valueAsNumber: true })} name: "lsSecs",
/> label: "Light Sleep Duration",
</Form> description: "How long the device will be in light sleep for",
suffix: "Seconds"
},
{
type: "number",
name: "minWakeSecs",
label: "Minimum Wake Time",
description:
"Minimum amount of time the device will stay awake for after receiving a packet",
suffix: "Seconds"
}
]
}
]}
/>
); );
}; };

105
src/components/PageComponents/Config/User.tsx

@ -1,105 +0,0 @@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
import { toast } from "react-hot-toast";
import { base16 } from "rfc4648";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { UserValidation } from "@app/validation/config/user.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
export const User = (): JSX.Element => {
const { hardware, nodes, connection } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
const { register, handleSubmit, reset, control } = useForm<UserValidation>({
defaultValues: myNode?.data.user,
resolver: classValidatorResolver(UserValidation)
});
useEffect(() => {
reset({
longName: myNode?.data.user?.longName,
shortName: myNode?.data.user?.shortName,
isLicensed: myNode?.data.user?.isLicensed
});
}, [reset, myNode]);
const onSubmit = handleSubmit((data) => {
if (connection && myNode?.data.user) {
void toast.promise(
connection
.setOwner(
new Protobuf.User({
...myNode.data.user,
...data
})
)
.then(() => reset({ ...data })),
{
loading: "Saving...",
success: "Saved User, Restarting Node",
error: "No response received"
}
);
}
});
return (
<Form onSubmit={onSubmit}>
<Input
label="Device Name"
description="Personalised name for this device."
{...register("longName")}
/>
<Input
label="Short Name"
description="Shown on small screens."
maxLength={4}
{...register("shortName")}
/>
<Controller
name="isLicensed"
control={control}
render={({ field: { value, ...rest } }) => (
<Toggle
label="Licenced Operator?"
description="Remove bandwidth restrictions in certain regions (HAM license required)"
checked={value}
{...rest}
/>
)}
/>
<Input
label="Mac Address"
description="Hardware address for this node."
disabled
value={
base16
.stringify(myNode?.data.user?.macaddr ?? [])
.match(/.{1,2}/g)
?.join(":") ?? ""
}
/>
<Input
label="Device ID"
disabled
description="Preset unique identifier for this device."
value={myNode?.data.user?.id}
/>
<Select
label="Hardware"
description="Hardware model of this device."
disabled
value={myNode?.data.user?.hwModel}
>
{renderOptions(Protobuf.HardwareModel)}
</Select>
</Form>
);
};

4
src/components/PageComponents/Connect/BLE.tsx

@ -1,11 +1,10 @@
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { Mono } from "@components/generic/Mono.js"; import { Mono } from "@components/generic/Mono.js";
import { Button } from "@components/form/Button.js"; import { Button } from "@components/UI/Button.js";
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js"; import { subscribeAll } from "@core/subscriptions.js";
import { randId } from "@core/utils/randId.js"; import { randId } from "@core/utils/randId.js";
import { PlusCircleIcon } from "@heroicons/react/24/outline";
import { Constants, IBLEConnection } from "@meshtastic/meshtasticjs"; import { Constants, IBLEConnection } from "@meshtastic/meshtasticjs";
export const BLE = (): JSX.Element => { export const BLE = (): JSX.Element => {
@ -64,7 +63,6 @@ export const BLE = (): JSX.Element => {
}); });
}} }}
> >
<PlusCircleIcon className="w-4" />
<span>New device</span> <span>New device</span>
</Button> </Button>
</div> </div>

6
src/components/PageComponents/Connect/HTTP.tsx

@ -1,12 +1,11 @@
import { Controller, useForm, useWatch } from "react-hook-form"; import { Controller, useForm, useWatch } from "react-hook-form";
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js"; import { Toggle } from "@components/form/Toggle.js";
import { Button } from "@components/form/Button.js"; import { Button } from "@components/UI/Button.js";
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js"; import { subscribeAll } from "@core/subscriptions.js";
import { randId } from "@core/utils/randId.js"; import { randId } from "@core/utils/randId.js";
import { PlusCircleIcon } from "@heroicons/react/24/outline";
import { IHTTPConnection } from "@meshtastic/meshtasticjs"; import { IHTTPConnection } from "@meshtastic/meshtasticjs";
export const HTTP = (): JSX.Element => { export const HTTP = (): JSX.Element => {
@ -71,8 +70,7 @@ export const HTTP = (): JSX.Element => {
)} )}
/> />
</div> </div>
<Button type="submit"> <Button>
<PlusCircleIcon className="w-4" />
<span>Connect</span> <span>Connect</span>
</Button> </Button>
</form> </form>

4
src/components/PageComponents/Connect/Serial.tsx

@ -1,11 +1,10 @@
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { Mono } from "@components/generic/Mono.js"; import { Mono } from "@components/generic/Mono.js";
import { Button } from "@components/form/Button.js"; import { Button } from "@components/UI/Button.js";
import { useAppStore } from "@core/stores/appStore.js"; import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js"; import { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js"; import { subscribeAll } from "@core/subscriptions.js";
import { randId } from "@core/utils/randId.js"; import { randId } from "@core/utils/randId.js";
import { PlusCircleIcon } from "@heroicons/react/24/outline";
import { ISerialConnection } from "@meshtastic/meshtasticjs"; import { ISerialConnection } from "@meshtastic/meshtasticjs";
export const Serial = (): JSX.Element => { export const Serial = (): JSX.Element => {
@ -70,7 +69,6 @@ export const Serial = (): JSX.Element => {
}); });
}} }}
> >
<PlusCircleIcon className="w-4" />
<span>New device</span> <span>New device</span>
</Button> </Button>
</div> </div>

77
src/components/PageComponents/Map/MapControlls.tsx

@ -1,77 +0,0 @@
import { useEffect } from "react";
import { useMap } from "react-map-gl";
import { useDevice } from "@core/providers/useDevice.js";
import {
MagnifyingGlassMinusIcon,
MagnifyingGlassPlusIcon,
ShareIcon
} from "@heroicons/react/24/outline";
import { bbox, lineString } from "@turf/turf";
export const MapControlls = (): JSX.Element => {
const { current: map } = useMap();
const { nodes } = useDevice();
const getBBox = () => {
const nodesWithPosition = nodes.filter((n) => n.data.position?.latitudeI);
if (!nodesWithPosition.length) return;
const line = lineString(
nodesWithPosition.map((n) => [
(n.data.position?.latitudeI ?? 0) / 1e7,
(n.data.position?.longitudeI ?? 0) / 1e7
])
);
const bounds = bbox(line);
const center = map?.cameraForBounds(
[
[bounds[1], bounds[0]],
[bounds[3], bounds[2]]
],
{ padding: { top: 10, bottom: 10, left: 10, right: 10 } }
);
if (center) map?.easeTo(center);
else if (nodesWithPosition.length === 1)
map?.easeTo({
zoom: 12,
center: [
(nodesWithPosition[0].data.position?.longitudeI ?? 0) / 1e7,
(nodesWithPosition[0].data.position?.latitudeI ?? 0) / 1e7
]
});
};
useEffect(() => {
getBBox();
}, []);
return (
<div className="absolute right-0 top-0 z-10 m-2 ">
<div className="divide-y-2 divide-backgroundSecondary overflow-hidden rounded-md bg-backgroundPrimary text-textSecondary">
<div
className="hover:bg-orange-200 cursor-pointer p-3 hover:text-accent"
onClick={() => {
map?.zoomIn();
}}
>
<MagnifyingGlassPlusIcon className="h-4 w-4" />
</div>
<div
className="hover:bg-orange-200 cursor-pointer p-3 hover:text-accent"
onClick={() => {
map?.zoomOut();
}}
>
<MagnifyingGlassMinusIcon className="h-4 w-4" />
</div>
<div
className="hover:bg-orange-200 cursor-pointer p-3 hover:text-accent"
onClick={() => getBBox()}
>
<ShareIcon className="h-4 w-4" />
</div>
</div>
</div>
);
};

2
src/components/PageComponents/Messages/ChannelChat.tsx

@ -1,6 +1,6 @@
import { Message } from "@components/PageComponents/Messages/Message.js"; import { Message } from "@components/PageComponents/Messages/Message.js";
import { MessageInput } from "@components/PageComponents/Messages/MessageInput.js"; import { MessageInput } from "@components/PageComponents/Messages/MessageInput.js";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import type { Channel } from "@core/stores/deviceStore.js"; import type { Channel } from "@core/stores/deviceStore.js";
export interface ChannelChatProps { export interface ChannelChatProps {

25
src/components/PageComponents/Messages/Message.tsx

@ -1,12 +1,12 @@
import { WaypointMessage } from "@components/PageComponents/Messages/WaypointMessage.js"; import { WaypointMessage } from "@components/PageComponents/Messages/WaypointMessage.js";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import type { AllMessageTypes } from "@core/stores/deviceStore.js"; import type { AllMessageTypes } from "@core/stores/deviceStore.js";
import { Hashicon } from "@emeraldpay/hashicon-react"; import { Hashicon } from "@emeraldpay/hashicon-react";
import { import {
CheckCircleIcon, CircleEllipsisIcon,
EllipsisHorizontalCircleIcon, AlertCircleIcon,
ExclamationCircleIcon CheckCircle2Icon
} from "@heroicons/react/24/outline"; } from "lucide-react";
import type { Protobuf } from "@meshtastic/meshtasticjs"; import type { Protobuf } from "@meshtastic/meshtasticjs";
export interface MessageProps { export interface MessageProps {
@ -30,11 +30,11 @@ export const Message = ({
return lastMsgSameUser ? ( return lastMsgSameUser ? (
<div className="ml-5 flex"> <div className="ml-5 flex">
{message.state === "ack" ? ( {message.state === "ack" ? (
<CheckCircleIcon className="my-auto h-4 text-textSecondary" /> <CheckCircle2Icon size={16} className="my-auto text-textSecondary" />
) : message.state === "waiting" ? ( ) : message.state === "waiting" ? (
<EllipsisHorizontalCircleIcon className="my-auto h-4 text-textSecondary" /> <CircleEllipsisIcon size={16} className="my-auto text-textSecondary" />
) : ( ) : (
<ExclamationCircleIcon className="my-auto h-4 text-textSecondary" /> <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
)} )}
{"waypointID" in message ? ( {"waypointID" in message ? (
<WaypointMessage waypointID={message.waypointID} /> <WaypointMessage waypointID={message.waypointID} />
@ -69,11 +69,14 @@ export const Message = ({
</div> </div>
<div className="ml-1 flex"> <div className="ml-1 flex">
{message.state === "ack" ? ( {message.state === "ack" ? (
<CheckCircleIcon className="my-auto h-4 text-textSecondary" /> <CheckCircle2Icon size={16} className="my-auto text-textSecondary" />
) : message.state === "waiting" ? ( ) : message.state === "waiting" ? (
<EllipsisHorizontalCircleIcon className="my-auto h-4 text-textSecondary" /> <CircleEllipsisIcon
size={16}
className="my-auto text-textSecondary"
/>
) : ( ) : (
<ExclamationCircleIcon className="my-auto h-4 text-textSecondary" /> <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
)} )}
{"waypointID" in message ? ( {"waypointID" in message ? (
<WaypointMessage waypointID={message.waypointID} /> <WaypointMessage waypointID={message.waypointID} />

16
src/components/PageComponents/Messages/MessageInput.tsx

@ -1,9 +1,9 @@
import { IconButton } from "@components/form/IconButton.js"; import { Input } from "@components/UI/Input.js";
import { Input } from "@components/form/Input.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { useDevice } from "@core/providers/useDevice.js";
import type { Channel } from "@core/stores/deviceStore.js"; import type { Channel } from "@core/stores/deviceStore.js";
import { MapPinIcon, PaperAirplaneIcon } from "@heroicons/react/24/outline"; import { SendIcon } from "lucide-react";
import type { Types } from "@meshtastic/meshtasticjs"; import type { Types } from "@meshtastic/meshtasticjs";
import { Button } from "@components/UI/Button.js";
export interface MessageInputProps { export interface MessageInputProps {
channel: Channel; channel: Channel;
@ -42,18 +42,16 @@ export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
<Input <Input
autoFocus autoFocus
minLength={2} minLength={2}
label=""
placeholder="Enter Message" placeholder="Enter Message"
value={messageDraft} value={messageDraft}
onChange={(e) => setMessageDraft(e.target.value)} onChange={(e) => setMessageDraft(e.target.value)}
/> />
</span> </span>
<IconButton <Button>
icon={<PaperAirplaneIcon className="text-slate-500 h-4" />} <SendIcon size={16} />
/> </Button>
</div> </div>
</form> </form>
<IconButton icon={<MapPinIcon className="text-slate-500 h-4" />} />
</div> </div>
); );
}; };

10
src/components/PageComponents/Messages/NewLocationMessage.tsx

@ -1,8 +1,6 @@
import { Input } from "@components/form/Input.js"; import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js"; import { Button } from "@components/UI/Button.js";
import { Button } from "@components/form/Button.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
enum LocationType { enum LocationType {
@ -23,9 +21,9 @@ export const NewLocationMessage = (): JSX.Element => {
> >
<Input label="Name" /> <Input label="Name" />
<Input label="Description" /> <Input label="Description" />
<Select label="Type" value={LocationType.MGRS}> {/* <Select label="Type" value={LocationType.MGRS}>
{renderOptions(LocationType)} {renderOptions(LocationType)}
</Select> </Select> */}
<Input label="Coordinates" /> <Input label="Coordinates" />
<Button <Button
onClick={() => { onClick={() => {

10
src/components/PageComponents/Messages/WaypointMessage.tsx

@ -1,6 +1,6 @@
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { toMGRS } from "@core/utils/toMGRS.js"; import { toMGRS } from "@core/utils/toMGRS.js";
import { MapPinIcon } from "@heroicons/react/24/outline"; import { MapPinIcon } from "lucide-react";
export interface WaypointMessageProps { export interface WaypointMessageProps {
waypointID: number; waypointID: number;
@ -13,13 +13,13 @@ export const WaypointMessage = ({
const waypoint = waypoints.find((wp) => wp.id === waypointID); const waypoint = waypoints.find((wp) => wp.id === waypointID);
return ( return (
<div className="border-l-slate-200 ml-4 border-l-2 pl-2"> <div className="ml-4 border-l-2 border-l-slate-200 pl-2">
<div className="flex gap-2 rounded-md p-2"> <div className="flex gap-2 rounded-md p-2">
<MapPinIcon className="text-slate-600 m-auto w-6" /> <MapPinIcon size={16} className="m-auto text-slate-600" />
<div> <div>
<div className="flex gap-2"> <div className="flex gap-2">
<div className="font-bold">{waypoint?.name}</div> <div className="font-bold">{waypoint?.name}</div>
<span className="text-slate-500 font-mono text-sm"> <span className="font-mono text-sm text-slate-500">
{toMGRS(waypoint?.latitudeI, waypoint?.longitudeI)} {toMGRS(waypoint?.latitudeI, waypoint?.longitudeI)}
</span> </span>
</div> </div>

132
src/components/PageComponents/ModuleConfig/Audio.tsx

@ -1,28 +1,12 @@
import { useEffect } from "react"; import type { AudioValidation } from "@app/validation/moduleConfig/audio.js";
import { Controller, useForm } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { AudioValidation } from "@app/validation/moduleConfig/audio.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Audio = (): JSX.Element => { export const Audio = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } = useForm<AudioValidation>({
mode: "onChange",
defaultValues: moduleConfig.audio,
resolver: classValidatorResolver(AudioValidation)
});
useEffect(() => { const onSubmit = (data: AudioValidation) => {
reset(moduleConfig.audio);
}, [reset, moduleConfig.audio]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -31,59 +15,63 @@ export const Audio = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<AudioValidation>
<Controller onSubmit={onSubmit}
name="codec2Enabled" defaultValues={moduleConfig.audio}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Audio Settings",
label="Codec 2 Enabled" description: "Settings for the Audio module",
description="Enter a description." fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "codec2Enabled",
)} label: "Codec 2 Enabled",
/> description: "Enable Codec 2 audio encoding"
<Input },
label="PTT Pin" {
description="Enter a description." type: "number",
type="number" name: "pttPin",
{...register("pttPin", { valueAsNumber: true })} label: "PTT Pin",
/> description: "GPIO pin to use for PTT"
<Select },
label="Bitrate" {
description="Enter a description." type: "select",
{...register("bitrate", { valueAsNumber: true })} name: "bitrate",
> label: "Bitrate",
{renderOptions(Protobuf.ModuleConfig_AudioConfig_Audio_Baud)} description: "Bitrate to use for audio encoding",
</Select> enumValue: Protobuf.ModuleConfig_AudioConfig_Audio_Baud
<Input },
label="i2SWs" {
description="Enter a description." type: "number",
type="number" name: "i2sWs",
{...register("i2sWs", { valueAsNumber: true })} label: "i2S WS",
/> description: "GPIO pin to use for i2S WS"
<Input },
label="i2SSd" {
description="Enter a description." type: "number",
type="number" name: "i2sSd",
{...register("i2sSd", { valueAsNumber: true })} label: "i2S SD",
/> description: "GPIO pin to use for i2S SD"
<Input },
label="i2SDin" {
description="Enter a description." type: "number",
type="number" name: "i2sDin",
{...register("i2sDin", { valueAsNumber: true })} label: "i2S DIN",
/> description: "GPIO pin to use for i2S DIN"
<Input },
label="i2SSck" {
description="Enter a description." type: "number",
type="number" name: "i2sSck",
{...register("i2sSck", { valueAsNumber: true })} label: "i2S SCK",
/> description: "GPIO pin to use for i2S SCK"
</Form> }
]
}
]}
/>
); );
}; };

219
src/components/PageComponents/ModuleConfig/CannedMessage.tsx

@ -1,40 +1,12 @@
import { useEffect } from "react"; import type { CannedMessageValidation } from "@app/validation/moduleConfig/cannedMessage.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { CannedMessageValidation } from "@app/validation/moduleConfig/cannedMessage.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const CannedMessage = (): JSX.Element => { export const CannedMessage = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const {
register,
handleSubmit,
formState: { errors, isDirty },
reset,
control
} = useForm<CannedMessageValidation>({
mode: "onChange",
defaultValues: moduleConfig.cannedMessage,
resolver: classValidatorResolver(CannedMessageValidation)
});
const moduleEnabled = useWatch({ const onSubmit = (data: CannedMessageValidation) => {
control,
name: "rotary1Enabled",
defaultValue: false
});
useEffect(() => {
reset(moduleConfig.cannedMessage);
}, [reset, moduleConfig.cannedMessage]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -43,110 +15,87 @@ export const CannedMessage = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<CannedMessageValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.mqtt}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Canned Message Settings",
label="Module Enabled" description: "Settings for the Canned Message module",
description="Enable canned messages" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "rotary1Enabled",
)} label: "Rotary Encoder #1 Enabled",
/> description: "Enable the rotary encoder"
<Controller },
name="rotary1Enabled" {
control={control} type: "number",
render={({ field: { value, ...rest } }) => ( name: "inputbrokerPinA",
<Toggle label="Rotary Encoder #1 Enabled" checked={value} {...rest} /> label: "Encoder Pin A",
)} description: "GPIO Pin Value (1-39) For encoder port A"
/> },
<Input {
label="Encoder Pin A" type: "number",
description="GPIO Pin Value (1-39) For encoder port A" name: "inputbrokerPinB",
type="number" label: "Encoder Pin B",
disabled={moduleEnabled} description: "GPIO Pin Value (1-39) For encoder port B"
{...register("inputbrokerPinA", { valueAsNumber: true })} },
/> {
<Input type: "number",
label="Encoder Pin B" name: "inputbrokerPinPress",
description="GPIO Pin Value (1-39) For encoder port B" label: "Encoder Pin Press",
type="number" description: "GPIO Pin Value (1-39) For encoder Press"
disabled={moduleEnabled} },
{...register("inputbrokerPinB", { valueAsNumber: true })} {
/> type: "select",
<Input name: "inputbrokerEventCw",
label="Encoder Pin Press" label: "Clockwise event",
description="GPIO Pin Value (1-39) For encoder Press" description: "Select input event.",
type="number" enumValue:
disabled={moduleEnabled} Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
{...register("inputbrokerPinPress", { valueAsNumber: true })} },
/> {
<Select type: "select",
label="Clockwise event" name: "inputbrokerEventCcw",
description="Select input event." label: "Counter Clockwise event",
disabled={moduleEnabled} description: "Select input event.",
{...register("inputbrokerEventCw", { valueAsNumber: true })} enumValue:
> Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
{renderOptions( },
Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar {
)} type: "select",
</Select> name: "inputbrokerEventPress",
<Select label: "Press event",
label="Counter Clockwise event" description: "Select input event",
description="Select input event." enumValue:
disabled={moduleEnabled} Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
{...register("inputbrokerEventCcw", { valueAsNumber: true })} },
> {
{renderOptions( type: "toggle",
Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar name: "updown1Enabled",
)} label: "Up Down enabled",
</Select> description: "Enable the up / down encoder"
<Select },
label="Press event" {
description="Select input event" type: "text",
disabled={moduleEnabled} name: "allowInputSource",
{...register("inputbrokerEventPress", { valueAsNumber: true })} label: "Allow Input Source",
> description:
{renderOptions( "Select from: '_any', 'rotEnc1', 'upDownEnc1', 'cardkb'"
Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar },
)} {
</Select> type: "toggle",
<Controller name: "sendBell",
name="updown1Enabled" label: "Send Bell",
control={control} description: "Sends a bell character with each message"
render={({ field: { value, ...rest } }) => ( }
<Toggle ]
label="Up Down enabled" }
description="Enable the up / down encoder" ]}
checked={value} />
{...rest}
/>
)}
/>
<Input
label="Allow Input Source"
description="Select from: '_any', 'rotEnc1', 'upDownEnc1', 'cardkb'"
disabled={moduleEnabled}
{...register("allowInputSource")}
/>
<Controller
name="sendBell"
control={control}
render={({ field: { value, ...rest } }) => (
<Toggle
label="Send Bell"
description="Sends a bell character with each message"
checked={value}
{...rest}
/>
)}
/>
</Form>
); );
}; };

349
src/components/PageComponents/ModuleConfig/ExternalNotification.tsx

@ -1,26 +1,12 @@
import { useEffect } from "react"; import type { ExternalNotificationValidation } from "@app/validation/moduleConfig/externalNotification.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { ExternalNotificationValidation } from "@app/validation/moduleConfig/externalNotification.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const ExternalNotification = (): JSX.Element => { export const ExternalNotification = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } =
useForm<ExternalNotificationValidation>({
mode: "onChange",
defaultValues: moduleConfig.externalNotification,
resolver: classValidatorResolver(ExternalNotificationValidation)
});
useEffect(() => {
reset(moduleConfig.externalNotification);
}, [reset, moduleConfig.externalNotification]);
const onSubmit = handleSubmit((data) => { const onSubmit = (data: ExternalNotificationValidation) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -29,170 +15,171 @@ export const ExternalNotification = (): JSX.Element => {
} }
}) })
); );
}); };
const moduleEnabled = useWatch({
control,
name: "enabled",
defaultValue: false
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<ExternalNotificationValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.externalNotification}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "External Notification Settings",
label="Module Enabled" description: "Configure the external notification module",
description="Enable External Notification" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "enabled",
)} label: "Module Enabled",
/> description: "Enable External Notification"
<Input },
type="number" {
label="Output MS" type: "number",
description="Description" name: "outputMs",
suffix="ms" label: "Output MS",
disabled={!moduleEnabled} description: "Output MS",
{...register("outputMs", { suffix: "ms",
valueAsNumber: true disabledBy: [
})} {
/> fieldName: "enabled"
<Input }
type="number" ]
label="Output" },
description="Description" {
disabled={!moduleEnabled} type: "number",
{...register("output", { name: "output",
valueAsNumber: true label: "Output",
})} description: "Output",
/> disabledBy: [
<Input {
type="number" fieldName: "enabled"
label="Output Vibrate" }
description="Description" ]
disabled={!moduleEnabled} },
{...register("outputVibra", { {
valueAsNumber: true type: "number",
})} name: "outputVibra",
/> label: "Output Vibrate",
<Input description: "Output Vibrate",
type="number" disabledBy: [
label="Output Buzzer" {
description="Description" fieldName: "enabled"
disabled={!moduleEnabled} }
{...register("outputBuzzer", { ]
valueAsNumber: true },
})} {
/> type: "number",
<Controller name: "outputBuzzer",
name="active" label: "Output Buzzer",
control={control} description: "Output Buzzer",
render={({ field: { value, ...rest } }) => ( disabledBy: [
<Toggle {
label="Active" fieldName: "enabled"
description="Description" }
checked={value} ]
{...rest} },
/> {
)} type: "toggle",
/> name: "active",
<Controller label: "Active",
name="alertMessage" description: "Active",
control={control} disabledBy: [
render={({ field: { value, ...rest } }) => ( {
<Toggle fieldName: "enabled"
label="Alert Message" }
description="Description" ]
checked={value} },
{...rest} {
/> type: "toggle",
)} name: "alertMessage",
/> label: "Alert Message",
<Controller description: "Alert Message",
name="alertMessageVibra" disabledBy: [
control={control} {
render={({ field: { value, ...rest } }) => ( fieldName: "enabled"
<Toggle }
label="Alert Message Vibrate" ]
description="Description" },
checked={value} {
{...rest} type: "toggle",
/> name: "alertMessageVibra",
)} label: "Alert Message Vibrate",
/> description: "Alert Message Vibrate",
<Controller disabledBy: [
name="alertMessageBuzzer" {
control={control} fieldName: "enabled"
render={({ field: { value, ...rest } }) => ( }
<Toggle ]
label="Alert Message Buzzer" },
description="Description" {
checked={value} type: "toggle",
{...rest} name: "alertMessageBuzzer",
/> label: "Alert Message Buzzer",
)} description: "Alert Message Buzzer",
/> disabledBy: [
<Controller {
name="alertBell" fieldName: "enabled"
control={control} }
render={({ field: { value, ...rest } }) => ( ]
<Toggle },
label="Alert Bell" {
description="Should an alert be triggered when receiving an incoming bell?" type: "toggle",
checked={value} name: "alertBell",
{...rest} label: "Alert Bell",
/> description:
)} "Should an alert be triggered when receiving an incoming bell?",
/> disabledBy: [
<Controller {
name="alertBellVibra" fieldName: "enabled"
control={control} }
render={({ field: { value, ...rest } }) => ( ]
<Toggle },
label="Alert Bell Vibrate" {
description="Description" type: "toggle",
checked={value} name: "alertBellVibra",
{...rest} label: "Alert Bell Vibrate",
/> description: "Alert Bell Vibrate",
)} disabledBy: [
/> {
<Controller fieldName: "enabled"
name="alertBellBuzzer" }
control={control} ]
render={({ field: { value, ...rest } }) => ( },
<Toggle {
label="Alert Bell Buzzer" type: "toggle",
description="Description" name: "alertBellBuzzer",
checked={value} label: "Alert Bell Buzzer",
{...rest} description: "Alert Bell Buzzer",
/> disabledBy: [
)} {
/> fieldName: "enabled"
<Controller }
name="usePwm" ]
control={control} },
render={({ field: { value, ...rest } }) => ( {
<Toggle type: "toggle",
label="Use PWM" name: "usePwm",
description="Description" label: "Use PWM",
checked={value} description: "Use PWM",
{...rest} disabledBy: [
/> {
)} fieldName: "enabled"
/> }
<Input ]
type="number" },
label="Nag Timeout" {
description="Description" type: "number",
disabled={!moduleEnabled} name: "nagTimeout",
{...register("nagTimeout", { label: "Nag Timeout",
valueAsNumber: true description: "Nag Timeout",
})} disabledBy: [
/> {
</Form> fieldName: "enabled"
}
]
}
]
}
]}
/>
); );
}; };

157
src/components/PageComponents/ModuleConfig/MQTT.tsx

@ -1,38 +1,12 @@
import { useEffect } from "react"; import type { MQTTValidation } from "@app/validation/moduleConfig/mqtt.js";
import { Controller, useForm, useWatch } from "react-hook-form";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { MQTTValidation } from "@app/validation/moduleConfig/mqtt.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
import { useDevice } from "@app/core/stores/deviceStore.js";
export const MQTT = (): JSX.Element => { export const MQTT = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const {
register,
handleSubmit,
formState: { errors, isDirty },
reset,
control
} = useForm<MQTTValidation>({
mode: "onChange",
defaultValues: moduleConfig.mqtt,
resolver: classValidatorResolver(MQTTValidation)
});
const moduleEnabled = useWatch({ const onSubmit = (data: MQTTValidation) => {
control,
name: "enabled",
defaultValue: false
});
useEffect(() => {
reset(moduleConfig.mqtt);
}, [reset, moduleConfig.mqtt]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -41,66 +15,71 @@ export const MQTT = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<MQTTValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.mqtt}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "MQTT Settings",
label="Module Enabled" description: "Settings for the MQTT module",
description="Enable MQTT" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "enabled",
)} label: "Enabled",
/> description: "Enable or disable MQTT"
<Input },
label="MQTT Server Address" {
description="Description" type: "text",
disabled={!moduleEnabled} name: "address",
{...register("address")} label: "MQTT Server Address",
/> description:
<Input "MQTT server address to use for default/custom servers",
label="MQTT Username" disabledBy: [
description="MQTT username to use for default/custom servers" {
disabled={!moduleEnabled} fieldName: "enabled"
{...register("username")} }
/> ]
<Input },
label="MQTT Password" {
description="MQTT password to use for default/custom servers" type: "text",
type="password" name: "username",
autoComplete="off" label: "MQTT Username",
disabled={!moduleEnabled} description: "MQTT username to use for default/custom servers",
{...register("password")} disabledBy: [
/> {
<Controller fieldName: "enabled"
name="encryptionEnabled" }
control={control} ]
render={({ field: { value, ...rest } }) => ( },
<Toggle {
label="Encryption Enabled" type: "password",
//description="Description" name: "password",
checked={value} label: "MQTT Password",
{...rest} description: "MQTT password to use for default/custom servers",
/> disabledBy: [
)} {
/> fieldName: "enabled"
<Controller }
name="jsonEnabled" ]
control={control} },
render={({ field: { value, ...rest } }) => ( {
<Toggle type: "toggle",
label="JSON Output Enabled" name: "encryptionEnabled",
description="Enable the sending / consumption of JSON packets on MQTT (Not encrypted)" label: "Encryption Enabled",
checked={value} description: "Enable or disable MQTT encryption",
{...rest} disabledBy: [
/> {
)} fieldName: "enabled"
/> }
</Form> ]
}
]
}
]}
/>
); );
}; };

102
src/components/PageComponents/ModuleConfig/RangeTest.tsx

@ -1,27 +1,12 @@
import { useEffect } from "react"; import type { RangeTestValidation } from "@app/validation/moduleConfig/rangeTest.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { RangeTestValidation } from "@app/validation/moduleConfig/rangeTest.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const RangeTest = (): JSX.Element => { export const RangeTest = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } =
useForm<RangeTestValidation>({
mode: "onChange",
defaultValues: moduleConfig.rangeTest,
resolver: classValidatorResolver(RangeTestValidation)
});
useEffect(() => { const onSubmit = (data: RangeTestValidation) => {
reset(moduleConfig.rangeTest);
}, [reset, moduleConfig.rangeTest]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -30,45 +15,48 @@ export const RangeTest = (): JSX.Element => {
} }
}) })
); );
}); };
const moduleEnabled = useWatch({
control,
name: "enabled",
defaultValue: false
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<RangeTestValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.mqtt}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label="Module Enabled" checked={value} {...rest} /> label: "Range Test Settings",
)} description: "Settings for the Range Test module",
/> fields: [
<Input {
type="number" type: "toggle",
label="Message Interval" name: "enabled",
description="How long to wait between sending test packets" label: "Module Enabled",
disabled={!moduleEnabled} description: "Enable Range Test"
suffix="Seconds" },
{...register("sender", { {
valueAsNumber: true type: "number",
})} name: "sender",
/> label: "Message Interval",
<Controller description: "How long to wait between sending test packets",
name="save" disabledBy: [
control={control} {
render={({ field: { value, ...rest } }) => ( fieldName: "enabled"
<Toggle }
label="Save CSV to storage" ]
description="ESP32 Only" },
checked={value} {
{...rest} type: "toggle",
/> name: "save",
)} label: "Save CSV to storage",
/> description: "ESP32 Only",
</Form> disabledBy: [
{
fieldName: "enabled"
}
]
}
]
}
]}
/>
); );
}; };

192
src/components/PageComponents/ModuleConfig/Serial.tsx

@ -1,28 +1,12 @@
import { useEffect } from "react"; import type { SerialValidation } from "@app/validation/moduleConfig/serial.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { SerialValidation } from "@app/validation/moduleConfig/serial.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { renderOptions } from "@core/utils/selectEnumOptions"; import { DynamicForm } from "@app/components/DynamicForm.js";
import { Select } from "@components/form/Select";
export const Serial = (): JSX.Element => { export const Serial = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } = useForm<SerialValidation>({
mode: "onChange",
defaultValues: moduleConfig.serial,
resolver: classValidatorResolver(SerialValidation)
});
useEffect(() => { const onSubmit = (data: SerialValidation) => {
reset(moduleConfig.serial);
}, [reset, moduleConfig.serial]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -31,84 +15,98 @@ export const Serial = (): JSX.Element => {
} }
}) })
); );
}); };
const moduleEnabled = useWatch({
control,
name: "enabled",
defaultValue: false
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<SerialValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.serial}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Serial Settings",
label="Module Enabled" description: "Settings for the Serial module",
description="Enable Serial output" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "enabled",
)} label: "Module Enabled",
/> description: "Enable Serial output"
<Controller },
name="echo" {
control={control} type: "toggle",
render={({ field: { value, ...rest } }) => ( name: "echo",
<Toggle label: "Echo",
label="Echo" description:
description="Any packets you send will be echoed back to your device" "Any packets you send will be echoed back to your device",
checked={value} disabledBy: [
{...rest} {
/> fieldName: "enabled"
)} }
/> ]
<Input },
type="number" {
label="RX Pin" type: "number",
description="Set the GPIO pin to the RXD pin you have set up." name: "rxd",
disabled={!moduleEnabled} label: "Receive Pin",
{...register("rxd", { description: "Set the GPIO pin to the RXD pin you have set up.",
valueAsNumber: true disabledBy: [
})} {
/> fieldName: "enabled"
<Input }
type="number" ]
label="TX Pin" },
description="Set the GPIO pin to the TXD pin you have set up." {
disabled={!moduleEnabled} type: "number",
{...register("txd", { name: "txd",
valueAsNumber: true label: "Transmit Pin",
})} description: "Set the GPIO pin to the TXD pin you have set up.",
/> disabledBy: [
<Select {
label="Baud Rate" fieldName: "enabled"
description="The serial baud rate" }
disabled={!moduleEnabled} ]
{...register("baud", { valueAsNumber: true })} },
> {
{renderOptions(Protobuf.ModuleConfig_SerialConfig_Serial_Baud)} type: "select",
</Select> name: "baud",
<Input label: "Baud Rate",
type="number" description: "The serial baud rate",
label="Timeout" enumValue: Protobuf.ModuleConfig_SerialConfig_Serial_Baud,
suffix="Seconds" disabledBy: [
description="Seconds to wait before we consider your packet as 'done'" {
disabled={!moduleEnabled} fieldName: "enabled"
{...register("timeout", { }
valueAsNumber: true ]
})} },
/> {
<Select type: "number",
label="Mode" name: "timeout",
description="Select Mode" label: "Timeout",
disabled={!moduleEnabled} suffix: "Seconds",
{...register("mode", { valueAsNumber: true })} description:
> "Seconds to wait before we consider your packet as 'done'",
{renderOptions(Protobuf.ModuleConfig_SerialConfig_Serial_Mode)} disabledBy: [
</Select> {
</Form> fieldName: "enabled"
}
]
},
{
type: "select",
name: "mode",
label: "Mode",
description: "Select Mode",
enumValue: Protobuf.ModuleConfig_SerialConfig_Serial_Mode,
formatEnumName: true,
disabledBy: [
{
fieldName: "enabled"
}
]
}
]
}
]}
/>
); );
}; };

148
src/components/PageComponents/ModuleConfig/StoreForward.tsx

@ -1,27 +1,12 @@
import { useEffect } from "react"; import type { StoreForwardValidation } from "@app/validation/moduleConfig/storeForward.js";
import { Controller, useForm, useWatch } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { StoreForwardValidation } from "@app/validation/moduleConfig/storeForward.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const StoreForward = (): JSX.Element => { export const StoreForward = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } =
useForm<StoreForwardValidation>({
mode: "onChange",
defaultValues: moduleConfig.storeForward,
resolver: classValidatorResolver(StoreForwardValidation)
});
useEffect(() => { const onSubmit = (data: StoreForwardValidation) => {
reset(moduleConfig.storeForward);
}, [reset, moduleConfig.storeForward]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -30,68 +15,71 @@ export const StoreForward = (): JSX.Element => {
} }
}) })
); );
}); };
const moduleEnabled = useWatch({
control,
name: "enabled",
defaultValue: false
});
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<StoreForwardValidation>
<Controller onSubmit={onSubmit}
name="enabled" defaultValues={moduleConfig.mqtt}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Store & Forward Settings",
label="Module Enabled" description: "Settings for the Store & Forward module",
description="Description" fields: [
checked={value} {
{...rest} type: "toggle",
/> name: "enabled",
)} label: "Module Enabled",
/> description: "Enable Store & Forward"
<Controller },
name="heartbeat" {
control={control} type: "toggle",
render={({ field: { value, ...rest } }) => ( name: "heartbeat",
<Toggle label: "Heartbeat Enabled",
label="Heartbeat Enabled" description: "Enable Store & Forward heartbeat",
description="Description" disabledBy: [
checked={value} {
{...rest} fieldName: "enabled"
/> }
)} ]
/> },
<Input {
type="number" type: "number",
label="Number of records" name: "records",
description="Max transmit power in dBm" label: "Number of records",
suffix="Records" description: "Number of records to store",
disabled={!moduleEnabled} suffix: "Records",
{...register("records", { disabledBy: [
valueAsNumber: true {
})} fieldName: "enabled"
/> }
<Input ]
type="number" },
label="History return max" {
description="Max transmit power in dBm" type: "number",
disabled={!moduleEnabled} name: "historyReturnMax",
{...register("historyReturnMax", { label: "History return max",
valueAsNumber: true description: "Max number of records to return",
})} disabledBy: [
/> {
<Input fieldName: "enabled"
type="number" }
label="History return window" ]
description="Max transmit power in dBm" },
disabled={!moduleEnabled} {
{...register("historyReturnWindow", { type: "number",
valueAsNumber: true name: "historyReturnWindow",
})} label: "History return window",
/> description: "Max number of records to return",
</Form> disabledBy: [
{
fieldName: "enabled"
}
]
}
]
}
]}
/>
); );
}; };

115
src/components/PageComponents/ModuleConfig/Telemetry.tsx

@ -1,27 +1,12 @@
import { useEffect } from "react"; import type { TelemetryValidation } from "@app/validation/moduleConfig/telemetry.js";
import { Controller, useForm } from "react-hook-form"; import { useDevice } from "@core/stores/deviceStore.js";
import { Input } from "@components/form/Input.js";
import { Toggle } from "@components/form/Toggle.js";
import { TelemetryValidation } from "@app/validation/moduleConfig/telemetry.js";
import { Form } from "@components/form/Form";
import { useDevice } from "@core/providers/useDevice.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
import { DynamicForm } from "@app/components/DynamicForm.js";
export const Telemetry = (): JSX.Element => { export const Telemetry = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice(); const { moduleConfig, setWorkingModuleConfig } = useDevice();
const { register, handleSubmit, reset, control } =
useForm<TelemetryValidation>({
mode: "onChange",
defaultValues: moduleConfig.telemetry,
resolver: classValidatorResolver(TelemetryValidation)
});
useEffect(() => { const onSubmit = (data: TelemetryValidation) => {
reset(moduleConfig.telemetry);
}, [reset, moduleConfig.telemetry]);
const onSubmit = handleSubmit((data) => {
setWorkingModuleConfig( setWorkingModuleConfig(
new Protobuf.ModuleConfig({ new Protobuf.ModuleConfig({
payloadVariant: { payloadVariant: {
@ -30,55 +15,51 @@ export const Telemetry = (): JSX.Element => {
} }
}) })
); );
}); };
return ( return (
<Form onSubmit={onSubmit}> <DynamicForm<TelemetryValidation>
<Controller onSubmit={onSubmit}
name="environmentMeasurementEnabled" defaultValues={moduleConfig.telemetry}
control={control} fieldGroups={[
render={({ field: { value, ...rest } }) => ( {
<Toggle label: "Telemetry Settings",
label="Module Enabled" description: "Settings for the Telemetry module",
description="Enable the Environment Telemetry" fields: [
checked={value} {
{...rest} type: "number",
/> name: "deviceUpdateInterval",
)} label: "Interval to get telemetry data",
/> suffix: "seconds"
<Controller },
name="environmentScreenEnabled" {
control={control} type: "number",
render={({ field: { value, ...rest } }) => ( name: "environmentUpdateInterval",
<Toggle label: "Update Interval",
label="Displayed on Screen" description: "How often to send Metrics over the mesh",
description="Show the Telemetry Module on the OLED" suffix: "seconds"
checked={value} },
{...rest} {
/> type: "toggle",
)} name: "environmentMeasurementEnabled",
/> label: "Module Enabled",
<Input description: "Enable the Environment Telemetry"
label="Update Interval" },
description="How often to send Metrics over the mesh" {
suffix="Seconds" type: "toggle",
type="number" name: "environmentScreenEnabled",
{...register("environmentUpdateInterval", { label: "Displayed on Screen",
valueAsNumber: true description: "Show the Telemetry Module on the OLED"
})} },
/> {
<Controller type: "toggle",
name="environmentDisplayFahrenheit" name: "environmentDisplayFahrenheit",
control={control} label: "Display Fahrenheit",
render={({ field: { value, ...rest } }) => ( description: "Display temp in Fahrenheit"
<Toggle }
label="Display Fahrenheit" ]
description="Display temp in Fahrenheit" }
checked={value} ]}
{...rest} />
/>
)}
/>
</Form>
); );
}; };

144
src/components/Sidebar.tsx

@ -1,70 +1,94 @@
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/stores/deviceStore.js";
import { toMGRS } from "@core/utils/toMGRS.js"; import type { Page } from "@core/stores/deviceStore.js";
import { BatteryWidget } from "@components/Widgets/BatteryWidget.js"; import {
import { DeviceWidget } from "@components/Widgets/DeviceWidget.js"; LucideIcon,
import { PeersWidget } from "@components/Widgets/PeersWidget.js"; MapIcon,
import { PositionWidget } from "@components/Widgets/PositionWidget.js"; MessageSquareIcon,
import { useAppStore } from "@core/stores/appStore.js"; SettingsIcon,
import { useDeviceStore } from "@core/stores/deviceStore.js"; LayersIcon,
import { CommandLineIcon } from "@heroicons/react/24/outline"; UsersIcon,
import { Types } from "@meshtastic/meshtasticjs"; EditIcon,
import { Input } from "@components/form/Input.js"; LayoutGrid
} from "lucide-react";
import { Subtle } from "./UI/Typography/Subtle.js";
import { Button } from "./UI/Button.js";
import { SidebarSection } from "./UI/Sidebar/SidebarSection.js";
import { SidebarButton } from "./UI/Sidebar/sidebarButton.js";
export const Sidebar = (): JSX.Element => { export interface SidebarProps {
const { removeDevice } = useDeviceStore(); children?: React.ReactNode;
const { connection, hardware, nodes, status, currentMetrics } = useDevice(); }
const { selectedDevice, setSelectedDevice, setCommandPaletteOpen } =
useAppStore(); export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
const { hardware, nodes } = useDevice();
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum); const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
const { activePage, setActivePage, setDialogOpen } = useDevice();
interface NavLink {
name: string;
icon: LucideIcon;
page: Page;
}
const pages: NavLink[] = [
{
name: "Messages",
icon: MessageSquareIcon,
page: "messages"
},
{
name: "Map",
icon: MapIcon,
page: "map"
},
{
name: "Config",
icon: SettingsIcon,
page: "config"
},
{
name: "Channels",
icon: LayersIcon,
page: "channels"
},
{
name: "Peers",
icon: UsersIcon,
page: "peers"
}
];
return ( return (
<div className="bg-slate-50 relative flex w-72 flex-shrink-0 flex-col gap-2 p-2"> <div className="min-w-[280px] max-w-min flex-col border-r-[0.5px] border-slate-300 bg-transparent dark:border-slate-700">
<DeviceWidget <div className="flex justify-between px-8 py-6">
name={ <div>
nodes.find((n) => n.data.num === hardware.myNodeNum)?.data.user <span className="text-lg font-medium">
?.longName ?? "UNK" {myNode?.data.user?.shortName ?? "UNK"}
} </span>
nodeNum={hardware.myNodeNum.toString()} <Subtle>{myNode?.data.user?.longName ?? "UNK"}</Subtle>
disconnected={status === Types.DeviceStatusEnum.DEVICE_DISCONNECTED} </div>
disconnect={() => { <button
void connection?.disconnect(); className="transition-all hover:text-accent"
setSelectedDevice(0); onClick={() => setDialogOpen("deviceName", true)}
removeDevice(selectedDevice ?? 0); >
}} <EditIcon size={16} />
reconnect={() => { </button>
void connection?.disconnect(); </div>
}}
/>
<div className="flex flex-grow flex-col gap-3"> <SidebarSection label="Navigation">
<BatteryWidget {pages.map((link) => (
batteryLevel={currentMetrics.batteryLevel} <SidebarButton
voltage={currentMetrics.voltage} key={link.page}
/> label={link.name}
<PeersWidget icon={link.icon}
peers={nodes onClick={() => {
.map((n) => n.data) setActivePage(link.page);
.filter((n) => n.num !== hardware.myNodeNum)}
/>
<PositionWidget
grid={toMGRS(
myNode?.data.position?.latitudeI,
myNode?.data.position?.longitudeI
)}
/>
<div className="mt-auto">
<Input
placeholder={"Search for a command"}
onClick={() => setCommandPaletteOpen(true)}
action={{
icon: <CommandLineIcon className="w-4" />,
action() {
setCommandPaletteOpen(true);
}
}} }}
active={link.page === activePage}
/> />
</div> ))}
</div> </SidebarSection>
{children}
</div> </div>
); );
}; };

42
src/components/Topbar.tsx

@ -0,0 +1,42 @@
import { LucideIcon, AlignLeftIcon } from "lucide-react";
export interface PageLayoutProps {
label: string;
children: React.ReactNode;
actions?: {
icon: LucideIcon;
onClick: () => void;
}[];
}
export const PageLayout = ({
label: title,
actions,
children
}: PageLayoutProps): JSX.Element => {
return (
<div className="relative flex h-full w-full flex-col">
<div className="flex h-14 shrink-0 border-b-[0.5px] border-slate-300 dark:border-slate-700 md:h-16 md:px-4">
<button className="pl-4 transition-all hover:text-accent md:hidden">
<AlignLeftIcon />
</button>
<div className="flex flex-1 items-center justify-between px-4 md:px-0">
<div className="flex w-full items-center">
<span className="w-full text-lg font-medium">{title}</span>
<div className="flex justify-end space-x-4">
{actions?.map((action) => (
<button
className="transition-all hover:text-accent"
onClick={action.onClick}
>
<action.icon />
</button>
))}
</div>
</div>
</div>
</div>
{children}
</div>
);
};

53
src/components/UI/Button.tsx

@ -0,0 +1,53 @@
import * as React from "react";
import { VariantProps, cva } from "class-variance-authority";
import { cn } from "@core/utils/cn.js";
const buttonVariants = cva(
"inline-flex items-center justify-center rounded-md text-sm font-medium transition-colors focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 dark:hover:bg-slate-800 dark:hover:text-slate-100 disabled:opacity-50 dark:focus:ring-slate-400 disabled:pointer-events-none dark:focus:ring-offset-slate-900 data-[state=open]:bg-slate-100 dark:data-[state=open]:bg-slate-800",
{
variants: {
variant: {
default:
"bg-slate-900 text-white hover:bg-slate-700 dark:bg-slate-50 dark:text-slate-900",
destructive:
"bg-red-500 text-white hover:bg-red-600 dark:hover:bg-red-600",
outline:
"bg-transparent border border-slate-200 hover:bg-slate-100 dark:border-slate-700 dark:text-slate-100",
subtle:
"bg-slate-100 text-slate-900 hover:bg-slate-200 dark:bg-slate-700 dark:text-slate-100",
ghost:
"bg-transparent hover:bg-slate-100 dark:hover:bg-slate-800 dark:text-slate-100 dark:hover:text-slate-100 data-[state=open]:bg-transparent dark:data-[state=open]:bg-transparent",
link: "bg-transparent underline-offset-4 hover:underline text-slate-900 dark:text-slate-100 hover:bg-transparent dark:hover:bg-transparent"
},
size: {
default: "h-10 py-2 px-4",
sm: "h-9 px-2 rounded-md",
lg: "h-11 px-8 rounded-md"
}
},
defaultVariants: {
variant: "default",
size: "default"
}
}
);
export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
VariantProps<typeof buttonVariants> {}
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, ...props }, ref) => {
return (
<button
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
);
}
);
Button.displayName = "Button";
export { Button, buttonVariants };

156
src/components/UI/Command.tsx

@ -0,0 +1,156 @@
import * as React from "react";
import type { DialogProps } from "@radix-ui/react-dialog";
import { Command as CommandPrimitive } from "cmdk";
import { Search } from "lucide-react";
import { cn } from "@core/utils/cn.js";
import { Dialog, DialogContent } from "@components/UI/Dialog.js";
const Command = React.forwardRef<
React.ElementRef<typeof CommandPrimitive>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive>
>(({ className, ...props }, ref) => (
<CommandPrimitive
ref={ref}
className={cn(
"flex h-full w-full flex-col overflow-hidden rounded-lg bg-white dark:bg-slate-800",
className
)}
{...props}
/>
));
Command.displayName = CommandPrimitive.displayName;
interface CommandDialogProps extends DialogProps {}
const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
<Dialog {...props}>
<DialogContent className="overflow-hidden p-0 shadow-2xl [&_[dialog-overlay]]:bg-red-100">
<Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-slate-500 [&_[cmdk-group]]:px-2 [&_[cmdk-group]_+[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
{children}
</Command>
</DialogContent>
</Dialog>
);
};
const CommandInput = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Input>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
>(({ className, ...props }, ref) => (
<div
className="flex items-center border-b border-b-slate-100 px-4 dark:border-b-slate-700"
cmdk-input-wrapper=""
>
<Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
<CommandPrimitive.Input
ref={ref}
className={cn(
"flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-slate-400 disabled:cursor-not-allowed disabled:opacity-50 dark:text-slate-50",
className
)}
{...props}
/>
</div>
));
CommandInput.displayName = CommandPrimitive.Input.displayName;
const CommandList = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.List>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
>(({ className, ...props }, ref) => (
<CommandPrimitive.List
ref={ref}
className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
{...props}
/>
));
CommandList.displayName = CommandPrimitive.List.displayName;
const CommandEmpty = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Empty>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
>((props, ref) => (
<CommandPrimitive.Empty
ref={ref}
className="py-6 text-center text-sm"
{...props}
/>
));
CommandEmpty.displayName = CommandPrimitive.Empty.displayName;
const CommandGroup = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Group>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Group
ref={ref}
className={cn(
"overflow-hidden py-3 px-2 text-slate-700 dark:text-slate-400 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:pb-1.5 [&_[cmdk-group-heading]]:text-sm [&_[cmdk-group-heading]]:font-semibold [&_[cmdk-group-heading]]:text-slate-900 [&_[cmdk-group-heading]]:dark:text-slate-300",
className
)}
{...props}
/>
));
CommandGroup.displayName = CommandPrimitive.Group.displayName;
const CommandSeparator = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Separator
ref={ref}
className={cn("-mx-1 h-px bg-slate-100 dark:bg-slate-700", className)}
{...props}
/>
));
CommandSeparator.displayName = CommandPrimitive.Separator.displayName;
const CommandItem = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-md py-1.5 px-2 text-sm font-medium outline-none aria-selected:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:aria-selected:bg-slate-700",
className
)}
{...props}
/>
));
CommandItem.displayName = CommandPrimitive.Item.displayName;
const CommandShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn(
"ml-auto text-xs tracking-widest text-slate-500",
className
)}
{...props}
/>
);
};
CommandShortcut.displayName = "CommandShortcut";
export {
Command,
CommandDialog,
CommandInput,
CommandList,
CommandEmpty,
CommandGroup,
CommandItem,
CommandShortcut,
CommandSeparator
};

128
src/components/UI/Dialog.tsx

@ -0,0 +1,128 @@
import * as React from "react";
import * as DialogPrimitive from "@radix-ui/react-dialog";
import { X } from "lucide-react";
import { cn } from "@core/utils/cn.js";
const Dialog = DialogPrimitive.Root;
const DialogTrigger = DialogPrimitive.Trigger;
const DialogPortal = ({
className,
children,
...props
}: DialogPrimitive.DialogPortalProps) => (
<DialogPrimitive.Portal className={cn(className)} {...props}>
<div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center">
{children}
</div>
</DialogPrimitive.Portal>
);
DialogPortal.displayName = DialogPrimitive.Portal.displayName;
const DialogOverlay = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, children, ...props }, ref) => (
<DialogPrimitive.Overlay
className={cn(
"fixed inset-0 z-50 bg-black/50 backdrop-blur-sm transition-opacity animate-in fade-in",
className
)}
{...props}
ref={ref}
/>
));
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
const DialogContent = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
>(({ className, children, ...props }, ref) => (
<DialogPortal>
<DialogOverlay />
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed z-50 grid w-full scale-100 gap-4 bg-white p-6 opacity-100 animate-in fade-in-90 slide-in-from-bottom-10 sm:max-w-lg sm:rounded-lg sm:zoom-in-90 sm:slide-in-from-bottom-0",
"dark:bg-slate-900",
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute top-4 right-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-slate-100 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-900 dark:data-[state=open]:bg-slate-800">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
</DialogPortal>
));
DialogContent.displayName = DialogPrimitive.Content.displayName;
const DialogHeader = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col space-y-2 text-center sm:text-left",
className
)}
{...props}
/>
);
DialogHeader.displayName = "DialogHeader";
const DialogFooter = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
className
)}
{...props}
/>
);
DialogFooter.displayName = "DialogFooter";
const DialogTitle = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
className={cn(
"text-lg font-semibold text-slate-900",
"dark:text-slate-50",
className
)}
{...props}
/>
));
DialogTitle.displayName = DialogPrimitive.Title.displayName;
const DialogDescription = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
className={cn("text-sm text-slate-500", "dark:text-slate-400", className)}
{...props}
/>
));
DialogDescription.displayName = DialogPrimitive.Description.displayName;
export {
Dialog,
DialogTrigger,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogDescription
};

24
src/components/UI/Input.tsx

@ -0,0 +1,24 @@
import * as React from "react";
import { cn } from "@core/utils/cn.js";
export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {}
const Input = React.forwardRef<HTMLInputElement, InputProps>(
({ className, ...props }, ref) => {
return (
<input
className={cn(
"flex h-10 w-full rounded-md border border-slate-300 bg-transparent py-2 px-3 text-sm placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-slate-700 dark:text-slate-50 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-900",
className
)}
ref={ref}
{...props}
/>
);
}
);
Input.displayName = "Input";
export { Input };

21
src/components/UI/Label.tsx

@ -0,0 +1,21 @@
import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label";
import { cn } from "@core/utils/cn.js";
const Label = React.forwardRef<
React.ElementRef<typeof LabelPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
>(({ className, ...props }, ref) => (
<LabelPrimitive.Root
ref={ref}
className={cn(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
className
)}
{...props}
/>
));
Label.displayName = LabelPrimitive.Root.displayName;
export { Label };

234
src/components/UI/Menubar.tsx

@ -0,0 +1,234 @@
import * as React from "react";
import * as MenubarPrimitive from "@radix-ui/react-menubar";
import { Check, ChevronRight, Circle } from "lucide-react";
import { cn } from "@core/utils/cn.js";
const MenubarMenu = MenubarPrimitive.Menu;
const MenubarGroup = MenubarPrimitive.Group;
const MenubarPortal = MenubarPrimitive.Portal;
const MenubarSub = MenubarPrimitive.Sub;
const MenubarRadioGroup = MenubarPrimitive.RadioGroup;
const Menubar = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Root>
>(({ className, ...props }, ref) => (
<MenubarPrimitive.Root
ref={ref}
className={cn(
"flex h-10 items-center space-x-1 rounded-md border border-slate-300 bg-white p-1 dark:border-slate-700 dark:bg-slate-800",
className
)}
{...props}
/>
));
Menubar.displayName = MenubarPrimitive.Root.displayName;
const MenubarTrigger = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Trigger>
>(({ className, ...props }, ref) => (
<MenubarPrimitive.Trigger
ref={ref}
className={cn(
"flex cursor-default select-none items-center rounded-[0.2rem] py-1.5 px-3 text-sm font-medium outline-none focus:bg-slate-100 data-[state=open]:bg-slate-100 dark:focus:bg-slate-700 dark:data-[state=open]:bg-slate-700",
className
)}
{...props}
/>
));
MenubarTrigger.displayName = MenubarPrimitive.Trigger.displayName;
const MenubarSubTrigger = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.SubTrigger>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.SubTrigger> & {
inset?: boolean;
}
>(({ className, inset, children, ...props }, ref) => (
<MenubarPrimitive.SubTrigger
ref={ref}
className={cn(
"flex cursor-default select-none items-center rounded-sm py-1.5 px-2 text-sm font-medium outline-none focus:bg-slate-100 data-[state=open]:bg-slate-100 dark:focus:bg-slate-700 dark:data-[state=open]:bg-slate-700",
inset && "pl-8",
className
)}
{...props}
>
{children}
<ChevronRight className="ml-auto h-4 w-4" />
</MenubarPrimitive.SubTrigger>
));
MenubarSubTrigger.displayName = MenubarPrimitive.SubTrigger.displayName;
const MenubarSubContent = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.SubContent>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.SubContent>
>(({ className, ...props }, ref) => (
<MenubarPrimitive.SubContent
ref={ref}
className={cn(
"z-50 min-w-[8rem] overflow-hidden rounded-md border border-slate-100 bg-white p-1 shadow-md animate-in slide-in-from-left-1 dark:border-slate-700 dark:bg-slate-800",
className
)}
{...props}
/>
));
MenubarSubContent.displayName = MenubarPrimitive.SubContent.displayName;
const MenubarContent = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Content>
>(
(
{ className, align = "start", alignOffset = -4, sideOffset = 8, ...props },
ref
) => (
<MenubarPrimitive.Portal>
<MenubarPrimitive.Content
ref={ref}
align={align}
alignOffset={alignOffset}
sideOffset={sideOffset}
className={cn(
"z-50 min-w-[12rem] overflow-hidden rounded-md border border-slate-100 bg-white p-1 text-slate-700 shadow-md animate-in slide-in-from-top-1 dark:border-slate-800 dark:bg-slate-800 dark:text-slate-400",
className
)}
{...props}
/>
</MenubarPrimitive.Portal>
)
);
MenubarContent.displayName = MenubarPrimitive.Content.displayName;
const MenubarItem = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Item> & {
inset?: boolean;
}
>(({ className, inset, ...props }, ref) => (
<MenubarPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 px-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-slate-700",
inset && "pl-8",
className
)}
{...props}
/>
));
MenubarItem.displayName = MenubarPrimitive.Item.displayName;
const MenubarCheckboxItem = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.CheckboxItem>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.CheckboxItem>
>(({ className, children, checked, ...props }, ref) => (
<MenubarPrimitive.CheckboxItem
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-slate-700",
className
)}
checked={checked}
{...props}
>
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
<MenubarPrimitive.ItemIndicator>
<Check className="h-4 w-4" />
</MenubarPrimitive.ItemIndicator>
</span>
{children}
</MenubarPrimitive.CheckboxItem>
));
MenubarCheckboxItem.displayName = MenubarPrimitive.CheckboxItem.displayName;
const MenubarRadioItem = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.RadioItem>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.RadioItem>
>(({ className, children, ...props }, ref) => (
<MenubarPrimitive.RadioItem
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none focus:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:focus:bg-slate-700",
className
)}
{...props}
>
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
<MenubarPrimitive.ItemIndicator>
<Circle className="h-2 w-2 fill-current" />
</MenubarPrimitive.ItemIndicator>
</span>
{children}
</MenubarPrimitive.RadioItem>
));
MenubarRadioItem.displayName = MenubarPrimitive.RadioItem.displayName;
const MenubarLabel = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Label> & {
inset?: boolean;
}
>(({ className, inset, ...props }, ref) => (
<MenubarPrimitive.Label
ref={ref}
className={cn(
"px-2 py-1.5 text-sm font-semibold text-slate-900 dark:text-slate-300",
inset && "pl-8",
className
)}
{...props}
/>
));
MenubarLabel.displayName = MenubarPrimitive.Label.displayName;
const MenubarSeparator = React.forwardRef<
React.ElementRef<typeof MenubarPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof MenubarPrimitive.Separator>
>(({ className, ...props }, ref) => (
<MenubarPrimitive.Separator
ref={ref}
className={cn("-mx-1 my-1 h-px bg-slate-100 dark:bg-slate-700", className)}
{...props}
/>
));
MenubarSeparator.displayName = MenubarPrimitive.Separator.displayName;
const MenubarShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn(
"ml-auto text-xs tracking-widest text-slate-500",
className
)}
{...props}
/>
);
};
MenubarShortcut.displayname = "MenubarShortcut";
export {
Menubar,
MenubarMenu,
MenubarTrigger,
MenubarContent,
MenubarItem,
MenubarSeparator,
MenubarLabel,
MenubarCheckboxItem,
MenubarRadioGroup,
MenubarRadioItem,
MenubarPortal,
MenubarSubContent,
MenubarSubTrigger,
MenubarGroup,
MenubarSub,
MenubarShortcut
};

29
src/components/UI/Popover.tsx

@ -0,0 +1,29 @@
import * as React from "react";
import * as PopoverPrimitive from "@radix-ui/react-popover";
import { cn } from "@core/utils/cn.js";
const Popover = PopoverPrimitive.Root;
const PopoverTrigger = PopoverPrimitive.Trigger;
const PopoverContent = React.forwardRef<
React.ElementRef<typeof PopoverPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
<PopoverPrimitive.Portal>
<PopoverPrimitive.Content
ref={ref}
align={align}
sideOffset={sideOffset}
className={cn(
"z-50 w-72 rounded-md border border-slate-100 bg-white p-4 shadow-md outline-none animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=top]:slide-in-from-bottom-2 dark:border-slate-800 dark:bg-slate-800",
className
)}
{...props}
/>
</PopoverPrimitive.Portal>
));
PopoverContent.displayName = PopoverPrimitive.Content.displayName;
export { Popover, PopoverTrigger, PopoverContent };

111
src/components/UI/Select.tsx

@ -0,0 +1,111 @@
import * as React from "react";
import * as SelectPrimitive from "@radix-ui/react-select";
import { Check, ChevronDown } from "lucide-react";
import { cn } from "@core/utils/cn.js";
const Select = SelectPrimitive.Root;
const SelectGroup = SelectPrimitive.Group;
const SelectValue = SelectPrimitive.Value;
const SelectTrigger = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Trigger
ref={ref}
className={cn(
"border-slate-300 placeholder:text-slate-400 focus:ring-slate-400 dark:border-slate-700 dark:text-slate-50 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-900 flex h-10 w-full items-center justify-between rounded-md border bg-transparent py-2 px-3 text-sm focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
className
)}
{...props}
>
{children}
<ChevronDown className="h-4 w-4 opacity-50" />
</SelectPrimitive.Trigger>
));
SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
const SelectContent = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Portal>
<SelectPrimitive.Content
ref={ref}
className={cn(
"border-slate-100 bg-white text-slate-700 dark:border-slate-800 dark:bg-slate-800 dark:text-slate-400 relative z-50 min-w-[8rem] overflow-hidden rounded-md border shadow-md animate-in fade-in-80",
className
)}
{...props}
>
<SelectPrimitive.Viewport className="p-1">
{children}
</SelectPrimitive.Viewport>
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
));
SelectContent.displayName = SelectPrimitive.Content.displayName;
const SelectLabel = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Label>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Label
ref={ref}
className={cn(
"text-slate-900 dark:text-slate-300 py-1.5 pr-2 pl-8 text-sm font-semibold",
className
)}
{...props}
/>
));
SelectLabel.displayName = SelectPrimitive.Label.displayName;
const SelectItem = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
>(({ className, children, ...props }, ref) => (
<SelectPrimitive.Item
ref={ref}
className={cn(
"focus:bg-slate-100 dark:focus:bg-slate-700 relative flex cursor-default select-none items-center rounded-sm py-1.5 pr-2 pl-8 text-sm font-medium outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
className
)}
{...props}
>
<span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
<SelectPrimitive.ItemIndicator>
<Check className="h-4 w-4" />
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
));
SelectItem.displayName = SelectPrimitive.Item.displayName;
const SelectSeparator = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
>(({ className, ...props }, ref) => (
<SelectPrimitive.Separator
ref={ref}
className={cn("bg-slate-100 dark:bg-slate-700 -mx-1 my-1 h-px", className)}
{...props}
/>
));
SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
export {
Select,
SelectGroup,
SelectValue,
SelectTrigger,
SelectContent,
SelectLabel,
SelectItem,
SelectSeparator
};

29
src/components/UI/Seperator.tsx

@ -0,0 +1,29 @@
import * as React from "react";
import * as SeparatorPrimitive from "@radix-ui/react-separator";
import { cn } from "@core/utils/cn.js";
const Separator = React.forwardRef<
React.ElementRef<typeof SeparatorPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
>(
(
{ className, orientation = "horizontal", decorative = true, ...props },
ref
) => (
<SeparatorPrimitive.Root
ref={ref}
decorative={decorative}
orientation={orientation}
className={cn(
"bg-slate-200 dark:bg-slate-700",
orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
className
)}
{...props}
/>
)
);
Separator.displayName = SeparatorPrimitive.Root.displayName;
export { Separator };

17
src/components/UI/Sidebar/SidebarSection.tsx

@ -0,0 +1,17 @@
import { H4 } from "../Typography/H4.js";
export interface SidebarSectionProps {
label: string;
subheader?: string;
children: React.ReactNode;
}
export const SidebarSection = ({
label: title,
children
}: SidebarSectionProps): JSX.Element => (
<div className="px-4 py-2">
<H4 className="mb-2 ml-2">{title}</H4>
<div className="space-y-1">{children}</div>
</div>
);

29
src/components/UI/Sidebar/sidebarButton.tsx

@ -0,0 +1,29 @@
import type { LucideIcon } from "lucide-react";
import { Button } from "../Button.js";
export interface SidebarButtonProps {
label: string;
active?: boolean;
icon?: LucideIcon;
element?: JSX.Element;
onClick?: () => void;
}
export const SidebarButton = ({
label,
active,
icon: Icon,
element,
onClick
}: SidebarButtonProps): JSX.Element => (
<Button
onClick={onClick}
variant={active ? "subtle" : "ghost"}
size="sm"
className="w-full justify-start gap-2"
>
{Icon && <Icon size={16} />}
{element && element}
{label}
</Button>
);

27
src/components/UI/Switch.tsx

@ -0,0 +1,27 @@
import * as React from "react";
import * as SwitchPrimitives from "@radix-ui/react-switch";
import { cn } from "@core/utils/cn.js";
const Switch = React.forwardRef<
React.ElementRef<typeof SwitchPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
>(({ className, ...props }, ref) => (
<SwitchPrimitives.Root
className={cn(
"peer inline-flex h-[24px] w-[44px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=unchecked]:bg-slate-200 data-[state=checked]:bg-slate-900 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-900 dark:data-[state=unchecked]:bg-slate-700 dark:data-[state=checked]:bg-slate-400",
className
)}
{...props}
ref={ref}
>
<SwitchPrimitives.Thumb
className={cn(
"pointer-events-none block h-5 w-5 rounded-full bg-white shadow-lg ring-0 transition-transform data-[state=unchecked]:translate-x-0 data-[state=checked]:translate-x-5"
)}
/>
</SwitchPrimitives.Root>
));
Switch.displayName = SwitchPrimitives.Root.displayName;
export { Switch };

53
src/components/UI/Tabs.tsx

@ -0,0 +1,53 @@
import * as React from "react";
import * as TabsPrimitive from "@radix-ui/react-tabs";
import { cn } from "@core/utils/cn.js";
const Tabs = TabsPrimitive.Root;
const TabsList = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.List>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
>(({ className, ...props }, ref) => (
<TabsPrimitive.List
ref={ref}
className={cn(
"inline-flex items-center justify-center rounded-md bg-slate-100 p-1 dark:bg-slate-800",
className
)}
{...props}
/>
));
TabsList.displayName = TabsPrimitive.List.displayName;
const TabsTrigger = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
>(({ className, ...props }, ref) => (
<TabsPrimitive.Trigger
className={cn(
"inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5 text-sm font-medium text-slate-700 transition-all disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-slate-900 data-[state=active]:shadow-sm dark:text-slate-200 dark:data-[state=active]:bg-slate-900 dark:data-[state=active]:text-slate-100",
className
)}
{...props}
ref={ref}
/>
));
TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
const TabsContent = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
>(({ className, ...props }, ref) => (
<TabsPrimitive.Content
className={cn(
"mt-2 rounded-md border border-slate-200 p-6 dark:border-slate-700",
className
)}
{...props}
ref={ref}
/>
));
TabsContent.displayName = TabsPrimitive.Content.displayName;
export { Tabs, TabsList, TabsTrigger, TabsContent };

128
src/components/UI/Toast.tsx

@ -0,0 +1,128 @@
import * as React from "react";
import * as ToastPrimitives from "@radix-ui/react-toast";
import { VariantProps, cva } from "class-variance-authority";
import { X } from "lucide-react";
import { cn } from "@core/utils/cn.js";
const ToastProvider = ToastPrimitives.Provider;
const ToastViewport = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Viewport>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Viewport
ref={ref}
className={cn(
"fixed top-0 z-50 flex max-h-screen w-full flex-col-reverse p-4 sm:top-auto sm:bottom-0 sm:right-0 sm:flex-col md:max-w-[420px]",
className
)}
{...props}
/>
));
ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
const toastVariants = cva(
"data-[swipe=move]:transition-none grow-1 group relative pointer-events-auto flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full mt-4 data-[state=closed]:slide-out-to-right-full dark:border-slate-700 last:mt-0 sm:last:mt-4",
{
variants: {
variant: {
default:
"bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700",
destructive:
"group destructive bg-red-600 text-white border-red-600 dark:border-red-600"
}
},
defaultVariants: {
variant: "default"
}
}
);
const Toast = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
VariantProps<typeof toastVariants>
>(({ className, variant, ...props }, ref) => {
return (
<ToastPrimitives.Root
ref={ref}
className={cn(toastVariants({ variant }), className)}
{...props}
/>
);
});
Toast.displayName = ToastPrimitives.Root.displayName;
const ToastAction = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Action>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Action
ref={ref}
className={cn(
"inline-flex h-8 shrink-0 items-center justify-center rounded-md border border-slate-200 bg-transparent px-3 text-sm font-medium transition-colors hover:bg-slate-100 focus:outline-none focus:ring-2 focus:ring-slate-400 focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-red-100 group-[.destructive]:hover:border-slate-50 group-[.destructive]:hover:bg-red-100 group-[.destructive]:hover:text-red-600 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600 dark:border-slate-700 dark:text-slate-100 dark:hover:bg-slate-700 dark:hover:text-slate-100 dark:focus:ring-slate-400 dark:focus:ring-offset-slate-900 dark:data-[state=open]:bg-slate-800",
className
)}
{...props}
/>
));
ToastAction.displayName = ToastPrimitives.Action.displayName;
const ToastClose = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Close>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Close
ref={ref}
className={cn(
"absolute top-2 right-2 rounded-md p-1 text-slate-500 opacity-0 transition-opacity hover:text-slate-900 focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600 dark:hover:text-slate-50",
className
)}
toast-close=""
{...props}
>
<X className="h-4 w-4" />
</ToastPrimitives.Close>
));
ToastClose.displayName = ToastPrimitives.Close.displayName;
const ToastTitle = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Title>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Title
ref={ref}
className={cn("text-sm font-semibold", className)}
{...props}
/>
));
ToastTitle.displayName = ToastPrimitives.Title.displayName;
const ToastDescription = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Description>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Description
ref={ref}
className={cn("text-sm opacity-90", className)}
{...props}
/>
));
ToastDescription.displayName = ToastPrimitives.Description.displayName;
type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
type ToastActionElement = React.ReactElement<typeof ToastAction>;
export {
type ToastProps,
type ToastActionElement,
ToastProvider,
ToastViewport,
Toast,
ToastTitle,
ToastDescription,
ToastClose,
ToastAction
};

29
src/components/UI/Tooltip.tsx

@ -0,0 +1,29 @@
import * as React from "react";
import * as TooltipPrimitive from "@radix-ui/react-tooltip";
import { cn } from "@core/utils/cn.js";
const TooltipProvider = TooltipPrimitive.Provider;
const Tooltip = ({ ...props }) => <TooltipPrimitive.Root {...props} />;
Tooltip.displayName = TooltipPrimitive.Tooltip.displayName;
const TooltipTrigger = TooltipPrimitive.Trigger;
const TooltipContent = React.forwardRef<
React.ElementRef<typeof TooltipPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
>(({ className, sideOffset = 4, ...props }, ref) => (
<TooltipPrimitive.Content
ref={ref}
sideOffset={sideOffset}
className={cn(
"z-50 overflow-hidden rounded-md border border-slate-100 bg-white px-3 py-1.5 text-sm text-slate-700 shadow-md animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=top]:slide-in-from-bottom-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 dark:border-slate-800 dark:bg-slate-800 dark:text-slate-400",
className
)}
{...props}
/>
));
TooltipContent.displayName = TooltipPrimitive.Content.displayName;
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };

9
src/components/UI/Typography/Blockquote.tsx

@ -0,0 +1,9 @@
export interface BlockquoteProps {
children: React.ReactNode;
}
export const BlockQuote = ({ children }: BlockquoteProps): JSX.Element => (
<blockquote className="mt-6 border-l-2 border-slate-300 pl-6 italic text-slate-800 dark:border-slate-600 dark:text-slate-200">
{children}
</blockquote>
);

9
src/components/UI/Typography/Code.tsx

@ -0,0 +1,9 @@
export interface CodeProps {
children: React.ReactNode;
}
export const Code = ({ children }: CodeProps): JSX.Element => (
<code className="relative rounded bg-slate-100 py-[0.2rem] px-[0.3rem] font-mono text-sm font-semibold text-slate-900 dark:bg-slate-800 dark:text-slate-400">
{children}
</code>
);

9
src/components/UI/Typography/H1.tsx

@ -0,0 +1,9 @@
export interface H1Props {
children: React.ReactNode;
}
export const H1 = ({ children }: H1Props): JSX.Element => (
<h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">
{children}
</h1>
);

9
src/components/UI/Typography/H2.tsx

@ -0,0 +1,9 @@
export interface H2Props {
children: React.ReactNode;
}
export const H2 = ({ children }: H2Props): JSX.Element => (
<h2 className="scroll-m-20 border-b border-b-slate-200 pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0 dark:border-b-slate-700">
{children}
</h2>
);

9
src/components/UI/Typography/H3.tsx

@ -0,0 +1,9 @@
export interface H3Props {
children: React.ReactNode;
}
export const H3 = ({ children }: H3Props): JSX.Element => (
<h3 className="scroll-m-20 text-2xl font-semibold tracking-tight">
{children}
</h3>
);

17
src/components/UI/Typography/H4.tsx

@ -0,0 +1,17 @@
import { cn } from "@app/core/utils/cn.js";
export interface H4Props {
className?: string;
children: React.ReactNode;
}
export const H4 = ({ className, children }: H4Props): JSX.Element => (
<h4
className={cn(
"scroll-m-20 text-xl font-semibold tracking-tight",
className
)}
>
{children}
</h4>
);

15
src/components/UI/Typography/Link.tsx

@ -0,0 +1,15 @@
export interface LinkProps {
href: string;
children: React.ReactNode;
}
export const Link = ({ href, children }: LinkProps): JSX.Element => (
<a
href={href}
target={"_blank"}
rel="noopener noreferrer"
className="font-medium text-slate-900 underline underline-offset-4 dark:text-slate-50"
>
{children}
</a>
);

7
src/components/UI/Typography/P.tsx

@ -0,0 +1,7 @@
export interface PProps {
children: React.ReactNode;
}
export const P = ({ children }: PProps): JSX.Element => (
<p className="leading-7 [&:not(:first-child)]:mt-6">{children}</p>
);

7
src/components/UI/Typography/Subtle.tsx

@ -0,0 +1,7 @@
export interface SubtleProps {
children: React.ReactNode;
}
export const Subtle = ({ children }: SubtleProps): JSX.Element => (
<p className="text-sm text-slate-500 dark:text-slate-400">{children}</p>
);

77
src/components/Widgets/BatteryWidget.tsx

@ -1,77 +0,0 @@
import { useEffect, useState } from "react";
import prettyMilliseconds from "pretty-ms";
import { useDevice } from "@core/providers/useDevice.js";
import { Battery100Icon, ClockIcon } from "@heroicons/react/24/outline";
export interface BatteryWidgetProps {
batteryLevel: number;
voltage: number;
}
export const BatteryWidget = ({
batteryLevel,
voltage
}: BatteryWidgetProps): JSX.Element => {
const { nodes, hardware } = useDevice();
const [timeRemaining, setTimeRemaining] = useState("Unknown");
useEffect(() => {
const stats = nodes.find(
(n) => n.data.num === hardware.myNodeNum
)?.deviceMetrics;
if (stats) {
let currentStat: number | undefined = undefined;
let currentTime = new Date();
let previousStat: number | undefined = undefined;
let previousTime = new Date();
for (const stat of [...stats].reverse()) {
if (stat.metric.batteryLevel) {
if (!currentStat) {
currentStat = stat.metric.batteryLevel;
currentTime = stat.timestamp;
} else {
previousStat = stat.metric.batteryLevel;
previousTime = stat.timestamp;
break;
}
}
}
if (currentStat && previousStat) {
const timeDiff = currentTime.getTime() - previousTime.getTime();
const statDiff = Math.abs(currentStat - previousStat);
if (statDiff !== 0) {
//convert to ms/%
const msPerPercent = timeDiff / statDiff;
const formatted = prettyMilliseconds(
(100 - currentStat) * msPerPercent
);
setTimeRemaining(formatted);
}
} else setTimeRemaining("Unknown");
}
}, [hardware.myNodeNum, nodes]);
return (
<div className="flex gap-3 overflow-hidden rounded-lg bg-backgroundPrimary p-3 text-textSecondary">
<div className="rounded-md bg-accent p-3 text-textPrimary">
<Battery100Icon className="h-6" />
</div>
<div>
<p className="truncate text-sm font-medium">Battery State</p>
<div className="flex gap-1">
<p className="text-xl font-semibold">{batteryLevel}%</p>
<div className="flex text-sm font-semibold">
<ClockIcon
className="h-5 w-5 flex-shrink-0 self-center"
aria-hidden="true"
/>
<span className="my-auto">{timeRemaining}</span>
</div>
</div>
</div>
</div>
);
};

39
src/components/Widgets/DeviceWidget.tsx

@ -1,39 +0,0 @@
import { Button } from "@components/form/Button.js";
import { Hashicon } from "@emeraldpay/hashicon-react";
import { XCircleIcon } from "@heroicons/react/24/outline";
export interface DeviceWidgetProps {
name: string;
nodeNum: string;
disconnected: boolean;
disconnect: () => void;
reconnect: () => void;
}
export const DeviceWidget = ({
name,
nodeNum,
disconnected,
disconnect,
reconnect
}: DeviceWidgetProps): JSX.Element => {
return (
<div className="relative flex shrink-0 flex-col overflow-hidden rounded-md text-sm text-textPrimary">
<div className="flex bg-backgroundPrimary p-3">
<div>
<Hashicon size={96} value={nodeNum} />
</div>
<div className="flex w-full flex-col">
<span className="ml-auto whitespace-nowrap text-xl font-bold">
{name}
</span>
<div className="my-auto ml-auto">
<Button onClick={disconnected ? reconnect : disconnect} size="sm">
<span>{disconnected ? "Reconnect" : "Disconnect"}</span>
</Button>
</div>
</div>
</div>
</div>
);
};

44
src/components/Widgets/PeersWidget.tsx

@ -1,44 +0,0 @@
import { useDevice } from "@core/providers/useDevice.js";
import { IconButton } from "@components/form/IconButton.js";
import { Mono } from "@components/generic/Mono.js";
import {
EllipsisHorizontalIcon,
UserGroupIcon
} from "@heroicons/react/24/outline";
import type { Protobuf } from "@meshtastic/meshtasticjs";
export interface PeersWidgetProps {
peers: Protobuf.NodeInfo[];
}
export const PeersWidget = ({ peers }: PeersWidgetProps): JSX.Element => {
const { setActivePage } = useDevice();
return (
<div className="flex gap-3 overflow-hidden rounded-lg bg-backgroundPrimary p-3 text-textSecondary">
<div className="rounded-md bg-accent p-3">
<UserGroupIcon className="h-6 text-textPrimary" />
</div>
<div>
<p className="truncate text-sm font-medium">Peers</p>
<div className="flex gap-1">
{peers.length > 0 ? (
<p className="text-lg font-semibold">
{`${peers.length} ${peers.length > 1 ? "Peers" : "Peer"}`}
</p>
) : (
<Mono className="m-auto">None Discovered.</Mono>
)}
</div>
</div>
<IconButton
className="my-auto ml-auto"
size="sm"
onClick={() => {
setActivePage("peers");
}}
icon={<EllipsisHorizontalIcon className="h-4" />}
/>
</div>
);
};

21
src/components/Widgets/PositionWidget.tsx

@ -1,21 +0,0 @@
import { MapPinIcon } from "@heroicons/react/24/outline";
export interface PositionWidgetProps {
grid: string;
}
export const PositionWidget = ({ grid }: PositionWidgetProps): JSX.Element => {
return (
<div className="flex gap-3 overflow-hidden rounded-lg bg-backgroundPrimary p-3 text-textSecondary">
<div className="rounded-md bg-accent p-3 text-textPrimary">
<MapPinIcon className="text-white h-6" />
</div>
<div>
<p className="truncate text-sm font-medium">Current Location</p>
<div className="flex gap-1">
<p className="text-lg font-semibold">{grid}</p>
</div>
</div>
</div>
);
};

6
src/components/form/BitwiseSelect.tsx

@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { bitwiseDecode, bitwiseEncode, enumLike } from "@core/utils/bitwise.js"; import { bitwiseDecode, bitwiseEncode, enumLike } from "@core/utils/bitwise.js";
import { InfoWrapper } from "@components/form/InfoWrapper.js"; import { InfoWrapper } from "@components/form/InfoWrapper.js";
import { Listbox } from "@headlessui/react"; // import { Listbox } from "@headlessui/react";
import { Protobuf } from "@meshtastic/meshtasticjs"; import { Protobuf } from "@meshtastic/meshtasticjs";
export interface BitwiseSelectProps { export interface BitwiseSelectProps {
@ -50,7 +50,7 @@ export const BitwiseSelect = ({
return ( return (
<InfoWrapper label={label} description={description} error={error}> <InfoWrapper label={label} description={description} error={error}>
<Listbox {/* <Listbox
value={bitwiseDecode(selected, decodeEnun)} value={bitwiseDecode(selected, decodeEnun)}
onChange={(value) => { onChange={(value) => {
onChange(bitwiseEncode(value)); onChange(bitwiseEncode(value));
@ -71,7 +71,7 @@ export const BitwiseSelect = ({
</Listbox.Option> </Listbox.Option>
))} ))}
</Listbox.Options> </Listbox.Options>
</Listbox> </Listbox> */}
</InfoWrapper> </InfoWrapper>
); );
}; };

35
src/components/form/Button.tsx

@ -1,35 +0,0 @@
import type { ButtonHTMLAttributes, ComponentType, SVGProps } from "react";
export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
size?: "sm" | "md" | "lg";
}
export const Button = ({
size = "md",
children,
disabled,
className,
...rest
}: ButtonProps): JSX.Element => {
return (
<button
className={`flex w-full select-none rounded-md bg-accentMuted px-3 text-textPrimary hover:brightness-hover focus:outline-none active:brightness-press ${
size === "sm"
? "h-8 text-sm"
: size === "md"
? "h-10 text-sm"
: "h-10 text-base"
} ${
disabled
? "cursor-not-allowed text-textSecondary brightness-disabled hover:brightness-disabled"
: ""
} ${className}`}
disabled={disabled}
{...rest}
>
<div className="m-auto flex shrink-0 items-center gap-2 font-medium">
{children}
</div>
</button>
);
};

22
src/components/form/Form.tsx

@ -1,22 +0,0 @@
import type { FormEvent, HTMLProps } from "react";
export interface FormProps extends HTMLProps<HTMLFormElement> {
onSubmit?: (event: FormEvent<HTMLFormElement>) => Promise<void>;
}
export const Form = ({
children,
onSubmit,
...props
}: FormProps): JSX.Element => {
return (
<form
className="w-full rounded-md bg-backgroundSecondary px-2"
onSubmit={onSubmit}
onChange={onSubmit}
{...props}
>
<div className="flex flex-col gap-3 p-4">{children}</div>
</form>
);
};

31
src/components/form/IconButton.tsx

@ -1,31 +0,0 @@
import type { ButtonHTMLAttributes } from "react";
export interface IconButtonProps
extends ButtonHTMLAttributes<HTMLButtonElement> {
size?: "sm" | "md" | "lg";
icon?: JSX.Element;
}
export const IconButton = ({
size = "md",
icon,
disabled,
className,
...rest
}: IconButtonProps): JSX.Element => {
return (
<button
className={`flex rounded-md bg-accentMuted text-textPrimary hover:brightness-hover focus:outline-none active:brightness-press ${
size === "sm" ? "h-8 w-8" : size === "md" ? "h-10 w-10" : "h-12 w-12"
} ${
disabled
? "cursor-not-allowed text-textSecondary brightness-disabled hover:brightness-disabled"
: ""
} ${className ?? ""}`}
disabled={disabled}
{...rest}
>
<div className="m-auto">{icon}</div>
</button>
);
};

6
src/components/form/InfoWrapper.tsx

@ -1,4 +1,4 @@
import { ExclamationCircleIcon } from "@heroicons/react/24/outline"; import { AlertCircleIcon } from "lucide-react";
import type { ReactNode } from "react"; import type { ReactNode } from "react";
export interface InfoWrapperProps { export interface InfoWrapperProps {
@ -26,13 +26,13 @@ export const InfoWrapper = ({
{children} {children}
{error && ( {error && (
<div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3"> <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
<ExclamationCircleIcon className="text-red-500 h-5 w-5" /> <AlertCircleIcon size={16} className="text-red-500" />
</div> </div>
)} )}
{description && ( {description && (
<p className="mt-2 text-sm text-textSecondary">{description}</p> <p className="mt-2 text-sm text-textSecondary">{description}</p>
)} )}
{error && <p className="text-red-600 mt-2 text-sm">{error}</p>} {error && <p className="mt-2 text-sm text-red-600">{error}</p>}
</div> </div>
); );
}; };

4
src/components/form/Input.tsx

@ -1,6 +1,6 @@
import { forwardRef, InputHTMLAttributes } from "react"; import { forwardRef, InputHTMLAttributes } from "react";
import { InfoWrapper, InfoWrapperProps } from "@components/form/InfoWrapper.js"; import { InfoWrapper, InfoWrapperProps } from "@components/form/InfoWrapper.js";
import { ExclamationCircleIcon } from "@heroicons/react/24/outline"; import { AlertCircleIcon } from "lucide-react";
export interface InputProps export interface InputProps
extends InputHTMLAttributes<HTMLInputElement>, extends InputHTMLAttributes<HTMLInputElement>,
@ -63,7 +63,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
)} )}
{error && ( {error && (
<div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3"> <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
<ExclamationCircleIcon className="text-red-500 h-5 w-5" /> <AlertCircleIcon size={16} className="text-red-500" />
</div> </div>
)} )}
</div> </div>

61
src/components/form/Select.tsx

@ -1,61 +0,0 @@
import { forwardRef, SelectHTMLAttributes } from "react";
import { InfoWrapper, InfoWrapperProps } from "@components/form/InfoWrapper.js";
export interface SelectProps
extends SelectHTMLAttributes<HTMLSelectElement>,
Omit<InfoWrapperProps, "children"> {
options?: string[];
action?: {
icon: JSX.Element;
action: () => void;
};
}
export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Input(
{
label,
description,
options,
action,
disabled,
error,
children,
...rest
}: SelectProps,
ref
) {
return (
<InfoWrapper label={label} description={description} error={error}>
<div className="flex rounded-md">
<select
ref={ref}
className={`flex h-10 w-full rounded-md border-transparent bg-backgroundPrimary px-3 text-sm text-textPrimary focus:border-transparent focus:outline-none focus:ring-2 focus:ring-accent ${
action ? "rounded-r-none" : ""
} ${
disabled
? "cursor-not-allowed text-textSecondary brightness-disabled hover:brightness-disabled"
: ""
}`}
disabled={disabled}
{...rest}
>
{options &&
options.map((option, index) => (
<option key={index}>{option}</option>
))}
{children}
</select>
{action && (
<button
type="button"
onClick={action.action}
className="relative -ml-px inline-flex items-center space-x-2 rounded-r-md bg-backgroundPrimary px-4 py-2 text-sm font-medium text-textSecondary brightness-hover hover:brightness-hover focus:outline-none focus:ring-2 focus:ring-accent active:brightness-press"
>
{action.icon}
</button>
)}
</div>
</InfoWrapper>
);
});

41
src/components/form/Toggle.tsx

@ -1,11 +1,11 @@
import { Switch } from "@headlessui/react"; import { Switch } from "../UI/Switch.js";
import { InfoWrapper } from "./InfoWrapper.js";
export interface ToggleProps { export interface ToggleProps {
checked: boolean; checked: boolean;
label?: string; label?: string;
description?: string; description?: string;
disabled?: boolean; disabled?: boolean;
className?: string;
onChange?: (checked: boolean) => void; onChange?: (checked: boolean) => void;
} }
@ -14,44 +14,15 @@ export const Toggle = ({
label, label,
description, description,
disabled, disabled,
className,
onChange onChange
}: ToggleProps): JSX.Element => { }: ToggleProps): JSX.Element => {
return ( return (
<Switch.Group <InfoWrapper label={label} description={description}>
as="div"
className={`flex items-center justify-between ${className}`}
>
<span className="flex flex-grow flex-col">
{label && (
<Switch.Label
as="span"
className="block text-sm font-medium text-textPrimary"
passive
>
{label}
</Switch.Label>
)}
{description && (
<Switch.Description as="span" className="text-sm text-textSecondary">
{description}
</Switch.Description>
)}
</span>
<Switch <Switch
checked={checked} checked={checked}
disabled={disabled} disabled={disabled}
onChange={onChange} onCheckedChange={onChange}
className={`relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-accent ${ />
checked ? "bg-accent" : "bg-backgroundPrimary" </InfoWrapper>
} ${disabled ? "bg-orange-200 cursor-not-allowed" : ""}`}
>
<span
className={`pointer-events-none inline-block h-5 w-5 transform rounded-full bg-backgroundSecondary ring-0 transition duration-200 ease-in-out ${
checked ? "translate-x-5" : "translate-x-0"
}`}
/>
</Switch>
</Switch.Group>
); );
}; };

48
src/components/generic/Dialog.tsx

@ -1,48 +0,0 @@
import { IconButton } from "@components/form/IconButton.js";
import { Dialog as DialogUI } from "@headlessui/react";
import { XMarkIcon } from "@heroicons/react/24/outline";
import { ThemeController } from "@components/generic/ThemeController.js";
import { Blur } from "@components/generic/Blur.js";
import type { ReactNode } from "react";
export interface DialogProps {
title: string;
description: string;
isOpen: boolean;
close: () => void;
children: ReactNode;
}
export const Dialog = ({
title,
description,
isOpen,
close,
children
}: DialogProps): JSX.Element => {
return (
<DialogUI open={isOpen} onClose={close}>
<ThemeController>
<Blur />
<div className="fixed inset-0 flex items-center justify-center p-4">
<DialogUI.Panel>
<div className="flex bg-backgroundPrimary px-4 py-5 sm:px-6">
<div>
<h1 className="text-lg font-bold text-textPrimary">{title}</h1>
<h5 className="text-sm text-textSecondary">{description}</h5>
</div>
<IconButton
onClick={close}
className="my-auto ml-auto"
size="sm"
icon={<XMarkIcon className="h-4" />}
/>
</div>
<div className="bg-backgroundSecondary p-4">{children}</div>
</DialogUI.Panel>
</div>
</ThemeController>
</DialogUI>
);
};

97
src/components/generic/TabbedContent.tsx

@ -1,97 +0,0 @@
import { Fragment } from "react";
import { Mono } from "@components/generic/Mono";
import { Tab } from "@headlessui/react";
export interface TabType {
label: string;
icon?: JSX.Element;
element: () => JSX.Element;
disabled?: boolean;
disabledMessage?: string;
disabledLink?: string;
}
export interface TabbedCOntentAction {
icon: JSX.Element;
action: () => void;
}
export interface TabbedContentProps {
tabs: TabType[];
actions?: TabbedCOntentAction[];
}
export const TabbedContent = ({
tabs,
actions
}: TabbedContentProps): JSX.Element => {
return (
<Tab.Group as="div" className="flex flex-grow flex-col">
<Tab.List className="flex bg-backgroundPrimary">
{tabs.map((entry, index) => (
<Tab key={index} disabled={entry.disabled}>
{({ selected }) => (
<div
className={`flex h-10 gap-3 truncate border-b-4 px-3 text-sm font-medium ${
selected
? "border-accent text-textPrimary"
: "border-backgroundPrimary text-textSecondary hover:text-textPrimary"
} ${
entry.disabled
? "cursor-not-allowed hover:text-textSecondary"
: "cursor-pointer bg-backgroundPrimary hover:brightness-hover active:brightness-press"
}
`}
>
{entry.icon && (
<div className="text-slate-500 m-auto">{entry.icon}</div>
)}
<span className="m-auto">{entry.label}</span>
</div>
)}
</Tab>
))}
<div className="ml-auto flex">
{actions?.map((action, index) => (
<div
key={index}
className="my-auto cursor-pointer bg-backgroundPrimary p-3 text-textSecondary hover:brightness-hover active:brightness-press"
onClick={action.action}
>
{action.icon}
</div>
))}
</div>
</Tab.List>
<Tab.Panels as={Fragment}>
{tabs.map((entry, index) => (
<Tab.Panel key={index} className="m-2 flex flex-grow">
{!entry.disabled ? (
<entry.element />
) : (
<div>
<Mono>
{entry.disabledMessage || "This tab is disabled"}.{" "}
{entry.disabledLink && (
<>
Click{" "}
<a
className="underline"
target="_blank"
rel="noreferrer"
href={entry.disabledLink}
>
here
</a>{" "}
for more information.
</>
)}
</Mono>
</div>
)}
</Tab.Panel>
))}
</Tab.Panels>
</Tab.Group>
);
};

6
src/components/generic/Table/index.tsx

@ -1,4 +1,4 @@
import { ChevronUpIcon } from "@heroicons/react/24/outline"; import { ChevronUpIcon } from "lucide-react";
export interface TableProps { export interface TableProps {
headings: Heading[]; headings: Heading[];
@ -28,7 +28,9 @@ export const Table = ({ headings, rows }: TableProps): JSX.Element => {
> >
<div className="flex gap-2"> <div className="flex gap-2">
{heading.title} {heading.title}
{heading.sortable && <ChevronUpIcon className="my-auto h-3" />} {heading.sortable && (
<ChevronUpIcon size={16} className="my-auto" />
)}
</div> </div>
</th> </th>
))} ))}

49
src/components/generic/VerticalTabbedContent.tsx

@ -1,49 +0,0 @@
import { Fragment } from "react";
import { Mono } from "@components/generic/Mono";
import { Tab } from "@headlessui/react";
export interface TabType {
label: string;
element: () => JSX.Element;
disabled?: boolean;
}
export interface TabbedContentProps {
tabs: TabType[];
}
export const VerticalTabbedContent = ({
tabs
}: TabbedContentProps): JSX.Element => {
return (
<Tab.Group as="div" className="flex w-full gap-3">
<Tab.List className="flex w-44 flex-col">
{tabs.map((tab, index) => (
<Tab key={index} as={Fragment}>
{({ selected }) => (
<div
className={`flex cursor-pointer items-center border-l-4 p-4 text-sm font-medium ${
selected
? "border-accent bg-accentMuted bg-opacity-10 text-textPrimary"
: "border-backgroundPrimary text-textSecondary"
}`}
>
{tab.label}
<span className="ml-auto rounded-full bg-accent px-3 text-textPrimary">
3
</span>
</div>
)}
</Tab>
))}
</Tab.List>
<Tab.Panels as={Fragment}>
{tabs.map((tab, index) => (
<Tab.Panel key={index} as={Fragment}>
<tab.element />
</Tab.Panel>
))}
</Tab.Panels>
</Tab.Group>
);
};

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save