Browse Source
Merge branch 'master' into switch-rsbuild-to-vite
pull/417/head
Dan Ditomaso
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
7 additions and
5 deletions
-
src/components/DeviceSelector.tsx
-
src/components/PageComponents/Connect/HTTP.tsx
-
src/core/stores/appStore.ts
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
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 { Code } from "@components/UI/Typography/Code.tsx"; |
|
|
|
import { useAppStore } from "@core/stores/appStore.ts"; |
|
|
|
|
|
|
|
@ -64,16 +64,16 @@ export const HTTP = ({ closeDialog }: TabElementProps): JSX.Element => { |
|
|
|
<Controller |
|
|
|
name="tls" |
|
|
|
control={control} |
|
|
|
render={({ field: { value, ...rest } }) => ( |
|
|
|
render={({ field: { value, onChange, ...rest } }) => ( |
|
|
|
<> |
|
|
|
<Label>Use HTTPS</Label> |
|
|
|
<Switch |
|
|
|
|
|
|
|
onCheckedChange={(checked) => { |
|
|
|
checked ? setHTTPS(true) : setHTTPS(false); |
|
|
|
}} |
|
|
|
// label="Use TLS"
|
|
|
|
// description="Description"
|
|
|
|
disabled={ |
|
|
|
|
|
|
|
disabled={ |
|
|
|
location.protocol === "https:" || connectionInProgress |
|
|
|
} |
|
|
|
checked={value} |
|
|
|
|
|
|
|
@ -14,11 +14,13 @@ interface ErrorState { |
|
|
|
message: string; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
interface ErrorState { |
|
|
|
field: string; |
|
|
|
message: string; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
interface AppState { |
|
|
|
selectedDevice: number; |
|
|
|
devices: { |
|
|
|
|