Browse Source

WIP form overhaul

pull/83/head
Sacha Weatherstone 3 years ago
parent
commit
66b6633822
No known key found for this signature in database GPG Key ID: 7AB2D7E206124B31
  1. 28
      package.json
  2. 594
      pnpm-lock.yaml
  3. 10
      src/App.tsx
  4. 171
      src/components/CommandPalette.tsx
  5. 30
      src/components/CommandPalette/GroupView.tsx
  6. 13
      src/components/CommandPalette/NoResults.tsx
  7. 40
      src/components/CommandPalette/PaletteTransition.tsx
  8. 22
      src/components/CommandPalette/SearchBox.tsx
  9. 80
      src/components/CommandPalette/SearchResult.tsx
  10. 104
      src/components/Dashboard.tsx
  11. 10
      src/components/DeviceSelector.tsx
  12. 26
      src/components/Dialog/DeviceNameDialog.tsx
  13. 15
      src/components/Dialog/ImportDialog.tsx
  14. 4
      src/components/Dialog/QRDialog.tsx
  15. 2
      src/components/Dialog/RebootDialog.tsx
  16. 2
      src/components/Dialog/ShutdownDialog.tsx
  17. 227
      src/components/DynamicForm.tsx
  18. 57
      src/components/Menu.tsx
  19. 77
      src/components/NewDevice.tsx
  20. 21
      src/components/PageComponents/Channel.tsx
  21. 110
      src/components/PageComponents/Config/Bluetooth.tsx
  22. 127
      src/components/PageComponents/Config/Device.tsx
  23. 176
      src/components/PageComponents/Config/Display.tsx
  24. 285
      src/components/PageComponents/Config/LoRa.tsx
  25. 271
      src/components/PageComponents/Config/Network.tsx
  26. 5
      src/components/PageComponents/Config/Position.tsx
  27. 165
      src/components/PageComponents/Config/Power.tsx
  28. 2
      src/components/PageComponents/Connect/BLE.tsx
  29. 4
      src/components/PageComponents/Connect/HTTP.tsx
  30. 2
      src/components/PageComponents/Connect/Serial.tsx
  31. 9
      src/components/PageComponents/Messages/MessageInput.tsx
  32. 8
      src/components/PageComponents/Messages/NewLocationMessage.tsx
  33. 11
      src/components/PageComponents/ModuleConfig/Audio.tsx
  34. 11
      src/components/PageComponents/ModuleConfig/CannedMessage.tsx
  35. 5
      src/components/PageComponents/ModuleConfig/ExternalNotification.tsx
  36. 5
      src/components/PageComponents/ModuleConfig/MQTT.tsx
  37. 5
      src/components/PageComponents/ModuleConfig/RangeTest.tsx
  38. 15
      src/components/PageComponents/ModuleConfig/Serial.tsx
  39. 5
      src/components/PageComponents/ModuleConfig/StoreForward.tsx
  40. 5
      src/components/PageComponents/ModuleConfig/Telemetry.tsx
  41. 45
      src/components/Sidebar.tsx
  42. 12
      src/components/Topbar.tsx
  43. 156
      src/components/UI/Command.tsx
  44. 24
      src/components/UI/Input.tsx
  45. 30
      src/components/UI/Sidebar/SidebarItem.tsx
  46. 27
      src/components/UI/Sidebar/SidebarSection.tsx
  47. 29
      src/components/UI/Sidebar/sidebarButton.tsx
  48. 22
      src/components/UI/Toast.tsx
  49. 2
      src/components/UI/Typography/H2.tsx
  50. 2
      src/components/UI/Typography/H3.tsx
  51. 12
      src/components/UI/Typography/H4.tsx
  52. 6
      src/components/form/BitwiseSelect.tsx
  53. 35
      src/components/form/Button.tsx
  54. 22
      src/components/form/Form.tsx
  55. 61
      src/components/form/Select.tsx
  56. 4
      src/components/form/Toggle.tsx
  57. 4
      src/core/stores/appStore.ts
  58. 13
      src/core/utils/selectEnumOptions.tsx
  59. 4
      src/index.css
  60. 13
      src/pages/Channels.tsx
  61. 2
      src/pages/Config/DeviceConfig.tsx
  62. 2
      src/pages/Config/ModuleConfig.tsx
  63. 23
      src/pages/Config/index.tsx
  64. 38
      src/pages/Map.tsx
  65. 40
      src/pages/Messages.tsx
  66. 6
      src/pages/Peers.tsx
  67. 6
      src/validation/config/device.ts
  68. 3
      src/validation/config/lora.ts
  69. 22
      src/validation/rasterSource.ts

28
package.json

@ -20,10 +20,9 @@
"homepage": "https://meshtastic.org",
"dependencies": {
"@emeraldpay/hashicon-react": "^0.5.2",
"@headlessui/react": "^1.7.9",
"@hookform/error-message": "^2.0.1",
"@hookform/resolvers": "^2.9.10",
"@meshtastic/meshtasticjs": "2.0.15-0",
"@hookform/resolvers": "^2.9.11",
"@meshtastic/meshtasticjs": "2.0.20-1",
"@radix-ui/react-dialog": "^1.0.2",
"@radix-ui/react-label": "^2.0.0",
"@radix-ui/react-menubar": "^1.0.0",
@ -41,37 +40,38 @@
"class-validator": "^0.14.0",
"class-variance-authority": "^0.4.0",
"clsx": "^1.2.1",
"cmdk": "^0.1.22",
"geodesy": "^2.4.0",
"i18next": "^22.4.9",
"immer": "^9.0.19",
"lucide-react": "^0.109.0",
"lucide-react": "^0.112.0",
"mapbox-gl": "npm:empty-npm-package@^1.0.0",
"maplibre-gl": "2.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.43.0",
"react-hook-form": "^7.43.1",
"react-map-gl": "^7.0.21",
"react-qrcode-logo": "^2.8.0",
"rfc4648": "^1.5.2",
"tailwind-merge": "^1.9.0",
"tailwind-merge": "^1.9.1",
"tailwindcss-animate": "^1.0.5",
"timeago-react": "^3.0.5",
"zustand": "4.3.2"
"zustand": "4.3.3"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.3",
"@types/chrome": "^0.0.212",
"@types/geodesy": "^2.2.3",
"@types/node": "^18.11.18",
"@types/node": "^18.13.0",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"@types/w3c-web-serial": "^1.0.3",
"@types/web-bluetooth": "^0.0.16",
"@typescript-eslint/eslint-plugin": "^5.50.0",
"@typescript-eslint/parser": "^5.50.0",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"@vitejs/plugin-react": "^3.1.0",
"autoprefixer": "^10.4.13",
"eslint": "^8.33.0",
"eslint": "^8.34.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5",
@ -79,15 +79,15 @@
"eslint-plugin-react-hooks": "^4.6.0",
"gzipper": "^7.2.0",
"postcss": "^8.4.21",
"prettier": "^2.8.3",
"prettier": "^2.8.4",
"prettier-plugin-tailwindcss": "^0.2.2",
"rollup-plugin-visualizer": "^5.9.0",
"tailwindcss": "^3.2.4",
"tailwindcss": "^3.2.6",
"tar": "^6.1.13",
"tslib": "^2.5.0",
"typescript": "^4.9.5",
"vite": "^4.1.1",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-pwa": "^0.14.1"
"vite-plugin-pwa": "^0.14.4"
}
}

594
pnpm-lock.yaml

File diff suppressed because it is too large

10
src/App.tsx

@ -2,13 +2,12 @@ import { MapProvider } from "react-map-gl";
import { useAppStore } from "@core/stores/appStore.js";
import { DeviceWrapper } from "@app/DeviceWrapper.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 { DialogManager } from "@components/Dialog/DialogManager.js";
import { NewDevice } from "@components/NewDevice.js";
import { Dashboard } from "@app/components/Dashboard.js";
import { useDeviceStore } from "@core/stores/deviceStore.js";
import { ThemeController } from "@components/generic/ThemeController.js";
import { Menu } from "./components/Menu.js";
import { NewDeviceDialog } from "./components/Dialog/NewDevice.js";
export const App = (): JSX.Element => {
@ -28,8 +27,7 @@ export const App = (): JSX.Element => {
/>
<MapProvider>
<DeviceWrapper device={device}>
<div className="flex min-h-screen flex-col">
<Menu />
<div className="flex min-h-screen flex-col bg-backgroundPrimary text-textPrimary">
<div className="flex flex-grow">
<DeviceSelector />
<div className="flex flex-grow flex-col">
@ -40,7 +38,7 @@ export const App = (): JSX.Element => {
<PageRouter />
</div>
) : (
<NewDevice />
<Dashboard />
)}
</div>
</div>

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

@ -1,14 +1,8 @@
import { ComponentType, Fragment, SVGProps, useEffect, useState } from "react";
import { useDevice } from "@core/stores/deviceStore.js";
import { useEffect } from "react";
import { useAppStore } from "@core/stores/appStore.js";
import { useDeviceStore } from "@core/stores/deviceStore.js";
import { GroupView } from "@components/CommandPalette/GroupView.js";
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 { useDevice, useDeviceStore } from "@core/stores/deviceStore.js";
import { useCommandState } from "cmdk";
import { Hashicon } from "@emeraldpay/hashicon-react";
import { Combobox, Dialog, Transition } from "@headlessui/react";
import {
LucideIcon,
LinkIcon,
@ -18,7 +12,6 @@ import {
PlusIcon,
PowerIcon,
EraserIcon,
ImportIcon,
RefreshCwIcon,
FactoryIcon,
ArrowLeftRightIcon,
@ -34,8 +27,14 @@ import {
XCircleIcon,
BoxSelectIcon
} from "lucide-react";
import { Blur } from "@components/generic/Blur.js";
import { ThemeController } from "@components/generic/ThemeController.js";
import {
CommandDialog,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList
} from "@components/UI/Command.js";
export interface Group {
label: string;
@ -57,7 +56,6 @@ export interface SubItem {
}
export const CommandPalette = (): JSX.Element => {
const [query, setQuery] = useState("");
const {
commandPaletteOpen,
setCommandPaletteOpen,
@ -69,7 +67,6 @@ export const CommandPalette = (): JSX.Element => {
setAccent
} = useAppStore();
const { getDevices } = useDeviceStore();
const { setDialogOpen, setActivePage, connection } = useDevice();
const groups: Group[] = [
@ -344,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(() => {
const handleKeydown = (e: KeyboardEvent) => {
if (e.key === "k" && (e.metaKey || e.ctrlKey)) {
e.preventDefault();
setCommandPaletteOpen(true);
}
};
window.addEventListener("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 (
<Transition.Root
show={commandPaletteOpen}
as={Fragment}
afterLeave={() => setQuery("")}
appear
<CommandDialog
open={commandPaletteOpen}
onOpenChange={setCommandPaletteOpen}
>
<Dialog
as="div"
className="relative z-10"
onClose={setCommandPaletteOpen}
>
<ThemeController>
<Blur />
<PaletteTransition>
<Dialog.Panel className="mx-auto max-w-2xl transform overflow-hidden rounded-md bg-backgroundPrimary transition-all">
<Combobox<Command | string>
onChange={(input) => {
if (typeof input === "string") {
setQuery(input);
} else if (input.action) {
<CommandInput placeholder="Type a command or search..." />
<CommandList>
<CommandEmpty>No results found.</CommandEmpty>
{groups.map((group) => (
<CommandGroup heading={group.label}>
{group.commands.map((command) => (
<>
<CommandItem
onSelect={() => {
command.action && command.action();
setCommandPaletteOpen(false);
input.action();
}
}}
>
<SearchBox setQuery={setQuery} />
}}
>
<command.icon size={16} className="mr-2" />
{command.label}
</CommandItem>
{command.subItems &&
command.subItems.map((subItem) => (
<SubItem
label={subItem.label}
icon={subItem.icon}
action={subItem.action}
/>
))}
</>
))}
</CommandGroup>
))}
</CommandList>
</CommandDialog>
);
};
{query === "" || filtered.length > 0 ? (
<Combobox.Options
static
className="max-h-80 scroll-py-2 divide-y divide-opacity-10 overflow-y-auto bg-backgroundSecondary"
>
<li className="p-2">
<ul className="flex flex-col gap-2 text-sm text-textSecondary">
{filtered.map((group, index) => (
<SearchResult key={index} group={group} />
))}
{query === "" &&
groups.map((group, index) => (
<GroupView key={index} group={group} />
))}
</ul>
</li>
</Combobox.Options>
) : (
query !== "" && filtered.length === 0 && <NoResults />
)}
</Combobox>
</Dialog.Panel>
</PaletteTransition>
</ThemeController>
</Dialog>
</Transition.Root>
const SubItem = ({
label,
icon,
action
}: {
label: string;
icon: React.ReactNode;
action: () => void;
}) => {
const search = useCommandState((state) => state.search);
if (!search) return null;
return (
<CommandItem onSelect={action}>
{icon}
{label}
</CommandItem>
);
};

30
src/components/CommandPalette/GroupView.tsx

@ -1,30 +0,0 @@
import type { Group } from "@components/CommandPalette/Index.js";
import { Combobox } from "@headlessui/react";
import { ChevronRightIcon } from "lucide-react";
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 size={20} />
<span className="ml-3 flex-auto truncate">{group.label}</span>
{active && (
<ChevronRightIcon size={16} className="text-textSecondary" />
)}
</>
)}
</Combobox.Option>
);
};

13
src/components/CommandPalette/NoResults.tsx

@ -1,13 +0,0 @@
import { Mono } from "@components/generic/Mono.js";
import { TerminalSquareIcon } from "lucide-react";
export const NoResults = (): JSX.Element => {
return (
<div className="py-14 px-14 text-center">
<TerminalSquareIcon className="mx-auto 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>
</>
);
};

22
src/components/CommandPalette/SearchBox.tsx

@ -1,22 +0,0 @@
import { Combobox } from "@headlessui/react";
import { SearchIcon } from "lucide-react";
export interface SearchBoxProps {
setQuery: (query: string) => void;
}
export const SearchBox = ({ setQuery }: SearchBoxProps): JSX.Element => {
return (
<div className="relative">
<SearchIcon
size={20}
className="pointer-events-none absolute m-3.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>
);
};

80
src/components/CommandPalette/SearchResult.tsx

@ -1,80 +0,0 @@
import type { Group } from "@components/CommandPalette/Index.js";
import { Combobox } from "@headlessui/react";
import { ChevronRightIcon } from "lucide-react";
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
size={16}
className="flex-none text-gray-900 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 ? "bg-backgroundPrimary text-gray-900" : ""
}`
}
>
{({ active }) => (
<>
<command.icon
className={`h-4 flex-none text-gray-900 text-opacity-40 ${
active ? "text-opacity-100" : ""
}`}
/>
<span className="ml-3">{command.label}</span>
{active && (
<ChevronRightIcon
size={16}
className="ml-auto text-gray-400"
/>
)}
</>
)}
</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
? "bg-backgroundPrimary bg-opacity-5 text-gray-900"
: ""
}`
}
>
{({ active }) => (
<>
{item.icon}
<span className="ml-3">{item.label}</span>
{active && (
<ChevronRightIcon
size={16}
className="ml-auto text-gray-400"
/>
)}
</>
)}
</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>
);
};

10
src/components/DeviceSelector.tsx

@ -11,7 +11,6 @@ import {
TerminalIcon
} from "lucide-react";
import { Separator } from "./UI/Seperator.js";
import { cn } from "@app/core/utils/cn.js";
import { Code } from "./UI/Typography/Code.js";
import { SidebarButton } from "./SidebarButton.js";
@ -27,10 +26,15 @@ export const DeviceSelector = (): JSX.Element => {
} = useAppStore();
return (
<nav className="drag custom-border flex flex-col justify-between border-r-[0.5px] bg-transparent pt-2">
<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 flex-col overflow-y-hidden">
<ul className="flex w-20 grow flex-col items-center space-y-4 bg-transparent py-4 px-5">
<SidebarButton active={false} onClick={() => {}}>
<SidebarButton
active={selectedDevice === 0}
onClick={() => {
setSelectedDevice(0);
}}
>
<HomeIcon />
</SidebarButton>
{getDevices().map((device) => (

26
src/components/Dialog/DeviceNameDialog.tsx

@ -1,4 +1,4 @@
import { Input } from "@components/form/Input.js";
import { Input } from "@components/UI/Input.js";
import {
Dialog,
DialogContent,
@ -7,10 +7,11 @@ import {
DialogHeader,
DialogTitle
} from "@components/UI/Dialog.js";
import { Button } from "../form/Button.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;
@ -31,9 +32,9 @@ export const DeviceNameDialog = ({
const myNode = nodes.find((n) => n.data.num === hardware.myNodeNum);
const { register, handleSubmit } = useForm<User>({
defaultValues: {
longName: myNode?.data.user?.longName,
shortName: myNode?.data.user?.shortName
values: {
longName: myNode?.data.user?.longName ?? "Unknown",
shortName: myNode?.data.user?.shortName ?? "Unknown"
}
});
@ -58,17 +59,10 @@ export const DeviceNameDialog = ({
</DialogHeader>
<div className="gap-4">
<form onSubmit={onSubmit}>
<Input
label="Long Name"
description="Personalised name for this device."
{...register("longName")}
/>
<Input
label="Short Name"
description="Shown on small screens."
maxLength={4}
{...register("shortName")}
/>
<Label>Long Name</Label>
<Input {...register("longName")} />
<Label>Short Name</Label>
<Input maxLength={4} {...register("shortName")} />
</form>
</div>
<DialogFooter>

15
src/components/Dialog/ImportDialog.tsx

@ -11,10 +11,8 @@ import {
DialogTitle
} from "@components/UI/Dialog.js";
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 { Button } from "@components/form/Button.js";
import { Button } from "@components/UI/Button.js";
import { useDevice } from "@core/stores/deviceStore.js";
export interface ImportDialogProps {
@ -97,27 +95,26 @@ export const ImportDialog = ({
<div className="flex w-full gap-2">
<div className="w-36">
<Toggle
className="flex-col gap-2"
label="Use Preset?"
disabled
checked={channelSet?.loraConfig?.usePreset ?? true}
/>
</div>
<Select
{/* <Select
label="Modem Preset"
disabled
value={channelSet?.loraConfig?.modemPreset}
>
{renderOptions(Protobuf.Config_LoRaConfig_ModemPreset)}
</Select>
</Select> */}
</div>
<Select
{/* <Select
label="Region"
disabled
value={channelSet?.loraConfig?.region}
>
{renderOptions(Protobuf.Config_LoRaConfig_RegionCode)}
</Select>
</Select> */}
<span className="text-md block font-medium text-textPrimary">
Channels:
@ -138,7 +135,7 @@ export const ImportDialog = ({
)}
</div>
<DialogFooter>
<Button onClick={() => apply()} disabled={!validURL}>
<Button onClick={apply} disabled={!validURL}>
Apply
</Button>
</DialogFooter>

4
src/components/Dialog/QRDialog.tsx

@ -64,10 +64,6 @@ export const QRDialog = ({
{channels.map((channel) => (
<Checkbox
key={channel.index}
disabled={
channel.index === 0 ||
channel.role === Protobuf.Channel_Role.DISABLED
}
label={
channel.settings?.name.length
? channel.settings.name

2
src/components/Dialog/RebootDialog.tsx

@ -9,7 +9,7 @@ import {
DialogTitle
} from "@components/UI/Dialog.js";
import { ClockIcon, RefreshCwIcon } from "lucide-react";
import { Button } from "@components/form/Button.js";
import { Button } from "@components/UI/Button.js";
import { Input } from "@components/form/Input.js";
export interface RebootDialogProps {

2
src/components/Dialog/ShutdownDialog.tsx

@ -8,7 +8,7 @@ import {
DialogTitle
} from "@components/UI/Dialog.js";
import { ClockIcon, PowerIcon } from "lucide-react";
import { Button } from "@components/form/Button.js";
import { Button } from "@components/UI/Button.js";
import { Input } from "@components/form/Input.js";
export interface ShutdownDialogProps {

227
src/components/DynamicForm.tsx

@ -0,0 +1,227 @@
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" | "textarea";
suffix?: string;
}
interface SelectFieldProps<T> extends BasicFieldProps<T> {
type: "select";
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);
return (
(typeof value === "boolean" && field.invert ? value : !value) ||
(typeof value === "number" &&
(field.selector && field.invert
? !field.selector === value
: field.selector === value))
);
});
};
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 "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>
);
}
})}
</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>
);

57
src/components/Menu.tsx

@ -1,57 +0,0 @@
import {
Menubar,
MenubarContent,
MenubarItem,
MenubarMenu,
MenubarSeparator,
MenubarShortcut,
MenubarTrigger
} from "@app/components/UI/Menubar.js";
import { useAppStore } from "@app/core/stores/appStore.js";
export const Menu = (): JSX.Element => {
const { darkMode } = useAppStore();
return (
<Menubar className="rounded-none dark:bg-slate-900">
<MenubarMenu>
<MenubarTrigger>
<img
src={darkMode ? "Logo_White.svg" : "Logo_Black.svg"}
className="h-4"
/>
</MenubarTrigger>
<MenubarContent>
<MenubarItem>About Music</MenubarItem>
<MenubarSeparator />
<MenubarItem>
Preferences... <MenubarShortcut>,</MenubarShortcut>
</MenubarItem>
<MenubarSeparator />
<MenubarItem>
Hide Music... <MenubarShortcut>H</MenubarShortcut>
</MenubarItem>
<MenubarItem>
Hide Others... <MenubarShortcut>H</MenubarShortcut>
</MenubarItem>
<MenubarShortcut />
<MenubarItem>
Quit Music <MenubarShortcut>Q</MenubarShortcut>
</MenubarItem>
</MenubarContent>
</MenubarMenu>
<MenubarMenu>
<MenubarTrigger>File</MenubarTrigger>
<MenubarContent>
<MenubarItem>
New Tab <MenubarShortcut>T</MenubarShortcut>
</MenubarItem>
<MenubarItem>New Window</MenubarItem>
<MenubarSeparator />
<MenubarItem>Share</MenubarItem>
<MenubarSeparator />
<MenubarItem>Print</MenubarItem>
</MenubarContent>
</MenubarMenu>
</Menubar>
);
};

77
src/components/NewDevice.tsx

@ -1,77 +0,0 @@
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 { Tabs, TabsContent, TabsList, TabsTrigger } from "./UI/Tabs.js";
import { Subtle } from "./UI/Typography/Subtle.js";
import { Link } from "./UI/Typography/Link.js";
export const NewDevice = () => {
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"
}
];
return (
<div className="m-auto">
<Tabs defaultValue="HTTP" className="w-[400px]">
<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>
</>
)}
</div>
);
};

21
src/components/PageComponents/Channel.tsx

@ -2,9 +2,7 @@ import { useEffect, useState } from "react";
import { fromByteArray, toByteArray } from "base64-js";
import { Controller, useForm } from "react-hook-form";
import { ChannelSettingsValidation } from "@app/validation/channelSettings.js";
import { Form } from "@components/form/Form";
import { Input } from "@components/form/Input.js";
import { Select } from "@components/form/Select.js";
import { Toggle } from "@components/form/Toggle.js";
import { useDevice } from "@core/stores/deviceStore.js";
import { RefreshCwIcon, EyeIcon, EyeOffIcon } from "lucide-react";
@ -88,17 +86,8 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
});
return (
<div className="flex flex-grow flex-col gap-2">
{/* actions={[
{
label: "Apply",
async onClick() {
await onSubmit();
}
}
]} */}
<Form onSubmit={onSubmit}>
<div className="p-3">
<form onSubmit={onSubmit}>
{channel?.index !== 0 && (
<>
<Controller
@ -121,7 +110,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
/>
</>
)}
<Select
{/* <Select
label="Key Size"
description="Desired size of generated key."
value={keySize}
@ -141,7 +130,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
>
<option value={128}>128 Bit</option>
<option value={256}>256 Bit</option>
</Select>
</Select> */}
<Input
width="100%"
label="Pre-Shared Key"
@ -180,7 +169,7 @@ export const Channel = ({ channel }: SettingsPanelProps): JSX.Element => {
/>
)}
/>
</Form>
</form>
</div>
);
};

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

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

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

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

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

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

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

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

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

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

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

@ -5,7 +5,6 @@ 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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -110,7 +109,7 @@ export const Position = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="gpsEnabled"
control={control}
@ -227,6 +226,6 @@ export const Position = (): JSX.Element => {
type="number"
{...register("txGpio", { valueAsNumber: true })}
/>
</Form>
</form>
);
};

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

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

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

@ -1,6 +1,6 @@
import { useCallback, useEffect, useState } from "react";
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 { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js";

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

@ -1,7 +1,7 @@
import { Controller, useForm, useWatch } from "react-hook-form";
import { Input } from "@components/form/Input.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 { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js";
@ -70,7 +70,7 @@ export const HTTP = (): JSX.Element => {
)}
/>
</div>
<Button type="submit">
<Button>
<span>Connect</span>
</Button>
</form>

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

@ -1,6 +1,6 @@
import { useCallback, useEffect, useState } from "react";
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 { useDeviceStore } from "@core/stores/deviceStore.js";
import { subscribeAll } from "@core/subscriptions.js";

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

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

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

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

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

@ -1,12 +1,9 @@
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
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/stores/deviceStore.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -34,7 +31,7 @@ export const Audio = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="codec2Enabled"
control={control}
@ -53,13 +50,13 @@ export const Audio = (): JSX.Element => {
type="number"
{...register("pttPin", { valueAsNumber: true })}
/>
<Select
{/* <Select
label="Bitrate"
description="Enter a description."
{...register("bitrate", { valueAsNumber: true })}
>
{renderOptions(Protobuf.ModuleConfig_AudioConfig_Audio_Baud)}
</Select>
</Select> */}
<Input
label="i2SWs"
description="Enter a description."
@ -84,6 +81,6 @@ export const Audio = (): JSX.Element => {
type="number"
{...register("i2sSck", { valueAsNumber: true })}
/>
</Form>
</form>
);
};

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

@ -1,12 +1,9 @@
import { useEffect } from "react";
import { Controller, useForm, useWatch } from "react-hook-form";
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/stores/deviceStore.js";
import { renderOptions } from "@core/utils/selectEnumOptions.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -46,7 +43,7 @@ export const CannedMessage = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -87,7 +84,7 @@ export const CannedMessage = (): JSX.Element => {
disabled={moduleEnabled}
{...register("inputbrokerPinPress", { valueAsNumber: true })}
/>
<Select
{/* <Select
label="Clockwise event"
description="Select input event."
disabled={moduleEnabled}
@ -116,7 +113,7 @@ export const CannedMessage = (): JSX.Element => {
{renderOptions(
Protobuf.ModuleConfig_CannedMessageConfig_InputEventChar
)}
</Select>
</Select> */}
<Controller
name="updown1Enabled"
control={control}
@ -147,6 +144,6 @@ export const CannedMessage = (): JSX.Element => {
/>
)}
/>
</Form>
</form>
);
};

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

@ -3,7 +3,6 @@ import { Controller, useForm, useWatch } from "react-hook-form";
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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -38,7 +37,7 @@ export const ExternalNotification = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -193,6 +192,6 @@ export const ExternalNotification = (): JSX.Element => {
valueAsNumber: true
})}
/>
</Form>
</form>
);
};

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

@ -3,7 +3,6 @@ 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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -44,7 +43,7 @@ export const MQTT = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -101,6 +100,6 @@ export const MQTT = (): JSX.Element => {
/>
)}
/>
</Form>
</form>
);
};

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

@ -3,7 +3,6 @@ import { Controller, useForm, useWatch } from "react-hook-form";
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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -39,7 +38,7 @@ export const RangeTest = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -69,6 +68,6 @@ export const RangeTest = (): JSX.Element => {
/>
)}
/>
</Form>
</form>
);
};

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

@ -3,12 +3,9 @@ import { Controller, useForm, useWatch } from "react-hook-form";
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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
import { renderOptions } from "@core/utils/selectEnumOptions";
import { Select } from "@components/form/Select";
export const Serial = (): JSX.Element => {
const { moduleConfig, setWorkingModuleConfig } = useDevice();
@ -40,7 +37,7 @@ export const Serial = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -83,14 +80,14 @@ export const Serial = (): JSX.Element => {
valueAsNumber: true
})}
/>
<Select
{/* <Select
label="Baud Rate"
description="The serial baud rate"
disabled={!moduleEnabled}
{...register("baud", { valueAsNumber: true })}
>
{renderOptions(Protobuf.ModuleConfig_SerialConfig_Serial_Baud)}
</Select>
</Select> */}
<Input
type="number"
label="Timeout"
@ -101,14 +98,14 @@ export const Serial = (): JSX.Element => {
valueAsNumber: true
})}
/>
<Select
{/* <Select
label="Mode"
description="Select Mode"
disabled={!moduleEnabled}
{...register("mode", { valueAsNumber: true })}
>
{renderOptions(Protobuf.ModuleConfig_SerialConfig_Serial_Mode)}
</Select>
</Form>
</Select> */}
</form>
);
};

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

@ -3,7 +3,6 @@ import { Controller, useForm, useWatch } from "react-hook-form";
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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -39,7 +38,7 @@ export const StoreForward = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="enabled"
control={control}
@ -92,6 +91,6 @@ export const StoreForward = (): JSX.Element => {
valueAsNumber: true
})}
/>
</Form>
</form>
);
};

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

@ -3,7 +3,6 @@ import { Controller, useForm } from "react-hook-form";
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/stores/deviceStore.js";
import { classValidatorResolver } from "@hookform/resolvers/class-validator";
import { Protobuf } from "@meshtastic/meshtasticjs";
@ -33,7 +32,7 @@ export const Telemetry = (): JSX.Element => {
});
return (
<Form onSubmit={onSubmit}>
<form onChange={onSubmit}>
<Controller
name="environmentMeasurementEnabled"
control={control}
@ -79,6 +78,6 @@ export const Telemetry = (): JSX.Element => {
/>
)}
/>
</Form>
</form>
);
};

45
src/components/Sidebar.tsx

@ -7,10 +7,13 @@ import {
SettingsIcon,
LayersIcon,
UsersIcon,
EditIcon
EditIcon,
LayoutGrid
} from "lucide-react";
import { Subtle } from "./UI/Typography/Subtle.js";
import { SidebarItem } from "./UI/Sidebar/SidebarItem.js";
import { Button } from "./UI/Button.js";
import { SidebarSection } from "./UI/Sidebar/SidebarSection.js";
import { SidebarButton } from "./UI/Sidebar/sidebarButton.js";
export interface SidebarProps {
children?: React.ReactNode;
@ -56,38 +59,36 @@ export const Sidebar = ({ children }: SidebarProps): JSX.Element => {
];
return (
<div className="min-w-[220px] flex-col border-r-[0.5px] bg-transparent">
<div className="flex h-16 flex-col justify-center px-4">
<div className="flex items-center justify-between">
<div>
<span className="text-lg font-medium">
{myNode?.data.user?.shortName ?? "UNK"}
</span>
<Subtle>{myNode?.data.user?.longName ?? "UNK"}</Subtle>
</div>
<button
className="transition-all hover:text-accent"
onClick={() => setDialogOpen("deviceName", true)}
>
<EditIcon size={16} />
</button>
<div className="min-w-[280px] max-w-min flex-col border-r-[0.5px] border-slate-300 bg-transparent dark:border-slate-700">
<div className="flex justify-between px-8 py-6">
<div>
<span className="text-lg font-medium">
{myNode?.data.user?.shortName ?? "UNK"}
</span>
<Subtle>{myNode?.data.user?.longName ?? "UNK"}</Subtle>
</div>
<button
className="transition-all hover:text-accent"
onClick={() => setDialogOpen("deviceName", true)}
>
<EditIcon size={16} />
</button>
</div>
<div className="mx-2.5 space-y-2">
<SidebarSection label="Navigation">
{pages.map((link) => (
<SidebarItem
<SidebarButton
key={link.page}
label={link.name}
icon={link.icon}
active={link.page === activePage}
onClick={() => {
setActivePage(link.page);
}}
active={link.page === activePage}
/>
))}
{children}
</div>
</SidebarSection>
{children}
</div>
);
};

12
src/components/Topbar.tsx

@ -1,7 +1,7 @@
import { LucideIcon, AlignLeftIcon } from "lucide-react";
export interface PageLayoutProps {
title: string;
label: string;
children: React.ReactNode;
actions?: {
icon: LucideIcon;
@ -10,26 +10,24 @@ export interface PageLayoutProps {
}
export const PageLayout = ({
title,
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] md:h-16 md:px-4">
<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="text-palette-800 w-full text-lg font-medium">
{title}
</span>
<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()}
onClick={action.onClick}
>
<action.icon />
</button>

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
};

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 };

30
src/components/UI/Sidebar/SidebarItem.tsx

@ -1,30 +0,0 @@
import { cn } from "@app/core/utils/cn.js";
import type { LucideIcon } from "lucide-react";
export interface SidebarItemProps {
icon?: LucideIcon;
element?: JSX.Element;
onClick?: () => void;
active?: boolean;
label: string;
}
export const SidebarItem = ({
icon: Icon,
element,
onClick,
active,
label
}: SidebarItemProps): JSX.Element => (
<button
className={cn(
"text-palette-600 flex w-full cursor-pointer items-center space-x-2.5 rounded-xl bg-transparent px-2.5 py-2.5 transition-all duration-300 hover:text-accent",
active && "bg-backgroundPrimary text-accent"
)}
onClick={() => onClick && onClick()}
>
{element}
{Icon && <Icon size={16} />}
<span className="align-middle font-mono text-sm">{label}</span>
</button>
);

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

@ -1,32 +1,17 @@
import type { LucideIcon } from "lucide-react";
import { H4 } from "../Typography/H4.js";
export interface SidebarSectionProps {
title: string;
action?: {
icon: LucideIcon;
onClick: () => void;
};
label: string;
subheader?: string;
children: React.ReactNode;
}
export const SidebarSection = ({
title,
action,
label: title,
children
}: SidebarSectionProps): JSX.Element => (
<div className="space-y-1.5">
<div className="mb-2 flex items-center justify-between px-2">
<div className="font-medium">{title}</div>
{action && (
<button
className="transition-all duration-300 hover:text-accent"
onClick={() => action.onClick}
>
<action.icon size={16} />
</button>
)}
</div>
<ul className="space-y-1">{children}</ul>
<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>
);

22
src/components/UI/Toast.tsx

@ -4,7 +4,6 @@ import { VariantProps, cva } from "class-variance-authority";
import { X } from "lucide-react";
import { cn } from "@core/utils/cn.js";
import { buttonVariants } from "./Button.js";
const ToastProvider = ToastPrimitives.Provider;
@ -15,7 +14,7 @@ const ToastViewport = React.forwardRef<
<ToastPrimitives.Viewport
ref={ref}
className={cn(
"fixed bottom-6 right-6 z-50 max-h-screen w-full space-y-3 md:max-w-[400px]",
"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}
@ -24,17 +23,18 @@ const ToastViewport = React.forwardRef<
ToastViewport.displayName = ToastPrimitives.Viewport.displayName;
const toastVariants = cva(
"data-[swipe=move]:transition-none grow-1 group pointer-events-auto relative 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-bottom-full data-[state=closed]:slide-out-to-right-full dark:border-slate-700",
"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: {
status: {
variant: {
default:
"bg-white border-slate-200 dark:bg-slate-800 dark:border-slate-700",
destructive: "bg-red-500 text-white border-red-500"
destructive:
"group destructive bg-red-600 text-white border-red-600 dark:border-red-600"
}
},
defaultVariants: {
status: "default"
variant: "default"
}
}
);
@ -43,11 +43,11 @@ const Toast = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
VariantProps<typeof toastVariants>
>(({ className, status, ...props }, ref) => {
>(({ className, variant, ...props }, ref) => {
return (
<ToastPrimitives.Root
ref={ref}
className={cn(toastVariants({ status }), className)}
className={cn(toastVariants({ variant }), className)}
{...props}
/>
);
@ -61,8 +61,7 @@ const ToastAction = React.forwardRef<
<ToastPrimitives.Action
ref={ref}
className={cn(
buttonVariants({ size: "sm", variant: "outline" }),
"h-8 shrink-0 px-3",
"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}
@ -77,9 +76,10 @@ const ToastClose = React.forwardRef<
<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 group-hover:opacity-100 dark:hover:text-slate-50",
"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" />

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

@ -3,7 +3,7 @@ export interface H2Props {
}
export const H2 = ({ children }: H2Props): JSX.Element => (
<h2 className="mt-10 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">
<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>
);

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

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

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

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

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

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>
);
});

4
src/components/form/Toggle.tsx

@ -6,7 +6,7 @@ export interface ToggleProps {
label?: string;
description?: string;
disabled?: boolean;
onChange: (checked: boolean) => void;
onChange?: (checked: boolean) => void;
}
export const Toggle = ({
@ -21,7 +21,7 @@ export const Toggle = ({
<Switch
checked={checked}
disabled={disabled}
onCheckedChange={(state) => onChange(state)}
onCheckedChange={onChange}
/>
</InfoWrapper>
);

4
src/core/stores/appStore.ts

@ -4,7 +4,7 @@ import { create } from "zustand";
export interface RasterSource {
enabled: boolean;
title: string;
tiles: string[];
tiles: string;
tileSize: number;
}
@ -48,7 +48,7 @@ export const useAppStore = create<AppState>()((set) => ({
currentPage: "messages",
rasterSources: [],
commandPaletteOpen: false,
darkMode: true,
darkMode: false,
accent: "orange",
connectDialogOpen: false,

13
src/core/utils/selectEnumOptions.tsx

@ -1,13 +0,0 @@
export const renderOptions = (enumValue: {
[s: string]: string | number;
}): JSX.Element[] => {
const optionsEnumValues = enumValue
? Object.entries(enumValue).filter((value) => typeof value[1] === "number")
: [];
return optionsEnumValues.map(([name, value], index) => (
<option key={index} value={value}>
{name}
</option>
));
};

4
src/index.css

@ -3,7 +3,7 @@
@tailwind utilities;
:root {
--backgroundPrimary: #f5f5f6;
--backgroundPrimary: #ffffff;
--backgroundSecondary: #e6e9ed;
--textPrimary: #111132;
--textSecondary: #64748b;
@ -15,7 +15,7 @@
}
[data-theme="dark"] {
--backgroundPrimary: #2d2d30;
--backgroundPrimary: #0f172a;
--backgroundSecondary: #363638;
--textPrimary: #ebebeb;
--textSecondary: #bdbdbd;

13
src/pages/Channels.tsx

@ -6,8 +6,9 @@ import { useDevice } from "@core/stores/deviceStore.js";
import { QrCodeIcon, ImportIcon } from "lucide-react";
import { Protobuf, Types } from "@meshtastic/meshtasticjs";
import { SidebarSection } from "@app/components/UI/Sidebar/SidebarSection.js";
import { SidebarItem } from "@app/components/UI/Sidebar/SidebarItem.js";
import { useState } from "react";
import { Button } from "@app/components/UI/Button.js";
import { SidebarButton } from "@app/components/UI/Sidebar/sidebarButton.js";
export const getChannelName = (channel: Protobuf.Channel) =>
channel.settings?.name.length
@ -25,13 +26,12 @@ export const ChannelsPage = (): JSX.Element => {
return (
<>
<Sidebar>
<SidebarSection title="Channels">
<SidebarSection label="Channels">
{channels.map((channel) => (
<SidebarItem
<SidebarButton
label={getChannelName(channel.config)}
key={channel.config.index}
active={channel.config.index === activeChannel}
onClick={() => setActiveChannel(channel.config.index)}
label={getChannelName(channel.config)}
element={
<span
className={cn(
@ -42,12 +42,13 @@ export const ChannelsPage = (): JSX.Element => {
)}
/>
}
onClick={() => setActiveChannel(channel.config.index)}
/>
))}
</SidebarSection>
</Sidebar>
<PageLayout
title={`Channel: ${
label={`Channel: ${
channels[activeChannel]
? getChannelName(channels[activeChannel].config)
: "Loading..."

2
src/pages/Config/DeviceConfig.tsx

@ -51,7 +51,7 @@ export const DeviceConfig = (): JSX.Element => {
];
return (
<Tabs defaultValue="Device" className="w-[400px]">
<Tabs defaultValue="Device">
<TabsList>
{tabs.map((tab) => (
<TabsTrigger

2
src/pages/Config/ModuleConfig.tsx

@ -54,7 +54,7 @@ export const ModuleConfig = (): JSX.Element => {
];
return (
<Tabs defaultValue="MQTT" className="w-[400px]">
<Tabs defaultValue="MQTT">
<TabsList>
{tabs.map((tab) => (
<TabsTrigger key={tab.label} value={tab.label}>

23
src/pages/Config/index.tsx

@ -4,9 +4,10 @@ import { DeviceConfig } from "@pages/Config/DeviceConfig.js";
import { ModuleConfig } from "@pages/Config/ModuleConfig.js";
import { PageLayout } from "@app/components/Topbar.js";
import { SidebarSection } from "@app/components/UI/Sidebar/SidebarSection.js";
import { SidebarItem } from "@app/components/UI/Sidebar/SidebarItem.js";
import { useState } from "react";
import { useDevice } from "@app/core/stores/deviceStore.js";
import { Button } from "@app/components/UI/Button.js";
import { SidebarButton } from "@app/components/UI/Sidebar/sidebarButton.js";
export const ConfigPage = (): JSX.Element => {
const { workingConfig, workingModuleConfig, connection } = useDevice();
@ -17,31 +18,23 @@ export const ConfigPage = (): JSX.Element => {
return (
<>
<Sidebar>
<SidebarSection title="Config Sections">
<SidebarItem
icon={SettingsIcon}
<SidebarSection label="Config Sections">
<SidebarButton
label="Device Config"
active={activeConfigSection === "device"}
onClick={() => setActiveConfigSection("device")}
icon={SettingsIcon}
/>
<SidebarItem
icon={BoxesIcon}
<SidebarButton
label="Module Config"
active={activeConfigSection === "module"}
onClick={() => setActiveConfigSection("module")}
icon={BoxesIcon}
/>
</SidebarSection>
<div className="space-y-1.5">
<div className="bg-palette-0 sticky top-0 pb-2">
<div className="text-palette-700 flex items-center justify-between px-2">
<div className="text-base font-medium"></div>
</div>
</div>
<ul className="space-y-1"></ul>
</div>
</Sidebar>
<PageLayout
title={
label={
activeConfigSection === "device" ? "Device Config" : "Module Config"
}
actions={[

38
src/pages/Map.tsx

@ -14,12 +14,14 @@ import {
PlusIcon
} from "lucide-react";
import { bbox, lineString } from "@turf/turf";
import { SidebarSection } from "@app/components/UI/Sidebar/SidebarSection.js";
import { Button } from "@app/components/UI/Button.js";
import { SidebarButton } from "@app/components/UI/Sidebar/sidebarButton.js";
export const MapPage = (): JSX.Element => {
const { nodes, waypoints } = useDevice();
const { rasterSources } = useAppStore();
const { default: map } = useMap();
const tmp = useMap();
const getBBox = () => {
const nodesWithPosition = nodes.filter((n) => n.data.position?.latitudeI);
@ -52,32 +54,14 @@ export const MapPage = (): JSX.Element => {
return (
<>
<Sidebar>
<div className="space-y-1.5">
<div className="bg-palette-0 sticky top-0 pb-2">
<div className="text-palette-700 flex items-center justify-between px-2">
<div className="text-base font-medium">Sources</div>
<div>
<button className="flex h-[22px] items-center transition-all duration-300 hover:text-accent">
<PlusIcon size={16} />
</button>
</div>
</div>
</div>
<ul className="space-y-1">
{rasterSources.map((source, index) => (
<li key={index}>
<div className="text-palette-600 flex w-full cursor-pointer items-center space-x-2.5 rounded-xl bg-transparent px-2.5 py-2.5 transition-all duration-300 hover:text-accent">
<span className="align-middle font-mono text-sm">
{source.title}
</span>
</div>
</li>
))}
</ul>
</div>
<SidebarSection label="Sources">
{rasterSources.map((source, index) => (
<SidebarButton key={index} label={source.title} />
))}
</SidebarSection>
</Sidebar>
<PageLayout
title="Map"
label="Map"
actions={[
{
icon: ZoomInIcon,
@ -125,11 +109,11 @@ export const MapPage = (): JSX.Element => {
</div>
</Marker>
))}
{rasterSources.map((source, index) => (
{/* {rasterSources.map((source, index) => (
<Source key={index} type="raster" {...source}>
<Layer type="raster" />
</Source>
))}
))} */}
{nodes.map((n) => {
if (n.data.position?.latitudeI) {
return (

40
src/pages/Messages.tsx

@ -3,47 +3,27 @@ import { PageLayout } from "@app/components/Topbar.js";
import { ChannelChat } from "@components/PageComponents/Messages/ChannelChat.js";
import { useDevice } from "@core/stores/deviceStore.js";
import { Hashicon } from "@emeraldpay/hashicon-react";
import { EditIcon, HashIcon } from "lucide-react";
import { HashIcon } from "lucide-react";
import { Protobuf, Types } from "@meshtastic/meshtasticjs";
import { SidebarSection } from "@app/components/UI/Sidebar/SidebarSection.js";
import { SidebarItem } from "@app/components/UI/Sidebar/SidebarItem.js";
import { useState } from "react";
import { getChannelName } from "./Channels.js";
import { SidebarButton } from "@app/components/UI/Sidebar/sidebarButton.js";
export const MessagesPage = (): JSX.Element => {
const { channels, setActivePage, nodes, hardware } = useDevice();
const { channels, nodes, hardware } = useDevice();
const [activeChannel, setActiveChannel] = useState<Types.ChannelNumber>(
Types.ChannelNumber.PRIMARY
);
const tabs = channels.map((channel) => {
return {
label: channel.config.settings?.name.length
? channel.config.settings?.name
: channel.config.index === 0
? "Primary"
: `Ch ${channel.config.index}`,
element: () => <ChannelChat channel={channel} />,
disabled: channel.config.role === Protobuf.Channel_Role.DISABLED
};
});
return (
<>
<Sidebar>
<SidebarSection
title="Channels"
action={{
icon: EditIcon,
onClick() {
setActivePage("channels");
}
}}
>
<SidebarSection label="Channels">
{channels
.filter((ch) => ch.config.role !== Protobuf.Channel_Role.DISABLED)
.map((channel) => (
<SidebarItem
<SidebarButton
key={channel.config.index}
label={
channel.config.settings?.name.length
@ -52,15 +32,17 @@ export const MessagesPage = (): JSX.Element => {
? "Primary"
: `Ch ${channel.config.index}`
}
icon={HashIcon}
active={channel.config.index === activeChannel}
onClick={() => setActiveChannel(channel.config.index)}
element={<HashIcon size={16} className="mr-2" />}
/>
))}
</SidebarSection>
<SidebarSection title="Peers">
<SidebarSection label="Peers">
{nodes
.filter((n) => n.data.num !== hardware.myNodeNum)
.map((node) => (
<SidebarItem
<SidebarButton
key={node.data.num}
label={node.data.user?.longName ?? "Unknown"}
element={
@ -71,7 +53,7 @@ export const MessagesPage = (): JSX.Element => {
</SidebarSection>
</Sidebar>
<PageLayout
title={`Messages: ${
label={`Messages: ${
channels[activeChannel]
? getChannelName(channels[activeChannel].config)
: "Loading..."

6
src/pages/Peers.tsx

@ -40,7 +40,11 @@ export const PeersPage = (): JSX.Element => {
.match(/.{1,2}/g)
?.join(":") ?? "UNK"}
</Mono>,
<TimeAgo timestamp={node.data.lastHeard * 1000} />,
node.data.lastHeard === 0 ? (
<p>Never</p>
) : (
<TimeAgo timestamp={node.data.lastHeard * 1000} />
),
<Mono>
{node.data.snr}db/
{Math.min(Math.max((node.data.snr + 10) * 5, 0), 100)}%/

6
src/validation/config/device.ts

@ -19,4 +19,10 @@ export class DeviceValidation
@IsInt()
buzzerGpio: number;
@IsEnum(Protobuf.Config_DeviceConfig_RebroadcastMode)
rebroadcastMode: Protobuf.Config_DeviceConfig_RebroadcastMode;
@IsInt()
nodeInfoBroadcastSecs: number;
}

3
src/validation/config/lora.ts

@ -51,6 +51,9 @@ export class LoRaValidation
@IsBoolean()
sx126xRxBoostedGain: boolean;
@IsInt()
overrideFrequency: number;
@IsArray()
ignoreIncoming: number[];
}

22
src/validation/rasterSource.ts

@ -0,0 +1,22 @@
import { IsArray, IsBoolean, IsNumber, IsString, IsUrl } from "class-validator";
import type { RasterSource } from "@core/stores/appStore.js";
export class MapValidation {
@IsArray()
rasterSources: MapValidation_RasterSources[];
}
export class MapValidation_RasterSources implements RasterSource {
@IsBoolean()
enabled: boolean;
@IsString()
title: string;
@IsUrl()
tiles: string;
@IsNumber()
tileSize: number;
}
Loading…
Cancel
Save