From 9486d699c9ba3d1ba2e8bd25e6477e1c66a8f85c Mon Sep 17 00:00:00 2001 From: daniel31x13 Date: Sat, 28 Oct 2023 01:42:31 -0400 Subject: [PATCH] bug fixed --- .../Modal/Collection/TeamManagement.tsx | 33 ++++--------------- components/ProfilePhoto.tsx | 2 +- .../collectionId/updateCollectionById.ts | 1 + .../users/userId/getPublicUserById.ts | 1 + lib/client/addMemberToCollection.ts | 2 +- lib/client/getPublicUserData.ts | 2 -- pages/collections/[id].tsx | 2 +- pages/settings/account.tsx | 1 - types/global.ts | 4 +-- 9 files changed, 13 insertions(+), 35 deletions(-) diff --git a/components/Modal/Collection/TeamManagement.tsx b/components/Modal/Collection/TeamManagement.tsx index 07854aa..68a2a81 100644 --- a/components/Modal/Collection/TeamManagement.tsx +++ b/components/Modal/Collection/TeamManagement.tsx @@ -40,15 +40,7 @@ export default function TeamManagement({ const publicCollectionURL = `${currentURL.origin}/public/collections/${collection.id}`; - const [member, setMember] = useState({ - canCreate: false, - canUpdate: false, - canDelete: false, - user: { - name: "", - username: "", - }, - }); + const [memberUsername, setMemberUsername] = useState(""); const [collectionOwner, setCollectionOwner] = useState({ id: null, @@ -77,15 +69,7 @@ export default function TeamManagement({ members: [...collection.members, newMember], }); - setMember({ - canCreate: false, - canUpdate: false, - canDelete: false, - user: { - name: "", - username: "", - }, - }); + setMemberUsername(""); }; const [submitLoader, setSubmitLoader] = useState(false); @@ -168,19 +152,14 @@ export default function TeamManagement({
{ - setMember({ - ...member, - user: { ...member.user, username: e.target.value }, - }); - }} + onChange={(e) => setMemberUsername(e.target.value)} onKeyDown={(e) => e.key === "Enter" && addMemberToCollection( session.data?.user.username as string, - member.user.username || "", + memberUsername || "", collection, setMemberState ) @@ -191,7 +170,7 @@ export default function TeamManagement({ onClick={() => addMemberToCollection( session.data?.user.username as string, - member.user.username || "", + memberUsername || "", collection, setMemberState ) diff --git a/components/ProfilePhoto.tsx b/components/ProfilePhoto.tsx index 7dcb02c..a96e8ba 100644 --- a/components/ProfilePhoto.tsx +++ b/components/ProfilePhoto.tsx @@ -14,7 +14,6 @@ export default function ProfilePhoto({ src, className, priority }: Props) { const [image, setImage] = useState(""); useEffect(() => { - console.log(src); if (src && !src?.includes("base64")) setImage(`/api/v1/${src.replace("uploads/", "").replace(".jpg", "")}`); else if (!src) setImage(""); @@ -36,6 +35,7 @@ export default function ProfilePhoto({ src, className, priority }: Props) { height={112} width={112} priority={priority} + draggable={false} className={`h-10 w-10 bg-sky-600 dark:bg-sky-600 shadow rounded-full aspect-square border border-slate-200 dark:border-neutral-700 ${className}`} /> ); diff --git a/lib/api/controllers/collections/collectionId/updateCollectionById.ts b/lib/api/controllers/collections/collectionId/updateCollectionById.ts index 076bb08..30bb601 100644 --- a/lib/api/controllers/collections/collectionId/updateCollectionById.ts +++ b/lib/api/controllers/collections/collectionId/updateCollectionById.ts @@ -59,6 +59,7 @@ export default async function updateCollection( include: { user: { select: { + image: true, username: true, name: true, id: true, diff --git a/lib/api/controllers/users/userId/getPublicUserById.ts b/lib/api/controllers/users/userId/getPublicUserById.ts index 1626043..c5a575e 100644 --- a/lib/api/controllers/users/userId/getPublicUserById.ts +++ b/lib/api/controllers/users/userId/getPublicUserById.ts @@ -40,6 +40,7 @@ export default async function getPublicUserById( const { password, ...lessSensitiveInfo } = user; const data = { + id: lessSensitiveInfo.id, name: lessSensitiveInfo.name, username: lessSensitiveInfo.username, image: lessSensitiveInfo.image, diff --git a/lib/client/addMemberToCollection.ts b/lib/client/addMemberToCollection.ts index 95f3217..8d1e0b1 100644 --- a/lib/client/addMemberToCollection.ts +++ b/lib/client/addMemberToCollection.ts @@ -27,10 +27,10 @@ const addMemberToCollection = async ( if (user.username) { setMember({ collectionId: collection.id, - userId: user.id, canCreate: false, canUpdate: false, canDelete: false, + userId: user.id, user: { id: user.id, name: user.name, diff --git a/lib/client/getPublicUserData.ts b/lib/client/getPublicUserData.ts index 6b3706e..20bd1e9 100644 --- a/lib/client/getPublicUserData.ts +++ b/lib/client/getPublicUserData.ts @@ -5,8 +5,6 @@ export default async function getPublicUserData(id: number | string) { const data = await response.json(); - console.log(data); - if (!response.ok) toast.error(data.response); return data.response; diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index f1751aa..320e031 100644 --- a/pages/collections/[id].tsx +++ b/pages/collections/[id].tsx @@ -105,7 +105,7 @@ export default function Index() { ); }) diff --git a/pages/settings/account.tsx b/pages/settings/account.tsx index 8248006..d7cf248 100644 --- a/pages/settings/account.tsx +++ b/pages/settings/account.tsx @@ -48,7 +48,6 @@ export default function Account() { } useEffect(() => { - console.log(account); if (!objectIsEmpty(account)) setUser({ ...account }); }, [account]); diff --git a/types/global.ts b/types/global.ts index 4944c83..cfc149b 100644 --- a/types/global.ts +++ b/types/global.ts @@ -18,11 +18,11 @@ export interface LinkIncludingShortenedCollectionAndTags export interface Member { collectionId?: number; - userId?: number; + userId: number; canCreate: boolean; canUpdate: boolean; canDelete: boolean; - user: OptionalExcluding; + user: OptionalExcluding; } export interface CollectionIncludingMembersAndLinkCount