From c4e66f7b79ff2d3d69dacecbec64752fe4a052c4 Mon Sep 17 00:00:00 2001
From: Anton Shubin <2spy4x@gmail.com>
Date: Mon, 29 Jan 2024 23:44:31 +0800
Subject: [PATCH] ui: extract nav menu into a component and highlight current
 menu item

---
 .../lib/client/components/icons/bell.svelte   |  14 +
 .../client/components/icons/chartPie.svelte   |  15 +
 .../client/components/icons/cog6tooth.svelte  |  15 +
 .../client/components/icons/cpuChip.svelte    |  14 +
 .../icons/exclamationTriangle.svelte          |  14 +
 .../lib/client/components/icons/home.svelte   |  14 +
 .../src/lib/client/components/icons/index.ts  |   8 +
 .../lib/client/components/icons/map.svelte    |  14 +
 .../lib/client/components/icons/user.svelte   |  14 +
 .../src/lib/client/components/nav.svelte      |  52 +++
 apps/front/src/routes/+layout.svelte          | 415 +-----------------
 11 files changed, 177 insertions(+), 412 deletions(-)
 create mode 100644 apps/front/src/lib/client/components/icons/bell.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/chartPie.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/cog6tooth.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/cpuChip.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/exclamationTriangle.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/home.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/index.ts
 create mode 100644 apps/front/src/lib/client/components/icons/map.svelte
 create mode 100644 apps/front/src/lib/client/components/icons/user.svelte
 create mode 100644 apps/front/src/lib/client/components/nav.svelte

diff --git a/apps/front/src/lib/client/components/icons/bell.svelte b/apps/front/src/lib/client/components/icons/bell.svelte
new file mode 100644
index 0000000..5ca098c
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/bell.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/chartPie.svelte b/apps/front/src/lib/client/components/icons/chartPie.svelte
new file mode 100644
index 0000000..3cad6b0
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/chartPie.svelte
@@ -0,0 +1,15 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path stroke-linecap="round" stroke-linejoin="round" d="M10.5 6a7.5 7.5 0 1 0 7.5 7.5h-7.5V6Z" />
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M13.5 10.5H21A7.5 7.5 0 0 0 13.5 3v7.5Z"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/cog6tooth.svelte b/apps/front/src/lib/client/components/icons/cog6tooth.svelte
new file mode 100644
index 0000000..c0137fd
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/cog6tooth.svelte
@@ -0,0 +1,15 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a7.723 7.723 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.94-1.11.94h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28Z"
+	/>
+	<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/cpuChip.svelte b/apps/front/src/lib/client/components/icons/cpuChip.svelte
new file mode 100644
index 0000000..1d68bde
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/cpuChip.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M8.25 3v1.5M4.5 8.25H3m18 0h-1.5M4.5 12H3m18 0h-1.5m-15 3.75H3m18 0h-1.5M8.25 19.5V21M12 3v1.5m0 15V21m3.75-18v1.5m0 15V21m-9-1.5h10.5a2.25 2.25 0 0 0 2.25-2.25V6.75a2.25 2.25 0 0 0-2.25-2.25H6.75A2.25 2.25 0 0 0 4.5 6.75v10.5a2.25 2.25 0 0 0 2.25 2.25Zm.75-12h9v9h-9v-9Z"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/exclamationTriangle.svelte b/apps/front/src/lib/client/components/icons/exclamationTriangle.svelte
new file mode 100644
index 0000000..1816bf4
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/exclamationTriangle.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/home.svelte b/apps/front/src/lib/client/components/icons/home.svelte
new file mode 100644
index 0000000..9484319
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/home.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/index.ts b/apps/front/src/lib/client/components/icons/index.ts
new file mode 100644
index 0000000..24bb6d8
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/index.ts
@@ -0,0 +1,8 @@
+export { default as IconBell } from './bell.svelte';
+export { default as IconChartPie } from './chartPie.svelte';
+export { default as IconCog6Tooth } from './cog6tooth.svelte';
+export { default as IconCpuChip } from './cpuChip.svelte';
+export { default as IconExclamationTriangle } from './exclamationTriangle.svelte';
+export { default as IconHome } from './home.svelte';
+export { default as IconMap } from './map.svelte';
+export { default as IconUser } from './user.svelte';
diff --git a/apps/front/src/lib/client/components/icons/map.svelte b/apps/front/src/lib/client/components/icons/map.svelte
new file mode 100644
index 0000000..9cbef15
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/map.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M9 6.75V15m6-6v8.25m.503 3.498 4.875-2.437c.381-.19.622-.58.622-1.006V4.82c0-.836-.88-1.38-1.628-1.006l-3.869 1.934c-.317.159-.69.159-1.006 0L9.503 3.252a1.125 1.125 0 0 0-1.006 0L3.622 5.689C3.24 5.88 3 6.27 3 6.695V19.18c0 .836.88 1.38 1.628 1.006l3.869-1.934c.317-.159.69-.159 1.006 0l4.994 2.497c.317.158.69.158 1.006 0Z"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/icons/user.svelte b/apps/front/src/lib/client/components/icons/user.svelte
new file mode 100644
index 0000000..b2fa1c9
--- /dev/null
+++ b/apps/front/src/lib/client/components/icons/user.svelte
@@ -0,0 +1,14 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="currentColor"
+	class="shrink-0 {$$props.size ? `size-${$$props.size}` : 'size-6'} {$$props.class || ''}"
+>
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z"
+	/>
+</svg>
diff --git a/apps/front/src/lib/client/components/nav.svelte b/apps/front/src/lib/client/components/nav.svelte
new file mode 100644
index 0000000..4fd62a8
--- /dev/null
+++ b/apps/front/src/lib/client/components/nav.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+	import type { SvelteComponent } from 'svelte';
+	import { page } from '$app/stores';
+	import {
+		IconBell,
+		IconChartPie,
+		IconCog6Tooth,
+		IconCpuChip,
+		IconExclamationTriangle,
+		IconHome,
+		IconMap,
+		IconUser
+	} from './icons';
+
+	// Define a type for navigation items
+	type NavItem = {
+		name: string;
+		href: string;
+		Icon: new (...args: any) => SvelteComponent;
+	};
+
+	// Initialize navigation items
+	const navItems: NavItem[] = [
+		{ name: 'Dashboard', href: '/', Icon: IconHome },
+		{ name: 'Map and Zones', href: '/map', Icon: IconMap },
+		{ name: 'Device Groups', href: '/device-groups', Icon: IconCpuChip },
+		{ name: 'Fault', href: '/fault', Icon: IconExclamationTriangle },
+		{ name: 'Notifications', href: '/notifications', Icon: IconBell },
+		{ name: 'Admin', href: '/admin', Icon: IconUser },
+		{ name: 'Reports', href: '/reports', Icon: IconChartPie },
+		{ name: 'Settings', href: '/settings', Icon: IconCog6Tooth }
+	];
+	const activeClasses = 'bg-gray-800 text-white';
+	const inactiveClasses = 'text-gray-400 hover:text-white hover:bg-gray-800';
+	const baseClasses = 'group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold';
+</script>
+
+<nav class="flex flex-1 flex-col">
+	<ul role="list" class="flex flex-1 flex-col -mx-2 space-y-1">
+		{#each navItems as { name, href, Icon }}
+			<li>
+				<a
+					{href}
+					class="{baseClasses} {$page.url.pathname === href ? activeClasses : inactiveClasses}"
+				>
+					<svelte:component this={Icon} />
+					{name}
+				</a>
+			</li>
+		{/each}
+	</ul>
+</nav>
diff --git a/apps/front/src/routes/+layout.svelte b/apps/front/src/routes/+layout.svelte
index bb0b1d5..188425e 100644
--- a/apps/front/src/routes/+layout.svelte
+++ b/apps/front/src/routes/+layout.svelte
@@ -2,6 +2,7 @@
 	import '../app.css';
 	import Login from '$lib/client/components/Login.svelte';
 	import { auth } from '$lib/client/stores/auth';
+	import Nav from '$lib/client/components/nav.svelte';
 
 	// import { onMount } from 'svelte';
 	let isDropdownOpen = false;
@@ -114,221 +115,7 @@
 							/>
 							<h3 class="text-white">JB Lux</h3>
 						</div>
-						<nav class="flex flex-1 flex-col">
-							<ul role="list" class="flex flex-1 flex-col gap-y-7">
-								<li>
-									<ul role="list" class="-mx-2 space-y-1">
-										<li>
-											<!-- Current: "bg-gray-800 text-white", Default: "text-gray-400 hover:text-white hover:bg-gray-800" -->
-											<a
-												href="#"
-												class="bg-gray-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
-													/>
-												</svg>
-												Dashboard
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M15 19.128a9.38 9.38 0 002.625.372 9.337 9.337 0 004.121-.952 4.125 4.125 0 00-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 018.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0111.964-3.07M12 6.375a3.375 3.375 0 11-6.75 0 3.375 3.375 0 016.75 0zm8.25 2.25a2.625 2.625 0 11-5.25 0 2.625 2.625 0 015.25 0z"
-													/>
-												</svg>
-												Team
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M2.25 12.75V12A2.25 2.25 0 014.5 9.75h15A2.25 2.25 0 0121.75 12v.75m-8.69-6.44l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z"
-													/>
-												</svg>
-												Projects
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 012.25-2.25h13.5A2.25 2.25 0 0121 7.5v11.25m-18 0A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75m-18 0v-7.5A2.25 2.25 0 015.25 9h13.5A2.25 2.25 0 0121 11.25v7.5"
-													/>
-												</svg>
-												Calendar
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 01-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 011.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 00-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 01-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 00-3.375-3.375h-1.5a1.125 1.125 0 01-1.125-1.125v-1.5a3.375 3.375 0 00-3.375-3.375H9.75"
-													/>
-												</svg>
-												Documents
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<svg
-													class="h-6 w-6 shrink-0"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													aria-hidden="true"
-												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M10.5 6a7.5 7.5 0 107.5 7.5h-7.5V6z"
-													/>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M13.5 10.5H21A7.5 7.5 0 0013.5 3v7.5z"
-													/>
-												</svg>
-												Reports
-											</a>
-										</li>
-									</ul>
-								</li>
-								<li>
-									<div class="text-xs font-semibold leading-6 text-gray-400">Your teams</div>
-									<ul role="list" class="-mx-2 mt-2 space-y-1">
-										<li>
-											<!-- Current: "bg-gray-800 text-white", Default: "text-gray-400 hover:text-white hover:bg-gray-800" -->
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<span
-													class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border border-gray-700 bg-gray-800 text-[0.625rem] font-medium text-gray-400 group-hover:text-white"
-													>H</span
-												>
-												<span class="truncate">Heroicons</span>
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<span
-													class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border border-gray-700 bg-gray-800 text-[0.625rem] font-medium text-gray-400 group-hover:text-white"
-													>T</span
-												>
-												<span class="truncate">Tailwind Labs</span>
-											</a>
-										</li>
-										<li>
-											<a
-												href="#"
-												class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-											>
-												<span
-													class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border border-gray-700 bg-gray-800 text-[0.625rem] font-medium text-gray-400 group-hover:text-white"
-													>W</span
-												>
-												<span class="truncate">Workcation</span>
-											</a>
-										</li>
-									</ul>
-								</li>
-								<li class="mt-auto">
-									<a
-										href="#"
-										class="group -mx-2 flex gap-x-3 rounded-md p-2 text-sm font-semibold leading-6 text-gray-400 hover:bg-gray-800 hover:text-white"
-									>
-										<svg
-											class="h-6 w-6 shrink-0"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke-width="1.5"
-											stroke="currentColor"
-											aria-hidden="true"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z"
-											/>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-											/>
-										</svg>
-										Settings
-									</a>
-								</li>
-							</ul>
-						</nav>
+						<Nav />
 					</div>
 				</div>
 			</div>
@@ -346,203 +133,7 @@
 					/>
 					<h3 class="text-white">JB Lux</h3>
 				</div>
-				<nav class="flex flex-1 flex-col">
-					<ul role="list" class="flex flex-1 flex-col gap-y-7">
-						<li>
-							<ul role="list" class="-mx-2 space-y-1">
-								<li>
-									<!-- Current: "bg-gray-800 text-white", Default: "text-gray-400 hover:text-white hover:bg-gray-800" -->
-									<a
-										href="/"
-										class="bg-gray-800 text-white group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											class="h-6 w-6 shrink-0"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke-width="1.5"
-											stroke="currentColor"
-											aria-hidden="true"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
-											/>
-										</svg>
-										Dashboard
-									</a>
-								</li>
-								<li>
-									<a
-										href="/map"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											class="h-6 w-6"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke="currentColor"
-											stroke-width="2"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7"
-											/>
-										</svg>
-										Map and Zones
-									</a>
-								</li>
-								<li>
-									<a
-										href="/device-groups"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											class="h-6 w-6"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke="currentColor"
-											stroke-width="2"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10"
-											/>
-										</svg>
-										Device Groups
-									</a>
-								</li>
-								<li>
-									<a
-										href="/fault"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke-width="1.5"
-											stroke="currentColor"
-											class="size-6"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z"
-											/>
-										</svg>
-
-										Fault
-									</a>
-								</li>
-								<li>
-									<a
-										href="#"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											class="h-6 w-6"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke="currentColor"
-											stroke-width="2"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M15 17h5l-1.405-1.405A2.032 2.032 0 0118 14.158V11a6.002 6.002 0 00-4-5.659V5a2 2 0 10-4 0v.341C7.67 6.165 6 8.388 6 11v3.159c0 .538-.214 1.055-.595 1.436L4 17h5m6 0v1a3 3 0 11-6 0v-1m6 0H9"
-											/>
-										</svg>
-										Notifications
-									</a>
-								</li>
-								<li>
-									<a
-										href="#"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											xmlns="http://www.w3.org/2000/svg"
-											class="h-6 w-6"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke="currentColor"
-											stroke-width="2"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z"
-											/>
-										</svg>
-										Admin
-									</a>
-								</li>
-								<li>
-									<a
-										href="#"
-										class="text-gray-400 hover:text-white hover:bg-gray-800 group flex gap-x-3 rounded-md p-2 text-sm leading-6 font-semibold"
-									>
-										<svg
-											class="h-6 w-6 shrink-0"
-											fill="none"
-											viewBox="0 0 24 24"
-											stroke-width="1.5"
-											stroke="currentColor"
-											aria-hidden="true"
-										>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M10.5 6a7.5 7.5 0 107.5 7.5h-7.5V6z"
-											/>
-											<path
-												stroke-linecap="round"
-												stroke-linejoin="round"
-												d="M13.5 10.5H21A7.5 7.5 0 0013.5 3v7.5z"
-											/>
-										</svg>
-										Reports
-									</a>
-								</li>
-							</ul>
-						</li>
-
-						<li class="mt-auto">
-							<a
-								href="#"
-								class="group -mx-2 flex gap-x-3 rounded-md p-2 text-sm font-semibold leading-6 text-gray-400 hover:bg-gray-800 hover:text-white"
-							>
-								<svg
-									class="h-6 w-6 shrink-0"
-									fill="none"
-									viewBox="0 0 24 24"
-									stroke-width="1.5"
-									stroke="currentColor"
-									aria-hidden="true"
-								>
-									<path
-										stroke-linecap="round"
-										stroke-linejoin="round"
-										d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z"
-									/>
-									<path
-										stroke-linecap="round"
-										stroke-linejoin="round"
-										d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-									/>
-								</svg>
-								Settings
-							</a>
-						</li>
-					</ul>
-				</nav>
+				<Nav />
 			</div>
 		</div>