more layout improvements

This commit is contained in:
Yuri Tatishchev 2025-01-01 21:39:33 -08:00
parent 32ab4104a7
commit d99ee9ef1e
Signed by: CaZzzer
GPG Key ID: E0EBF441EA424369
7 changed files with 113 additions and 100 deletions

View File

@ -44,6 +44,8 @@
--sidebar-accent-foreground: 240 5.9% 10%; --sidebar-accent-foreground: 240 5.9% 10%;
--sidebar-border: 220 13% 91%; --sidebar-border: 220 13% 91%;
--sidebar-ring: 217.2 91.2% 59.8%; --sidebar-ring: 217.2 91.2% 59.8%;
--surface: 210 26% 76%;
} }
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
@ -85,6 +87,8 @@
--sidebar-accent-foreground: 240 4.8% 95.9%; --sidebar-accent-foreground: 240 4.8% 95.9%;
--sidebar-border: 240 3.7% 15.9%; --sidebar-border: 240 3.7% 15.9%;
--sidebar-ring: 217.2 91.2% 59.8%; --sidebar-ring: 217.2 91.2% 59.8%;
--surface: 217.2 40.6% 10.5%;
} }
} }
} }

View File

@ -16,51 +16,59 @@
let wasCopied = $state(false); let wasCopied = $state(false);
const roundedPre = copy || download ? 'rounded-b-lg' : 'rounded-lg';
async function copyToClipboard() { async function copyToClipboard() {
await navigator.clipboard.writeText(data); await navigator.clipboard.writeText(data);
wasCopied = true; wasCopied = true;
} }
</script> </script>
<div class="relative flex-grow overflow-x-hidden rounded-lg bg-accent"> <div class="flex max-w-full flex-grow flex-col rounded-lg bg-accent">
<div class="flex items-start overflow-x-auto p-2"> {#if copy || download}
<pre><code>{data}</code></pre> <!--Copy and download buttons-->
{#if copy || download} <div class="b flex flex-wrap items-center justify-between gap-4 rounded-t-lg p-2">
<!--Copy button--> Configuration
<!--Flex reverse for peer hover to work properly--> <div class="flex gap-2">
<div class="absolute right-2 flex flex-col gap-2">
{#if copy} {#if copy}
<div class="flex flex-row-reverse items-center gap-1"> <Button
<Button class="action-button group"
class="peer size-10 p-2" onclick={copyToClipboard}
onclick={copyToClipboard} onmouseleave={() => (wasCopied = false)}
onmouseleave={() => (wasCopied = false)} >
> <LucideClipboardCopy />
<LucideClipboardCopy /> <span class="group-hover:block">
</Button>
<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
{wasCopied ? 'Copied' : 'Copy to clipboard'} {wasCopied ? 'Copied' : 'Copy to clipboard'}
</span> </span>
</div> </Button>
{/if} {/if}
{#if download} {#if download}
<div class="flex flex-row-reverse items-center gap-1"> <a
<a class="contents"
class="peer contents" href={`data:application/octet-stream;charset=utf-8,${encodeURIComponent(data)}`}
href={`data:application/octet-stream;charset=utf-8,${encodeURIComponent(data)}`} download={filename}
download={filename} >
> <Button class="action-button group">
<Button class="size-10 p-2"> <LucideDownload />
<LucideDownload /> <span class="group-hover:block">Download</span>
</Button> </Button>
</a> </a>
<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
Download
</span>
</div>
{/if} {/if}
</div> </div>
{/if} </div>
{/if}
<div class="bg-surface flex items-start overflow-x-auto {roundedPre} p-2">
<pre><code>{data}</code></pre>
</div> </div>
</div> </div>
<style>
:global(.action-button) {
@apply relative size-auto p-2;
}
:global(.action-button > span) {
@apply absolute bottom-full mb-3 hidden rounded-lg bg-muted p-2 text-xs text-foreground;
}
</style>

View File

@ -29,7 +29,7 @@
</ul> </ul>
</nav> </nav>
</header> </header>
<main class="flex min-w-full max-w-full flex-grow flex-col gap-4 xl:min-w-[1280px]"> <main class="flex min-w-full max-w-full flex-grow flex-col gap-4 xl:min-w-[78rem]">
{@render children()} {@render children()}
</main> </main>

View File

@ -38,7 +38,7 @@
</Table.Header> </Table.Header>
<Table.Body class="divide-y-2 divide-background"> <Table.Body class="divide-y-2 divide-background">
{#each data.clients as client} {#each data.clients as client}
<Table.Row class="group hover:bg-background hover:bg-opacity-40"> <Table.Row class="hover:bg-surface group">
<Table.Head scope="row"> <Table.Head scope="row">
<a <a
href={`/clients/${client.id}`} href={`/clients/${client.id}`}

View File

@ -2,7 +2,7 @@
import type { PageData } from './$types'; import type { PageData } from './$types';
import QRCode from 'qrcode-svg'; import QRCode from 'qrcode-svg';
import { CodeSnippet } from '$lib/components/app/code-snippet'; import { CodeSnippet } from '$lib/components/app/code-snippet';
import { WireguardGuide } from '$lib/components/app/wireguard-guide/index.js'; import { WireguardGuide } from '$lib/components/app/wireguard-guide';
const { data }: { data: PageData } = $props(); const { data }: { data: PageData } = $props();
@ -16,6 +16,8 @@
content: data.config, content: data.config,
join: true, join: true,
background: 'hsl(var(--accent-light))', background: 'hsl(var(--accent-light))',
width: 296,
height: 296,
}); });
</script> </script>
@ -25,10 +27,10 @@
<h1 class="w-fit rounded-lg bg-accent p-2 text-lg">{data.client.name}</h1> <h1 class="w-fit rounded-lg bg-accent p-2 text-lg">{data.client.name}</h1>
<section id="client-configuration" class="flex flex-wrap justify-center gap-4"> <section id="client-configuration" class="flex flex-wrap items-center justify-center gap-4">
<CodeSnippet data={data.config} filename={clientWgCleanedName} copy download /> <CodeSnippet data={data.config} filename={clientWgCleanedName} copy download />
<div class="overflow-hidden rounded-lg"> <div class="size-fit overflow-auto rounded-lg">
{@html qrCode.svg()} {@html qrCode.svg()}
</div> </div>
</section> </section>

View File

@ -17,13 +17,11 @@
}); });
function getSize(size: number) { function getSize(size: number) {
let sizes = ['Bytes', 'KiB', 'MiB', 'GiB', let sizes = ['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
for (let i = 1; i < sizes.length; i++) { for (let i = 1; i < sizes.length; i++) {
if (size < Math.pow(1024, i)) if (size < Math.pow(1024, i))
return (Math.round((size / Math.pow( return Math.round((size / Math.pow(1024, i - 1)) * 100) / 100 + ' ' + sizes[i - 1];
1024, i - 1)) * 100) / 100) + ' ' + sizes[i - 1];
} }
return size; return size;
} }
@ -33,7 +31,7 @@
<title>Connections</title> <title>Connections</title>
</svelte:head> </svelte:head>
<Table.Root class="bg-accent rounded-lg overflow-hidden divide-y-2 divide-background"> <Table.Root class="divide-y-2 divide-background overflow-hidden rounded-lg bg-accent">
<Table.Header> <Table.Header>
<Table.Row> <Table.Row>
<Table.Head scope="col">Name</Table.Head> <Table.Head scope="col">Name</Table.Head>
@ -49,14 +47,14 @@
</Table.Header> </Table.Header>
<Table.Body class="divide-y-2 divide-background"> <Table.Body class="divide-y-2 divide-background">
{#each data.peers.rows as peer} {#each data.peers.rows as peer}
<Table.Row class="hover:bg-background hover:bg-opacity-40"> <Table.Row class="hover:bg-surface">
<Table.Head scope="row">{peer.name}</Table.Head> <Table.Head scope="row">{peer.name}</Table.Head>
<Table.Cell class="truncate max-w-[10ch]">{peer['public-key']}</Table.Cell> <Table.Cell class="max-w-[10ch] truncate">{peer['public-key']}</Table.Cell>
<Table.Cell>{peer.endpoint}</Table.Cell> <Table.Cell>{peer.endpoint}</Table.Cell>
<Table.Cell> <Table.Cell>
<div class="flex flex-wrap gap-1"> <div class="flex flex-wrap gap-1">
{#each peer['allowed-ips'].split(',') as addr} {#each peer['allowed-ips'].split(',') as addr}
<Badge class="bg-background select-auto" variant="secondary">{addr}</Badge> <Badge class="select-auto bg-background" variant="secondary">{addr}</Badge>
{/each} {/each}
</div> </div>
</Table.Cell> </Table.Cell>

View File

@ -1,93 +1,94 @@
import { fontFamily } from "tailwindcss/defaultTheme"; import { fontFamily } from 'tailwindcss/defaultTheme';
import type { Config } from "tailwindcss"; import type { Config } from 'tailwindcss';
import tailwindcssAnimate from "tailwindcss-animate"; import tailwindcssAnimate from 'tailwindcss-animate';
const config: Config = { const config: Config = {
darkMode: ["media"], darkMode: ['media'],
content: ["./src/**/*.{html,js,svelte,ts}"], content: ['./src/**/*.{html,js,svelte,ts}'],
safelist: ["dark"], safelist: ['dark'],
theme: { theme: {
container: { container: {
center: true, center: true,
padding: "2rem", padding: '2rem',
screens: { screens: {
"2xl": "1400px" '2xl': '1400px',
} },
}, },
extend: { extend: {
colors: { colors: {
border: "hsl(var(--border) / <alpha-value>)", border: 'hsl(var(--border) / <alpha-value>)',
input: "hsl(var(--input) / <alpha-value>)", input: 'hsl(var(--input) / <alpha-value>)',
ring: "hsl(var(--ring) / <alpha-value>)", ring: 'hsl(var(--ring) / <alpha-value>)',
background: "hsl(var(--background) / <alpha-value>)", background: 'hsl(var(--background) / <alpha-value>)',
foreground: "hsl(var(--foreground) / <alpha-value>)", foreground: 'hsl(var(--foreground) / <alpha-value>)',
primary: { primary: {
DEFAULT: "hsl(var(--primary) / <alpha-value>)", DEFAULT: 'hsl(var(--primary) / <alpha-value>)',
foreground: "hsl(var(--primary-foreground) / <alpha-value>)" foreground: 'hsl(var(--primary-foreground) / <alpha-value>)',
}, },
secondary: { secondary: {
DEFAULT: "hsl(var(--secondary) / <alpha-value>)", DEFAULT: 'hsl(var(--secondary) / <alpha-value>)',
foreground: "hsl(var(--secondary-foreground) / <alpha-value>)" foreground: 'hsl(var(--secondary-foreground) / <alpha-value>)',
}, },
destructive: { destructive: {
DEFAULT: "hsl(var(--destructive) / <alpha-value>)", DEFAULT: 'hsl(var(--destructive) / <alpha-value>)',
foreground: "hsl(var(--destructive-foreground) / <alpha-value>)" foreground: 'hsl(var(--destructive-foreground) / <alpha-value>)',
}, },
muted: { muted: {
DEFAULT: "hsl(var(--muted) / <alpha-value>)", DEFAULT: 'hsl(var(--muted) / <alpha-value>)',
foreground: "hsl(var(--muted-foreground) / <alpha-value>)" foreground: 'hsl(var(--muted-foreground) / <alpha-value>)',
}, },
accent: { accent: {
DEFAULT: "hsl(var(--accent) / <alpha-value>)", DEFAULT: 'hsl(var(--accent) / <alpha-value>)',
foreground: "hsl(var(--accent-foreground) / <alpha-value>)" foreground: 'hsl(var(--accent-foreground) / <alpha-value>)',
}, },
popover: { popover: {
DEFAULT: "hsl(var(--popover) / <alpha-value>)", DEFAULT: 'hsl(var(--popover) / <alpha-value>)',
foreground: "hsl(var(--popover-foreground) / <alpha-value>)" foreground: 'hsl(var(--popover-foreground) / <alpha-value>)',
}, },
card: { card: {
DEFAULT: "hsl(var(--card) / <alpha-value>)", DEFAULT: 'hsl(var(--card) / <alpha-value>)',
foreground: "hsl(var(--card-foreground) / <alpha-value>)" foreground: 'hsl(var(--card-foreground) / <alpha-value>)',
}, },
sidebar: { sidebar: {
DEFAULT: "hsl(var(--sidebar-background))", DEFAULT: 'hsl(var(--sidebar-background))',
foreground: "hsl(var(--sidebar-foreground))", foreground: 'hsl(var(--sidebar-foreground))',
primary: "hsl(var(--sidebar-primary))", primary: 'hsl(var(--sidebar-primary))',
"primary-foreground": "hsl(var(--sidebar-primary-foreground))", 'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
accent: "hsl(var(--sidebar-accent))", accent: 'hsl(var(--sidebar-accent))',
"accent-foreground": "hsl(var(--sidebar-accent-foreground))", 'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
border: "hsl(var(--sidebar-border))", border: 'hsl(var(--sidebar-border))',
ring: "hsl(var(--sidebar-ring))", ring: 'hsl(var(--sidebar-ring))',
}, },
surface: 'hsl(var(--surface) / <alpha-value>)',
}, },
borderRadius: { borderRadius: {
xl: "calc(var(--radius) + 4px)", xl: 'calc(var(--radius) + 4px)',
lg: "var(--radius)", lg: 'var(--radius)',
md: "calc(var(--radius) - 2px)", md: 'calc(var(--radius) - 2px)',
sm: "calc(var(--radius) - 4px)" sm: 'calc(var(--radius) - 4px)',
}, },
fontFamily: { fontFamily: {
sans: [...fontFamily.sans] sans: [...fontFamily.sans],
}, },
keyframes: { keyframes: {
"accordion-down": { 'accordion-down': {
from: { height: "0" }, from: { height: '0' },
to: { height: "var(--bits-accordion-content-height)" }, to: { height: 'var(--bits-accordion-content-height)' },
}, },
"accordion-up": { 'accordion-up': {
from: { height: "var(--bits-accordion-content-height)" }, from: { height: 'var(--bits-accordion-content-height)' },
to: { height: "0" }, to: { height: '0' },
}, },
"caret-blink": { 'caret-blink': {
"0%,70%,100%": { opacity: "1" }, '0%,70%,100%': { opacity: '1' },
"20%,50%": { opacity: "0" }, '20%,50%': { opacity: '0' },
}, },
}, },
animation: { animation: {
"accordion-down": "accordion-down 0.2s ease-out", 'accordion-down': 'accordion-down 0.2s ease-out',
"accordion-up": "accordion-up 0.2s ease-out", 'accordion-up': 'accordion-up 0.2s ease-out',
"caret-blink": "caret-blink 1.25s ease-out infinite", 'caret-blink': 'caret-blink 1.25s ease-out infinite',
}, },
}, },
}, },
plugins: [tailwindcssAnimate], plugins: [tailwindcssAnimate],