Skip to content
Prev Previous commit
Next Next commit
chore: make link size more precise
  • Loading branch information
Aslam97 committed Sep 11, 2024
commit 36e53d4eb3cea9c2ff5d1f76c4af0a7263cb9e13
98 changes: 53 additions & 45 deletions web/components/custom/sidebar/partial/link-section.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
import React from "react"
import Link from "next/link"
import { usePathname, useRouter } from "next/navigation"
import { usePathname } from "next/navigation"
import { useAccount } from "@/lib/providers/jazz-provider"
import { cn } from "@/lib/utils"
import { PersonalLinkLists } from "@/lib/schema/personal-link"
import { useQueryState, parseAsStringLiteral } from "nuqs"
import { LEARNING_STATES } from "@/lib/constants"

export const LinkSection: React.FC<{ pathname: string }> = ({ pathname }) => {
const ALL_STATES = [{ label: "All", value: "all", icon: "List", className: "text-foreground" }, ...LEARNING_STATES]
const ALL_STATES_STRING = ALL_STATES.map(ls => ls.value)

interface LinkSectionProps {
pathname: string
}

export const LinkSection: React.FC<LinkSectionProps> = ({ pathname }) => {
const { me } = useAccount({
root: {
personalLinks: []
}
})

const linkCount = me?.root.personalLinks?.length || 0
const isActive = pathname === "/links"

if (!me) return null

const linkCount = me.root.personalLinks?.length || 0
const isActive = pathname === "/links"

return (
<div className="group/pages flex flex-col gap-px py-2">
<LinkSectionHeader linkCount={linkCount} isActive={isActive} />
Expand All @@ -34,20 +41,19 @@ interface LinkSectionHeaderProps {

const LinkSectionHeader: React.FC<LinkSectionHeaderProps> = ({ linkCount }) => {
const pathname = usePathname()
const [state] = useQueryState("state", parseAsStringLiteral(LEARNING_STATES.map(ls => ls.value)))
const isLinksActive = pathname.startsWith("/links") && !state
const [state] = useQueryState("state", parseAsStringLiteral(ALL_STATES_STRING))
const isLinksActive = pathname.startsWith("/links") && (!state || state === "all")

return (
<div className="flex gap-px rounded-md">
<div
className={cn(
"flex min-h-[30px] items-center gap-px rounded-md",
isLinksActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
<Link
href="/links"
className={cn(
"flex size-6 flex-1 items-center justify-start rounded-md px-2",
"focus-visible:outline-none focus-visible:ring-0",
isLinksActive
? "bg-accent text-accent-foreground items-center justify-center py-3"
: "hover:bg-accent hover:text-accent-foreground"
)}
className="flex flex-1 items-center justify-start rounded-md px-2 py-1 focus-visible:outline-none focus-visible:ring-0"
>
<p className="flex w-full items-center text-xs font-medium">
Links
Expand All @@ -66,24 +72,29 @@ const List: React.FC<ListProps> = ({ personalLinks }) => {
const pathname = usePathname()
const [state] = useQueryState("state", parseAsStringLiteral(LEARNING_STATES.map(ls => ls.value)))

const toLearnCount = personalLinks.filter(link => link?.learningState === "wantToLearn").length
const learningCount = personalLinks.filter(link => link?.learningState === "learning").length
const learnedCount = personalLinks.filter(link => link?.learningState === "learned").length

const isActive = (checkState: string) => {
return pathname === "/links" && state === checkState
const linkCounts = {
wantToLearn: personalLinks.filter(link => link?.learningState === "wantToLearn").length,
learning: personalLinks.filter(link => link?.learningState === "learning").length,
learned: personalLinks.filter(link => link?.learningState === "learned").length
}

const isActive = (checkState: string) => pathname === "/links" && state === checkState

return (
<div className="flex flex-col gap-px">
<ListItem
label="To Learn"
href="/links?state=wantToLearn"
count={toLearnCount}
count={linkCounts.wantToLearn}
isActive={isActive("wantToLearn")}
/>
<ListItem label="Learning" href="/links?state=learning" count={learningCount} isActive={isActive("learning")} />
<ListItem label="Learned" href="/links?state=learned" count={learnedCount} isActive={isActive("learned")} />
<ListItem
label="Learning"
href="/links?state=learning"
count={linkCounts.learning}
isActive={isActive("learning")}
/>
<ListItem label="Learned" href="/links?state=learned" count={linkCounts.learned} isActive={isActive("learned")} />
</div>
)
}
Expand All @@ -95,26 +106,23 @@ interface ListItemProps {
isActive: boolean
}

const ListItem: React.FC<ListItemProps> = ({ label, href, count, isActive }) => {
return (
<div className="group/reorder-page relative">
<div className="group/topic-link relative flex min-w-0 flex-1">
<Link
href={href}
className={cn(
"relative flex h-8 w-full items-center gap-2 rounded-md p-1.5 font-medium",
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
>
<div className="flex max-w-full flex-1 items-center gap-1.5 truncate text-sm">
<p className={cn("truncate opacity-95 group-hover/topic-link:opacity-100")}>{label}</p>
</div>
</Link>

{count > 0 && (
<span className="absolute right-2 top-1/2 z-[1] -translate-y-1/2 rounded p-1 text-sm">{count}</span>
const ListItem: React.FC<ListItemProps> = ({ label, href, count, isActive }) => (
<div className="group/reorder-page relative">
<div className="group/topic-link relative flex min-w-0 flex-1">
<Link
href={href}
className={cn(
"relative flex h-8 w-full items-center gap-2 rounded-md p-1.5 font-medium",
isActive ? "bg-accent text-accent-foreground" : "hover:bg-accent hover:text-accent-foreground"
)}
</div>
>
<div className="flex max-w-full flex-1 items-center gap-1.5 truncate text-sm">
<p className={cn("truncate opacity-95 group-hover/topic-link:opacity-100")}>{label}</p>
</div>
</Link>
{count > 0 && (
<span className="absolute right-2 top-1/2 z-[1] -translate-y-1/2 rounded p-1 text-sm">{count}</span>
)}
</div>
)
}
</div>
)