starred/linsa-linsa-io
1
0
Fork 0
mirror of https://github.com/linsa-io/linsa.git synced 2026-04-23 00:38:39 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
Aslam H
2024-09-23 23:28:04 +07:00
parent f362f70ff0 867478d55c
commit cc578b1ab8
46 changed files with 972 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/components/custom/sidebar/partial/page-section.tsx
View File

@@ -81,10 +81,7 @@ const PageSectionHeader: React.FC<PageSectionHeaderProps> = ({ pageCount, isActi
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
<Link
href="/pages"
className="flex flex-1 items-center justify-start rounded-md px-2 py-1 focus-visible:outline-none focus-visible:ring-0"
>
<Link href="/pages" className="flex flex-1 items-center justify-start rounded-md px-2 py-1">
<p className="text-xs">
Pages
{pageCount > 0 && <span className="text-muted-foreground ml-1">{pageCount}</span>}

6
web/components/custom/sidebar/partial/profile-section.tsx
View File

@@ -1,6 +1,6 @@
"use client"
import { useEffect, useState } from "react"
import * as React from "react"
import { SignInButton, useAuth, useUser } from "@clerk/nextjs"
import { useAtom } from "jotai"
import Link from "next/link"
@@ -27,13 +27,13 @@ import { useKeyboardManager } from "@/hooks/use-keyboard-manager"
export const ProfileSection: React.FC = () => {
const { user, isSignedIn } = useUser()
const { signOut } = useAuth()
const [menuOpen, setMenuOpen] = useState(false)
const [menuOpen, setMenuOpen] = React.useState(false)
const pathname = usePathname()
const [, setShowShortcut] = useAtom(showShortcutAtom)
const { disableKeydown } = useKeyboardManager("profileSection")
useEffect(() => {
React.useEffect(() => {
disableKeydown(menuOpen)
}, [menuOpen, disableKeydown])