Browse Source

Merge branch 'master' into switch-rsbuild-to-vite

pull/417/head
Dan Ditomaso 1 year ago
committed by GitHub
parent
commit
349a2bf855
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      src/components/DeviceSelector.tsx
  2. 8
      src/components/PageComponents/Connect/HTTP.tsx
  3. 2
      src/core/stores/appStore.ts

2
src/components/DeviceSelector.tsx

@ -1,5 +1,5 @@
import { DeviceSelectorButton } from "@components/DeviceSelectorButton.tsx"; import { DeviceSelectorButton } from "@components/DeviceSelectorButton.tsx";
import { ThemeSwitcher } from "@components/ThemeSwitcher.tsx"; import ThemeSwitcher from "@components/ThemeSwitcher.tsx";
import { Separator } from "@components/UI/Seperator.tsx"; import { Separator } from "@components/UI/Seperator.tsx";
import { Code } from "@components/UI/Typography/Code.tsx"; import { Code } from "@components/UI/Typography/Code.tsx";
import { useAppStore } from "@core/stores/appStore.ts"; import { useAppStore } from "@core/stores/appStore.ts";

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

@ -64,16 +64,16 @@ export const HTTP = ({ closeDialog }: TabElementProps): JSX.Element => {
<Controller <Controller
name="tls" name="tls"
control={control} control={control}
render={({ field: { value, ...rest } }) => ( render={({ field: { value, onChange, ...rest } }) => (
<> <>
<Label>Use HTTPS</Label> <Label>Use HTTPS</Label>
<Switch <Switch
onCheckedChange={(checked) => { onCheckedChange={(checked) => {
checked ? setHTTPS(true) : setHTTPS(false); checked ? setHTTPS(true) : setHTTPS(false);
}} }}
// label="Use TLS"
// description="Description" disabled={
disabled={
location.protocol === "https:" || connectionInProgress location.protocol === "https:" || connectionInProgress
} }
checked={value} checked={value}

2
src/core/stores/appStore.ts

@ -14,11 +14,13 @@ interface ErrorState {
message: string; message: string;
} }
interface ErrorState { interface ErrorState {
field: string; field: string;
message: string; message: string;
} }
interface AppState { interface AppState {
selectedDevice: number; selectedDevice: number;
devices: { devices: {

Loading…
Cancel
Save