From 33b48d7f41047877f2e5c9d2a483c1daf664c978 Mon Sep 17 00:00:00 2001 From: ImUrX Date: Sun, 5 Feb 2023 01:15:10 -0300 Subject: [PATCH 1/4] eslint action --- gui/.eslintrc.json | 3 +- gui/package.json | 6 +-- gui/src/components/commons/BodyDisplay.tsx | 2 +- .../components/onboarding/StepperSlider.tsx | 2 +- .../settings/pages/GeneralSettings.tsx | 2 +- .../settings/pages/OSCRouterSettings.tsx | 2 +- .../settings/pages/VRCOSCSettings.tsx | 2 +- gui/src/hooks/app.ts | 21 +++------ gui/src/hooks/autobone.ts | 45 +++++++------------ gui/src/hooks/config.ts | 2 +- gui/src/hooks/datafeed-config.ts | 6 +-- gui/src/hooks/onboarding.ts | 24 +++++----- gui/src/hooks/pubSub.ts | 10 +---- gui/src/hooks/timeout.ts | 6 +-- gui/src/hooks/websocket-api.ts | 34 +++----------- gui/src/i18n/config.tsx | 1 - gui/src/index.css | 4 +- gui/src/maths/quaternion.ts | 6 +-- gui/src/maths/vector3.ts | 2 +- gui/src/vite-env.d.ts | 1 + 20 files changed, 62 insertions(+), 119 deletions(-) diff --git a/gui/.eslintrc.json b/gui/.eslintrc.json index 7d7f754c3..870568494 100644 --- a/gui/.eslintrc.json +++ b/gui/.eslintrc.json @@ -27,7 +27,8 @@ "no-inline-styles": "off", "@typescript-eslint/no-explicit-any": "off", "react/no-unescaped-entities": "off", - "prettier/prettier": "warn" + "prettier/prettier": "warn", + "camelcase": "error" }, "settings": { "import/resolver": { diff --git a/gui/package.json b/gui/package.json index 433ebf784..6c42f3d65 100644 --- a/gui/package.json +++ b/gui/package.json @@ -37,9 +37,9 @@ "dev": "tauri dev", "skipbundler": "tauri build -b none", "tauri": "tauri", - "lint": "eslint src/**/*.{js,jsx,ts,tsx,json}", - "lint:fix": "eslint --fix src/**/*.{js,jsx,ts,tsx,json}", - "format": "prettier --write src/**/*.{js,jsx,ts,tsx,css,md,json} --config ./.prettierrc", + "lint": "eslint \"src/**/*.{js,jsx,ts,tsx,json}\"", + "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\"", + "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,md,json}\"", "preview-vite": "vite preview", "javaversion-build": "cd src-tauri/src/ && javac JavaVersion.java && jar cvfe JavaVersion.jar JavaVersion JavaVersion.class" }, diff --git a/gui/src/components/commons/BodyDisplay.tsx b/gui/src/components/commons/BodyDisplay.tsx index 12a119c81..348ab0039 100644 --- a/gui/src/components/commons/BodyDisplay.tsx +++ b/gui/src/components/commons/BodyDisplay.tsx @@ -5,7 +5,7 @@ import { useLayoutEffect, useMemo, useRef, - useState + useState, } from 'react'; import { BodyPart, TrackerDataT } from 'solarxr-protocol'; import { FlatDeviceTracker } from '../../hooks/app'; diff --git a/gui/src/components/onboarding/StepperSlider.tsx b/gui/src/components/onboarding/StepperSlider.tsx index 7a0930213..3e1fe2b1e 100644 --- a/gui/src/components/onboarding/StepperSlider.tsx +++ b/gui/src/components/onboarding/StepperSlider.tsx @@ -5,7 +5,7 @@ import { ReactNode, useEffect, useRef, - useState + useState, } from 'react'; import { useElemSize } from '../../hooks/layout'; import { CheckIcon } from '../commons/icon/CheckIcon'; diff --git a/gui/src/components/settings/pages/GeneralSettings.tsx b/gui/src/components/settings/pages/GeneralSettings.tsx index 9f433a77f..8a38482b3 100644 --- a/gui/src/components/settings/pages/GeneralSettings.tsx +++ b/gui/src/components/settings/pages/GeneralSettings.tsx @@ -14,7 +14,7 @@ import { SettingsRequestT, SettingsResponseT, SteamVRTrackersSettingT, - TapDetectionSettingsT + TapDetectionSettingsT, } from 'solarxr-protocol'; import { useConfig } from '../../../hooks/config'; import { useWebsocketAPI } from '../../../hooks/websocket-api'; diff --git a/gui/src/components/settings/pages/OSCRouterSettings.tsx b/gui/src/components/settings/pages/OSCRouterSettings.tsx index 4ad7761ce..5c819df8e 100644 --- a/gui/src/components/settings/pages/OSCRouterSettings.tsx +++ b/gui/src/components/settings/pages/OSCRouterSettings.tsx @@ -8,7 +8,7 @@ import { OSCSettingsT, RpcMessage, SettingsRequestT, - SettingsResponseT + SettingsResponseT, } from 'solarxr-protocol'; import { useWebsocketAPI } from '../../../hooks/websocket-api'; import { CheckBox } from '../../commons/Checkbox'; diff --git a/gui/src/components/settings/pages/VRCOSCSettings.tsx b/gui/src/components/settings/pages/VRCOSCSettings.tsx index 31c0c5004..ba6f3b9f6 100644 --- a/gui/src/components/settings/pages/VRCOSCSettings.tsx +++ b/gui/src/components/settings/pages/VRCOSCSettings.tsx @@ -9,7 +9,7 @@ import { RpcMessage, SettingsRequestT, SettingsResponseT, - VRCOSCSettingsT + VRCOSCSettingsT, } from 'solarxr-protocol'; import { useWebsocketAPI } from '../../../hooks/websocket-api'; import { CheckBox } from '../../commons/Checkbox'; diff --git a/gui/src/hooks/app.ts b/gui/src/hooks/app.ts index 27e1936ca..3d999a330 100644 --- a/gui/src/hooks/app.ts +++ b/gui/src/hooks/app.ts @@ -47,17 +47,13 @@ export function reducer(state: AppState, action: AppStateAction) { } export function useProvideAppContext(): AppContext { - const { sendDataFeedPacket, useDataFeedPacket, isConnected } = - useWebsocketAPI(); + const { sendDataFeedPacket, useDataFeedPacket, isConnected } = useWebsocketAPI(); const { config } = useConfig(); const { dataFeedConfig } = useDataFeedConfig(); const navigate = useNavigate(); - const [state, dispatch] = useReducer>( - reducer, - { - datafeed: new DataFeedUpdateT(), - } - ); + const [state, dispatch] = useReducer>(reducer, { + datafeed: new DataFeedUpdateT(), + }); useEffect(() => { if (isConnected) { @@ -85,12 +81,9 @@ export function useProvideAppContext(): AppContext { [state] ); - useDataFeedPacket( - DataFeedMessage.DataFeedUpdate, - (packet: DataFeedUpdateT) => { - dispatch({ type: 'datafeed', value: packet }); - } - ); + useDataFeedPacket(DataFeedMessage.DataFeedUpdate, (packet: DataFeedUpdateT) => { + dispatch({ type: 'datafeed', value: packet }); + }); return { state, diff --git a/gui/src/hooks/autobone.ts b/gui/src/hooks/autobone.ts index 4e6d4b33e..0289bdb54 100644 --- a/gui/src/hooks/autobone.ts +++ b/gui/src/hooks/autobone.ts @@ -28,9 +28,7 @@ export function useProvideAutobone(): AutoboneContext { const [hasRecording, setHasRecording] = useState(false); const [hasCalibration, setHasCalibration] = useState(false); const [progress, setProgress] = useState(0); - const [skeletonParts, setSkeletonParts] = useState( - null - ); + const [skeletonParts, setSkeletonParts] = useState(null); const bodyParts = useMemo(() => { return ( @@ -81,11 +79,7 @@ export function useProvideAutobone(): AutoboneContext { if (data.processType) { if (data.message) { - console.log( - AutoBoneProcessType[data.processType], - ': ', - data.message - ); + console.log(AutoBoneProcessType[data.processType], ': ', data.message); } if (data.total > 0 && data.current >= 0) { @@ -123,25 +117,22 @@ export function useProvideAutobone(): AutoboneContext { } ); - useRPCPacket( - RpcMessage.AutoBoneEpochResponse, - (data: AutoBoneEpochResponseT) => { - setProgress(data.currentEpoch / data.totalEpochs); + useRPCPacket(RpcMessage.AutoBoneEpochResponse, (data: AutoBoneEpochResponseT) => { + setProgress(data.currentEpoch / data.totalEpochs); - // Probably not necessary to show to the user - console.log( - 'Epoch ', - data.currentEpoch, - '/', - data.totalEpochs, - ' (Error ', - data.epochError, - ')' - ); + // Probably not necessary to show to the user + console.log( + 'Epoch ', + data.currentEpoch, + '/', + data.totalEpochs, + ' (Error ', + data.epochError, + ')' + ); - setSkeletonParts(data.adjustedSkeletonParts); - } - ); + setSkeletonParts(data.adjustedSkeletonParts); + }); return { hasCalibration, @@ -154,9 +145,7 @@ export function useProvideAutobone(): AutoboneContext { }; } -export const AutoboneContextC = createContext( - undefined as any -); +export const AutoboneContextC = createContext(undefined as any); export function useAutobone() { const context = useContext(AutoboneContextC); diff --git a/gui/src/hooks/config.ts b/gui/src/hooks/config.ts index ce95e69a2..5fff53ab2 100644 --- a/gui/src/hooks/config.ts +++ b/gui/src/hooks/config.ts @@ -3,7 +3,7 @@ import { createDir, readTextFile, renameFile, - writeFile + writeFile, } from '@tauri-apps/api/fs'; import { createContext, useContext, useRef, useState } from 'react'; diff --git a/gui/src/hooks/datafeed-config.ts b/gui/src/hooks/datafeed-config.ts index b344f81c4..97548f661 100644 --- a/gui/src/hooks/datafeed-config.ts +++ b/gui/src/hooks/datafeed-config.ts @@ -1,8 +1,4 @@ -import { - DataFeedConfigT, - DeviceDataMaskT, - TrackerDataMaskT, -} from 'solarxr-protocol'; +import { DataFeedConfigT, DeviceDataMaskT, TrackerDataMaskT } from 'solarxr-protocol'; import { useConfig } from './config'; export function useDataFeedConfig() { diff --git a/gui/src/hooks/onboarding.ts b/gui/src/hooks/onboarding.ts index eec33f318..fc2135353 100644 --- a/gui/src/hooks/onboarding.ts +++ b/gui/src/hooks/onboarding.ts @@ -51,18 +51,18 @@ export function reducer(state: OnboardingState, action: OnboardingAction) { export function useProvideOnboarding(): OnboardingContext { const { setConfig } = useConfig(); - const [state, dispatch] = useReducer< - Reducer - >(reducer, { - progress: 0, - alonePage: false, - }); + const [state, dispatch] = useReducer>( + reducer, + { + progress: 0, + alonePage: false, + } + ); const { state: locatioState } = useLocation(); useLayoutEffect(() => { - const { alonePage = false }: { alonePage?: boolean } = - (locatioState as any) || {}; + const { alonePage = false }: { alonePage?: boolean } = (locatioState as any) || {}; if (alonePage !== state.alonePage) dispatch({ type: 'alone-page', value: alonePage }); @@ -84,16 +84,12 @@ export function useProvideOnboarding(): OnboardingContext { }; } -export const OnboardingContextC = createContext( - undefined as any -); +export const OnboardingContextC = createContext(undefined as any); export function useOnboarding() { const context = useContext(OnboardingContextC); if (!context) { - throw new Error( - 'useOnboarding must be within a OnboardingContext Provider' - ); + throw new Error('useOnboarding must be within a OnboardingContext Provider'); } return context; } diff --git a/gui/src/hooks/pubSub.ts b/gui/src/hooks/pubSub.ts index 55464598b..f9126ed10 100644 --- a/gui/src/hooks/pubSub.ts +++ b/gui/src/hooks/pubSub.ts @@ -16,9 +16,7 @@ export type PayloadType = MessageT['payloadType']; export function usePubSub() { const { sendPubSubPacket, usePubSubPacket } = useWebsocketAPI(); - const [handleTopics, setHandleTopics] = useState<{ [key: number]: TopicIdT }>( - {} - ); + const [handleTopics, setHandleTopics] = useState<{ [key: number]: TopicIdT }>({}); const subscribe = ( topicId: TopicIdT, @@ -78,11 +76,7 @@ export function usePubSub() { }; } -export const topic = ({ - appName, - organization, - topic, -}: Omit) => +export const topic = ({ appName, organization, topic }: Omit) => Object.assign(new TopicIdT(), { appName, organization, topic }); export const OVERLAY_DISPLAY_SETTINGS_TOPIC = topic({ diff --git a/gui/src/hooks/timeout.ts b/gui/src/hooks/timeout.ts index 311a470b5..acba907ea 100644 --- a/gui/src/hooks/timeout.ts +++ b/gui/src/hooks/timeout.ts @@ -14,11 +14,7 @@ export function useInterval(fn: () => void, delay: number) { }); } -export const useDebouncedEffect = ( - effect: () => void, - deps: any[], - delay: number -) => { +export const useDebouncedEffect = (effect: () => void, deps: any[], delay: number) => { useEffect(() => { const handler = setTimeout(() => effect(), delay); diff --git a/gui/src/hooks/websocket-api.ts b/gui/src/hooks/websocket-api.ts index b6575a594..aa18383ff 100644 --- a/gui/src/hooks/websocket-api.ts +++ b/gui/src/hooks/websocket-api.ts @@ -19,22 +19,14 @@ export interface WebSocketApi { isFirstConnection: boolean; reconnect: () => void; useRPCPacket: (type: RpcMessage, callback: (packet: T) => void) => void; - useDataFeedPacket: ( - type: DataFeedMessage, - callback: (packet: T) => void - ) => void; + useDataFeedPacket: (type: DataFeedMessage, callback: (packet: T) => void) => void; sendRPCPacket: (type: RpcMessage, data: RPCPacketType) => void; sendDataFeedPacket: (type: DataFeedMessage, data: DataFeedPacketType) => void; - usePubSubPacket: ( - type: PubSubUnion, - callback: (packet: T) => void - ) => void; + usePubSubPacket: (type: PubSubUnion, callback: (packet: T) => void) => void; sendPubSubPacket: (type: PubSubUnion, data: PubSubPacketType) => void; } -export const WebSocketApiContext = createContext( - undefined as never -); +export const WebSocketApiContext = createContext(undefined as never); export type RPCPacketType = RpcMessageHeaderT['message']; export type PubSubPacketType = PubSubHeaderT['u']; @@ -142,10 +134,7 @@ export function useProvideWebsocketApi(): WebSocketApi { webSocketRef.current.send(fbb.asUint8Array()); }; - const sendPubSubPacket = ( - type: PubSubUnion, - data: PubSubPacketType - ): void => { + const sendPubSubPacket = (type: PubSubUnion, data: PubSubPacketType): void => { if (webSocketRef?.current?.readyState !== WebSocket.OPEN) return; const fbb = new Builder(1); @@ -198,18 +187,12 @@ export function useProvideWebsocketApi(): WebSocketApi { isConnected, isFirstConnection, reconnect, - useDataFeedPacket: ( - type: DataFeedMessage, - callback: (packet: T) => void - ) => { + useDataFeedPacket: (type: DataFeedMessage, callback: (packet: T) => void) => { useEffect(() => { const onEvent = (event: CustomEventInit) => { callback(event.detail); }; - datafeedlistenerRef.current.addEventListener( - DataFeedMessage[type], - onEvent - ); + datafeedlistenerRef.current.addEventListener(DataFeedMessage[type], onEvent); return () => { datafeedlistenerRef.current.removeEventListener( DataFeedMessage[type], @@ -236,10 +219,7 @@ export function useProvideWebsocketApi(): WebSocketApi { }; pubsublistenerRef.current.addEventListener(PubSubUnion[type], onEvent); return () => { - pubsublistenerRef.current.removeEventListener( - PubSubUnion[type], - onEvent - ); + pubsublistenerRef.current.removeEventListener(PubSubUnion[type], onEvent); }; }, [callback, type]); }, diff --git a/gui/src/i18n/config.tsx b/gui/src/i18n/config.tsx index 99304aab8..8f0be147d 100644 --- a/gui/src/i18n/config.tsx +++ b/gui/src/i18n/config.tsx @@ -11,7 +11,6 @@ import { } from 'react'; import { exists, readTextFile, BaseDirectory } from '@tauri-apps/api/fs'; - export const defaultNS = 'translation'; export const DEFAULT_LOCALE = 'en'; const OVERRIDE_FILENAME = 'override.ftl'; diff --git a/gui/src/index.css b/gui/src/index.css index 05b821640..f9dccaadd 100644 --- a/gui/src/index.css +++ b/gui/src/index.css @@ -4,7 +4,7 @@ body { font-variant-numeric: tabular-nums; - font-family: 'poppins', sans-serif, emoji, "Twemoji Country Flags"; + font-family: 'poppins', sans-serif, emoji, 'Twemoji Country Flags'; height: 100vh; width: 100vw; user-select: none; @@ -12,7 +12,7 @@ body { } @font-face { - font-family: "Twemoji Country Flags"; + font-family: 'Twemoji Country Flags'; unicode-range: U+1F1E6-1F1FF, U+1F3F4, U+E0062-E0063, U+E0065, U+E0067, U+E006C, U+E006E, U+E0073-E0074, U+E0077, U+E007F; src: url('/fonts/TwemojiCountryFlags.woff2') format('woff2'); diff --git a/gui/src/maths/quaternion.ts b/gui/src/maths/quaternion.ts index bfd7a8a6b..9d3bcf4c5 100644 --- a/gui/src/maths/quaternion.ts +++ b/gui/src/maths/quaternion.ts @@ -17,14 +17,12 @@ export function QuaternionToQuatT(q: QuatObject) { return quat; } -export function MountingOrientationDegreesToQuatT( - mountingOrientationDegrees: number -) { +export function MountingOrientationDegreesToQuatT(mountingOrientationDegrees: number) { return QuaternionToQuatT( new Quaternion().setFromEuler( new Euler(0, +mountingOrientationDegrees * DEG_TO_RAD, 0) ) - ) + ); } const RAD_TO_DEG = 180 / Math.PI; diff --git a/gui/src/maths/vector3.ts b/gui/src/maths/vector3.ts index 305aec84d..c753f6d8f 100644 --- a/gui/src/maths/vector3.ts +++ b/gui/src/maths/vector3.ts @@ -1,7 +1,7 @@ import { Vec3fT } from 'solarxr-protocol'; import { Vector3 } from 'three'; -export type Vector3Object = { x: number; y: number; z: number; }; +export type Vector3Object = { x: number; y: number; z: number }; export function Vector3FromVec3fT(vec?: Vector3Object | null) { return vec ? new Vector3(vec.x, vec.y, vec.z) : new Vector3(); diff --git a/gui/src/vite-env.d.ts b/gui/src/vite-env.d.ts index a28e51abb..9497b58e7 100644 --- a/gui/src/vite-env.d.ts +++ b/gui/src/vite-env.d.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line spaced-comment /// declare const __COMMIT_HASH__: string; From 14de051f0c0e6dbf1da241189d5e8006ec4db024 Mon Sep 17 00:00:00 2001 From: ImUrX Date: Sun, 5 Feb 2023 01:17:08 -0300 Subject: [PATCH 2/4] rename to lint --- .github/workflows/build-gui.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/build-gui.yml b/.github/workflows/build-gui.yml index 9dd5912a9..40efaa493 100644 --- a/.github/workflows/build-gui.yml +++ b/.github/workflows/build-gui.yml @@ -17,6 +17,26 @@ on: create: jobs: + lint: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version-file: '.node-version' + cache: 'npm' + + - name: Build + run: | + npm ci + cd gui + npm run lint + build: strategy: fail-fast: false From 836dc5473d95a5335a2063d9ac16f2c81aa174d6 Mon Sep 17 00:00:00 2001 From: ImUrX Date: Sun, 5 Feb 2023 01:42:13 -0300 Subject: [PATCH 3/4] eslint fixes --- gui/.eslintrc.json | 9 ++++++++- gui/src/App.tsx | 12 ++++++------ gui/src/components/MainLayout.tsx | 2 -- gui/src/components/commons/Input.tsx | 4 ++-- gui/src/components/commons/icon/CheckIcon.tsx | 2 +- gui/src/components/onboarding/BodyAssignment.tsx | 2 -- .../components/settings/pages/OSCRouterSettings.tsx | 2 +- gui/src/components/settings/pages/VRCOSCSettings.tsx | 7 +++---- gui/src/components/tracker/TrackerSettings.tsx | 5 +++-- gui/src/hooks/layout.ts | 10 +--------- gui/src/hooks/onboarding.ts | 11 ++--------- gui/src/hooks/timeout.ts | 2 +- gui/src/hooks/wifi-form.tsx | 2 -- 13 files changed, 28 insertions(+), 42 deletions(-) diff --git a/gui/.eslintrc.json b/gui/.eslintrc.json index 870568494..e40559ef9 100644 --- a/gui/.eslintrc.json +++ b/gui/.eslintrc.json @@ -28,7 +28,14 @@ "@typescript-eslint/no-explicit-any": "off", "react/no-unescaped-entities": "off", "prettier/prettier": "warn", - "camelcase": "error" + "camelcase": "error", + "@typescript-eslint/no-unused-vars": [ + "warn", + { + "argsIgnorePattern": "^_", + "varsIgnorePattern": "^_" + } + ] }, "settings": { "import/resolver": { diff --git a/gui/src/App.tsx b/gui/src/App.tsx index 992d3c92a..51cd0d267 100644 --- a/gui/src/App.tsx +++ b/gui/src/App.tsx @@ -116,8 +116,8 @@ export default function App() { const unlisten = listen( 'server-status', (event: Event<[string, string]>) => { - const [event_type, s] = event.payload; - if ('stderr' === event_type) { + const [eventType, s] = event.payload; + if ('stderr' === eventType) { // This strange invocation is what lets us lose the line information in the console // See more here: https://stackoverflow.com/a/48994308 setTimeout( @@ -128,7 +128,7 @@ export default function App() { 'color:red' ) ); - } else if (event_type === 'stdout') { + } else if (eventType === 'stdout') { setTimeout( console.log.bind( console, @@ -137,11 +137,11 @@ export default function App() { 'color:green' ) ); - } else if (event_type === 'error') { + } else if (eventType === 'error') { console.error('Error: %s', s); - } else if (event_type === 'terminated') { + } else if (eventType === 'terminated') { console.error('Server Process Terminated: %s', s); - } else if (event_type === 'other') { + } else if (eventType === 'other') { console.log('Other process event: %s', s); } } diff --git a/gui/src/components/MainLayout.tsx b/gui/src/components/MainLayout.tsx index 701ee0d32..97d769423 100644 --- a/gui/src/components/MainLayout.tsx +++ b/gui/src/components/MainLayout.tsx @@ -1,8 +1,6 @@ import classNames from 'classnames'; import { ReactNode, useEffect, useState } from 'react'; import { - DriftCompensationSettings, - DriftCompensationSettingsT, ResetType, RpcMessage, SettingsRequestT, diff --git a/gui/src/components/commons/Input.tsx b/gui/src/components/commons/Input.tsx index 33b580a58..1f74262cf 100644 --- a/gui/src/components/commons/Input.tsx +++ b/gui/src/components/commons/Input.tsx @@ -5,7 +5,7 @@ import { EyeIcon } from './icon/EyeIcon'; interface InputProps { variant?: 'primary' | 'secondary'; - label: string; + label?: string; name: string; } @@ -13,7 +13,7 @@ export const InputInside = forwardRef< HTMLInputElement, { variant?: 'primary' | 'secondary'; - label: string; + label?: string; onChange: () => void; } & Partial >(function AppInput( diff --git a/gui/src/components/commons/icon/CheckIcon.tsx b/gui/src/components/commons/icon/CheckIcon.tsx index ee06dc53a..df86a9971 100644 --- a/gui/src/components/commons/icon/CheckIcon.tsx +++ b/gui/src/components/commons/icon/CheckIcon.tsx @@ -1,4 +1,4 @@ -export function CheckIcon(props: any) { +export function CheckIcon(_props: any) { return ( void; }) { - const { l10n } = useLocalization(); const { useAssignedTrackers } = useTrackers(); const assignedTrackers = useAssignedTrackers(); diff --git a/gui/src/components/settings/pages/OSCRouterSettings.tsx b/gui/src/components/settings/pages/OSCRouterSettings.tsx index 5c819df8e..46257494d 100644 --- a/gui/src/components/settings/pages/OSCRouterSettings.tsx +++ b/gui/src/components/settings/pages/OSCRouterSettings.tsx @@ -45,7 +45,7 @@ export function OSCRouterSettings() { const { state } = useLocation(); const pageRef = useRef(null); - const { reset, control, watch, handleSubmit, register } = + const { reset, control, watch, handleSubmit } = useForm({ defaultValues: defaultValues, }); diff --git a/gui/src/components/settings/pages/VRCOSCSettings.tsx b/gui/src/components/settings/pages/VRCOSCSettings.tsx index ba6f3b9f6..1aba35ec8 100644 --- a/gui/src/components/settings/pages/VRCOSCSettings.tsx +++ b/gui/src/components/settings/pages/VRCOSCSettings.tsx @@ -64,10 +64,9 @@ export function VRCOSCSettings() { const { state } = useLocation(); const pageRef = useRef(null); - const { reset, control, watch, handleSubmit, register } = - useForm({ - defaultValues: defaultValues, - }); + const { reset, control, watch, handleSubmit } = useForm({ + defaultValues: defaultValues, + }); const onSubmit = (values: VRCOSCSettingsForm) => { const settings = new ChangeSettingsRequestT(); diff --git a/gui/src/components/tracker/TrackerSettings.tsx b/gui/src/components/tracker/TrackerSettings.tsx index 0795f27e2..02cf92a96 100644 --- a/gui/src/components/tracker/TrackerSettings.tsx +++ b/gui/src/components/tracker/TrackerSettings.tsx @@ -51,7 +51,7 @@ export function TrackerSettingsPage() { trackernum: string; deviceid: string; }>(); - const { control, register, watch, reset, handleSubmit } = useForm<{ + const { control, watch, reset, handleSubmit } = useForm<{ trackerName: string | null; allowDriftCompensation: boolean | null; }>({ @@ -335,7 +335,8 @@ export function TrackerSettingsPage() { type="text" name="trackerName" control={control} - autocomplete={false} + autocomplete="false" + rules={undefined} > diff --git a/gui/src/hooks/layout.ts b/gui/src/hooks/layout.ts index bfba85735..998b6609c 100644 --- a/gui/src/hooks/layout.ts +++ b/gui/src/hooks/layout.ts @@ -1,12 +1,4 @@ -import { - MutableRefObject, - Ref, - useEffect, - useLayoutEffect, - useMemo, - useRef, - useState, -} from 'react'; +import { MutableRefObject, useEffect, useLayoutEffect, useRef, useState } from 'react'; export function useLayout() { const [layoutHeight, setLayoutHeigt] = useState(window.innerHeight); diff --git a/gui/src/hooks/onboarding.ts b/gui/src/hooks/onboarding.ts index fc2135353..74f6ff780 100644 --- a/gui/src/hooks/onboarding.ts +++ b/gui/src/hooks/onboarding.ts @@ -1,12 +1,5 @@ -import { - createContext, - Reducer, - useContext, - useEffect, - useLayoutEffect, - useReducer, -} from 'react'; -import { useLocation, useParams } from 'react-router-dom'; +import { createContext, Reducer, useContext, useLayoutEffect, useReducer } from 'react'; +import { useLocation } from 'react-router-dom'; import { useConfig } from './config'; type OnboardingAction = diff --git a/gui/src/hooks/timeout.ts b/gui/src/hooks/timeout.ts index acba907ea..547a6cd7b 100644 --- a/gui/src/hooks/timeout.ts +++ b/gui/src/hooks/timeout.ts @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react'; +import { useEffect } from 'react'; export function useTimeout(fn: () => void, delay: number) { useEffect(() => { diff --git a/gui/src/hooks/wifi-form.tsx b/gui/src/hooks/wifi-form.tsx index 5cbdc56d9..f1f616be6 100644 --- a/gui/src/hooks/wifi-form.tsx +++ b/gui/src/hooks/wifi-form.tsx @@ -1,8 +1,6 @@ -import { Localized } from '@fluent/react'; import { useEffect } from 'react'; import { useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; -import { Input } from '../components/commons/Input'; import { useOnboarding } from './onboarding'; export interface WifiFormData { From 54b04e5dd73063a09b5d930043178c6659e81505 Mon Sep 17 00:00:00 2001 From: Uriel Date: Sun, 5 Feb 2023 18:46:12 -0300 Subject: [PATCH 4/4] Update index.css --- gui/src/index.css | 1 - 1 file changed, 1 deletion(-) diff --git a/gui/src/index.css b/gui/src/index.css index b3143c474..0dd89b89e 100644 --- a/gui/src/index.css +++ b/gui/src/index.css @@ -4,7 +4,6 @@ body { font-variant-numeric: tabular-nums; - font-family: 'poppins', sans-serif, emoji, 'Twemoji Country Flags'; font-family: 'poppins', sans-serif, 'Twemoji'; height: 100vh; width: 100vw;