Changes
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { LogOut, User } from "lucide-react";
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
@@ -12,7 +11,7 @@ import { useAuth } from "@/hooks/useAuth";
|
||||
import AuthDialog from "./AuthDialog";
|
||||
|
||||
const AccountMenu = () => {
|
||||
const { user, loading, signOut } = useAuth();
|
||||
const { user, loading } = useAuth();
|
||||
const [authDialogOpen, setAuthDialogOpen] = useState(false);
|
||||
const [authMode, setAuthMode] = useState<"login" | "signup">("login");
|
||||
const navigate = useNavigate();
|
||||
@@ -22,14 +21,25 @@ const AccountMenu = () => {
|
||||
setAuthDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleSignOut = async () => {
|
||||
await signOut();
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// If user is logged in, navigate directly to account page
|
||||
if (user) {
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
onClick={() => navigate("/account")}
|
||||
className="text-primary hover:text-primary/80 font-serif text-base font-bold border-2 hover:bg-[rgba(220,38,38,0.3)]"
|
||||
style={{ borderColor: '#dc2626' }}
|
||||
>
|
||||
Mitt konto
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
|
||||
// If not logged in, show dropdown with login/signup options
|
||||
return (
|
||||
<>
|
||||
<DropdownMenu>
|
||||
@@ -46,44 +56,20 @@ const AccountMenu = () => {
|
||||
align="end"
|
||||
className="bg-background border border-border shadow-lg z-50 min-w-[160px]"
|
||||
>
|
||||
{user ? (
|
||||
<>
|
||||
<DropdownMenuItem className="text-muted-foreground text-sm cursor-default">
|
||||
{user.email}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
onClick={() => navigate("/profile")}
|
||||
className="cursor-pointer flex items-center gap-2 hover:!bg-[rgba(220,38,38,0.3)] focus:!bg-[rgba(220,38,38,0.3)] hover:!text-black focus:!text-black"
|
||||
>
|
||||
<User className="h-4 w-4" />
|
||||
Min profil
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
onClick={handleSignOut}
|
||||
className="cursor-pointer flex items-center gap-2 hover:!bg-[rgba(220,38,38,0.3)] focus:!bg-[rgba(220,38,38,0.3)] hover:!text-black focus:!text-black"
|
||||
>
|
||||
<LogOut className="h-4 w-4" />
|
||||
Logga ut
|
||||
</DropdownMenuItem>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<div className="px-2 py-1.5">
|
||||
<button
|
||||
onClick={() => handleOpenAuth("signup")}
|
||||
className="w-full px-2 py-1.5 text-left text-sm rounded-sm hover:bg-[rgba(220,38,38,0.3)] focus:bg-[rgba(220,38,38,0.3)] transition-colors"
|
||||
>
|
||||
Skapa konto
|
||||
</button>
|
||||
</div>
|
||||
<DropdownMenuItem
|
||||
onClick={() => handleOpenAuth("login")}
|
||||
className="cursor-pointer hover:!bg-[rgba(220,38,38,0.3)] focus:!bg-[rgba(220,38,38,0.3)] hover:!text-black focus:!text-black"
|
||||
>
|
||||
Logga in
|
||||
</DropdownMenuItem>
|
||||
</>
|
||||
)}
|
||||
<div className="px-2 py-1.5">
|
||||
<button
|
||||
onClick={() => handleOpenAuth("signup")}
|
||||
className="w-full px-2 py-1.5 text-left text-sm rounded-sm hover:bg-[rgba(220,38,38,0.3)] focus:bg-[rgba(220,38,38,0.3)] transition-colors"
|
||||
>
|
||||
Skapa konto
|
||||
</button>
|
||||
</div>
|
||||
<DropdownMenuItem
|
||||
onClick={() => handleOpenAuth("login")}
|
||||
className="cursor-pointer hover:!bg-[rgba(220,38,38,0.3)] focus:!bg-[rgba(220,38,38,0.3)] hover:!text-black focus:!text-black"
|
||||
>
|
||||
Logga in
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user