sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-17 22:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Eduard Gert
2026-05-11 15:16:41 +02:00
parent b5a970155b
commit 439f44c6b4
13 changed files with 12 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/ui/frontend/src/screens/Debug.tsx
View File

@@ -1,11 +1,6 @@
import { useState } from "react";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Debug.tsx
import { Debug as DebugSvc } from "@bindings/services";
import type { DebugBundleResult } from "@bindings/services/models.js";
========
import { Debug as DebugSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { DebugBundleResult } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Debug.tsx
import { Button } from "../components/Button";
import { Input } from "../components/Input";
import { Switch } from "../components/Switch";

5
client/ui/frontend/src/screens/Networks.tsx
View File

@@ -1,12 +1,7 @@
import { useCallback, useEffect, useMemo, useState } from "react";
import { RefreshCw } from "lucide-react";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Networks.tsx
import { Networks as NetworksSvc } from "@bindings/services";
import type { Network } from "@bindings/services/models.js";
========
import { Networks as NetworksSvc } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { Network } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Networks.tsx
import { Button } from "../components/Button";
import { Tabs } from "../components/Tabs";

4
client/ui/frontend/src/screens/Peers.tsx
View File

@@ -1,11 +1,7 @@
import { useMemo, useState } from "react";
import { ChevronDown, ChevronRight, Network, ShieldCheck, Zap } from "lucide-react";
import { useStatus } from "../hooks/useStatus";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Peers.tsx
import type { PeerStatus } from "@bindings/services/models.js";
========
import type { PeerStatus } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Peers.tsx
import { Card } from "../components/Card";
import { Input } from "../components/Input";
import { cn } from "../lib/cn";

5
client/ui/frontend/src/screens/Profiles.tsx
View File

@@ -3,13 +3,8 @@ import { Plus, RefreshCw } from "lucide-react";
import {
Profiles as ProfilesSvc,
Connection,
<<<<<<<< HEAD:client/ui/frontend/src/screens/Profiles.tsx
} from "@bindings/services";
import type { Profile } from "@bindings/services/models.js";
========
} from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { Profile } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Profiles.tsx
import { Button } from "../components/Button";
import { Input } from "../components/Input";
import { Card } from "../components/Card";

4
client/ui/frontend/src/screens/QuickActions.tsx
View File

@@ -1,10 +1,6 @@
import { CheckCircle2, Circle, Loader2, Power } from "lucide-react";
import { useStatus } from "../hooks/useStatus";
<<<<<<<< HEAD:client/ui/frontend/src/screens/QuickActions.tsx
import { Connection } from "@bindings/services";
========
import { Connection } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/QuickActions.tsx
import { Button } from "../components/Button";
import { cn } from "../lib/cn";

5
client/ui/frontend/src/screens/Settings.tsx
View File

@@ -2,13 +2,8 @@ import { useCallback, useEffect, useState } from "react";
import {
Settings as SettingsSvc,
Profiles as ProfilesSvc,
<<<<<<<< HEAD:client/ui/frontend/src/screens/Settings.tsx
} from "@bindings/services";
import type { Config } from "@bindings/services/models.js";
========
} from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { Config } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Settings.tsx
import { Button } from "../components/Button";
import { Input } from "../components/Input";
import { Switch } from "../components/Switch";

8
client/ui/frontend/src/screens/Status.tsx
View File

@@ -1,13 +1,8 @@
import { CheckCircle2, Circle, Loader2, AlertTriangle, Power, LogIn } from "lucide-react";
import { useNavigate } from "react-router-dom";
import { useStatus } from "../hooks/useStatus";
<<<<<<<< HEAD:client/ui/frontend/src/screens/Status.tsx
import { Connection } from "@bindings/services";
import type { SystemEvent } from "@bindings/services/models.js";
========
import { Connection } from "../../bindings/github.com/netbirdio/netbird/client/ui/services";
import type { SystemEvent } from "../../bindings/github.com/netbirdio/netbird/client/ui/services/models.js";
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Status.tsx
import { Button } from "../components/Button";
import { Card } from "../components/Card";
import { cn } from "../lib/cn";
@@ -29,15 +24,12 @@ export default function Status() {
// the user has no other way out. Disconnect is the manual unstick path.
const showLogin = !connected;
<<<<<<<< HEAD:client/ui/frontend/src/screens/Status.tsx
const toggleState: ConnectionState =
connected ? ConnectionState.Connected
: connecting ? ConnectionState.Connecting
: ConnectionState.Disconnected;
========
const login = () => navigate("/login");
>>>>>>>> ui-refactor:client/ui/frontend/src/pages/Status.tsx
const connect = () => Connection.Up({ profileName: "", username: "" }).catch(console.error);
const disconnect = () => Connection.Down().catch(console.error);
const toggleConnection = () => (connected ? disconnect() : connect());