WIP: more proper logging

opnsense: sanitize usernames for creating peers
connections page: update API, combine opnsense data with db data
2025-01-09 15:01:03 -08:00 · 2025-01-09 14:44:48 -08:00 · 2025-01-07 19:03:54 -08:00 · 2025-01-07 17:58:31 -08:00 · 2025-01-07 16:22:43 -08:00 · 2025-01-01 21:48:34 -08:00
37 changed files with 497 additions and 440 deletions
--- a/bunfig.toml
+++ b/bunfig.toml
@@ -0,0 +1 @@
+logLevel = "info"
--- a/drizzle/0000_fair_tarantula.sql
+++ b/drizzle/0000_fair_tarantula.sql
@@ -1,10 +1,22 @@
-CREATE TABLE `ip_allocations` (
+CREATE TABLE `devices` (
 	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`client_id` integer,
-	FOREIGN KEY (`client_id`) REFERENCES `wg_clients`(`id`) ON UPDATE no action ON DELETE set null
+	`user_id` text NOT NULL,
+	`name` text NOT NULL,
+	`opnsense_id` text,
+	`public_key` text NOT NULL,
+	`private_key` text,
+	`pre_shared_key` text,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
 );
 --> statement-breakpoint
-CREATE UNIQUE INDEX `ip_allocations_client_id_unique` ON `ip_allocations` (`client_id`);--> statement-breakpoint
+CREATE UNIQUE INDEX `devices_public_key_unique` ON `devices` (`public_key`);--> statement-breakpoint
+CREATE TABLE `ip_allocations` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`device_id` integer,
+	FOREIGN KEY (`device_id`) REFERENCES `devices`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `ip_allocations_device_id_unique` ON `ip_allocations` (`device_id`);--> statement-breakpoint
 CREATE TABLE `sessions` (
 	`id` text PRIMARY KEY NOT NULL,
 	`user_id` text NOT NULL,
@@ -17,16 +29,3 @@ CREATE TABLE `users` (
 	`username` text NOT NULL,
 	`name` text NOT NULL
 );
--> statement-breakpoint
-CREATE TABLE `wg_clients` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` text NOT NULL,
-	`name` text NOT NULL,
-	`opnsense_id` text,
-	`public_key` text NOT NULL,
-	`private_key` text,
-	`pre_shared_key` text,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
-);
--> statement-breakpoint
-CREATE UNIQUE INDEX `wg_clients_public_key_unique` ON `wg_clients` (`public_key`);
--- a/drizzle/meta/0000_snapshot.json
+++ b/drizzle/meta/0000_snapshot.json
@@ -1,9 +1,90 @@
 {
  "version": "6",
  "dialect": "sqlite",
-  "id": "29e6fd88-fa47-4f79-ad83-c52538bc36a6",
+  "id": "48b7ce55-58f1-4b97-a144-ca733576dba6",
  "prevId": "00000000-0000-0000-0000-000000000000",
  "tables": {
+    "devices": {
+      "name": "devices",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "opnsense_id": {
+          "name": "opnsense_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "private_key": {
+          "name": "private_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pre_shared_key": {
+          "name": "pre_shared_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "devices_public_key_unique": {
+          "name": "devices_public_key_unique",
+          "columns": [
+            "public_key"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "devices_user_id_users_id_fk": {
+          "name": "devices_user_id_users_id_fk",
+          "tableFrom": "devices",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
    "ip_allocations": {
      "name": "ip_allocations",
      "columns": {
@@ -14,8 +95,8 @@
          "notNull": true,
          "autoincrement": true
        },
-        "client_id": {
-          "name": "client_id",
+        "device_id": {
+          "name": "device_id",
          "type": "integer",
          "primaryKey": false,
          "notNull": false,
@@ -23,21 +104,21 @@
        }
      },
      "indexes": {
-        "ip_allocations_client_id_unique": {
-          "name": "ip_allocations_client_id_unique",
+        "ip_allocations_device_id_unique": {
+          "name": "ip_allocations_device_id_unique",
          "columns": [
-            "client_id"
+            "device_id"
          ],
          "isUnique": true
        }
      },
      "foreignKeys": {
-        "ip_allocations_client_id_wg_clients_id_fk": {
-          "name": "ip_allocations_client_id_wg_clients_id_fk",
+        "ip_allocations_device_id_devices_id_fk": {
+          "name": "ip_allocations_device_id_devices_id_fk",
          "tableFrom": "ip_allocations",
-          "tableTo": "wg_clients",
+          "tableTo": "devices",
          "columnsFrom": [
-            "client_id"
+            "device_id"
          ],
          "columnsTo": [
            "id"
@@ -125,87 +206,6 @@
      "compositePrimaryKeys": {},
      "uniqueConstraints": {},
      "checkConstraints": {}
-    },
-    "wg_clients": {
-      "name": "wg_clients",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "opnsense_id": {
-          "name": "opnsense_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "public_key": {
-          "name": "public_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "private_key": {
-          "name": "private_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pre_shared_key": {
-          "name": "pre_shared_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "wg_clients_public_key_unique": {
-          "name": "wg_clients_public_key_unique",
-          "columns": [
-            "public_key"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "wg_clients_user_id_users_id_fk": {
-          "name": "wg_clients_user_id_users_id_fk",
-          "tableFrom": "wg_clients",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
    }
  },
  "views": {},
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -5,8 +5,8 @@
    {
      "idx": 0,
      "version": "6",
-      "when": 1735028333867,
-      "tag": "0000_young_wong",
+      "when": 1736295566569,
+      "tag": "0000_fair_tarantula",
      "breakpoints": true
    }
  ]
--- a/src/app.css
+++ b/src/app.css
@@ -44,6 +44,8 @@
 		--sidebar-accent-foreground: 240 5.9% 10%;
 		--sidebar-border: 220 13% 91%;
 		--sidebar-ring: 217.2 91.2% 59.8%;
+
+		--surface: 210 26% 76%;
 	}

 	@media (prefers-color-scheme: dark) {
@@ -85,6 +87,8 @@
 			--sidebar-accent-foreground: 240 4.8% 95.9%;
 			--sidebar-border: 240 3.7% 15.9%;
 			--sidebar-ring: 217.2 91.2% 59.8%;
+
+			--surface: 217.2 40.6% 11.5%;
 		}
 	}
 }
--- a/src/hooks.server.ts
+++ b/src/hooks.server.ts
@@ -39,7 +39,7 @@ const authRequired = [
 	/^\/api/,
 	/^\/user/,
 	/^\/connections/,
-	/^\/clients/,
+	/^\/devices/,
 ];
 const handleProtectedPaths: Handle = ({ event, resolve }) => {
 	const isProtected = authRequired.some((re) => re.test(event.url.pathname));
--- a/src/lib/assets/guide-android.mp4
+++ b/src/lib/assets/guide-android.mp4
--- a/src/lib/assets/guide-client.mp4
+++ b/src/lib/assets/guide-client.mp4
--- a/src/lib/clients.ts
+++ b/src/lib/clients.ts
@@ -1,33 +0,0 @@
-import type { ClientDetails } from '$lib/types/clients';
-
-/**
- * Convert client details to WireGuard configuration.
- *
- * ```conf
- * [Interface]
- * PrivateKey = wPa07zR0H4wYoc1ljfeiqlSbR8Z28pPc6jplwE7zPms=
- * Address = 10.18.11.100/32,fd00::1/128
- * DNS = 10.18.11.1,fd00::0
- *
- * [Peer]
- * PublicKey = BJ5faPVJsDP4CCxNYilmKnwlQXOtXEOJjqIwb4U/CgM=
- * PresharedKey = uhZUVqXKF0oayP0BS6yPu6Gepgh68Nz9prtbE5Cuok0=
- * Endpoint = vpn.lab.cazzzer.com:51820
- * AllowedIPs = 0.0.0.0/0,::/0
- * ```
- * @param client
- */
-export function clientDetailsToConfig(client: ClientDetails): string {
-	return `\
-[Interface]
-PrivateKey = ${client.privateKey}
-Address = ${client.ips.join(', ')}
-DNS = ${client.vpnDns}
-
-[Peer]
-PublicKey = ${client.vpnPublicKey}
-PresharedKey = ${client.preSharedKey}
-Endpoint = ${client.vpnEndpoint}
-AllowedIPs = 0.0.0.0/0,::/0
-`;
-}
--- a/src/lib/components/app/code-snippet/code-snippet.svelte
+++ b/src/lib/components/app/code-snippet/code-snippet.svelte
@@ -16,51 +16,59 @@

 	let wasCopied = $state(false);

+	const roundedPre = copy || download ? 'rounded-b-lg' : 'rounded-lg';
+
 	async function copyToClipboard() {
 		await navigator.clipboard.writeText(data);
 		wasCopied = true;
 	}
 </script>

-<div class="relative flex-grow overflow-x-hidden rounded-lg bg-accent">
-	<div class="flex items-start overflow-x-auto p-2">
-		<pre><code>{data}</code></pre>
+<div class="flex max-w-full flex-grow flex-col rounded-lg bg-accent">
 	{#if copy || download}
-			<!--Copy button-->
-			<!--Flex reverse for peer hover to work properly-->
-			<div class="absolute right-2 flex flex-col gap-2">
+		<!--Copy and download buttons-->
+		<div class="b flex flex-wrap items-center justify-between gap-4 rounded-t-lg p-2">
+			Configuration
+			<div class="flex gap-2">
 				{#if copy}
-					<div class="flex flex-row-reverse items-center gap-1">
 					<Button
-							class="peer size-10 p-2"
+						class="action-button group"
 						onclick={copyToClipboard}
 						onmouseleave={() => (wasCopied = false)}
 					>
 						<LucideClipboardCopy />
-						</Button>
-						<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
+						<span class="group-hover:block">
 							{wasCopied ? 'Copied' : 'Copy to clipboard'}
 						</span>
-					</div>
+					</Button>
 				{/if}

 				{#if download}
-					<div class="flex flex-row-reverse items-center gap-1">
 					<a
-							class="peer contents"
+						class="contents"
 						href={`data:application/octet-stream;charset=utf-8,${encodeURIComponent(data)}`}
 						download={filename}
 					>
-							<Button class="size-10 p-2">
+						<Button class="action-button group">
 							<LucideDownload />
+							<span class="group-hover:block">Download</span>
 						</Button>
 					</a>
-						<span class="hidden rounded-lg bg-background p-2 text-xs peer-hover:block">
-							Download
-						</span>
-					</div>
-				{/if}
-			</div>
 				{/if}
 			</div>
 		</div>
+	{/if}
+	<div class="bg-surface flex items-start overflow-x-auto {roundedPre} p-2">
+		<pre><code>{data}</code></pre>
+	</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>
--- a/src/lib/components/app/wireguard-guide/wireguard-guide.svelte
+++ b/src/lib/components/app/wireguard-guide/wireguard-guide.svelte
@@ -2,7 +2,7 @@
 	import * as Tabs from '$lib/components/ui/tabs';
 	import * as Card from '$lib/components/ui/card';
 	import getItOnGooglePlay from '$lib/assets/GetItOnGooglePlay_Badge_Web_color_English.png';
-	import guideVideo from '$lib/assets/guide-client.mp4';
+	import guideVideoAndroid from '$lib/assets/guide-android.mp4';
 </script>

 <Tabs.Root value="android">
@@ -36,7 +36,7 @@
 							<p>Download the configuration file and import it</p>
 							<aside>Alternatively, you can scan the QR code with the WireGuard app</aside>
 							<video autoplay loop controls muted preload="metadata" class="max-h-screen">
-								<source src={guideVideo} type="video/mp4" />
+								<source src={guideVideoAndroid} type="video/mp4" />
 							</video>
 						</div>
 					</li>
--- a/src/lib/connections.ts
+++ b/src/lib/connections.ts
@@ -0,0 +1,10 @@
+export type ConnectionDetails = {
+	deviceId: number;
+	deviceName: string;
+	devicePublicKey: string;
+	deviceIps: string[];
+	endpoint: string;
+	transferRx: number;
+	transferTx: number;
+	latestHandshake: number;
+};
--- a/src/lib/devices.ts
+++ b/src/lib/devices.ts
@@ -0,0 +1,43 @@
+/**
+ * Convert device details to WireGuard configuration.
+ *
+ * ```conf
+ * [Interface]
+ * PrivateKey = wPa07zR0H4wYoc1ljfeiqlSbR8Z28pPc6jplwE7zPms=
+ * Address = 10.18.11.100/32,fd00::1/128
+ * DNS = 10.18.11.1,fd00::0
+ *
+ * [Peer]
+ * PublicKey = BJ5faPVJsDP4CCxNYilmKnwlQXOtXEOJjqIwb4U/CgM=
+ * PresharedKey = uhZUVqXKF0oayP0BS6yPu6Gepgh68Nz9prtbE5Cuok0=
+ * Endpoint = vpn.lab.cazzzer.com:51820
+ * AllowedIPs = 0.0.0.0/0,::/0
+ * ```
+ * @param device
+ */
+export function deviceDetailsToConfig(device: DeviceDetails): string {
+	return `\
+[Interface]
+PrivateKey = ${device.privateKey}
+Address = ${device.ips.join(', ')}
+DNS = ${device.vpnDns}
+
+[Peer]
+PublicKey = ${device.vpnPublicKey}
+PresharedKey = ${device.preSharedKey}
+Endpoint = ${device.vpnEndpoint}
+AllowedIPs = 0.0.0.0/0,::/0
+`;
+}
+
+export type DeviceDetails = {
+	id: number;
+	name: string;
+	publicKey: string;
+	privateKey: string | null;
+	preSharedKey: string | null;
+	ips: string[];
+	vpnPublicKey: string;
+	vpnEndpoint: string;
+	vpnDns: string;
+};
--- a/src/lib/opnsense/index.ts
+++ b/src/lib/opnsense/index.ts
@@ -0,0 +1,3 @@
+export function opnsenseSanitezedUsername(username: string) {
+	return username.slice(0, 63).replace(/[^a-zA-Z0-9_-]/g, '_');
+}
--- a/src/lib/server/db/schema.ts
+++ b/src/lib/server/db/schema.ts
@@ -8,7 +8,7 @@ export const users = sqliteTable('users', {
 });

 export const usersRelations = relations(users, ({ many }) => ({
-	wgClients: many(wgClients),
+	devices: many(devices),
 }));

 export const sessions = sqliteTable('sessions', {
@@ -22,14 +22,14 @@ export const sessions = sqliteTable('sessions', {
 export const ipAllocations = sqliteTable('ip_allocations', {
 	// for now, id will be the same as the ipIndex
 	id: integer('id').primaryKey({ autoIncrement: true }),
-	// clientId is nullable because allocations can remain after the client is deleted
-	// unique for now, only allowing one allocation per client
-	clientId: integer('client_id')
+	// deviceId is nullable because allocations can remain after the device is deleted
+	// unique for now, only allowing one allocation per device
+	deviceId: integer('device_id')
 		.unique()
-		.references(() => wgClients.id, { onDelete: 'set null' }),
+		.references(() => devices.id, { onDelete: 'set null' }),
 });

-export const wgClients = sqliteTable('wg_clients', {
+export const devices = sqliteTable('devices', {
 	id: integer().primaryKey({ autoIncrement: true }),
 	userId: text('user_id')
 		.notNull()
@@ -38,7 +38,7 @@ export const wgClients = sqliteTable('wg_clients', {
 	// questioning whether this should be nullable
 	opnsenseId: text('opnsense_id'),
 	publicKey: text('public_key').notNull().unique(),
-	// nullable for the possibility of a client supplying their own private key
+	// nullable for the possibility of a user supplying their own private key
 	privateKey: text('private_key'),
 	// nullable for the possibility of no psk
 	preSharedKey: text('pre_shared_key'),
@@ -48,18 +48,18 @@ export const wgClients = sqliteTable('wg_clients', {
 	// allowedIps: text('allowed_ips').notNull(),
 });

-export const wgClientsRelations = relations(wgClients, ({ one }) => ({
+export const devicesRelations = relations(devices, ({ one }) => ({
 	user: one(users, {
-		fields: [wgClients.userId],
+		fields: [devices.userId],
 		references: [users.id],
 	}),
 	ipAllocation: one(ipAllocations, {
-		fields: [wgClients.id],
-		references: [ipAllocations.clientId],
+		fields: [devices.id],
+		references: [ipAllocations.deviceId],
 	}),
 }));

-export type WgClient = typeof wgClients.$inferSelect;
+export type Device = typeof devices.$inferSelect;

 export type Session = typeof sessions.$inferSelect;

--- a/src/lib/server/db/seed.ts
+++ b/src/lib/server/db/seed.ts
@@ -1,4 +1,4 @@
-import { ipAllocations, users, wgClients } from './schema';
+import { ipAllocations, users, devices } from './schema';
 import { eq } from 'drizzle-orm';
 import assert from 'node:assert';
 import { drizzle } from 'drizzle-orm/libsql';
@@ -11,10 +11,10 @@ async function seed() {
 	const user = await db.query.users.findFirst({ where: eq(users.username, 'CaZzzer') });
 	assert(user, 'User not found');

-	const clients: typeof wgClients.$inferInsert[] = [
+	const newDevices: typeof devices.$inferInsert[] = [
 		{
 			userId: user.id,
-			name: 'Client1',
+			name: 'Device1',
 			publicKey: 'BJ5faPVJsDP4CCxNYilmKnwlQXOtXEOJjqIwb4U/CgM=',
 			privateKey: 'KKqsHDu30WCSrVsyzMkOKbE3saQ+wlx0sBwGs61UGXk=',
 			preSharedKey: '0LWopbrISXBNHUxr+WOhCSAg+0hD8j3TLmpyzHkBHCQ=',
@@ -22,10 +22,10 @@ async function seed() {
 			// allowedIps: '10.18.11.101/32,fd00::1/112',
 		},
 	];
-	const returned = await db.insert(wgClients).values(clients).returning({ insertedId: wgClients.id });
+	const returned = await db.insert(devices).values(newDevices).returning({ insertedId: devices.id });

 	const ipAllocation: typeof ipAllocations.$inferInsert = {
-		clientId: returned[0].insertedId,
+		deviceId: returned[0].insertedId,
 	};
 	await db.insert(ipAllocations).values(ipAllocation);
 }
--- a/src/lib/server/devices.ts
+++ b/src/lib/server/devices.ts
@@ -1,15 +1,16 @@
 import type { User } from '$lib/server/db/schema';
-import { ipAllocations, wgClients } from '$lib/server/db/schema';
+import { ipAllocations, devices } from '$lib/server/db/schema';
 import { db } from '$lib/server/db';
 import { opnsenseAuth, opnsenseUrl, serverPublicKey, serverUuid } from '$lib/server/opnsense';
 import { Address4, Address6 } from 'ip-address';
 import { env } from '$env/dynamic/private';
 import { and, count, eq, isNull } from 'drizzle-orm';
 import { err, ok, type Result } from '$lib/types';
-import type { ClientDetails } from '$lib/types/clients';
+import type { DeviceDetails } from '$lib/devices';
+import { opnsenseSanitezedUsername } from '$lib/opnsense';

-export async function findClients(userId: string) {
-	return db.query.wgClients.findMany({
+export async function findDevices(userId: string) {
+	return db.query.devices.findMany({
 		columns: {
 			id: true,
 			name: true,
@@ -20,12 +21,12 @@ export async function findClients(userId: string) {
 		with: {
 			ipAllocation: true,
 		},
-		where: eq(wgClients.userId, userId),
+		where: eq(devices.userId, userId),
 	});
 }

-export async function findClient(userId: string, clientId: number) {
-	return db.query.wgClients.findFirst({
+export async function findDevice(userId: string, deviceId: number) {
+	return db.query.devices.findFirst({
 		columns: {
 			id: true,
 			name: true,
@@ -36,20 +37,20 @@ export async function findClient(userId: string, clientId: number) {
 		with: {
 			ipAllocation: true,
 		},
-		where: and(eq(wgClients.userId, userId), eq(wgClients.id, clientId)),
+		where: and(eq(devices.userId, userId), eq(devices.id, deviceId)),
 	});
 }

-export function mapClientToDetails(
-	client: Awaited<ReturnType<typeof findClients>>[0],
-): ClientDetails {
-	const ips = getIpsFromIndex(client.ipAllocation.id);
+export function mapDeviceToDetails(
+	device: Awaited<ReturnType<typeof findDevices>>[0],
+): DeviceDetails {
+	const ips = getIpsFromIndex(device.ipAllocation.id);
 	return {
-		id: client.id,
-		name: client.name,
-		publicKey: client.publicKey,
-		privateKey: client.privateKey,
-		preSharedKey: client.preSharedKey,
+		id: device.id,
+		name: device.name,
+		publicKey: device.publicKey,
+		privateKey: device.privateKey,
+		preSharedKey: device.preSharedKey,
 		ips,
 		vpnPublicKey: serverPublicKey,
 		vpnEndpoint: env.VPN_ENDPOINT,
@@ -57,35 +58,35 @@ export function mapClientToDetails(
 	};
 }

-export async function createClient(params: {
+export async function createDevice(params: {
 	name: string;
 	user: User;
 }): Promise<Result<number, [400 | 500, string]>> {
-	// check if user exceeds the limit of clients
-	const [{ clientCount }] = await db
-		.select({ clientCount: count() })
-		.from(wgClients)
-		.where(eq(wgClients.userId, params.user.id));
-	if (clientCount >= parseInt(env.MAX_CLIENTS_PER_USER))
-		return err([400, 'Maximum number of clients reached'] as [400, string]);
+	// check if user exceeds the limit of devices
+	const [{ deviceCount }] = await db
+		.select({ deviceCount: count() })
+		.from(devices)
+		.where(eq(devices.userId, params.user.id));
+	if (deviceCount >= parseInt(env.MAX_CLIENTS_PER_USER))
+		return err([400, 'Maximum number of devices reached'] as [400, string]);

 	// this is going to be quite long
-	// 1. fetch params for new client from opnsense api
-	// 2.1 get an allocation for the client
-	// 2.2. insert new client into db
-	// 2.3. update the allocation with the client id
+	// 1. fetch params for new device from opnsense api
+	// 2.1 get an allocation for the device
+	// 2.2. insert new device into db
+	// 2.3. update the allocation with the device id
 	// 3. create the client in opnsense
 	// 4. reconfigure opnsense to enable the new client
 	return await db.transaction(async (tx) => {
 		const [keys, availableAllocation, lastAllocation] = await Promise.all([
-			// fetch params for new client from opnsense api
+			// fetch params for new device from opnsense api
 			getKeys(),
 			// find first unallocated IP
 			await tx.query.ipAllocations.findFirst({
 				columns: {
 					id: true,
 				},
-				where: isNull(ipAllocations.clientId),
+				where: isNull(ipAllocations.deviceId),
 			}),
 			// find last allocation to check if we have any IPs left
 			await tx.query.ipAllocations.findFirst({
@@ -109,9 +110,9 @@ export async function createClient(params: {
 		// transaction savepoint after creating a new IP allocation
 		// TODO: not sure if this is needed
 		return await tx.transaction(async (tx2) => {
-			// create new client in db
-			const [newClient] = await tx2
-				.insert(wgClients)
+			// create new device in db
+			const [newDevice] = await tx2
+				.insert(devices)
 				.values({
 					userId: params.user.id,
 					name: params.name,
@@ -119,12 +120,12 @@ export async function createClient(params: {
 					privateKey: keys.privkey,
 					preSharedKey: keys.psk,
 				})
-				.returning({ id: wgClients.id });
+				.returning({ id: devices.id });

-			// update IP allocation with client ID
+			// update IP allocation with device ID
 			await tx2
 				.update(ipAllocations)
-				.set({ clientId: newClient.id })
+				.set({ deviceId: newDevice.id })
 				.where(eq(ipAllocations.id, ipAllocationId));

 			// create client in opnsense
@@ -143,7 +144,7 @@ export async function createClient(params: {

 			// reconfigure opnsense
 			await opnsenseReconfigure();
-			return ok(newClient.id);
+			return ok(newDevice.id);
 		});
 	});
 }
@@ -196,7 +197,7 @@ async function opnsenseCreateClient(params: {
 		body: JSON.stringify({
 			configbuilder: {
 				enabled: '1',
-				name: `vpgen-${params.username}`,
+				name: `vpgen-${opnsenseSanitezedUsername(params.username)}`,
 				pubkey: params.pubkey,
 				psk: params.psk,
 				tunneladdress: params.allowedIps,
--- a/src/lib/server/opnsense/index.ts
+++ b/src/lib/server/opnsense/index.ts
@@ -30,7 +30,7 @@ export async function fetchOpnsenseServer() {
 	const uuid = servers.rows.find((server) => server.name === opnsenseIfname)?.uuid;
 	assert(uuid, 'Failed to find server UUID for OPNsense WireGuard server');
 	serverUuid = uuid;
-	console.log('OPNsense WireGuard server UUID:', serverUuid);
+	console.info('OPNsense WireGuard server UUID:', serverUuid);

 	const resServerInfo = await fetch(
 		`${opnsenseUrl}/api/wireguard/client/get_server_info/${serverUuid}`,
--- a/src/lib/types/clients.ts
+++ b/src/lib/types/clients.ts
@@ -1,11 +0,0 @@
-export type ClientDetails = {
-	id: number;
-	name: string;
-	publicKey: string;
-	privateKey: string | null;
-	preSharedKey: string | null;
-	ips: string[];
-	vpnPublicKey: string;
-	vpnEndpoint: string;
-	vpnDns: string;
-};
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -1,11 +1,9 @@
-import type { LayoutServerLoad } from './$types';
-
-export const trailingSlash = 'always';
+import type { LayoutServerLoad } from "./$types";

 export const load: LayoutServerLoad = async (event) => {
 	const { user } = event.locals;

 	return {
-		user,
+		user
 	};
 };
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -15,19 +15,21 @@
 </script>

 <header class="flex w-full flex-wrap justify-between gap-x-6 gap-y-4 xl:max-w-screen-xl">
+	<a href="/" class="contents">
 		<span class="font-bold sm:inline-block">VPGen</span>
+	</a>
 	<nav class="max-w-full">
 		<ul class="flex items-center gap-6 overflow-x-auto text-sm">
 			<li><a href="/" class={getNavClass(/^\/$/)}>Home</a></li>
 			{#if user}
-				<li><a href="/user/" class={getNavClass(/^\/user\/$/)}>Profile</a></li>
-				<li><a href="/connections/" class={getNavClass(/^\/connections\/$/)}>Connections</a></li>
-				<li><a href="/clients/" class={getNavClass(/^\/clients(\/\d+)?\/$/)}>Clients</a></li>
+				<li><a href="/user" class={getNavClass(/^\/user$/)}>Profile</a></li>
+				<li><a href="/connections" class={getNavClass(/^\/connections$/)}>Connections</a></li>
+				<li><a href="/devices" class={getNavClass(/^\/devices(\/\d+)?$/)}>Devices</a></li>
 			{/if}
 		</ul>
 	</nav>
 </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()}
 </main>

@@ -35,7 +37,7 @@
 <!--Some shenanings needed to be done to get the footer position to stick correctly,
 didn't work with display: contents-->
 <footer class="inset-x-0 bottom-0 w-full text-center">
-	<p>&copy; 2024</p>
+	<p>&copy; 2025</p>
 </footer>

 <style>
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -21,7 +21,7 @@
 	<section id="get-started" class="border-l-2 pl-6">
 		<p>
 			To get started,
-			<Button class="ml-2" href="/clients/?add=New+Client">Create a New Client</Button>
+			<Button class="ml-2" href="/devices?add=New+Device">Add a New Device</Button>
 		</p>
 	</section>
 	<!--	<section id="using-wireguard">-->
--- a/src/routes/api/clients/[id]/+server.ts
+++ b/src/routes/api/clients/[id]/+server.ts
@@ -1,20 +0,0 @@
-import { error } from '@sveltejs/kit';
-import type { RequestHandler } from './$types';
-import { findClient, mapClientToDetails } from '$lib/server/clients';
-
-export const GET: RequestHandler = async (event) => {
-	if (!event.locals.user) {
-		return error(401, 'Unauthorized');
-	}
-
-	const { id } = event.params;
-	const clientId = parseInt(id);
-	if (isNaN(clientId)) {
-		return error(400, 'Invalid client ID');
-	}
-	const client = await findClient(event.locals.user.id, clientId);
-	if (!client) {
-		return error(404, 'Client not found');
-	}
-	return new Response(JSON.stringify(mapClientToDetails(client)));
-};
--- a/src/routes/api/connections/+server.ts
+++ b/src/routes/api/connections/+server.ts
@@ -2,13 +2,56 @@ import { error } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
 import { opnsenseAuth, opnsenseUrl } from '$lib/server/opnsense';
 import type { OpnsenseWgPeers } from '$lib/opnsense/wg';
+import { findDevices } from '$lib/server/devices';
+import type { ConnectionDetails } from '$lib/connections';
+import { opnsenseSanitezedUsername } from '$lib/opnsense';

 export const GET: RequestHandler = async (event) => {
 	if (!event.locals.user) {
 		return error(401, 'Unauthorized');
 	}
-	const apiUrl = `${opnsenseUrl}/api/wireguard/service/show`;
-	const options: RequestInit = {
+	console.debug('/api/connections');
+	const peers = await fetchOpnsensePeers(event.locals.user.username);
+	console.debug('/api/connections: fetched opnsense peers', peers.rowCount);
+	const devices = await findDevices(event.locals.user.id);
+	console.debug('/api/connections: fetched db devices');
+
+	if (!peers) {
+		return error(500, 'Error getting info from OPNsense API');
+	}
+
+	// TODO: this is all garbage performance
+	// filter devices with no recent handshakes
+	peers.rows = peers.rows.filter((peer) => peer['latest-handshake']);
+
+	// start from devices, to treat db as the source of truth
+	const connections: ConnectionDetails[] = [];
+	for (const device of devices) {
+		const peerData = peers.rows.find((peer) => peer['public-key'] === device.publicKey);
+		if (!peerData) continue;
+		connections.push({
+			deviceId: device.id,
+			deviceName: device.name,
+			devicePublicKey: device.publicKey,
+			deviceIps: peerData['allowed-ips'].split(','),
+			endpoint: peerData['endpoint'],
+			// swap rx and tx, since the opnsense values are from the server perspective
+			transferRx: peerData['transfer-tx'],
+			transferTx: peerData['transfer-rx'],
+			latestHandshake: peerData['latest-handshake'] * 1000,
+		});
+	}
+
+	return new Response(JSON.stringify(connections), {
+		headers: {
+			'Content-Type': 'application/json',
+			'Cache-Control': 'max-age=5',
+		},
+	});
+};
+
+async function fetchOpnsensePeers(username: string) {
+	const res = await fetch(`${opnsenseUrl}/api/wireguard/service/show`, {
 		method: 'POST',
 		headers: {
 			Authorization: opnsenseAuth,
@@ -16,28 +59,15 @@ export const GET: RequestHandler = async (event) => {
 			'Content-Type': 'application/json',
 		},
 		body: JSON.stringify({
-			'current': 1,
+			current: 1,
 			// "rowCount": 7,
-			'sort': {},
+			sort: {},
 			// TODO: use a more unique search phrase
 			// unfortunately 64 character limit,
 			// but it should be fine if users can't change their own username
-			'searchPhrase': `vpgen-${event.locals.user.username}`,
-			'type': ['peer'],
+			searchPhrase: `vpgen-${opnsenseSanitezedUsername(username)}`,
+			type: ['peer'],
 		}),
-	};
-
-	const res = await fetch(apiUrl, options);
-	const peers = await res.json() as OpnsenseWgPeers;
-	peers.rows = peers.rows.filter(peer => peer['latest-handshake'])
-
-	if (!peers) {
-		return error(500, 'Error getting info from OPNsense API');
-	}
-	return new Response(JSON.stringify(peers), {
-		headers: {
-			'Content-Type': 'application/json',
-			'Cache-Control': 'max-age=5',
-		}
 	});
-};
+	return (await res.json()) as OpnsenseWgPeers;
+}
--- a/src/routes/api/devices/+server.ts
+++ b/src/routes/api/devices/+server.ts
@@ -1,29 +1,29 @@
 import { error } from '@sveltejs/kit';
 import type { RequestHandler } from './$types';
-import { createClient, findClients, mapClientToDetails } from '$lib/server/clients';
+import { createDevice, findDevices, mapDeviceToDetails } from '$lib/server/devices';

 export const GET: RequestHandler = async (event) => {
 	if (!event.locals.user) {
 		return error(401, 'Unauthorized');
 	}

-	const clients = await findClients(event.locals.user.id);
+	const devices = await findDevices(event.locals.user.id);
 	return new Response(
 		JSON.stringify({
-			clients: clients.map(mapClientToDetails),
+			devices: devices.map(mapDeviceToDetails),
 		}),
 	);
 };


-export type Clients = Awaited<ReturnType<typeof findClients>>;
+export type Devices = Awaited<ReturnType<typeof findDevices>>;

 export const POST: RequestHandler = async (event) => {
 	if (!event.locals.user) {
 		return error(401, 'Unauthorized');
 	}
 	const { name } = await event.request.json();
-	const res = await createClient({
+	const res = await createDevice({
 		name,
 		user: event.locals.user,
 	});
--- a/src/routes/api/devices/[id]/+server.ts
+++ b/src/routes/api/devices/[id]/+server.ts
@@ -0,0 +1,20 @@
+import { error } from '@sveltejs/kit';
+import type { RequestHandler } from './$types';
+import { findDevice, mapDeviceToDetails } from '$lib/server/devices';
+
+export const GET: RequestHandler = async (event) => {
+	if (!event.locals.user) {
+		return error(401, 'Unauthorized');
+	}
+
+	const { id } = event.params;
+	const deviceId = parseInt(id);
+	if (isNaN(deviceId)) {
+		return error(400, 'Invalid device ID');
+	}
+	const device = await findDevice(event.locals.user.id, deviceId);
+	if (!device) {
+		return error(404, 'Device not found');
+	}
+	return new Response(JSON.stringify(mapDeviceToDetails(device)));
+};
--- a/src/routes/auth/authentik/callback/+server.ts
+++ b/src/routes/auth/authentik/callback/+server.ts
@@ -35,7 +35,7 @@ export async function GET(event: RequestEvent): Promise<Response> {
 		});
 	}
 	const claims = decodeIdToken(tokens.idToken()) as { sub: string, preferred_username: string, name: string };
-	console.log("claims", claims);
+	console.info("claims", claims);
 	const userId: string = claims.sub;
 	const username: string = claims.preferred_username;

--- a/src/routes/clients/+page.ts
+++ b/src/routes/clients/+page.ts
@@ -1,9 +0,0 @@
-import type { PageLoad } from './$types';
-import type { ClientDetails } from '$lib/types/clients';
-
-export const load: PageLoad = async ({ fetch }) => {
-	const res = await fetch('/api/clients');
-	const { clients } = await res.json() as { clients: ClientDetails[] };
-
-	return { clients };
-};
--- a/src/routes/clients/[id]/+page.ts
+++ b/src/routes/clients/[id]/+page.ts
@@ -1,16 +0,0 @@
-import type { PageLoad } from './$types';
-import type { ClientDetails } from '$lib/types/clients';
-import { clientDetailsToConfig } from '$lib/clients';
-import { error } from '@sveltejs/kit';
-
-export const load: PageLoad = async ({ fetch, params }) => {
-	const res = await fetch(`/api/clients/${params.id}`);
-	const resJson = await res.json();
-	if (!res.ok) {
-		return error(res.status, resJson['message']);
-	}
-	const client = resJson as ClientDetails;
-	const config = clientDetailsToConfig(client);
-
-	return { client, config };
-};
--- a/src/routes/connections/+page.svelte
+++ b/src/routes/connections/+page.svelte
@@ -16,14 +16,12 @@
 		return () => clearInterval(interval);
 	});

-	function getSize(size: number) {
-		let sizes = ['Bytes', 'KiB', 'MiB', 'GiB',
-			'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+	function toSizeString(size: number) {
+		let sizes = ['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];

 		for (let i = 1; i < sizes.length; i++) {
 			if (size < Math.pow(1024, i))
-				return (Math.round((size / Math.pow(
-					1024, i - 1)) * 100) / 100) + ' ' + sizes[i - 1];
+				return Math.round((size / Math.pow(1024, i - 1)) * 100) / 100 + ' ' + sizes[i - 1];
 		}
 		return size;
 	}
@@ -33,38 +31,34 @@
 	<title>Connections</title>
 </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.Row>
-			<Table.Head scope="col">Name</Table.Head>
+			<Table.Head scope="col">Device</Table.Head>
 			<Table.Head scope="col">Public Key</Table.Head>
 			<Table.Head scope="col">Endpoint</Table.Head>
-			<Table.Head scope="col">Allowed IPs</Table.Head>
+			<Table.Head scope="col">Device IPs</Table.Head>
 			<Table.Head scope="col">Latest Handshake</Table.Head>
 			<Table.Head scope="col">RX</Table.Head>
 			<Table.Head scope="col">TX</Table.Head>
-			<Table.Head scope="col" class="hidden">Persistent Keepalive</Table.Head>
-			<Table.Head scope="col" class="hidden">Interface Name</Table.Head>
 		</Table.Row>
 	</Table.Header>
 	<Table.Body class="divide-y-2 divide-background">
-		{#each data.peers.rows as peer}
-			<Table.Row class="hover:bg-background hover:bg-opacity-40">
-				<Table.Head scope="row">{peer.name}</Table.Head>
-				<Table.Cell class="truncate max-w-[10ch]">{peer['public-key']}</Table.Cell>
-				<Table.Cell>{peer.endpoint}</Table.Cell>
+		{#each data.connections as conn}
+			<Table.Row class="hover:bg-surface">
+				<Table.Head scope="row">{conn.deviceName}</Table.Head>
+				<Table.Cell class="max-w-[10ch] truncate">{conn.devicePublicKey}</Table.Cell>
+				<Table.Cell>{conn.endpoint}</Table.Cell>
 				<Table.Cell>
 					<div class="flex flex-wrap gap-1">
-						{#each peer['allowed-ips'].split(',') as addr}
-							<Badge class="bg-background select-auto" variant="secondary">{addr}</Badge>
+						{#each conn.deviceIps as addr}
+							<Badge class="select-auto bg-background" variant="secondary">{addr}</Badge>
 						{/each}
 					</div>
 				</Table.Cell>
-				<Table.Cell>{new Date(peer['latest-handshake'] * 1000).toLocaleString()}</Table.Cell>
-				<Table.Cell>{getSize(peer['transfer-rx'])}</Table.Cell>
-				<Table.Cell>{getSize(peer['transfer-tx'])}</Table.Cell>
-				<Table.Cell class="hidden">{peer['persistent-keepalive']}</Table.Cell>
-				<Table.Cell class="hidden">{peer.ifname}</Table.Cell>
+				<Table.Cell>{new Date(conn.latestHandshake).toLocaleString()}</Table.Cell>
+				<Table.Cell>{toSizeString(conn.transferRx)}</Table.Cell>
+				<Table.Cell>{toSizeString(conn.transferTx)}</Table.Cell>
 			</Table.Row>
 		{/each}
 	</Table.Body>
--- a/src/routes/connections/+page.ts
+++ b/src/routes/connections/+page.ts
@@ -1,9 +1,9 @@
 import type { PageLoad } from './$types';
-import type { OpnsenseWgPeers } from '$lib/opnsense/wg';
+import type { ConnectionDetails } from '$lib/connections';

 export const load: PageLoad = async ({ fetch }) => {
 	const res = await fetch('/api/connections');
-	const peers = await res.json() as OpnsenseWgPeers;
+	const connections = await res.json() as ConnectionDetails[];

-	return { peers };
+	return { connections };
 };
--- a/src/routes/devices/+page.server.ts
+++ b/src/routes/devices/+page.server.ts
@@ -1,5 +1,5 @@
 import type { Actions } from './$types';
-import { createClient } from '$lib/server/clients';
+import { createDevice } from '$lib/server/devices';
 import { error, redirect } from '@sveltejs/kit';

 export const actions = {
@@ -8,14 +8,14 @@ export const actions = {
 		const formData = await event.request.formData();
 		const name = formData.get('name');
 		if (typeof name !== 'string' || name.trim() === '') return error(400, 'Invalid name');
-		const res = await createClient({
+		const res = await createDevice({
 			name: name.trim(),
 			user: event.locals.user,
 		});

 		switch (res._tag) {
 			case 'ok': {
-				return redirect(303, `/clients/${res.value}/`);
+				return redirect(303, `/devices/${res.value}`);
 			}
 			case 'err': {
 				const [status, message] = res.error;
--- a/src/routes/devices/+page.svelte
+++ b/src/routes/devices/+page.svelte
@@ -4,7 +4,7 @@
 	import { Badge } from '$lib/components/ui/badge';
 	import { Button, buttonVariants } from '$lib/components/ui/button';
 	import { Input } from '$lib/components/ui/input';
-	import { LucidePlus } from 'lucide-svelte';
+	import { LucideLoaderCircle, LucidePlus } from 'lucide-svelte';
 	import type { PageData } from './$types';
 	import { Label } from '$lib/components/ui/label';
 	import { page } from '$app/state';
@@ -13,6 +13,7 @@

 	let dialogOpen = $state(page.url.searchParams.has('add'));
 	let dialogVal = $state(page.url.searchParams.get('add') ?? '');
+	let submitted = $state(false);

 	$effect(() => {
 		if (dialogOpen) page.url.searchParams.set('add', dialogVal);
@@ -23,7 +24,7 @@
 </script>

 <svelte:head>
-	<title>Clients</title>
+	<title>Devices</title>
 </svelte:head>

 <Table.Root class="divide-y-2 divide-background overflow-hidden rounded-lg bg-accent">
@@ -37,21 +38,21 @@
 		</Table.Row>
 	</Table.Header>
 	<Table.Body class="divide-y-2 divide-background">
-		{#each data.clients as client}
-			<Table.Row class="group hover:bg-background hover:bg-opacity-40">
+		{#each data.devices as device}
+			<Table.Row class="hover:bg-surface group">
 				<Table.Head scope="row">
 					<a
-						href={`./${client.id}/`}
+						href="/devices/{device.id}"
 						class="flex size-full items-center group-hover:underline"
 					>
-						{client.name}
+						{device.name}
 					</a>
 				</Table.Head>
-				<Table.Cell class="truncate">{client.publicKey}</Table.Cell>
-				<!--				<Table.Cell class="truncate max-w-[10ch]">{client.privateKey}</Table.Cell>-->
-				<!--				<Table.Cell class="truncate max-w-[10ch]">{client.preSharedKey}</Table.Cell>-->
+				<Table.Cell class="truncate">{device.publicKey}</Table.Cell>
+				<!--				<Table.Cell class="truncate max-w-[10ch]">{device.privateKey}</Table.Cell>-->
+				<!--				<Table.Cell class="truncate max-w-[10ch]">{device.preSharedKey}</Table.Cell>-->
 				<Table.Cell class="flex flex-wrap gap-1">
-					{#each client.ips as ip}
+					{#each device.ips as ip}
 						<Badge class="select-auto bg-background" variant="secondary">{ip}</Badge>
 					{/each}
 				</Table.Cell>
@@ -60,18 +61,18 @@
 	</Table.Body>
 </Table.Root>

-<!--Floating action button for adding a new client-->
+<!--Floating action button for adding a new device-->
 <Dialog.Root bind:open={dialogOpen}>
 	<div class="mt-auto flex self-end pt-4">
 		<Dialog.Trigger class={buttonVariants({ variant: 'default' }) + ' flex gap-4'}>
 			<LucidePlus />
-			New Client
+			New Device
 		</Dialog.Trigger>
 	</div>
 	<Dialog.Content class="max-w-xs">
-		<form class="contents" method="post" action="?/create">
+		<form class="contents" method="post" onsubmit={() => submitted = true} action="?/create">
 			<Dialog.Header class="">
-				<Dialog.Title>Create a new client</Dialog.Title>
+				<Dialog.Title>Add a new device</Dialog.Title>
 			</Dialog.Header>
 			<div class="flex flex-wrap items-center justify-between gap-4">
 				<Label for="name">Name</Label>
@@ -81,12 +82,17 @@
 					pattern=".*[^\s]+.*"
 					type="text"
 					name="name"
-					placeholder="New Client"
+					placeholder="New Device"
 					class="max-w-[20ch]"
 				/>
 			</div>
 			<Dialog.Footer>
-				<Button type="submit">Create</Button>
+				<Button type="submit" disabled={submitted}>
+					{#if submitted}
+						<LucideLoaderCircle class="size-4 mr-2 animate-spin" />
+					{/if}
+					Add
+				</Button>
 			</Dialog.Footer>
 		</form>
 	</Dialog.Content>
--- a/src/routes/devices/+page.ts
+++ b/src/routes/devices/+page.ts
@@ -0,0 +1,9 @@
+import type { PageLoad } from './$types';
+import type { DeviceDetails } from '$lib/devices';
+
+export const load: PageLoad = async ({ fetch }) => {
+	const res = await fetch('/api/devices');
+	const { devices } = await res.json() as { devices: DeviceDetails[] };
+
+	return { devices };
+};
--- a/src/routes/devices/[id]/+page.svelte
+++ b/src/routes/devices/[id]/+page.svelte
@@ -2,33 +2,35 @@
 	import type { PageData } from './$types';
 	import QRCode from 'qrcode-svg';
 	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();

-	// Clean the client name for the file name,
+	// Clean the device name for the wg config filename,
 	// things can break otherwise (too long or invalid characters)
 	// https://github.com/pirate/wireguard-docs
-	const clientWgCleanedName =
-		data.client.name.slice(0, 15).replace(/[^a-zA-Z0-9_=+.-]/g, '_') + '.conf';
+	const deviceWgCleanedName =
+		data.device.name.slice(0, 15).replace(/[^a-zA-Z0-9_=+.-]/g, '_') + '.conf';

 	let qrCode = new QRCode({
 		content: data.config,
 		join: true,
 		background: 'hsl(var(--accent-light))',
+		width: 296,
+		height: 296,
 	});
 </script>

 <svelte:head>
-	<title>{data.client.name}</title>
+	<title>{data.device.name}</title>
 </svelte:head>

-<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.device.name}</h1>

-<section id="client-configuration" class="flex flex-wrap justify-center gap-4">
-	<CodeSnippet data={data.config} filename={clientWgCleanedName} copy download />
+<section id="device-configuration" class="flex flex-wrap items-center justify-center gap-4">
+	<CodeSnippet data={data.config} filename={deviceWgCleanedName} copy download />

-	<div class="overflow-hidden rounded-lg">
+	<div class="size-fit overflow-auto rounded-lg">
 		{@html qrCode.svg()}
 	</div>
 </section>
--- a/src/routes/devices/[id]/+page.ts
+++ b/src/routes/devices/[id]/+page.ts
@@ -0,0 +1,15 @@
+import type { PageLoad } from './$types';
+import { type DeviceDetails, deviceDetailsToConfig } from '$lib/devices';
+import { error } from '@sveltejs/kit';
+
+export const load: PageLoad = async ({ fetch, params }) => {
+	const res = await fetch(`/api/devices/${params.id}`);
+	const resJson = await res.json();
+	if (!res.ok) {
+		return error(res.status, resJson['message']);
+	}
+	const device = resJson as DeviceDetails;
+	const config = deviceDetailsToConfig(device);
+
+	return { device, config };
+};
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -1,92 +1,93 @@
-import { fontFamily } from "tailwindcss/defaultTheme";
-import type { Config } from "tailwindcss";
-import tailwindcssAnimate from "tailwindcss-animate";
+import { fontFamily } from 'tailwindcss/defaultTheme';
+import type { Config } from 'tailwindcss';
+import tailwindcssAnimate from 'tailwindcss-animate';

 const config: Config = {
-	darkMode: ["media"],
-	content: ["./src/**/*.{html,js,svelte,ts}"],
-	safelist: ["dark"],
+	darkMode: ['media'],
+	content: ['./src/**/*.{html,js,svelte,ts}'],
+	safelist: ['dark'],
 	theme: {
 		container: {
 			center: true,
-			padding: "2rem",
+			padding: '2rem',
 			screens: {
-				"2xl": "1400px"
-			}
+				'2xl': '1400px',
+			},
 		},
 		extend: {
 			colors: {
-				border: "hsl(var(--border) / <alpha-value>)",
-				input: "hsl(var(--input) / <alpha-value>)",
-				ring: "hsl(var(--ring) / <alpha-value>)",
-				background: "hsl(var(--background) / <alpha-value>)",
-				foreground: "hsl(var(--foreground) / <alpha-value>)",
+				border: 'hsl(var(--border) / <alpha-value>)',
+				input: 'hsl(var(--input) / <alpha-value>)',
+				ring: 'hsl(var(--ring) / <alpha-value>)',
+				background: 'hsl(var(--background) / <alpha-value>)',
+				foreground: 'hsl(var(--foreground) / <alpha-value>)',
 				primary: {
-					DEFAULT: "hsl(var(--primary) / <alpha-value>)",
-					foreground: "hsl(var(--primary-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--primary) / <alpha-value>)',
+					foreground: 'hsl(var(--primary-foreground) / <alpha-value>)',
 				},
 				secondary: {
-					DEFAULT: "hsl(var(--secondary) / <alpha-value>)",
-					foreground: "hsl(var(--secondary-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--secondary) / <alpha-value>)',
+					foreground: 'hsl(var(--secondary-foreground) / <alpha-value>)',
 				},
 				destructive: {
-					DEFAULT: "hsl(var(--destructive) / <alpha-value>)",
-					foreground: "hsl(var(--destructive-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--destructive) / <alpha-value>)',
+					foreground: 'hsl(var(--destructive-foreground) / <alpha-value>)',
 				},
 				muted: {
-					DEFAULT: "hsl(var(--muted) / <alpha-value>)",
-					foreground: "hsl(var(--muted-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--muted) / <alpha-value>)',
+					foreground: 'hsl(var(--muted-foreground) / <alpha-value>)',
 				},
 				accent: {
-					DEFAULT: "hsl(var(--accent) / <alpha-value>)",
-					foreground: "hsl(var(--accent-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--accent) / <alpha-value>)',
+					foreground: 'hsl(var(--accent-foreground) / <alpha-value>)',
 				},
 				popover: {
-					DEFAULT: "hsl(var(--popover) / <alpha-value>)",
-					foreground: "hsl(var(--popover-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--popover) / <alpha-value>)',
+					foreground: 'hsl(var(--popover-foreground) / <alpha-value>)',
 				},
 				card: {
-					DEFAULT: "hsl(var(--card) / <alpha-value>)",
-					foreground: "hsl(var(--card-foreground) / <alpha-value>)"
+					DEFAULT: 'hsl(var(--card) / <alpha-value>)',
+					foreground: 'hsl(var(--card-foreground) / <alpha-value>)',
 				},
 				sidebar: {
-					DEFAULT: "hsl(var(--sidebar-background))",
-					foreground: "hsl(var(--sidebar-foreground))",
-					primary: "hsl(var(--sidebar-primary))",
-					"primary-foreground": "hsl(var(--sidebar-primary-foreground))",
-					accent: "hsl(var(--sidebar-accent))",
-					"accent-foreground": "hsl(var(--sidebar-accent-foreground))",
-					border: "hsl(var(--sidebar-border))",
-					ring: "hsl(var(--sidebar-ring))",
+					DEFAULT: 'hsl(var(--sidebar-background))',
+					foreground: 'hsl(var(--sidebar-foreground))',
+					primary: 'hsl(var(--sidebar-primary))',
+					'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
+					accent: 'hsl(var(--sidebar-accent))',
+					'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
+					border: 'hsl(var(--sidebar-border))',
+					ring: 'hsl(var(--sidebar-ring))',
 				},
+				surface: 'hsl(var(--surface) / <alpha-value>)',
 			},
 			borderRadius: {
-				xl: "calc(var(--radius) + 4px)",
-				lg: "var(--radius)",
-				md: "calc(var(--radius) - 2px)",
-				sm: "calc(var(--radius) - 4px)"
+				xl: 'calc(var(--radius) + 4px)',
+				lg: 'var(--radius)',
+				md: 'calc(var(--radius) - 2px)',
+				sm: 'calc(var(--radius) - 4px)',
 			},
 			fontFamily: {
-				sans: [...fontFamily.sans]
+				sans: [...fontFamily.sans],
 			},
 			keyframes: {
-				"accordion-down": {
-					from: { height: "0" },
-					to: { height: "var(--bits-accordion-content-height)" },
+				'accordion-down': {
+					from: { height: '0' },
+					to: { height: 'var(--bits-accordion-content-height)' },
 				},
-				"accordion-up": {
-					from: { height: "var(--bits-accordion-content-height)" },
-					to: { height: "0" },
+				'accordion-up': {
+					from: { height: 'var(--bits-accordion-content-height)' },
+					to: { height: '0' },
 				},
-				"caret-blink": {
-					"0%,70%,100%": { opacity: "1" },
-					"20%,50%": { opacity: "0" },
+				'caret-blink': {
+					'0%,70%,100%': { opacity: '1' },
+					'20%,50%': { opacity: '0' },
 				},
 			},
 			animation: {
-        		"accordion-down": "accordion-down 0.2s ease-out",
-        		"accordion-up": "accordion-up 0.2s ease-out",
-       			"caret-blink": "caret-blink 1.25s ease-out infinite",
+				'accordion-down': 'accordion-down 0.2s ease-out',
+				'accordion-up': 'accordion-up 0.2s ease-out',
+				'caret-blink': 'caret-blink 1.25s ease-out infinite',
 			},
 		},
 	},
Author	SHA1	Message	Date
Yuri Tatishchev	b38ab19c3e	WIP: more proper logging	2025-01-09 15:01:03 -08:00
Yuri Tatishchev	80acec720c	opnsense: sanitize usernames for creating peers	2025-01-09 14:44:48 -08:00
Yuri Tatishchev	29fbccc953	connections page: update API, combine opnsense data with db data	2025-01-07 19:03:54 -08:00
Yuri Tatishchev	76559d2931	update guide video for android	2025-01-07 17:58:31 -08:00
Yuri Tatishchev	cc7c94417d	rename clients to devices	2025-01-07 16:22:43 -08:00
Yuri Tatishchev	d99ee9ef1e	more layout improvements	2025-01-01 21:48:34 -08:00
Yuri Tatishchev	32ab4104a7	super mega layout improvements	2025-01-01 17:15:12 -08:00