Second round of formatting

2023-07-09 14:14:49 +10:00
parent 20ac657b51
commit 1012167c89
59 changed files with 216 additions and 207 deletions
@@ -1,17 +1,17 @@
-import { Sidebar } from "@components/Sidebar.js";
-import { PageLayout } from "@components/PageLayout.js";
-import { cn } from "@app/core/utils/cn.js";
-import { Channel } from "@components/PageComponents/Channel.js";
-import { useDevice } from "@core/stores/deviceStore.js";
-import { QrCodeIcon, ImportIcon } from "lucide-react";
-import { Protobuf, Types } from "@meshtastic/meshtasticjs";
-import { useState } from "react";
 import {
  Tabs,
  TabsContent,
  TabsList,
  TabsTrigger,
 } from "@app/components/UI/Tabs.js";
+import { cn } from "@app/core/utils/cn.js";
+import { Channel } from "@components/PageComponents/Channel.js";
+import { PageLayout } from "@components/PageLayout.js";
+import { Sidebar } from "@components/Sidebar.js";
+import { useDevice } from "@core/stores/deviceStore.js";
+import { Protobuf, Types } from "@meshtastic/meshtasticjs";
+import { ImportIcon, QrCodeIcon } from "lucide-react";
+import { useState } from "react";

 export const getChannelName = (channel: Protobuf.Channel) =>
  channel.settings?.name.length
@@ -31,7 +31,7 @@ export const ChannelsPage = (): JSX.Element => {

  return (
    <>
-      <Sidebar></Sidebar>
+      <Sidebar />
      <PageLayout
        label={`Channel: ${
          currentChannel ? getChannelName(currentChannel) : "Loading..."
@@ -1,18 +1,18 @@
-import { Fragment } from "react";
-import { Network } from "@components/PageComponents/Config/Network.js";
 import { Bluetooth } from "@components/PageComponents/Config/Bluetooth.js";
 import { Device } from "@components/PageComponents/Config/Device.js";
 import { Display } from "@components/PageComponents/Config/Display.js";
 import { LoRa } from "@components/PageComponents/Config/LoRa.js";
+import { Network } from "@components/PageComponents/Config/Network.js";
 import { Position } from "@components/PageComponents/Config/Position.js";
 import { Power } from "@components/PageComponents/Config/Power.js";
-import { useDevice } from "@core/stores/deviceStore.js";
 import {
  Tabs,
  TabsContent,
  TabsList,
  TabsTrigger,
 } from "@components/UI/Tabs.js";
+import { useDevice } from "@core/stores/deviceStore.js";
+import { Fragment } from "react";

 export const DeviceConfig = (): JSX.Element => {
  const { hardware } = useDevice();
@@ -1,4 +1,4 @@
-import { Fragment } from "react";
+import { useDevice } from "@app/core/stores/deviceStore.js";
 import { Audio } from "@components/PageComponents/ModuleConfig/Audio.js";
 import { CannedMessage } from "@components/PageComponents/ModuleConfig/CannedMessage";
 import { ExternalNotification } from "@components/PageComponents/ModuleConfig/ExternalNotification.js";
@@ -7,13 +7,13 @@ import { RangeTest } from "@components/PageComponents/ModuleConfig/RangeTest.js"
 import { Serial } from "@components/PageComponents/ModuleConfig/Serial.js";
 import { StoreForward } from "@components/PageComponents/ModuleConfig/StoreForward.js";
 import { Telemetry } from "@components/PageComponents/ModuleConfig/Telemetry.js";
-import { useDevice } from "@app/core/stores/deviceStore.js";
 import {
  Tabs,
  TabsContent,
  TabsList,
  TabsTrigger,
 } from "@components/UI/Tabs.js";
+import { Fragment } from "react";

 export const ModuleConfig = (): JSX.Element => {
  const { workingModuleConfig, connection } = useDevice();
@@ -1,13 +1,13 @@
-import { Sidebar } from "@components/Sidebar.js";
-import { SettingsIcon, BoxesIcon, SaveIcon } from "lucide-react";
-import { DeviceConfig } from "@pages/Config/DeviceConfig.js";
-import { ModuleConfig } from "@pages/Config/ModuleConfig.js";
-import { PageLayout } from "@components/PageLayout.js";
-import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
-import { useState } from "react";
 import { useDevice } from "@app/core/stores/deviceStore.js";
+import { PageLayout } from "@components/PageLayout.js";
+import { Sidebar } from "@components/Sidebar.js";
+import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
 import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
 import { useToast } from "@core/hooks/useToast.js";
+import { DeviceConfig } from "@pages/Config/DeviceConfig.js";
+import { ModuleConfig } from "@pages/Config/ModuleConfig.js";
+import { BoxesIcon, SaveIcon, SettingsIcon } from "lucide-react";
+import { useState } from "react";

 export const ConfigPage = (): JSX.Element => {
  const { workingConfig, workingModuleConfig, connection } = useDevice();
@@ -1,22 +1,22 @@
-import maplibregl from "maplibre-gl";
-import { Layer, Map, Marker, Source, useMap } from "react-map-gl";
+import { Subtle } from "@app/components/UI/Typography/Subtle.js";
+import { cn } from "@app/core/utils/cn.js";
+import { PageLayout } from "@components/PageLayout.js";
+import { Sidebar } from "@components/Sidebar.js";
+import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
+import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
 import { useAppStore } from "@core/stores/appStore.js";
 import { useDevice } from "@core/stores/deviceStore.js";
 import { Hashicon } from "@emeraldpay/hashicon-react";
-import { Sidebar } from "@components/Sidebar.js";
-import { PageLayout } from "@components/PageLayout.js";
+import { bbox, lineString } from "@turf/turf";
 import {
-  ZoomInIcon,
-  ZoomOutIcon,
  BoxSelectIcon,
  MapPinIcon,
+  ZoomInIcon,
+  ZoomOutIcon,
 } from "lucide-react";
-import { bbox, lineString } from "@turf/turf";
-import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
-import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
-import { Subtle } from "@app/components/UI/Typography/Subtle.js";
-import { cn } from "@app/core/utils/cn.js";
+import maplibregl from "maplibre-gl";
 import { useCallback, useEffect, useState } from "react";
+import { Layer, Map as MapGL, Marker, Source, useMap } from "react-map-gl";

 export const MapPage = (): JSX.Element => {
  const { nodes, waypoints } = useDevice();
@@ -76,8 +76,8 @@ export const MapPage = (): JSX.Element => {
    <>
      <Sidebar>
        <SidebarSection label="Sources">
-          {rasterSources.map((source, index) => (
-            <SidebarButton key={index} label={source.title} />
+          {rasterSources.map((source) => (
+            <SidebarButton key={source.title} label={source.title} />
          ))}
        </SidebarSection>
      </Sidebar>
@@ -105,7 +105,7 @@ export const MapPage = (): JSX.Element => {
          },
        ]}
      >
-        <Map
+        <MapGL
          mapStyle="https://raw.githubusercontent.com/hc-oss/maplibre-gl-styles/master/styles/osm-mapnik/v8/default.json"
          // onClick={(e) => {
          //   const waypoint = new Protobuf.Waypoint({
@@ -176,7 +176,7 @@ export const MapPage = (): JSX.Element => {
              );
            }
          })}
-        </Map>
+        </MapGL>
      </PageLayout>
    </>
  );
@@ -1,14 +1,14 @@
-import { Sidebar } from "@components/Sidebar.js";
-import { PageLayout } from "@components/PageLayout.js";
+import { getChannelName } from "./Channels.js";
 import { ChannelChat } from "@components/PageComponents/Messages/ChannelChat.js";
+import { PageLayout } from "@components/PageLayout.js";
+import { Sidebar } from "@components/Sidebar.js";
+import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
+import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";
 import { useDevice } from "@core/stores/deviceStore.js";
 import { Hashicon } from "@emeraldpay/hashicon-react";
-import { HashIcon } from "lucide-react";
 import { Protobuf, Types } from "@meshtastic/meshtasticjs";
-import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.js";
+import { HashIcon } from "lucide-react";
 import { useMemo, useState } from "react";
-import { getChannelName } from "./Channels.js";
-import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.js";

 export const MessagesPage = (): JSX.Element => {
  const { channels, nodes, hardware, messages } = useDevice();
@@ -1,11 +1,11 @@
-import { base16 } from "rfc4648";
+import { Sidebar } from "@components/Sidebar.js";
 import { Mono } from "@components/generic/Mono.js";
 import { Table } from "@components/generic/Table";
 import { TimeAgo } from "@components/generic/Table/tmp/TimeAgo.js";
 import { useDevice } from "@core/stores/deviceStore.js";
 import { Hashicon } from "@emeraldpay/hashicon-react";
 import { Protobuf } from "@meshtastic/meshtasticjs";
-import { Sidebar } from "@components/Sidebar.js";
+import { base16 } from "rfc4648";

 export const PeersPage = (): JSX.Element => {
  const { nodes, hardware } = useDevice();
@@ -16,7 +16,7 @@ export const PeersPage = (): JSX.Element => {

  return (
    <>
-      <Sidebar></Sidebar>
+      <Sidebar />
      <div className="w-full overflow-y-auto">
        <Table
          headings={[