mirror of
https://github.com/ManInDark/HabitTrove.git
synced 2026-03-11 04:49:49 +01:00
Merge Tag 'v0.2.31'
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
import { signIn } from '@/app/actions/user';
|
||||
import { toast } from '@/hooks/use-toast';
|
||||
import { currentUserAtom, usersAtom } from '@/lib/atoms';
|
||||
import { SafeUser, User } from '@/lib/types';
|
||||
import { SafeUser } from '@/lib/types';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { Description } from '@radix-ui/react-dialog';
|
||||
import { useAtom } from 'jotai';
|
||||
@@ -15,8 +15,6 @@ import UserForm from './UserForm';
|
||||
import { Avatar, AvatarFallback, AvatarImage } from './ui/avatar';
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle } from './ui/dialog';
|
||||
|
||||
|
||||
|
||||
function UserCard({
|
||||
user,
|
||||
onSelect,
|
||||
@@ -24,7 +22,7 @@ function UserCard({
|
||||
showEdit,
|
||||
isCurrentUser,
|
||||
}: {
|
||||
user: User,
|
||||
user: SafeUser,
|
||||
onSelect: () => void,
|
||||
onEdit: () => void,
|
||||
showEdit: boolean,
|
||||
@@ -99,7 +97,7 @@ function UserSelectionView({
|
||||
onEditUser,
|
||||
onCreateUser,
|
||||
}: {
|
||||
users: User[],
|
||||
users: SafeUser[],
|
||||
currentUserFromHook?: SafeUser,
|
||||
onUserSelect: (userId: string) => void,
|
||||
onEditUser: (userId: string) => void,
|
||||
|
||||
Reference in New Issue
Block a user