Skip to content
Snippets Groups Projects
Commit 940aa954 authored by Guilherme Eduardo's avatar Guilherme Eduardo
Browse files

Issue #347: FIX buttons positions on my collections page (edit, delete, download and share)

parent 2870bb8f
No related branches found
No related tags found
1 merge request!318Issue #347: FIX buttons positions on my collections page (edit, delete, download and share)
Pipeline #42548 passed
...@@ -35,7 +35,6 @@ export default function ModalNotifications({ countNotifications, notifications, ...@@ -35,7 +35,6 @@ export default function ModalNotifications({ countNotifications, notifications,
postViewNotification(payload) postViewNotification(payload)
} }
console.log ("notificações: ", notifications)
return ( return (
<div> <div>
<Button <Button
......
...@@ -34,7 +34,6 @@ export default function Notifications() { ...@@ -34,7 +34,6 @@ export default function Notifications() {
// temp pq o set fica um passo atras ai nao eh possivel usar o set do countNotifications // temp pq o set fica um passo atras ai nao eh possivel usar o set do countNotifications
let temp = data.filter((noti) => {return((noti.viewed === false && noti.activity != "complaint.create"))}) let temp = data.filter((noti) => {return((noti.viewed === false && noti.activity != "complaint.create"))})
console.log ("temp", temp)
setNotifications(temp) setNotifications(temp)
setCountNotifications(temp.length) setCountNotifications(temp.length)
}) })
......
...@@ -16,7 +16,7 @@ export default function EditCollectionButton({ collectionId, collectionData, onU ...@@ -16,7 +16,7 @@ export default function EditCollectionButton({ collectionId, collectionData, onU
<button <button
className="p-2 text-sm outline outline-1 outline-ice-HC-white className="p-2 text-sm outline outline-1 outline-ice-HC-white
text-darkGray-HC-white-underline bg-ice-HC-dark hover:bg-lightGray-HC-white hover:text-darkGray-HC-dark-underline text-darkGray-HC-white-underline bg-ice-HC-dark hover:bg-lightGray-HC-white hover:text-darkGray-HC-dark-underline
rounded-lg font-bold normal-case flex items-center justify-center gap-2 lg:w-32 max-lg:mr-1 w-9 max-lg:h-9" rounded-xl font-bold normal-case flex items-center justify-center gap-2 lg:w-32 max-lg:mr-1 w-9 max-lg:h-9"
onClick={() => setEditOpen(true)} onClick={() => setEditOpen(true)}
aria-label="Editar" aria-label="Editar"
> >
......
...@@ -188,11 +188,15 @@ export default function ProfileCollections({ id, idLogin }) { ...@@ -188,11 +188,15 @@ export default function ProfileCollections({ id, idLogin }) {
<div key={index} className="bg-white-HC-dark outline outline-1 outline-ice-HC-white mb-10 pt-6 px-4 rounded-2xl relative"> <div key={index} className="bg-white-HC-dark outline outline-1 outline-ice-HC-white mb-10 pt-6 px-4 rounded-2xl relative">
{/* Cabeçalho com título, autor e botões */} {/* Cabeçalho com título, autor e botões */}
<div className="flex justify-between items-start"> <div className="flex justify-between items-start w-full">
{/* Título e autor */} {/* Título e autor */}
<div className="flex flex-col"> <div className="flex flex-col max-w-[60%] max-xl:max-w-[50%] max-md:max-w-[75%]">
<p className="text-2xl font-bold mb-1 text-darkGray-HC-white-underline hover:underline"> <p className="text-2xl font-bold mb-1 text-darkGray-HC-white-underline hover:underline">
<Link href={`/colecao/${item.id}`}>{item.name}</Link> <Link href={`/colecao/${item.id}`}>
<span className="block truncate whitespace-nowrap overflow-hidden text-ellipsis">
{item.name}
</span>
</Link>
</p> </p>
<p className="ml-1 text-darkGray-HC-white-underline"> <p className="ml-1 text-darkGray-HC-white-underline">
por <Link className="hover:underline" href={`/perfil/${item.owner.id}`}>{item.owner.name}</Link> por <Link className="hover:underline" href={`/perfil/${item.owner.id}`}>{item.owner.name}</Link>
...@@ -205,7 +209,7 @@ export default function ProfileCollections({ id, idLogin }) { ...@@ -205,7 +209,7 @@ export default function ProfileCollections({ id, idLogin }) {
<DownloadButton id={item.id} objects={item.collection_items} /> <DownloadButton id={item.id} objects={item.collection_items} />
<ShareButton id={item.id} type={'colecao'} /> <ShareButton id={item.id} type={'colecao'} />
{id === idLogin && ( {id === idLogin && (
<div className="flex lg:gap-2"> <div className="flex xl:gap-2">
{/* Botão de Editar */} {/* Botão de Editar */}
<EditCollectionButton <EditCollectionButton
collectionId={item.id} collectionId={item.id}
...@@ -219,7 +223,7 @@ export default function ProfileCollections({ id, idLogin }) { ...@@ -219,7 +223,7 @@ export default function ProfileCollections({ id, idLogin }) {
p-2 p-2
max-lg:w-9 max-lg:h-9 max-lg:ml-2 max-lg:w-9 max-lg:h-9 max-lg:ml-2
text-sm text-sm
rounded-lg rounded-xl
text-black-HC-white text-black-HC-white
font-bold font-bold
normal-case normal-case
...@@ -258,7 +262,7 @@ export default function ProfileCollections({ id, idLogin }) { ...@@ -258,7 +262,7 @@ export default function ProfileCollections({ id, idLogin }) {
fullWidth fullWidth
disableElevation disableElevation
variant="outlined" variant="outlined"
className="mb-2 border-hidden hover:bg-transparent rounded-lg normal-case" className="mb-2 border-hidden hover:bg-transparent rounded-xl normal-case"
onClick={() => toggleContent()} onClick={() => toggleContent()}
alt="Ver mais" alt="Ver mais"
> >
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment