diff --git a/frontend/bun.lockb b/frontend/bun.lockb index c71f745..2d31ff6 100755 Binary files a/frontend/bun.lockb and b/frontend/bun.lockb differ diff --git a/frontend/package.json b/frontend/package.json index c33e9ad..c1a0577 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -51,7 +51,6 @@ "formsnap": "^1.0.0", "he": "^1.2.0", "lucide-svelte": "^0.418.0", - "magic-regexp": "^0.8.0", "mode-watcher": "^0.1.2", "nanoid": "^5.0.3", "node-html-parser": "^6.1.12", diff --git a/frontend/src/lib/components/sidebar.svelte b/frontend/src/lib/components/sidebar.svelte index f34f145..8ec59f9 100644 --- a/frontend/src/lib/components/sidebar.svelte +++ b/frontend/src/lib/components/sidebar.svelte @@ -3,7 +3,6 @@ import { Button } from '$lib/components/ui/button' import { cn } from '$lib/utils' import { Blocks, Home, Link, Settings } from 'lucide-svelte' - import { createRegExp, exactly, word } from 'magic-regexp' let className: string | undefined = undefined export { className as class } @@ -12,41 +11,25 @@ { href: '/dashboard', name: 'Home', - regex: createRegExp(exactly('/dashboard/').notBefore(word)), + match: (path: string) => path === '/dashboard', icon: Home, }, { href: '/dashboard/links', name: 'Links', - regex: createRegExp( - exactly('/dashboard/links') - .at.lineStart() - .or(exactly('/dashboard/links/').notBefore(word).and(word)), - ), + match: (path: string) => path.startsWith('/dashboard/links'), icon: Link, }, { href: '/dashboard/projects', name: 'Projects', - regex: createRegExp( - exactly('/dashboard/projects') - .at.lineStart() - .or( - exactly('/dashboard/projects/').notBefore(word).and(word), - ), - ), + match: (path: string) => path.startsWith('/dashboard/projects'), icon: Blocks, }, { href: '/dashboard/settings/account', name: 'Settings', - regex: createRegExp( - exactly('/dashboard/settings') - .at.lineStart() - .or( - exactly('/dashboard/settings/').notBefore(word).and(word), - ), - ), + match: (path: string) => path.startsWith('/dashboard/settings'), icon: Settings, }, ] as const @@ -61,7 +44,7 @@
{#each routes as route}