diff --git a/client/src-tauri/capabilities/default.json b/client/src-tauri/capabilities/default.json index dc33f09..e1dae12 100644 --- a/client/src-tauri/capabilities/default.json +++ b/client/src-tauri/capabilities/default.json @@ -1,20 +1,30 @@ { "$schema": "../gen/schemas/desktop-schema.json", - "identifier": "default", "description": "enables the default permissions", - "windows": [ - "main" - ], + "identifier": "default-capability", "permissions": [ "core:default", "http:default", + "core:window:default", + "core:window:allow-start-dragging", + "core:window:allow-is-fullscreen", + "core:window:allow-minimize", + "core:window:allow-toggle-maximize", + "core:window:allow-close", + "http:allow-fetch", { - "identifier": "http:allow-fetch", "allow": [ { - "url": "https://ip.vomitblood.com" + "url": "https://*.vomitblood.com" + }, + { + "url": "http://localhost" } - ] + ], + "identifier": "http:default" } + ], + "windows": [ + "main" ] } \ No newline at end of file diff --git a/client/src-tauri/tauri.conf.json b/client/src-tauri/tauri.conf.json index e4d38b7..2cc5060 100644 --- a/client/src-tauri/tauri.conf.json +++ b/client/src-tauri/tauri.conf.json @@ -3,22 +3,7 @@ "app": { "security": { "capabilities": [ - { - "identifier": "default", - "permissions": [ - "core:window:default", - "core:window:allow-start-dragging", - "core:window:allow-is-fullscreen", - "core:window:allow-minimize", - "core:window:allow-toggle-maximize", - "core:window:allow-close", - "http:default", - "http:allow-fetch" - ], - "windows": [ - "main" - ] - } + "default-capability" ], "csp": null }, diff --git a/client/src/components/HeaderBar/ServerStatus.tsx b/client/src/components/HeaderBar/ServerStatus.tsx index fc25e5e..b57a30c 100644 --- a/client/src/components/HeaderBar/ServerStatus.tsx +++ b/client/src/components/HeaderBar/ServerStatus.tsx @@ -4,7 +4,7 @@ import { useAtom } from "jotai"; import { MouseEvent, useState } from "react"; import { serverConnectionAtom, serverUrlAtom } from "../../lib/jotai"; import { defaultSettings } from "../../lib/settings"; -import { ServerUrlInput } from "../Home/ServerUrlInput"; +import { ServerUrlInput } from "./ServerUrlInput"; export const ServerStatus = () => { // contexts diff --git a/client/src/components/Home/ServerUrlInput.tsx b/client/src/components/HeaderBar/ServerUrlInput.tsx similarity index 100% rename from client/src/components/Home/ServerUrlInput.tsx rename to client/src/components/HeaderBar/ServerUrlInput.tsx diff --git a/client/src/components/Home/Layout.tsx b/client/src/components/Home/Layout.tsx index d65032e..c408ecc 100644 --- a/client/src/components/Home/Layout.tsx +++ b/client/src/components/Home/Layout.tsx @@ -2,7 +2,7 @@ import { Box, Button, Container, Grid2, Switch, TextField, Typography, useTheme import { HeaderBar } from "../HeaderBar/HeaderBar"; import { AttackItem } from "./AttackItem"; -import { ServerUrlInput } from "./ServerUrlInput"; +import { ServerUrlInput } from "../HeaderBar/ServerUrlInput"; export const Layout = () => { // contexts