improved user experience

This commit is contained in:
daniel31x13 2023-12-19 18:28:48 -05:00
parent ad895eee17
commit 8529602252
2 changed files with 217 additions and 92 deletions

View File

@ -23,7 +23,7 @@ export default function Modal({ toggleModal, className, children }: Props) {
className || "" className || ""
}`} }`}
> >
<div className="slide-up mt-auto sm:m-auto relative border-neutral-content rounded-t-2xl sm:rounded-2xl border-t sm:border shadow-2xl p-5 bg-base-100"> <div className="slide-up mt-auto sm:m-auto relative border-neutral-content rounded-t-2xl sm:rounded-2xl border-t sm:border shadow-2xl p-5 bg-base-100 overflow-y-auto sm:overflow-y-visible">
<div <div
onClick={toggleModal as MouseEventHandler<HTMLDivElement>} onClick={toggleModal as MouseEventHandler<HTMLDivElement>}
className="absolute top-4 right-3 btn btn-sm outline-none btn-circle btn-ghost z-10" className="absolute top-4 right-3 btn btn-sm outline-none btn-circle btn-ghost z-10"

View File

@ -186,129 +186,254 @@ export default function EditCollectionSharingModal({
{collection?.members[0]?.user && ( {collection?.members[0]?.user && (
<> <>
<div <div className="flex flex-col divide-y divide-neutral-content border border-neutral-content rounded-xl bg-base-200">
className="flex flex-col divide-y divide-neutral-content border border-neutral-content rounded-xl overflow-hidden ">
<div <div
className="relative p-3 bg-base-200 flex gap-2 justify-between" className="relative p-3 bg-base-200 rounded-xl flex gap-2 justify-between"
title={`@${collectionOwner.username} is the owner of this collection.`} title={`@${collectionOwner.username} is the owner of this collection`}
> >
<div className={"flex items-center justify-between w-full"}> <div className={"flex items-center justify-between w-full"}>
<div className={"flex items-center"}> <div className={"flex items-center"}>
<div className={"shrink-0"}> <div className={"shrink-0"}>
<ProfilePhoto <ProfilePhoto
src={collectionOwner.image ? collectionOwner.image : undefined} src={
collectionOwner.image
? collectionOwner.image
: undefined
}
name={collectionOwner.name} name={collectionOwner.name}
/> />
</div> </div>
<div className={"grow ml-2"}> <div className={"grow ml-2"}>
<p className="text-sm font-semibold">{collectionOwner.name}</p> <p className="text-sm font-semibold">
<p className="text-xs text-neutral">@{collectionOwner.username}</p> {collectionOwner.name}
</p>
<p className="text-xs text-neutral">
@{collectionOwner.username}
</p>
</div> </div>
</div> </div>
<div> <div>
<p className="text-sm text-neutral"> <p className="text-sm font-bold">Owner</p>
Owner
</p>
</div> </div>
</div> </div>
</div> </div>
<div className="divider my-0 last:hidden h-[3px]"></div>
{collection.members {collection.members
.sort((a, b) => (a.userId as number) - (b.userId as number)) .sort((a, b) => (a.userId as number) - (b.userId as number))
.map((e, i) => { .map((e, i) => {
const roleLabel =
e.canCreate && e.canUpdate && e.canDelete
? "Admin"
: e.canCreate && !e.canUpdate && !e.canDelete
? "Contributor"
: !e.canCreate && !e.canUpdate && !e.canDelete
? "Viewer"
: undefined;
return ( return (
<div <>
key={i} <div
className="relative p-3 bg-base-200 flex gap-2 justify-between" key={i}
> className="relative p-3 bg-base-200 rounded-xl flex gap-2 justify-between border-none"
<div className={"flex items-center justify-between w-full"}> >
<div className={"flex items-center"}> <div
<div className={"shrink-0"}> className={"flex items-center justify-between w-full"}
<ProfilePhoto >
src={e.user.image ? e.user.image : undefined} <div className={"flex items-center"}>
name={e.user.name} <div className={"shrink-0"}>
/> <ProfilePhoto
src={e.user.image ? e.user.image : undefined}
name={e.user.name}
/>
</div>
<div className={"grow ml-2"}>
<p className="text-sm font-semibold">
{e.user.name}
</p>
<p className="text-xs text-neutral">
@{e.user.username}
</p>
</div>
</div> </div>
<div className={"grow ml-2"}>
<p className="text-sm font-semibold">{e.user.name}</p>
<p className="text-xs text-neutral">@{e.user.username}</p>
</div>
</div>
<div className={"flex items-center gap-2"}> <div className={"flex items-center gap-2"}>
{permissions === true && (
<i
className={"bi-x text-xl btn btn-sm text-neutral hover:text-red-500 dark:hover:text-red-500 duration-100 cursor-pointer"}
title="Remove Member"
onClick={() => {
const updatedMembers = collection.members.filter(
(member) => {
return member.user.username !== e.user.username;
}
);
setCollection({
...collection,
members: updatedMembers,
});
}}
/>
)}
<div>
{permissions === true ? ( {permissions === true ? (
<select <div className="dropdown dropdown-bottom dropdown-end">
onChange={(evt) => { <div
if (permissions !== true) return; tabIndex={0}
role="button"
switch (evt.target.value) { className="btn btn-sm btn-primary font-normal"
case 'admin': >
collection.members[i].canCreate = true; {roleLabel}
collection.members[i].canUpdate = true; <i className="bi-chevron-down"></i>
collection.members[i].canDelete = true; </div>
break; <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-xl w-64 mt-1">
case 'contributor': <li>
collection.members[i].canCreate = true; <label
collection.members[i].canUpdate = false; className="label cursor-pointer flex justify-start"
collection.members[i].canDelete = false; tabIndex={0}
break; role="button"
default: >
collection.members[i].canCreate = false; <input
collection.members[i].canUpdate = false; type="radio"
collection.members[i].canDelete = false; name={`role-radio-${e.userId}`}
break; className="radio checked:bg-primary"
} checked={
}} !e.canCreate &&
className="select select-bordered select-sm w-full max-w-xs"> !e.canUpdate &&
<option value={'viewer'} !e.canDelete
selected={!e.canCreate && !e.canUpdate && !e.canDelete}> }
Viewer onChange={() => {
</option> const updatedMember = {
<option value={'contributor'} ...e,
selected={e.canCreate && !e.canUpdate && !e.canDelete}> canCreate: false,
Contributor canUpdate: false,
</option> canDelete: false,
<option value={'admin'} selected={e.canCreate && e.canUpdate && e.canDelete}> };
Admin const updatedMembers =
</option> collection.members.map((member) =>
</select> member.userId === e.userId
? updatedMember
: member
);
setCollection({
...collection,
members: updatedMembers,
});
(
document?.activeElement as HTMLElement
)?.blur();
}}
/>
<div>
<p className="font-bold">Viewer</p>
<p>Read-only access</p>
</div>
</label>
</li>
<li>
<label
className="label cursor-pointer flex justify-start"
tabIndex={0}
role="button"
>
<input
type="radio"
name={`role-radio-${e.userId}`}
className="radio checked:bg-primary"
checked={
e.canCreate &&
!e.canUpdate &&
!e.canDelete
}
onChange={() => {
const updatedMember = {
...e,
canCreate: true,
canUpdate: false,
canDelete: false,
};
const updatedMembers =
collection.members.map((member) =>
member.userId === e.userId
? updatedMember
: member
);
setCollection({
...collection,
members: updatedMembers,
});
(
document?.activeElement as HTMLElement
)?.blur();
}}
/>
<div>
<p className="font-bold">Contributor</p>
<p>Can view and create Links</p>
</div>
</label>
</li>
<li>
<label
className="label cursor-pointer flex justify-start"
tabIndex={0}
role="button"
>
<input
type="radio"
name={`role-radio-${e.userId}`}
className="radio checked:bg-primary"
checked={
e.canCreate &&
e.canUpdate &&
e.canDelete
}
onChange={() => {
const updatedMember = {
...e,
canCreate: true,
canUpdate: true,
canDelete: true,
};
const updatedMembers =
collection.members.map((member) =>
member.userId === e.userId
? updatedMember
: member
);
setCollection({
...collection,
members: updatedMembers,
});
(
document?.activeElement as HTMLElement
)?.blur();
}}
/>
<div>
<p className="font-bold">Admin</p>
<p>Full access to all Links</p>
</div>
</label>
</li>
</ul>
</div>
) : ( ) : (
<p className="text-sm text-neutral"> <p className="text-sm text-neutral">
{ {roleLabel}
(e.canCreate && e.canUpdate && e.canDelete)
? "Admin"
: (e.canCreate)
? 'Contributor'
: 'Viewer'
}
</p> </p>
)} )}
{permissions === true && (
<i
className={
"bi-x text-xl btn btn-sm btn-square btn-ghost text-neutral hover:text-red-500 dark:hover:text-red-500 duration-100 cursor-pointer"
}
title="Remove Member"
onClick={() => {
const updatedMembers =
collection.members.filter((member) => {
return (
member.user.username !== e.user.username
);
});
setCollection({
...collection,
members: updatedMembers,
});
}}
/>
)}
</div> </div>
</div> </div>
</div> </div>
</div> <div className="divider my-0 last:hidden h-[3px]"></div>
</>
); );
}) })}
}
</div> </div>
</> </>
)} )}