diff --git a/package.json b/package.json index 9d2b34e7..73b42397 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Meshtastic web client", "license": "GPL-3.0-only", "scripts": { - "dev": "NODE_ENV=development vite", + "dev": "vite", "build": "tsc && vite build", "preview": "vite preview", "package": "gzipper c -i html,js,css,png,ico,svg,webmanifest,txt dist dist/output && tar -cvf dist/build.tar -C ./dist/output/ $(ls ./dist/output/)", @@ -13,7 +13,7 @@ }, "dependencies": { "@headlessui/react": "^1.4.2", - "@meshtastic/meshtasticjs": "^0.6.26", + "@meshtastic/meshtasticjs": "^0.6.27", "@reduxjs/toolkit": "^1.6.2", "boring-avatars": "^1.5.8", "i18next": "^21.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d496e519..a7b8bc1b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,7 +2,7 @@ lockfileVersion: 5.3 specifiers: '@headlessui/react': ^1.4.2 - '@meshtastic/meshtasticjs': ^0.6.26 + '@meshtastic/meshtasticjs': ^0.6.27 '@reduxjs/toolkit': ^1.6.2 '@types/react': ^17.0.34 '@types/react-dom': ^17.0.11 @@ -52,7 +52,7 @@ specifiers: dependencies: '@headlessui/react': 1.4.2_react-dom@17.0.2+react@17.0.2 - '@meshtastic/meshtasticjs': 0.6.26 + '@meshtastic/meshtasticjs': 0.6.27 '@reduxjs/toolkit': 1.6.2_react-redux@7.2.6+react@17.0.2 boring-avatars: 1.5.8 i18next: 21.4.2 @@ -1359,8 +1359,8 @@ packages: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} dev: true - /@meshtastic/meshtasticjs/0.6.26: - resolution: {integrity: sha512-1itDg63rfyMzEbDQrFycmG19mLus3mCffpm3T0PC+egj7e4q9aWBO3o3WC8/eoakeaS/cmBUW+FIO+h/Cktkzw==} + /@meshtastic/meshtasticjs/0.6.27: + resolution: {integrity: sha512-WiM9v/3+YWtt6/wLJOyyhAQdtsIGcEs3geofRZA6y/TCQkbjo/mdvY8Y+ZMZERSFXIZXiovvZgJG0vSYq7JC9A==} dependencies: '@protobuf-ts/runtime': 2.0.7 sub-events: 1.8.9 diff --git a/src/App.tsx b/src/App.tsx index 9646e287..551e4b1a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -49,7 +49,7 @@ const App = (): JSX.Element => { const connectionURL = hostOverrideEnabled ? hostOverride - : import.meta.env.NODE_ENV === 'production' + : import.meta.env.PROD ? window.location.hostname : (import.meta.env.VITE_PUBLIC_DEVICE_IP as string) ?? 'http://meshtastic.local'; diff --git a/src/components/templates/PageLayout.tsx b/src/components/templates/PageLayout.tsx index 88fab314..4fd332c7 100644 --- a/src/components/templates/PageLayout.tsx +++ b/src/components/templates/PageLayout.tsx @@ -5,7 +5,8 @@ import { FiXCircle } from 'react-icons/fi'; import { useBreakpoint } from '@app/hooks/breakpoint'; import { Drawer } from '@components/generic/Drawer'; import { IconButton } from '@components/generic/IconButton'; -import { SidebarItem, SidebarItemProps } from '@components/generic/SidebarItem'; +import type { SidebarItemProps } from '@components/generic/SidebarItem'; +import { SidebarItem } from '@components/generic/SidebarItem'; import { Tab } from '@headlessui/react'; export interface PageLayoutProps { diff --git a/src/pages/Plugins/Files.tsx b/src/pages/Plugins/Files.tsx index 5f3ab575..6110929a 100644 --- a/src/pages/Plugins/Files.tsx +++ b/src/pages/Plugins/Files.tsx @@ -40,7 +40,7 @@ export const Files = ({ navOpen, setNavOpen }: RangeTestProps): JSX.Element => { const connectionURL = hostOverrideEnabled ? hostOverride - : import.meta.env.NODE_ENV === 'production' + : import.meta.env.PROD ? window.location.hostname : (import.meta.env.VITE_PUBLIC_DEVICE_IP as string) ?? 'http://meshtastic.local'; diff --git a/src/pages/settings/Connection.tsx b/src/pages/settings/Connection.tsx index c40acb36..cdf7ee91 100644 --- a/src/pages/settings/Connection.tsx +++ b/src/pages/settings/Connection.tsx @@ -109,7 +109,7 @@ export const Connection = ({ const connectionURL: string = hostOverrideEnabled ? hostOverride - : import.meta.env.NODE_ENV === 'production' + : import.meta.env.PROD ? window.location.hostname : (import.meta.env.VITE_PUBLIC_DEVICE_IP as string) ?? 'http://meshtastic.local'; diff --git a/src/pages/settings/Radio.tsx b/src/pages/settings/Radio.tsx index ec17bf28..a7a6d43b 100644 --- a/src/pages/settings/Radio.tsx +++ b/src/pages/settings/Radio.tsx @@ -88,6 +88,16 @@ export const Radio = ({ navOpen, setNavOpen }: RadioProps): JSX.Element => { } />
+
Power
+
+ + + +
WiFi
{ label={t('strings.wifi_psk')} {...register('wifiPassword')} /> - +
Position
+ + +
+
Other
+