fix: merge syntax errors
This commit is contained in:
@@ -362,7 +362,8 @@ export interface TabContextTab {
|
|||||||
| "file_manager"
|
| "file_manager"
|
||||||
| "user_profile"
|
| "user_profile"
|
||||||
| "rdp"
|
| "rdp"
|
||||||
| "vnc";
|
| "vnc"
|
||||||
|
| "tunnel"
|
||||||
| "docker";
|
| "docker";
|
||||||
title: string;
|
title: string;
|
||||||
hostConfig?: SSHHost;
|
hostConfig?: SSHHost;
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ function AppContent() {
|
|||||||
currentTabData?.type === "server" ||
|
currentTabData?.type === "server" ||
|
||||||
currentTabData?.type === "file_manager" ||
|
currentTabData?.type === "file_manager" ||
|
||||||
currentTabData?.type === "rdp" ||
|
currentTabData?.type === "rdp" ||
|
||||||
currentTabData?.type === "vnc";
|
currentTabData?.type === "vnc" ||
|
||||||
currentTabData?.type === "tunnel" ||
|
currentTabData?.type === "tunnel" ||
|
||||||
currentTabData?.type === "docker";
|
currentTabData?.type === "docker";
|
||||||
const showHome = currentTabData?.type === "home";
|
const showHome = currentTabData?.type === "home";
|
||||||
|
|||||||
@@ -2,7 +2,10 @@ import React, { useEffect, useRef, useState, useMemo } from "react";
|
|||||||
import { Terminal } from "@/ui/desktop/apps/terminal/Terminal.tsx";
|
import { Terminal } from "@/ui/desktop/apps/terminal/Terminal.tsx";
|
||||||
import { ServerStats as ServerView } from "@/ui/desktop/apps/server-stats/ServerStats.tsx";
|
import { ServerStats as ServerView } from "@/ui/desktop/apps/server-stats/ServerStats.tsx";
|
||||||
import { FileManager } from "@/ui/desktop/apps/file-manager/FileManager.tsx";
|
import { FileManager } from "@/ui/desktop/apps/file-manager/FileManager.tsx";
|
||||||
import { GuacamoleDisplay, type GuacamoleConnectionConfig } from "@/ui/desktop/apps/guacamole/GuacamoleDisplay.tsx";
|
import {
|
||||||
|
GuacamoleDisplay,
|
||||||
|
type GuacamoleConnectionConfig,
|
||||||
|
} from "@/ui/desktop/apps/guacamole/GuacamoleDisplay.tsx";
|
||||||
import { TunnelManager } from "@/ui/desktop/apps/tunnel/TunnelManager.tsx";
|
import { TunnelManager } from "@/ui/desktop/apps/tunnel/TunnelManager.tsx";
|
||||||
import { DockerManager } from "@/ui/desktop/apps/docker/DockerManager.tsx";
|
import { DockerManager } from "@/ui/desktop/apps/docker/DockerManager.tsx";
|
||||||
import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
|
import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
|
||||||
@@ -63,7 +66,7 @@ export function AppView({
|
|||||||
tab.type === "server" ||
|
tab.type === "server" ||
|
||||||
tab.type === "file_manager" ||
|
tab.type === "file_manager" ||
|
||||||
tab.type === "rdp" ||
|
tab.type === "rdp" ||
|
||||||
tab.type === "vnc", ||
|
tab.type === "vnc" ||
|
||||||
tab.type === "tunnel" ||
|
tab.type === "tunnel" ||
|
||||||
tab.type === "docker",
|
tab.type === "docker",
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ export function Tab({
|
|||||||
tabType === "file_manager" ||
|
tabType === "file_manager" ||
|
||||||
tabType === "user_profile" ||
|
tabType === "user_profile" ||
|
||||||
tabType === "rdp" ||
|
tabType === "rdp" ||
|
||||||
tabType === "vnc"
|
tabType === "vnc" ||
|
||||||
tabType === "tunnel" ||
|
tabType === "tunnel" ||
|
||||||
tabType === "docker"
|
tabType === "docker"
|
||||||
) {
|
) {
|
||||||
@@ -141,17 +141,14 @@ export function Tab({
|
|||||||
? t("nav.serverStats")
|
? t("nav.serverStats")
|
||||||
: isFileManager
|
: isFileManager
|
||||||
? t("nav.fileManager")
|
? t("nav.fileManager")
|
||||||
: isUserProfile
|
|
||||||
? t("nav.userProfile")
|
|
||||||
: isRemoteDesktop
|
|
||||||
? tabType.toUpperCase()
|
|
||||||
: t("nav.terminal"));
|
|
||||||
: isTunnel
|
: isTunnel
|
||||||
? t("nav.tunnels")
|
? t("nav.tunnels")
|
||||||
: isDocker
|
: isDocker
|
||||||
? t("nav.docker")
|
? t("nav.docker")
|
||||||
: isUserProfile
|
: isUserProfile
|
||||||
? t("nav.userProfile")
|
? t("nav.userProfile")
|
||||||
|
: isRemoteDesktop
|
||||||
|
? tabType.toUpperCase()
|
||||||
: t("nav.terminal"));
|
: t("nav.terminal"));
|
||||||
|
|
||||||
const { base, suffix } = splitTitle(displayTitle);
|
const { base, suffix } = splitTitle(displayTitle);
|
||||||
|
|||||||
Reference in New Issue
Block a user