Skip to content
Snippets Groups Projects
Commit 4cd0dfac authored by Richard Fernando Heise Ferreira's avatar Richard Fernando Heise Ferreira
Browse files

Issue #242: FIX share button and colors

parent c7dcecf7
Branches
No related tags found
1 merge request!227Issue #242: FIX share button and colors
Pipeline #40470 passed
......@@ -62,7 +62,7 @@ export default function Colecao({ params }) {
<Loading scroll />
) : (
<>
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} />
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} link={`${location.protocol}//${location.host}/colecao/${collection.id}`}/>
<NeedLoginModal open={needLoginOpen} setOpen={setNeedLoginOpen} />
<div className="flex mb-5 overflow-y-auto scrollbar-none flex-col lg:flex-row">
<div className="flex flex-col bg-main p-3 w-full flex-shrink-0">
......@@ -87,7 +87,7 @@ export default function Colecao({ params }) {
{/* Botão de Compartilhar */}
<button
className="p-2 max-md:my-3 text-sm rounded-xl bg-violet outline text-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-violet-hover"
className="p-2 max-md:my-3 text-sm rounded-xl bg-main outline outline-2 outline-outlineColor hover:bg-main-hover text-text-filter font-bold normal-case flex justify-center items-center gap-2"
onClick={() => setShareOpen(true)}
aria-label="Compartilhar" // Texto para leitores de tela
>
......
......@@ -33,11 +33,11 @@ export default function DownloadButton({ id, objects }) {
return (
<button
id="Baixar"
className="p-2 text-sm border-secondary rounded-xl hover:bg-secondary-hover max-md:my-3 bg-secondary text-white font-bold normal-case flex items-center justify-center gap-2 md:px-3 md:py-2 md:w-32"
className="p-2 text-sm outline outline-2 outline-outlineColor hover:bg-main-hover bg-main rounded-xl max-md:my-3 text-text-filter font-bold normal-case flex items-center justify-center gap-2 md:px-3 md:py-2 md:w-32"
onClick={handleDownloadCollection}
aria-label="Baixar" // Texto para leitores de tela
>
<DownloadOutlinedIcon className="text-white" /> {/* Ícone de download */}
<DownloadOutlinedIcon className="text-text-filter" /> {/* Ícone de download */}
<span className="hidden md:inline">Baixar</span> {/* Texto visível apenas em telas maiores */}
</button>
);
......
......@@ -99,11 +99,11 @@ export default function InfiniteScrollCards({ data, searchClass, setNewSize, new
{/* Botões */}
<div className="flex flex-row gap-2 justify-end">
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} />
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} link={`${location.protocol}//${location.host}/colecao/${item.id}`} />
<DownloadButton id={item.id} objects={item.collection_items} />
{/* Botão de Compartilhar */}
<button
className="p-2 text-sm rounded-xl max-md:my-3 bg-violet outline text-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-violet-hover"
className="p-2 text-sm rounded-xl max-md:my-3 bg-main hover:bg-main-hover outline outline-2 outline-outlineColor text-text-filter font-bold normal-case flex justify-center items-center gap-2"
onClick={() => setShareOpen(true)}
aria-label="Compartilhar"
>
......
......@@ -9,7 +9,7 @@ import SendOutlinedIcon from "@mui/icons-material/SendOutlined";
* @param {Boolean} props.open
* @param {Function} props.onClose
*/
export default function ShareModal({ open, onClose, title}) {
export default function ShareModal({ open, onClose, title, link}) {
const [clicked, setClicked] = useState(false);
const pathname = usePathname();
let url = "";
......@@ -63,7 +63,7 @@ export default function ShareModal({ open, onClose, title}) {
justifyContent: "start",
}}
onClick={() => {
navigator.clipboard.writeText(url);
navigator.clipboard.writeText(link);
setClicked(true);
}}
alt="Copiar link para o clipboard"
......
......@@ -216,11 +216,11 @@ export default function ProfileCollections({ id, idLogin }) {
<div className="flex flex-row gap-2 justify-end">
<EditCollectionModal open={editOpen} onClose={() => setEditOpen(false)} collectionId={item.id} collectionData={item} />
<DeleteCollectionModal open={deleteOpen} onClose={() => setDeleteOpen(false)} />
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} />
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar coleção"} link={`${location.protocol}//${location.host}/colecao/${item.id}`}/>
<DownloadButton id={item.id} objects={item.collection_items} />
{/* Botão de Compartilhar */}
<button
className="p-2 max-md:my-3 text-sm rounded-xl bg-violet outline text-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-violet-hover"
className="p-2 max-md:my-3 text-sm rounded-xl bg-main hover:bg-main-hover outline outline-2 outline-outlineColor text-text-filter font-bold normal-case flex justify-center items-center gap-2"
onClick={() => setShareOpen(true)}
aria-label="Compartilhar" // Texto para leitores de tela
>
......@@ -231,7 +231,7 @@ export default function ProfileCollections({ id, idLogin }) {
<div className="flex gap-4"> {/* Adiciona um espaçamento entre os botões */}
{/* Botão de Editar */}
<button
className="px-3 py-2 text-sm border-secondary rounded-xl bg-orange text-white font-bold normal-case max-md:my-3 flex justify-center items-center gap-2 hover:bg-orange-hover md:px-3 md:py-2"
className="px-3 py-2 text-sm rounded-xl outline outline-2 outline-outlineColor bg-main hover:bg-main-hover text-text-filter font-bold normal-case max-md:my-3 flex justify-center items-center gap-2 md:px-3 md:py-2"
onClick={() => setEditOpen(true)}
aria-label="Editar" // Texto para leitores de tela
>
......@@ -241,7 +241,7 @@ export default function ProfileCollections({ id, idLogin }) {
{/* Botão de Excluir */}
<button
className="p-2 max-md:my-3 text-sm rounded-xl bg-red text-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-red-hover"
className="p-2 max-md:my-3 text-sm rounded-xl text-black-text font-bold normal-case flex justify-center items-center gap-2 hover:bg-red"
onClick={() => setDeleteOpen(true)}
aria-label="Excluir" // Texto para leitores de tela
>
......
......@@ -17,7 +17,7 @@ import ReportModal from "./reportModal";
import CollectModal from "./collectModal";
import HomologationModal from "./homologationModal";
import DeleteModal from "./deleteModal";
import { mecredURLv1 } from "@/axiosConfig";
import { usePathname } from "next/navigation";
function ChangeOnHover({ text, textOnHover }) {
return (
......@@ -42,6 +42,7 @@ export default function ActionButtons({ learningObject, setNeedLoginOpen, state
const token = getStoredValue("access_token");
const client = getStoredValue("client");
const uid = getStoredValue("uid");
const pathname = usePathname();
useEffect(() => {
if (!isLoggedIn()) return;
......@@ -192,7 +193,7 @@ export default function ActionButtons({ learningObject, setNeedLoginOpen, state
<>
<DeleteModal open={deleteOpen} onClose={() => setDeleteOpen(false)} idLogin={userData["id"]} resourceId={learningObject.id} />
<HomologationModal open={submitOpen} onClose={() => setSubmitOpen(false)} name={learningObject.name} id={learningObject.submission_id} setSubmitted={setSubmitted}/>
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar recurso"} />
<ShareModal open={shareOpen} onClose={() => setShareOpen(false)} title={"Compartilhar recurso"} link={window.location.origin + pathname}/>
<ReportModal
learningObject={learningObject}
open={reportOpen}
......
......@@ -43,7 +43,7 @@ export default function CollectionInfo({ resourceId, collectionId }) {
return (
<div className="flex flex-col bg-white p-4 rounded-lg mb-4">
<Loading loaded={Boolean(collection)}>
<div className="text-main-text font-normal text-xl ml-2 mb-3">Recursos na coleção <Link className="font-bold" href={"/colecao/" + collectionId}>{collection?.name}</Link></div>
<div className="text-main-text font-normal text-xl ml-2 mb-3">Recursos na coleção <Link className="font-bold hover:underline" href={"/colecao/" + collectionId}>{collection?.name}</Link></div>
<div className="overflow-auto snap-y">
{collection?.collection_items.map((item, index) => {
let isCurrent = item["collectionable"]["id"] === Number(resourceId);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment