Self-hosted, plugin-based server management.
TypeScript dockerhomelabpluginsrdpremote-desktopself-hostedserver-managementsftpsshterminaltermixvnc
Revert "Rename terminals, add welcome card for the survey, add buttons to make it clear how to open the sidebar/topbar after closing."
LukeGusb0880129adcb
diff --git a/.env b/.envindex 27929cdee..3967bc094 100644--- a/.env+++ b/.env@@ -1 +1 @@-VERSION=1.1.1\ No newline at end of file+VERSION=1.1\ No newline at end of filediff --git a/src/App.tsx b/src/App.tsxindex c4510ae9a..8940ef8c0 100644--- a/src/App.tsx+++ b/src/App.tsx@@ -1,7 +1,7 @@import React from "react"import {Homepage} from "@/apps/Homepage/Homepage.tsx"-import {Terminal} from "@/apps/SSH/Terminal/Terminal.tsx"+import {SSH} from "@/apps/SSH/Terminal/SSH.tsx"import {SSHTunnel} from "@/apps/SSH/Tunnel/SSHTunnel.tsx";import {ConfigEditor} from "@/apps/SSH/Config Editor/ConfigEditor.tsx";import {SSHManager} from "@/apps/SSH/Manager/SSHManager.tsx"@@ -35,7 +35,7 @@ function App() {)}{mountedViews.has("terminal") && (<div style={{display: view === "terminal" ? "block" : "none"}}>- <Terminal onSelectView={handleSelectView} />+ <SSH onSelectView={handleSelectView} /></div>)}{mountedViews.has("tunnel") && (diff --git a/src/apps/Homepage/Homepage.tsx b/src/apps/Homepage/Homepage.tsxindex 9efe1e67a..470168b5f 100644--- a/src/apps/Homepage/Homepage.tsx+++ b/src/apps/Homepage/Homepage.tsx@@ -3,7 +3,6 @@ import React, {useEffect, useState} from "react";import {HomepageAuth} from "@/apps/Homepage/HomepageAuth.tsx";import axios from "axios";import {HomepageUpdateLog} from "@/apps/Homepage/HompageUpdateLog.tsx";-import {HomepageWelcomeCard} from "@/apps/Homepage/HomepageWelcomeCard.tsx";interface HomepageProps {onSelectView: (view: string) => void;@@ -33,12 +32,9 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {const [username, setUsername] = useState<string | null>(null);const [authLoading, setAuthLoading] = useState(true);const [dbError, setDbError] = useState<string | null>(null);- const [showWelcomeCard, setShowWelcomeCard] = useState(true);useEffect(() => {const jwt = getCookie("jwt");- const welcomeHidden = getCookie("welcome_hidden");-if (jwt) {setAuthLoading(true);Promise.all([@@ -50,7 +46,6 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {setIsAdmin(!!meRes.data.is_admin);setUsername(meRes.data.username || null);setDbError(null);- setShowWelcomeCard(welcomeHidden !== "true");}).catch((err) => {setLoggedIn(false);@@ -69,11 +64,6 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {}}, []);- const handleHideWelcomeCard = () => {- setShowWelcomeCard(false);- setCookie("welcome_hidden", "true", 365 * 10);- };-return (<HomepageSidebaronSelectView={onSelectView}@@ -96,13 +86,6 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {loggedIn={loggedIn}/></div>-- {loggedIn && !authLoading && showWelcomeCard && (- <div- className="absolute inset-0 flex items-center justify-center bg-background/80 backdrop-blur-sm z-10">- <HomepageWelcomeCard onHidePermanently={handleHideWelcomeCard}/>- </div>- )}</div></HomepageSidebar>);diff --git a/src/apps/Homepage/HomepageWelcomeCard.tsx b/src/apps/Homepage/HomepageWelcomeCard.tsxdeleted file mode 100644index 4ef52ce3a..000000000--- a/src/apps/Homepage/HomepageWelcomeCard.tsx+++ /dev/null@@ -1,58 +0,0 @@-import React from "react";-import {Card, CardContent, CardFooter, CardHeader, CardTitle} from "@/components/ui/card";-import {Button} from "@/components/ui/button";--interface HomepageWelcomeCardProps {- onHidePermanently: () => void;-}--export function HomepageWelcomeCard({onHidePermanently}: HomepageWelcomeCardProps): React.ReactElement {- return (- <Card className="w-full max-w-2xl mx-auto">- <CardHeader>- <CardTitle className="text-2xl font-bold text-center">- The Future of Termix- </CardTitle>- </CardHeader>- <CardContent>- <p className="text-muted-foreground text-center leading-relaxed">- Please checkout the linked survey{" "}- <a- href="https://docs.google.com/forms/d/e/1FAIpQLSeGvnQODFtnpjmJsMKgASbaQ87CLQEBCcnzK_Vuw5TdfbfIyA/viewform?usp=sharing&ouid=107601685503825301492"- target="_blank"- rel="noopener noreferrer"- className="text-primary hover:underline hover:text-primary/80 transition-colors"- >- here- </a>- . The purpose of this survey is to gather feedback from users on what the future UI of Termix could- look like to optimize server management. Please take a minute or two to read the survey questions- and answer them to the best of your ability. Thank you!- </p>- <p className="text-muted-foreground text-center leading-relaxed mt-6">- A special thanks to those in Asia who recently joined Termix through various forum posts, keep- sharing it! A Chinese translation is planned for Termix, but since I don’t speak Chinese, I’ll need- to hire someone to help with the translation. If you’d like to support me financially, you can do- so{" "}- <a- href="https://github.com/sponsors/LukeGus"- target="_blank"- rel="noopener noreferrer"- className="text-primary hover:underline hover:text-primary/80 transition-colors"- >- here.- </a>- </p>- </CardContent>- <CardFooter className="justify-center">- <Button- variant="outline"- onClick={onHidePermanently}- className="w-full max-w-xs"- >- Hide Permanently- </Button>- </CardFooter>- </Card>- );-}diff --git a/src/apps/SSH/Terminal/Terminal.tsx b/src/apps/SSH/Terminal/SSH.tsxsimilarity index 97%rename from src/apps/SSH/Terminal/Terminal.tsxrename to src/apps/SSH/Terminal/SSH.tsxindex e6e926001..002be4caa 100644--- a/src/apps/SSH/Terminal/Terminal.tsx+++ b/src/apps/SSH/Terminal/SSH.tsx@@ -1,10 +1,9 @@import React, {useState, useRef, useEffect} from "react";-import {TerminalSidebar} from "@/apps/SSH/Terminal/TerminalSidebar.tsx";-import {TerminalComponent} from "./TerminalComponent.tsx";-import {TerminalTopbar} from "@/apps/SSH/Terminal/TerminalTopbar.tsx";+import {SSHSidebar} from "@/apps/SSH/Terminal/SSHSidebar.tsx";+import {SSHTerminal} from "./SSHTerminal.tsx";+import {SSHTopbar} from "@/apps/SSH/Terminal/SSHTopbar.tsx";import {ResizablePanelGroup, ResizablePanel, ResizableHandle} from '@/components/ui/resizable.tsx';import * as ResizablePrimitive from "react-resizable-panels";-import {ChevronDown, ChevronRight} from "lucide-react";interface ConfigEditorProps {onSelectView: (view: string) => void;@@ -17,7 +16,7 @@ type Tab = {terminalRef: React.RefObject<any>;};-export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElement {+export function SSH({onSelectView}: ConfigEditorProps): React.ReactElement {const [allTabs, setAllTabs] = useState<Tab[]>([]);const [currentTab, setCurrentTab] = useState<number | null>(null);const [allSplitScreenTab, setAllSplitScreenTab] = useState<number[]>([]);@@ -26,7 +25,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementconst [isSidebarOpen, setIsSidebarOpen] = useState<boolean>(true);const [isTopbarOpen, setIsTopbarOpen] = useState<boolean>(true);const SIDEBAR_WIDTH = 256;- const HANDLE_THICKNESS = 10;+ const HANDLE_THICKNESS = 6;const [panelRects, setPanelRects] = useState<Record<string, DOMRect | null>>({});const panelRefs = useRef<Record<string, HTMLDivElement | null>>({});@@ -161,7 +160,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementconst isVisible = !!layoutStyles[tab.id];return (<div key={tab.id} style={style} data-terminal-id={tab.id}>- <TerminalComponent+ <SSHTerminalkey={tab.id}ref={tab.terminalRef}hostConfig={tab.hostConfig}@@ -594,6 +593,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementreturn (<div style={{display: 'flex', width: '100vw', height: '100vh', overflow: 'hidden', position: 'relative'}}>+ {/* Sidebar (collapsible) */}<divstyle={{width: isSidebarOpen ? SIDEBAR_WIDTH : 0,@@ -609,7 +609,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementwillChange: 'width',}}>- <TerminalSidebar+ <SSHSidebaronSelectView={onSelectView}onHostConnect={onHostConnect}allTabs={allTabs}@@ -655,7 +655,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementwillChange: 'height',}}>- <TerminalTopbar+ <SSHTopbarallTabs={allTabs}currentTab={currentTab ?? -1}setActiveTab={setActiveTab}@@ -677,15 +677,12 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementbackground: '#222224',cursor: 'pointer',zIndex: 12,- display: 'flex',- alignItems: 'center',- justifyContent: 'center',}}- title="Show top bar">- <ChevronDown size={HANDLE_THICKNESS} />- </div>+ title="Show top bar"+ />)}+ {/* Main terminal area (height adapts to topbar) */}<divstyle={{height: isTopbarOpen ? 'calc(100% - 46px)' : '100%',@@ -759,6 +756,7 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElement</div></div>+ {/* Sidebar reopen handle */}{!isSidebarOpen && (<divonClick={() => setIsSidebarOpen(true)}@@ -771,13 +769,9 @@ export function Terminal({onSelectView}: ConfigEditorProps): React.ReactElementbackground: '#222224',cursor: 'pointer',zIndex: 20,- display: 'flex',- alignItems: 'center',- justifyContent: 'center',}}- title="Show sidebar">- <ChevronRight size={HANDLE_THICKNESS} />- </div>+ title="Show sidebar"+ />)}</div>);diff --git a/src/apps/SSH/Terminal/TerminalSidebar.tsx b/src/apps/SSH/Terminal/SSHSidebar.tsxsimilarity index 99%rename from src/apps/SSH/Terminal/TerminalSidebar.tsxrename to src/apps/SSH/Terminal/SSHSidebar.tsxindex 903185203..e92dbae59 100644--- a/src/apps/SSH/Terminal/TerminalSidebar.tsx+++ b/src/apps/SSH/Terminal/SSHSidebar.tsx@@ -74,7 +74,7 @@ export interface SidebarProps {onOpenChange?: (open: boolean) => void;}-export function TerminalSidebar({+export function SSHSidebar({onSelectView,onHostConnect,allTabs,diff --git a/src/apps/SSH/Terminal/TerminalTabList.tsx b/src/apps/SSH/Terminal/SSHTabList.tsxsimilarity index 98%rename from src/apps/SSH/Terminal/TerminalTabList.tsxrename to src/apps/SSH/Terminal/SSHTabList.tsxindex 2e52d865d..b60bfbb57 100644--- a/src/apps/SSH/Terminal/TerminalTabList.tsx+++ b/src/apps/SSH/Terminal/SSHTabList.tsx@@ -16,7 +16,7 @@ interface SSHTabListProps {setCloseTab: (tab: number) => void;}-export function TerminalTabList({+export function SSHTabList({allTabs,currentTab,setActiveTab,diff --git a/src/apps/SSH/Terminal/TerminalComponent.tsx b/src/apps/SSH/Terminal/SSHTerminal.tsxsimilarity index 99%rename from src/apps/SSH/Terminal/TerminalComponent.tsxrename to src/apps/SSH/Terminal/SSHTerminal.tsxindex c69ac609e..740899814 100644--- a/src/apps/SSH/Terminal/TerminalComponent.tsx+++ b/src/apps/SSH/Terminal/SSHTerminal.tsx@@ -13,7 +13,7 @@ interface SSHTerminalProps {splitScreen?: boolean;}-export const TerminalComponent = forwardRef<any, SSHTerminalProps>(function SSHTerminal(+export const SSHTerminal = forwardRef<any, SSHTerminalProps>(function SSHTerminal({hostConfig, isVisible, splitScreen = false},ref) {diff --git a/src/apps/SSH/Terminal/TerminalTopbar.tsx b/src/apps/SSH/Terminal/SSHTopbar.tsxsimilarity index 94%rename from src/apps/SSH/Terminal/TerminalTopbar.tsxrename to src/apps/SSH/Terminal/SSHTopbar.tsxindex 036ae6223..30d4c9101 100644--- a/src/apps/SSH/Terminal/TerminalTopbar.tsx+++ b/src/apps/SSH/Terminal/SSHTopbar.tsx@@ -1,4 +1,4 @@-import {TerminalTabList} from "@/apps/SSH/Terminal/TerminalTabList.tsx";+import {SSHTabList} from "@/apps/SSH/Terminal/SSHTabList.tsx";import React from "react";import {ChevronUp} from "lucide-react";@@ -17,7 +17,7 @@ interface SSHTopbarProps {onHideTopbar?: () => void;}-export function TerminalTopbar({+export function SSHTopbar({allTabs,currentTab,setActiveTab,@@ -38,7 +38,7 @@ export function TerminalTopbar({}}><div style={{flex: 1, minWidth: 0, height: '100%', overflowX: 'auto'}}><div style={{minWidth: 'max-content', height: '100%', paddingLeft: 8, overflowY: 'hidden'}}>- <TerminalTabList+ <SSHTabListallTabs={allTabs}currentTab={currentTab}setActiveTab={setActiveTab}