ManInDark/HabitTrove
1
0
Fork 0
mirror of https://github.com/ManInDark/HabitTrove.git synced 2026-01-21 06:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix emoji picker and about modal (#146)

Browse Source
This commit is contained in:
Doh
2025-05-25 20:33:08 -04:00
committed by GitHub
parent 3ac311c3fd
commit 42c8d14d6d
12 changed files with 122 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
components/Profile.tsx
View File

@@ -8,8 +8,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from './ui/dialog'
import UserForm from './UserForm'
import Link from "next/link"
import { useAtom } from "jotai"
import { settingsAtom, userSelectAtom } from "@/lib/atoms"
import AboutModal from "./AboutModal"
import { aboutOpenAtom, settingsAtom, userSelectAtom } from "@/lib/atoms"
import { useEffect, useState } from "react"
import { useTheme } from "next-themes"
import { signOut } from "@/app/actions/user"
@@ -22,7 +21,7 @@ export function Profile() {
const [settings] = useAtom(settingsAtom)
const [userSelect, setUserSelect] = useAtom(userSelectAtom)
const [isEditing, setIsEditing] = useState(false)
const [showAbout, setShowAbout] = useState(false)
const [aboutOpen, setAboutOpen] = useAtom(aboutOpenAtom)
const { theme, setTheme } = useTheme()
const { currentUser: user } = useHelpers()
const [open, setOpen] = useState(false)
@@ -111,27 +110,32 @@ export function Profile() {
</div>
</DropdownMenuItem>
<DropdownMenuItem className="cursor-pointer px-2 py-1.5" asChild>
<Link
href="/settings"
aria-label={t('settingsLink')}
className="flex items-center w-full gap-3"
>
<Settings className="h-4 w-4" />
<span>{t('settingsLink')}</span>
</Link>
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-2">
<Settings className="h-4 w-4" />
<Link
href="/settings"
aria-label={t('settingsLink')}
>
<span>{t('settingsLink')}</span>
</Link>
</div>
</div>
</DropdownMenuItem>
<DropdownMenuItem className="cursor-pointer px-2 py-1.5" asChild>
<button
onClick={() => setShowAbout(true)}
className="flex items-center w-full gap-3"
>
<Info className="h-4 w-4" />
<span>{t('aboutButton')}</span>
</button>
<DropdownMenuItem className="cursor-pointer px-2 py-1.5" onClick={() => {
setOpen(false); // Close the dropdown
setAboutOpen(true); // Open the about modal
}}>
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-2">
<Info className="h-4 w-4" />
<span>{t('aboutButton')}</span>
</div>
</div>
</DropdownMenuItem>
<DropdownMenuItem className="cursor-pointer px-2 py-1.5">
<div className="flex items-center justify-between w-full gap-3">
<div className="flex items-center gap-3">
<div className="flex items-center justify-between w-full">
<div className="flex items-center gap-2">
<Palette className="h-4 w-4" />
<span>{t('themeLabel')}</span>
</div>
@@ -169,8 +173,6 @@ export function Profile() {
</DropdownMenuContent>
</DropdownMenu>
<AboutModal isOpen={showAbout} onClose={() => setShowAbout(false)} />
{/* Add the UserForm dialog */}
{isEditing && user && (
<Dialog open={isEditing} onOpenChange={() => setIsEditing(false)}>