Skip to content

Self-hosted, plugin-based server management.

Update fonts, upadte logging, and auth.

LukeGus08f914399361
diff --git a/src/App.tsx b/src/App.tsx
index 46efa03ff..99d1319c8 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -35,8 +35,8 @@ function App() {
}
return (
- <div className="flex">
- <main>
+ <div className="flex min-h-svh w-full">
+ <main className="flex-1 w-full">
{renderActiveView()}
</main>
</div>
diff --git a/src/apps/Homepage/Homepage.tsx b/src/apps/Homepage/Homepage.tsx
index 60aa9464e..0279f1752 100644
--- a/src/apps/Homepage/Homepage.tsx
+++ b/src/apps/Homepage/Homepage.tsx
@@ -68,16 +68,14 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {
}, []);
return (
- <div className="flex min-h-screen">
- <HomepageSidebar
- onSelectView={onSelectView}
- disabled={!loggedIn || authLoading}
- isAdmin={isAdmin}
- username={loggedIn ? username : null}
- />
- <div className="flex-1 bg-background grid grid-cols-3 items-center">
- <div className="col-span-1"></div>
- <div className="col-span-1 flex justify-center">
+ <HomepageSidebar
+ onSelectView={onSelectView}
+ disabled={!loggedIn || authLoading}
+ isAdmin={isAdmin}
+ username={loggedIn ? username : null}
+ >
+ <div className="w-full min-h-svh grid place-items-center">
+ <div className="flex flex-row items-center justify-center gap-8">
<HomepageAuth
setLoggedIn={setLoggedIn}
setIsAdmin={setIsAdmin}
@@ -87,13 +85,11 @@ export function Homepage({onSelectView}: HomepageProps): React.ReactElement {
dbError={dbError}
setDbError={setDbError}
/>
- </div>
- <div className="col-span-1 flex justify-center">
<HomepageUpdateLog
loggedIn={loggedIn}
/>
</div>
</div>
- </div>
+ </HomepageSidebar>
);
}
\ No newline at end of file
diff --git a/src/apps/Homepage/HomepageAuth.tsx b/src/apps/Homepage/HomepageAuth.tsx
index a078cfcf4..185ac43d1 100644
--- a/src/apps/Homepage/HomepageAuth.tsx
+++ b/src/apps/Homepage/HomepageAuth.tsx
@@ -249,50 +249,50 @@ export function HomepageAuth({
)}
{(internalLoggedIn || (authLoading && getCookie("jwt"))) && (
<div className="flex flex-col items-center gap-4">
- <Alert className="my-2">
- <AlertTitle>Logged in!</AlertTitle>
- <AlertDescription>
- You are logged in! Use the sidebar to access all available tools. To get started,
- create an SSH Host in the SSH Manager tab. Once created, you can connect to that
- host using the other apps in the sidebar.
- </AlertDescription>
- </Alert>
+ <Alert className="my-2">
+ <AlertTitle>Logged in!</AlertTitle>
+ <AlertDescription>
+ You are logged in! Use the sidebar to access all available tools. To get started,
+ create an SSH Host in the SSH Manager tab. Once created, you can connect to that
+ host using the other apps in the sidebar.
+ </AlertDescription>
+ </Alert>
- <div className="flex flex-row items-center gap-2">
- <Button
- variant="link"
- className="text-sm"
- onClick={() => window.open('https://github.com/LukeGus/Termix', '_blank')}
- >
- GitHub
- </Button>
- <div className="w-px h-4 bg-border"></div>
- <Button
- variant="link"
- className="text-sm"
- onClick={() => window.open('https://github.com/LukeGus/Termix/issues/new', '_blank')}
- >
- Feedback
- </Button>
- <div className="w-px h-4 bg-border"></div>
- <Button
- variant="link"
- className="text-sm"
- onClick={() => window.open('https://discord.com/invite/jVQGdvHDrf', '_blank')}
- >
- Discord
- </Button>
- <div className="w-px h-4 bg-border"></div>
- <Button
- variant="link"
- className="text-sm"
- onClick={() => window.open('https://github.com/sponsors/LukeGus', '_blank')}
- >
- Fund
- </Button>
- </div>
- </div>
- )}
+ <div className="flex flex-row items-center gap-2">
+ <Button
+ variant="link"
+ className="text-sm"
+ onClick={() => window.open('https://github.com/LukeGus/Termix', '_blank')}
+ >
+ GitHub
+ </Button>
+ <div className="w-px h-4 bg-border"></div>
+ <Button
+ variant="link"
+ className="text-sm"
+ onClick={() => window.open('https://github.com/LukeGus/Termix/issues/new', '_blank')}
+ >
+ Feedback
+ </Button>
+ <div className="w-px h-4 bg-border"></div>
+ <Button
+ variant="link"
+ className="text-sm"
+ onClick={() => window.open('https://discord.com/invite/jVQGdvHDrf', '_blank')}
+ >
+ Discord
+ </Button>
+ <div className="w-px h-4 bg-border"></div>
+ <Button
+ variant="link"
+ className="text-sm"
+ onClick={() => window.open('https://github.com/sponsors/LukeGus', '_blank')}
+ >
+ Fund
+ </Button>
+ </div>
+ </div>
+ )}
{(!internalLoggedIn && (!authLoading || !getCookie("jwt"))) && (
<>
<div className="flex gap-2 mb-6">
diff --git a/src/apps/Homepage/HomepageSidebar.tsx b/src/apps/Homepage/HomepageSidebar.tsx
index 8608b8db8..30f4e524a 100644
--- a/src/apps/Homepage/HomepageSidebar.tsx
+++ b/src/apps/Homepage/HomepageSidebar.tsx
@@ -14,7 +14,7 @@ import {
SidebarGroupLabel,
SidebarMenu,
SidebarMenuButton,
- SidebarMenuItem, SidebarProvider,
+ SidebarMenuItem, SidebarProvider, SidebarInset,
} from "@/components/ui/sidebar.tsx"
import {
@@ -44,6 +44,7 @@ interface SidebarProps {
disabled?: boolean;
isAdmin?: boolean;
username?: string | null;
+ children?: React.ReactNode;
}
function handleLogout() {
@@ -72,7 +73,8 @@ export function HomepageSidebar({
getView,
disabled,
isAdmin,
- username
+ username,
+ children,
}: SidebarProps): React.ReactElement {
const [adminSheetOpen, setAdminSheetOpen] = React.useState(false);
const [allowRegistration, setAllowRegistration] = React.useState(true);
@@ -160,7 +162,7 @@ export function HomepageSidebar({
};
return (
- <div>
+ <div className="min-h-svh">
<SidebarProvider>
<Sidebar>
<SidebarContent>
@@ -430,6 +432,9 @@ export function HomepageSidebar({
</Sheet>
)}
</Sidebar>
+ <SidebarInset>
+ {children}
+ </SidebarInset>
</SidebarProvider>
</div>
)
diff --git a/src/apps/Homepage/HompageUpdateLog.tsx b/src/apps/Homepage/HompageUpdateLog.tsx
index 7453dd8cc..3a72c18f8 100644
--- a/src/apps/Homepage/HompageUpdateLog.tsx
+++ b/src/apps/Homepage/HompageUpdateLog.tsx
@@ -98,7 +98,7 @@ export function HomepageUpdateLog({loggedIn}: HomepageUpdateLogProps) {
};
return (
- <div className="w-[400px] h-[600px] mr-8 flex flex-col border border-border rounded-lg bg-card p-4">
+ <div className="w-[400px] h-[600px] flex flex-col border border-border rounded-lg bg-card p-4">
<div>
<h3 className="text-lg font-semibold mb-3">Updates & Releases</h3>
diff --git a/src/apps/SSH/Terminal/SSHSidebar.tsx b/src/apps/SSH/Terminal/SSHSidebar.tsx
index 634db0d26..f890d4fcb 100644
--- a/src/apps/SSH/Terminal/SSHSidebar.tsx
+++ b/src/apps/SSH/Terminal/SSHSidebar.tsx
@@ -38,6 +38,7 @@ import {
import {ScrollArea} from "@/components/ui/scroll-area.tsx";
import {Input} from "@/components/ui/input.tsx";
import {getSSHHosts} from "@/apps/SSH/ssh-axios";
+import {Checkbox} from "@/components/ui/checkbox.tsx";
interface SSHHost {
id: number;
@@ -186,6 +187,17 @@ export function SSHSidebar({onSelectView, onHostConnect, allTabs, runCommandOnTa
}
};
+ function getCookie(name: string) {
+ return document.cookie.split('; ').reduce((r, v) => {
+ const parts = v.split('=');
+ return parts[0] === name ? decodeURIComponent(parts[1]) : r;
+ }, "");
+ }
+
+ const updateRightClickCopyPaste = (checked) => {
+ document.cookie = `rightClickCopyPaste=${checked}; expires=2147483647; path=/`;
+ }
+
return (
<SidebarProvider>
<Sidebar className="h-full flex flex-col overflow-hidden">
@@ -332,6 +344,19 @@ export function SSHSidebar({onSelectView, onHostConnect, allTabs, runCommandOnTa
</AccordionContent>
</AccordionItem>
</Accordion>
+
+ <Separator className="p-0.25"/>
+
+ <div className="flex items-center space-x-2 mt-5">
+ <Checkbox id="enable-copy-paste" onCheckedChange={updateRightClickCopyPaste}
+ defaultChecked={getCookie("rightClickCopyPaste") === "true"}/>
+ <label
+ htmlFor="enable-paste"
+ className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+ >
+ Enable right‑click copy/paste
+ </label>
+ </div>
</div>
</SheetContent>
</Sheet>
diff --git a/src/apps/SSH/Terminal/SSHTerminal.tsx b/src/apps/SSH/Terminal/SSHTerminal.tsx
index c198469c7..e26a12369 100644
--- a/src/apps/SSH/Terminal/SSHTerminal.tsx
+++ b/src/apps/SSH/Terminal/SSHTerminal.tsx
@@ -52,6 +52,49 @@ export const SSHTerminal = forwardRef<any, SSHTerminalProps>(function SSHTermina
fitAddonRef.current?.fit();
}
+ function getCookie(name: string) {
+ return document.cookie.split('; ').reduce((r, v) => {
+ const parts = v.split('=');
+ return parts[0] === name ? decodeURIComponent(parts[1]) : r;
+ }, "");
+ }
+
+ function getUseRightClickCopyPaste() {
+ return getCookie("rightClickCopyPaste") === "true"
+ }
+
+ async function writeTextToClipboard(text: string): Promise<void> {
+ try {
+ if (navigator.clipboard && navigator.clipboard.writeText) {
+ await navigator.clipboard.writeText(text);
+ return;
+ }
+ } catch (_) {
+ }
+ const textarea = document.createElement('textarea');
+ textarea.value = text;
+ textarea.style.position = 'fixed';
+ textarea.style.left = '-9999px';
+ document.body.appendChild(textarea);
+ textarea.focus();
+ textarea.select();
+ try {
+ document.execCommand('copy');
+ } finally {
+ document.body.removeChild(textarea);
+ }
+ }
+
+ async function readTextFromClipboard(): Promise<string> {
+ try {
+ if (navigator.clipboard && navigator.clipboard.readText) {
+ return await navigator.clipboard.readText();
+ }
+ } catch (_) {
+ }
+ return '';
+ }
+
useEffect(() => {
if (!terminal || !xtermRef.current || !hostConfig) return;
@@ -59,7 +102,7 @@ export const SSHTerminal = forwardRef<any, SSHTerminalProps>(function SSHTermina
cursorBlink: true,
cursorStyle: 'bar',
scrollback: 10000,
- fontSize: 15,
+ fontSize: 14,
fontFamily: '"JetBrains Mono Nerd Font", "MesloLGS NF", "FiraCode Nerd Font", "Cascadia Code", "JetBrains Mono", Consolas, "Courier New", monospace',
theme: {
background: '#09090b',
@@ -88,6 +131,31 @@ export const SSHTerminal = forwardRef<any, SSHTerminalProps>(function SSHTermina
terminal.loadAddon(webLinksAddon);
terminal.open(xtermRef.current);
+ const element = xtermRef.current;
+ const handleContextMenu = async (e: MouseEvent) => {
+ if (!getUseRightClickCopyPaste()) return;
+ e.preventDefault();
+ e.stopPropagation();
+ try {
+ if (terminal.hasSelection()) {
+ const selection = terminal.getSelection();
+ if (selection) {
+ await writeTextToClipboard(selection);
+ terminal.clearSelection();
+ }
+ } else {
+ const pasteText = await readTextFromClipboard();
+ if (pasteText) {
+ terminal.paste(pasteText);
+ }
+ }
+ } catch (_) {
+ }
+ };
+ if (element) {
+ element.addEventListener('contextmenu', handleContextMenu);
+ }
+
const resizeObserver = new ResizeObserver(() => {
if (resizeTimeout.current) clearTimeout(resizeTimeout.current);
resizeTimeout.current = setTimeout(() => {
@@ -158,6 +226,9 @@ export const SSHTerminal = forwardRef<any, SSHTerminalProps>(function SSHTermina
return () => {
resizeObserver.disconnect();
+ if (element) {
+ element.removeEventListener('contextmenu', handleContextMenu);
+ }
if (resizeTimeout.current) clearTimeout(resizeTimeout.current);
if (pingIntervalRef.current) {
clearInterval(pingIntervalRef.current);