even more visual improvements

This commit is contained in:
Daniel 2023-05-25 05:17:18 +03:30
parent 1606587931
commit b473716237
5 changed files with 281 additions and 263 deletions

View File

@ -19,7 +19,7 @@ export default function ({ collection }: { collection: ExtendedCollection }) {
return ( return (
<Link href={`/collections/${collection.id}`}> <Link href={`/collections/${collection.id}`}>
<div className="p-5 bg-gray-100 min-h-[10rem] w-72 rounded-md border-sky-100 border-solid border flex flex-col gap-2 justify-between cursor-pointer hover:bg-gray-50 duration-100"> <div className="p-5 bg-gray-100 min-h-[12rem] rounded-md border-sky-100 border-solid border flex flex-col gap-2 justify-between cursor-pointer hover:bg-gray-50 duration-100">
<div> <div>
<div className="flex justify-between text-sky-600 items-center"> <div className="flex justify-between text-sky-600 items-center">
<p className="text-lg w-max font-bold">{collection.name}</p> <p className="text-lg w-max font-bold">{collection.name}</p>
@ -30,25 +30,33 @@ export default function ({ collection }: { collection: ExtendedCollection }) {
</div> </div>
<p className="text-sky-400">{collection.description}</p> <p className="text-sky-400">{collection.description}</p>
</div> </div>
<div className="text-sky-400 flex gap-1 flex-wrap"> <div className="flex justify-between items-center">
<p>Members:</p> <div className="text-sky-400 flex items-center w-full">
{collection.members.map((e, i) => { {collection.members
return ( .map((e, i) => {
<p return (
className="text-sky-500 font-semibold" <img
title={e.user.email} src={`/api/avatar/${e.userId}`}
key={i} className="h-10 w-10 shadow rounded-full border-[3px] border-sky-100 -mr-3"
> alt=""
{e.user.name} />
</p> );
); })
})} .reverse()
</div> .slice(0, 3)}
<div className="flex gap-2 items-baseline"> {collection.members.length - 3 > 0 ? (
<p className="text-sky-300 font-bold text-sm">{formattedDate}</p> <div className="h-10 w-10 text-white flex items-center justify-center rounded-full border-[3px] bg-sky-500 border-sky-100 -mr-3">
<p className="text-sky-500 font-bold"> +{collection.members.length - 3}
{links.filter((e) => e.collectionId === collection.id).length} Links </div>
</p> ) : null}
</div>
<div className="text-right w-full">
<p className="text-sky-500 font-bold">
{links.filter((e) => e.collectionId === collection.id).length}{" "}
Links
</p>
<p className="text-sky-300 font-bold text-sm">{formattedDate}</p>
</div>
</div> </div>
</div> </div>
</Link> </Link>

View File

@ -120,129 +120,133 @@ export default function AddCollection({ toggleCollectionModal }: Props) {
</p> </p>
) : null} ) : null}
{newCollection.members.map((e, i) => { <div className="h-36 overflow-auto flex flex-col gap-3 rounded-md shadow-inner">
return ( {newCollection.members.map((e, i) => {
<div return (
key={i} <div
className="relative border p-2 rounded-md border-sky-100 flex flex-col sm:flex-row sm:items-center gap-2 justify-between" key={i}
> className="relative border p-2 rounded-md border-sky-100 flex flex-col sm:flex-row sm:items-center gap-2 justify-between"
<FontAwesomeIcon >
icon={faClose} <FontAwesomeIcon
className="absolute right-2 top-2 text-gray-500 h-4 hover:text-red-500 duration-100 cursor-pointer" icon={faClose}
title="Remove Member" className="absolute right-2 top-2 text-gray-500 h-4 hover:text-red-500 duration-100 cursor-pointer"
onClick={() => { title="Remove Member"
const updatedMembers = newCollection.members.filter( onClick={() => {
(member) => { const updatedMembers = newCollection.members.filter(
return member.email !== e.email; (member) => {
} return member.email !== e.email;
); }
setNewCollection({ );
...newCollection, setNewCollection({
members: updatedMembers, ...newCollection,
}); members: updatedMembers,
}} });
/> }}
<div className="flex items-center gap-2">
<img
// @ts-ignore
src={`/api/avatar/${e.id}`}
className="h-10 w-10 rounded-full border-[3px] border-sky-100"
alt=""
/> />
<div> <div className="flex items-center gap-2">
<p className="text-sm font-bold text-sky-500">{e.name}</p> <img
<p className="text-sky-900">{e.email}</p> // @ts-ignore
src={`/api/avatar/${e.id}`}
className="h-10 w-10 shadow rounded-full border-[3px] border-sky-100"
alt=""
/>
<div>
<p className="text-sm font-bold text-sky-500">{e.name}</p>
<p className="text-sky-900">{e.email}</p>
</div>
</div>
<div className="flex sm:block items-center gap-5">
<div>
<p className="font-bold text-sm text-gray-500">Permissions</p>
<p className="text-xs text-gray-400 mb-2">
(Click to toggle.)
</p>
</div>
<div>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canCreate"
className="peer sr-only"
checked={e.canCreate}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canCreate: !e.canCreate };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Create
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canUpdate"
className="peer sr-only"
checked={e.canUpdate}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canUpdate: !e.canUpdate };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Update
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canDelete"
className="peer sr-only"
checked={e.canDelete}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canDelete: !e.canDelete };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Delete
</span>
</label>
</div>
</div> </div>
</div> </div>
<div className="flex sm:block items-center gap-5"> );
<div> })}
<p className="font-bold text-sm text-gray-500">Permissions</p> </div>
<p className="text-xs text-gray-400 mb-2">(Click to toggle.)</p>
</div>
<div>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canCreate"
className="peer sr-only"
checked={e.canCreate}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canCreate: !e.canCreate };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Create
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canUpdate"
className="peer sr-only"
checked={e.canUpdate}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canUpdate: !e.canUpdate };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Update
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canDelete"
className="peer sr-only"
checked={e.canDelete}
onChange={() => {
const updatedMembers = newCollection.members.map(
(member) => {
if (member.email === e.email) {
return { ...member, canDelete: !e.canDelete };
}
return member;
}
);
setNewCollection({
...newCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Delete
</span>
</label>
</div>
</div>
</div>
);
})}
<div <div
className="mx-auto mt-2 bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400" className="mx-auto mt-2 bg-sky-500 text-white flex items-center gap-2 py-2 px-5 rounded-md select-none font-bold cursor-pointer duration-100 hover:bg-sky-400"

View File

@ -135,129 +135,135 @@ export default function EditCollection({
</p> </p>
) : null} ) : null}
{activeCollection.members.map((e, i) => { <div className="h-36 overflow-auto flex flex-col gap-3 rounded-md shadow-inner">
return ( {activeCollection.members.map((e, i) => {
<div return (
key={i} <div
className="relative border p-2 rounded-md border-sky-100 flex flex-col sm:flex-row sm:items-center gap-2 justify-between" key={i}
> className="relative border p-2 rounded-md border-sky-100 flex flex-col sm:flex-row sm:items-center gap-2 justify-between"
<FontAwesomeIcon >
icon={faClose} <FontAwesomeIcon
className="absolute right-2 top-2 text-gray-500 h-4 hover:text-red-500 duration-100 cursor-pointer" icon={faClose}
title="Remove Member" className="absolute right-2 top-2 text-gray-500 h-4 hover:text-red-500 duration-100 cursor-pointer"
onClick={() => { title="Remove Member"
const updatedMembers = activeCollection.members.filter( onClick={() => {
(member) => { const updatedMembers = activeCollection.members.filter(
return member.user.email !== e.user.email; (member) => {
} return member.user.email !== e.user.email;
); }
setActiveCollection({ );
...activeCollection, setActiveCollection({
members: updatedMembers, ...activeCollection,
}); members: updatedMembers,
}} });
/> }}
<div className="flex items-center gap-2">
<img
// @ts-ignore
src={`/api/avatar/${e.userId}`}
className="h-10 w-10 rounded-full border-[3px] border-sky-100"
alt=""
/> />
<div> <div className="flex items-center gap-2">
<p className="text-sm font-bold text-sky-500">{e.user.name}</p> <img
<p className="text-sky-900">{e.user.email}</p> // @ts-ignore
src={`/api/avatar/${e.userId}`}
className="h-10 w-10 shadow rounded-full border-[3px] border-sky-100"
alt=""
/>
<div>
<p className="text-sm font-bold text-sky-500">
{e.user.name}
</p>
<p className="text-sky-900">{e.user.email}</p>
</div>
</div>
<div className="flex sm:block items-center gap-5">
<div>
<p className="font-bold text-sm text-gray-500">Permissions</p>
<p className="text-xs text-gray-400 mb-2">
(Click to toggle.)
</p>
</div>
<div>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canCreate"
className="peer sr-only"
checked={e.canCreate}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canCreate: !e.canCreate };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Create
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canUpdate"
className="peer sr-only"
checked={e.canUpdate}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canUpdate: !e.canUpdate };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Update
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canDelete"
className="peer sr-only"
checked={e.canDelete}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canDelete: !e.canDelete };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Delete
</span>
</label>
</div>
</div> </div>
</div> </div>
<div className="flex sm:block items-center gap-5"> );
<div> })}
<p className="font-bold text-sm text-gray-500">Permissions</p> </div>
<p className="text-xs text-gray-400 mb-2">(Click to toggle.)</p>
</div>
<div>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canCreate"
className="peer sr-only"
checked={e.canCreate}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canCreate: !e.canCreate };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Create
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canUpdate"
className="peer sr-only"
checked={e.canUpdate}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canUpdate: !e.canUpdate };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Update
</span>
</label>
<label className="cursor-pointer mr-1">
<input
type="checkbox"
id="canDelete"
className="peer sr-only"
checked={e.canDelete}
onChange={() => {
const updatedMembers = activeCollection.members.map(
(member) => {
if (member.user.email === e.user.email) {
return { ...member, canDelete: !e.canDelete };
}
return member;
}
);
setActiveCollection({
...activeCollection,
members: updatedMembers,
});
}}
/>
<span className="text-sky-900 peer-checked:bg-sky-500 text-sm hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">
Delete
</span>
</label>
</div>
</div>
</div>
);
})}
<div className="flex flex-col justify-center items-center gap-2 mt-2"> <div className="flex flex-col justify-center items-center gap-2 mt-2">
<div <div

View File

@ -81,7 +81,7 @@ export default function () {
{account.profilePic ? ( {account.profilePic ? (
<img <img
src={account.profilePic} src={account.profilePic}
className="h-10 w-10 pointer-events-none rounded-full border-[3px] border-sky-100 group-hover:border-sky-500 duration-100" className="h-10 w-10 shadow pointer-events-none rounded-full border-[3px] border-sky-100 group-hover:border-sky-500 duration-100"
alt="" alt=""
/> />
) : ( ) : (

View File

@ -188,13 +188,13 @@ export default function () {
</div> </div>
</div> </div>
<div className="flex flex-wrap gap-5"> <div className="grid 2xl:grid-cols-4 xl:grid-cols-3 sm:grid-cols-2 gap-5">
{sortedCollections.map((e, i) => { {sortedCollections.map((e, i) => {
return <CollectionCard key={i} collection={e} />; return <CollectionCard key={i} collection={e} />;
})} })}
<div <div
className="p-5 bg-gray-100 h-40 w-60 rounded-md border-sky-100 border-solid border flex flex-col gap-4 justify-center items-center cursor-pointer hover:bg-gray-50 duration-100" className="p-5 bg-gray-100 self-stretch min-h-[12rem] rounded-md border-sky-100 border-solid border flex flex-col gap-4 justify-center items-center cursor-pointer hover:bg-gray-50 duration-100"
onClick={toggleCollectionModal} onClick={toggleCollectionModal}
> >
<p className="text-sky-900">New Collection</p> <p className="text-sky-900">New Collection</p>