From fca3719bceb91ba435314126ff43c4285688b782 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Fri, 30 Dec 2022 17:32:47 +1100 Subject: [PATCH] Quick cleanup --- .eslintrc.cjs | 7 ------- eslint.config.js | 12 ++++++++++++ index.html | 2 ++ public/apple-touch-icon.png | Bin 0 -> 4598 bytes public/favicon.ico | Bin 0 -> 15086 bytes src/core/subscriptions.ts | 28 ++++++++++++++-------------- src/index.css | 2 +- src/pages/Info.tsx | 2 +- src/pages/Logs.tsx | 2 +- tailwind.config.cjs | 2 +- 10 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 .eslintrc.cjs create mode 100644 eslint.config.js create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico diff --git a/.eslintrc.cjs b/.eslintrc.cjs deleted file mode 100644 index fb23ee1b..00000000 --- a/.eslintrc.cjs +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - extends: "@meshtastic/eslint-config", - parserOptions: { - tsconfigRootDir: __dirname, - project: ["./tsconfig.json"] - } -}; diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 00000000..9e0933b7 --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,12 @@ +import react from "eslint-plugin-react"; + +export default [ + "eslint:all", + { + files: ["src/**/*.{ts,tsx}"], + rules: { + semi: "error", + "prefer-const": "error" + } + } +]; diff --git a/index.html b/index.html index 34057353..d5323e2c 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,8 @@ + + diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a75fd498005ee04a51dd8846917a5a955ae5920b GIT binary patch literal 4598 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 literal 0 HcmV?d00001 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..2a1cdfc1b8275d0ce168440277cc793d3a3789ef GIT binary patch literal 15086 zcmeHO`EwLS6dnYm%3ts=kd)<_1PB2FxkyL?xqv_*0df(NkOWXU1W`c|`F%apo7vgf>_V1Z*2-3W>6xDHclI&U@5M0s z7=4X|1OsJ^@$i*~kz^P~OpJAZsbL&P-K8k`ys@8Qw4lK?XoD_BHNblHyTU92{oVdk z!vG)~*aaK|{stt>_!s=X0`>rfz$Jm?=5w@*1?~ZU0m3b_KYqVMmPdf$-RXem1;7!& zADu|o(;qW{K2AMQmk)dkL|Vo`{7*r~8Fu+`e-&^z3S`&1bwXA(mQeNsc0`fvS_jUD zOMqnHhbWZ)H^|I&X+spsu6=MnWIqta@^c>i8pZPe1KGLHX@B&Vy|(Bb1GX{HeyTx; z?LT)vN80hc{ZwPXc0tWGMa$xAlO?FWj`q!aD`fHglcnwZIsRn>zl}#`%Yt2#EVUnq(#o zl@!QUbyK$MI3nNHgV1&Is4l+H-A7lu-p*@l+>i%(k>|}%oSPjyb^%R}h1%8QB{eQi zGKLS4B@aw-wXM<>{K%Jnm<4~deINWd;us8EU0ZCr-aFZ^uH0X8bB4qAu~J-_Dx1Ejacvt4 zU1-~tFU^qbv|-BEGv;N;9beV?to78Dd%~15OIPe6PF=ZgZ0W3%=?!BPt?cw+vg&25 z_23Z-SzT#ZKApR{K+*=sOZw1wxnbu-(_RjLQ;yqSq^{W2er@T>w!n4m6C`~| zyrcp1wicRpaL{p;qX%P&w%vTJR;JBPQ$8OzHc?i;QRZtmOOCmlY`WfQ>Pp?3I?5y` zBT>;PsY{nFCu)U03AMa#^fdo*nHK+Acm5t-t4&?UXC=y-x5|~Q)2uq`zvj(yU;TSv zV>g+->S!k*82>9>U!$!#XJVyvPP)`J=c+NI#-HVrK<~F+{6nCd_xy{M9L~R2T;`wF zb^8P*GsimDO1>j_&501mbhbLuw#|FXWqh`^{#B%?b;mi5wXUW0SZg3R-!J%HyY?NI z^*79VaEvdwYm!=v3MVF+>m=%&wotmhT`sxS`}pGf-1h`$zw>^N@xeWSI<&l3>9ZGj z@kd+ERlbXK`#lt9A8_u`4}_PzE^^QhM7ZZ`Ah~*<2ln0n)J8l*3^;Bt;5LlMM63La zi|&hJ`M-qh%~32rFUfj43iM%GfT~meD|er<}Y$!#}GG<1dzj4C6PJ0}Z2-tqQ#YP)JXYr8W~D+b5}Jb7BkssLEg{NZ{k5YG2S=6F<*JIbqpNaP6d9gS;A zD-fymkmG@Cccj+hufhAz2=b4V-6Li1z#f9+V0cH2(Y ztN0{iH@x--tdc$QvV zkt#gjW_(7S7rD`~>iC>ANQ-f_VB(%Ut6GcrKF`D%FJ%6JKEGl-@wOMH%h=IFWjfA0 z-C{J_U+lxaMWv$^E#?epI=YR&lI<4lHe+XXYY=bMet-?wr*T8RI@i1&aT0YVYt?(` z;hueJ(U)h+q!lc0MFagA$1H=*7`MOW=@O5vNoVtyH7X{?*wX6PePblF`z=qENCx`S z?rt$rkF0+Dr(?IwRbc$xp1(o*%%NZmiSdff$Gc)Il&=-J9?TJ7-+*yeKl~{l`KZ`8 z;-b|na%9^N)_kD7f%$EP$`5n56qxe?b!})v2C8WGjHOo##{hDFi(bg4wbM4^Gfu(L>@OF)< zK;O^C7@%Lh@;C5|@k_>RlaZUkJcUr?M>zeW#`U3UX~5iH_aSlzz*o27vvnU-$^2~- zyw)rIJY*$#0&ad~9mj+AOUQUSeewUh|09C7;y2F02=YGx-fMtJy$AAJ?{eS+z%!r1 zbj`D}IO`jz5ZB?%)#tZfiTU+s{>452N9IG|eENd4`MtyMO}GDbp)Z<&LqI6!1;24V z1^BJ!b=HLQgMpnmN$9|-LX$daFzs=^{*p%rcy)p&dGnlt#}YAs=bWM+ZX7?z-5;n2 zjswAtRsLVmd|&`j2b@bzKmW&yG(HD{|y6^yCz@0gD=Fl1%1JHAm$M=|H*DMCvWGy@*nA1dU;A4FRPFHIj`<#r{UX| z { + connection.events.onDeviceMetadataPacket.subscribe((metadataPacket) => { device.addDeviceMetadataMessage(metadataPacket); }); - connection.onRoutingPacket.subscribe((routingPacket) => { + connection.events.onRoutingPacket.subscribe((routingPacket) => { switch (routingPacket.data.variant.oneofKind) { case "errorReason": if ( @@ -46,11 +46,11 @@ export const subscribeAll = ( } }); - connection.onTelemetryPacket.subscribe((telemetryPacket) => { + connection.events.onTelemetryPacket.subscribe((telemetryPacket) => { device.setMetrics(telemetryPacket); }); - connection.onDeviceStatus.subscribe((status) => { + connection.events.onDeviceStatus.subscribe((status) => { device.setStatus(status); if (status === Types.DeviceStatusEnum.DEVICE_CONFIGURED) { @@ -60,7 +60,7 @@ export const subscribeAll = ( } }); - connection.onWaypointPacket.subscribe((waypoint) => { + connection.events.onWaypointPacket.subscribe((waypoint) => { const { data, ...rest } = waypoint; device.addWaypoint(data); device.addWaypointMessage({ @@ -70,48 +70,48 @@ export const subscribeAll = ( }); }); - connection.onMyNodeInfo.subscribe((nodeInfo) => { + connection.events.onMyNodeInfo.subscribe((nodeInfo) => { device.setHardware(nodeInfo); myNodeNum = nodeInfo.myNodeNum; }); - connection.onUserPacket.subscribe((user) => { + connection.events.onUserPacket.subscribe((user) => { device.addUser(user); }); - connection.onPositionPacket.subscribe((position) => { + connection.events.onPositionPacket.subscribe((position) => { device.addPosition(position); }); - connection.onNodeInfoPacket.subscribe((nodeInfo) => { + connection.events.onNodeInfoPacket.subscribe((nodeInfo) => { toast(`New Node Discovered: ${nodeInfo.data.user?.shortName ?? "UNK"}`, { icon: "🔎" }); device.addNodeInfo(nodeInfo); }); - connection.onChannelPacket.subscribe((channel) => { + connection.events.onChannelPacket.subscribe((channel) => { device.addChannel({ config: channel.data, lastInterraction: new Date(), messages: [] }); }); - connection.onConfigPacket.subscribe((config) => { + connection.events.onConfigPacket.subscribe((config) => { device.setConfig(config.data); }); - connection.onModuleConfigPacket.subscribe((moduleConfig) => { + connection.events.onModuleConfigPacket.subscribe((moduleConfig) => { device.setModuleConfig(moduleConfig.data); }); - connection.onMessagePacket.subscribe((messagePacket) => { + connection.events.onMessagePacket.subscribe((messagePacket) => { device.addMessage({ ...messagePacket, ack: messagePacket.packet.from !== myNodeNum }); }); - connection.onPendingSettingsChange.subscribe((state) => { + connection.events.onPendingSettingsChange.subscribe((state) => { device.setPendingSettingsChanges(state); }); }; diff --git a/src/index.css b/src/index.css index 16679ce6..b02acc95 100644 --- a/src/index.css +++ b/src/index.css @@ -84,4 +84,4 @@ [data-accent="pink"][data-theme="dark"] { --accent: #e454c4; -} \ No newline at end of file +} diff --git a/src/pages/Info.tsx b/src/pages/Info.tsx index 9cb3fc66..da879a50 100644 --- a/src/pages/Info.tsx +++ b/src/pages/Info.tsx @@ -16,7 +16,7 @@ export const InfoPage = (): JSX.Element => { const [serialLogs, setSerialLogs] = useState(""); - connection?.onDeviceDebugLog.subscribe((packet) => { + connection?.events.onDeviceDebugLog.subscribe((packet) => { setSerialLogs(serialLogs + new TextDecoder().decode(packet)); }); diff --git a/src/pages/Logs.tsx b/src/pages/Logs.tsx index dd53be11..ae775d55 100644 --- a/src/pages/Logs.tsx +++ b/src/pages/Logs.tsx @@ -10,7 +10,7 @@ export const LogsPage = (): JSX.Element => { const [logs, setLogs] = useState([]); useEffect(() => { - connection?.onLogEvent.subscribe((log) => { + connection?.events.onLogEvent.subscribe((log) => { setLogs([...logs, log]); }); }, [connection, setLogs, logs]); diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 3d8af6b6..9739998d 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -24,7 +24,7 @@ module.exports = { button: "var(--button)", textPrimary: "var(--textPrimary)", textSecondary: "var(--textSecondary)", - link: "var(--link)", + link: "var(--link)" }, brightness: { hover: "var(--brighnessHover)",