From f7acacba1edf195b64b6c66e33a622ff25cecb52 Mon Sep 17 00:00:00 2001 From: a-eloCard <esrsc23@inf.ufpr.br> Date: Tue, 8 Apr 2025 11:17:34 -0300 Subject: [PATCH] FIX Correction of the random color vector and other details, plus removal of statistics --- src/app/acessibilidade/page.js | 8 +-- src/app/ajuda/page.js | 10 +-- .../components/publisherInfoCollection.js | 11 ++-- src/app/components/About.js | 7 --- src/app/components/Cards.js | 20 +++--- src/app/components/FormFilters.js | 2 +- src/app/components/ItemNotification.js | 20 +++--- src/app/components/MenuProfile.js | 20 +++--- src/app/components/RecommendedCards.js | 20 +++--- src/app/components/UsersPageCard.js | 20 +++--- src/app/components/publisherInfo.js | 20 +++--- src/app/editar/[id]/components/UpdateInfo.js | 22 +++---- src/app/estatisticas/page.js | 12 +++- src/app/not-found.js | 5 +- .../[id]/components/EditCollectionModal.js | 62 ++++++++++++++++--- .../[id]/components/ProfileCollections.js | 4 +- src/app/perfil/[id]/components/UserCard.js | 10 +-- src/app/publicar/components/RevisionForm.js | 4 +- .../recurso/[id]/components/createComments.js | 20 +++--- .../[id]/components/deleteCommentModal.js | 10 +-- .../recurso/[id]/components/editComments.js | 2 +- .../recurso/[id]/components/printComments.js | 20 +++--- src/app/recurso/[id]/page.js | 4 +- src/app/submit/components/InfoForm.js | 2 +- 24 files changed, 168 insertions(+), 167 deletions(-) diff --git a/src/app/acessibilidade/page.js b/src/app/acessibilidade/page.js index 91bf4f1b..57f08196 100644 --- a/src/app/acessibilidade/page.js +++ b/src/app/acessibilidade/page.js @@ -4,7 +4,7 @@ export default function Help() { return ( <Overlay type="twoColumns"> <div className="flex w-full justify-center"> - <div className="max-w-screen-md bg-white-HC-dark rounded p-12"> + <div className="max-w-screen-md bg-white-HC-dark rounded p-12 outline outline-1 outline-ice-HC-white"> <div className="text-2xl mb-8 text-darkGray-HC-white font-bold">Acessibilidade</div> <div className="text-md mb-8 text-darkGray-HC-white"> O MECRED acredita na importância de uma educação de qualidade e acessível para todos. Por isso, adota os princípios do design universal para assegurar que sua plataforma seja inclusiva e de fácil navegação. Nesta página, você encontrará instruções detalhadas sobre como navegar pelo site sem o uso do mouse. Ao final da página, há um botão que direciona para a tela de contato, onde você pode relatar eventuais problemas diretamente à nossa equipe. @@ -17,9 +17,9 @@ export default function Help() { <div className="text-md text-darkGray-HC-white"><div className="font-bold font-mono inline mx-2">{"<Ctrl> + <0>"}</div>Restaurar o tamanho da fonte para o tamanho original.</div> </div> <div className="flex justify-center flex-col items-center"> - <div className="text-darkGray-HC-white-underline mt-4 text-xl font-bold">Quer saber mais?</div> - <div className="text-darkGray-HC-white-underline text-md mt-1 ml-3">Acesse a página de Ajuda e Suporte!</div> - <a href="/ajuda" className="mt-4 bg-turquoise text-md text-white-HC-dark-underline p-1 px-6 rounded-lg hover:bg-turquoise-hover">Ir para a página de Ajuda</a> + <div className="text-darkGray-HC-white mt-4 text-xl font-bold">Quer saber mais?</div> + <div className="text-darkGray-HC-white text-md mt-1 ml-3">Acesse a página de Ajuda e Suporte!</div> + <a href="/ajuda" className="mt-4 bg-turquoise-HC-white text-lg text-white-HC-dark-underline p-2 px-4 rounded-lg hover:bg-darkTurquoise-HC-dark hover:text-white outline outline-1">Ir para a página de Ajuda</a> </div> </div> </div> diff --git a/src/app/ajuda/page.js b/src/app/ajuda/page.js index d3ade305..6d564ed0 100644 --- a/src/app/ajuda/page.js +++ b/src/app/ajuda/page.js @@ -58,10 +58,10 @@ export default function Help() { <Overlay type="twoColumns"> <div className="overflow-y-auto scrollbar-none ml-6 max-md:mb-24 h-screen"> <div className="flex justify-center"> - <div className="text-darkGray-HC-white-underline text-2xl font-bold">Ajuda e Suporte</div> + <div className="text-darkGray-HC-white text-2xl font-bold">Ajuda e Suporte</div> </div> <div className="flex justify-center mt-4"> - <p className="text-darkGray-HC-white-underline text-lg max-sm:text-center">Entre em contato para enviar dúvidas, sugestões ou críticas.</p> + <p className="text-darkGray-HC-white text-lg max-sm:text-center">Entre em contato para enviar dúvidas, sugestões ou críticas.</p> </div> <div className="flex justify-center mt-8"> <div className=" max-xl:overflow-x-auto max-xl:ml-10 flex gap-10 max-sm:gap-4"> @@ -103,9 +103,9 @@ export default function Help() { </div> </div> <div className="flex flex-col items-center rounded-xl px-10 max-sm:px-0 max-sm:py-6 mx-20 max-sm:mx-4 max-md:pb-28"> - <div className="text-darkGray-HC-white-underline mt-5 max-sm:mt-0 text-xl font-bold text-center">Não encontrou o que precisa?</div> - <div className="text-darkGray-HC-white-underline text-md mt-4 ml-3 text-center">Entre em contato com nossa equipe</div> - <button onClick={() => router.push("/contato")} className="mt-4 bg-turquoise text-lg text-white-HC-dark-underline p-2 px-4 rounded-lg hover:bg-turquoise-hover">Página de contato</button> + <div className="text-darkGray-HC-white mt-5 max-sm:mt-0 text-xl font-bold text-center">Não encontrou o que precisa?</div> + <div className="text-darkGray-HC-white text-md mt-4 ml-3 text-center">Entre em contato com nossa equipe</div> + <button onClick={() => router.push("/contato")} className="mt-4 bg-turquoise-HC-white text-lg text-white-HC-dark-underline p-2 px-4 rounded-lg hover:bg-darkTurquoise-HC-dark hover:text-white outline outline-1">Página de contato</button> </div> </div> diff --git a/src/app/colecao/[id]/components/publisherInfoCollection.js b/src/app/colecao/[id]/components/publisherInfoCollection.js index ce21216a..8c8ac1b2 100644 --- a/src/app/colecao/[id]/components/publisherInfoCollection.js +++ b/src/app/colecao/[id]/components/publisherInfoCollection.js @@ -40,19 +40,16 @@ export default function PublisherInfoCollection({ publisher, disabledButton = fa function getRandomBg(id) { const colors = [ - "bg-turquoise", + "bg-turquoise-HC-white", "bg-orange-HC-white", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white", "bg-violet-HC-white", "bg-pink-HC-white", "bg-red-HC-white", "bg-darkGray-HC-white", "bg-darkGray-HC-white-underline", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/About.js b/src/app/components/About.js index cd8d63e9..79952341 100644 --- a/src/app/components/About.js +++ b/src/app/components/About.js @@ -318,12 +318,6 @@ export default function AboutComponent() { link="/equipe" /> </div> - <DevelopmentInfo - title="Estatísticas" - description="Veja as estatísticas de uso da plataforma." - access="Clique aqui para ver as estatísticas." - link="/estatisticas" - /> </> ) } @@ -338,7 +332,6 @@ export default function AboutComponent() { <div> <Title /> </div> - <Statistics /> </div> <div className="flex flex-col text-center items-center mt-12 rounded-lg bg-white-HC-dark max-sm:hidden outline outline-1 outline-ice-HC-white"> <Actors /> diff --git a/src/app/components/Cards.js b/src/app/components/Cards.js index 6b57b12e..29fec7c0 100644 --- a/src/app/components/Cards.js +++ b/src/app/components/Cards.js @@ -90,19 +90,15 @@ export default function Cards(props) { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/FormFilters.js b/src/app/components/FormFilters.js index b6cead33..36f59b5c 100644 --- a/src/app/components/FormFilters.js +++ b/src/app/components/FormFilters.js @@ -262,7 +262,7 @@ export default function FormFilters({ <div className="fixed bottom-[10%] z-20 bg-white-HC-dark p-4 w-[56%] flex justify-end"> <div className="flex"> <Button onClick={handleResetFilters} className="text-darkGray-HC-white-underline normal-case font-semibold text-base hover:bg-ice-HC-dark cursor-pointer mx-2 outline outline-1 outline-ice-HC-white">Remover filtros</Button> - <Button type="submit" className="bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark text-white-HC-dark-underline hover:text-white normal-case font-semibold text-base hover:bg-turquoise-hover cursor-pointer outline outline-1 outline-ice-HC-white">Mostrar resultados</Button> + <Button type="submit" className="bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark text-white-HC-dark-underline hover:text-white normal-case font-semibold text-base cursor-pointer outline outline-1 outline-ice-HC-white">Mostrar resultados</Button> </div> </div> </form> diff --git a/src/app/components/ItemNotification.js b/src/app/components/ItemNotification.js index e865af54..ab649e3e 100644 --- a/src/app/components/ItemNotification.js +++ b/src/app/components/ItemNotification.js @@ -23,19 +23,15 @@ const timeFunction = (updated_time) => { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/MenuProfile.js b/src/app/components/MenuProfile.js index a4fa7f39..bbe24532 100644 --- a/src/app/components/MenuProfile.js +++ b/src/app/components/MenuProfile.js @@ -56,19 +56,15 @@ const items = [ function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/RecommendedCards.js b/src/app/components/RecommendedCards.js index 3848c1b8..532cc688 100644 --- a/src/app/components/RecommendedCards.js +++ b/src/app/components/RecommendedCards.js @@ -91,19 +91,15 @@ export default function RecommendedCards(props) { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/UsersPageCard.js b/src/app/components/UsersPageCard.js index 82a854c8..322e884c 100644 --- a/src/app/components/UsersPageCard.js +++ b/src/app/components/UsersPageCard.js @@ -12,19 +12,15 @@ import Link from "next/link" export default function UsersPageCard({ item }) { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/components/publisherInfo.js b/src/app/components/publisherInfo.js index de10b6f5..80f8dcfb 100644 --- a/src/app/components/publisherInfo.js +++ b/src/app/components/publisherInfo.js @@ -40,19 +40,15 @@ export default function PublisherInfo({ publisher, disabledButton = false }) { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/editar/[id]/components/UpdateInfo.js b/src/app/editar/[id]/components/UpdateInfo.js index ab87bf29..5ae05df0 100644 --- a/src/app/editar/[id]/components/UpdateInfo.js +++ b/src/app/editar/[id]/components/UpdateInfo.js @@ -23,19 +23,15 @@ export default function UpdateInfo({ user }) { function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", + "bg-darkGray-HC-white", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/estatisticas/page.js b/src/app/estatisticas/page.js index 1b912d6e..7afa5637 100644 --- a/src/app/estatisticas/page.js +++ b/src/app/estatisticas/page.js @@ -1,9 +1,17 @@ "use client" import Overlay from "../components/Overlay" +import { useEffect } from 'react'; +import { useRouter } from 'next/navigation'; + export default function About() { + const router = useRouter(); + + useEffect(() => { + router.push(`/sobre`); + }); - return ( + /*return ( <Overlay type="twoColumns"> <div className="m-3 sm:ml-24 "> <iframe @@ -15,5 +23,5 @@ export default function About() { </iframe> </div> </Overlay> - ) + )*/ } diff --git a/src/app/not-found.js b/src/app/not-found.js index 8e982b2e..95291a7c 100644 --- a/src/app/not-found.js +++ b/src/app/not-found.js @@ -6,11 +6,10 @@ export default function Error(){ const router = useRouter() return ( <Overlay> - <div className="flex justify-center items-center mt-72 flex-col"> - <p className="text-8xl text-darkGray-HC-white font-bold">404</p> + <p className="text-8xl text-darkGray-HC-white font-bold mb-10">404</p> <p className="text-darkGray-HC-white text-xl font-semibold">Página não encontrada</p> - <button onClick={() => router.push("/")} className="mt-4 bg-turquoise text-lg text-white-HC-dark-underline p-2 px-4 rounded-lg hover:bg-turquoise-hover">Voltar para página inicial</button> + <button onClick={() => router.push("/")} className="mt-4 bg-turquoise-HC-white text-lg text-white-HC-dark-underline p-2 px-4 rounded-lg hover:bg-darkTurquoise-HC-dark hover:text-white outline outline-1">Voltar para página inicial</button> </div> </Overlay> ) diff --git a/src/app/perfil/[id]/components/EditCollectionModal.js b/src/app/perfil/[id]/components/EditCollectionModal.js index cf231bcf..2dbe06a8 100644 --- a/src/app/perfil/[id]/components/EditCollectionModal.js +++ b/src/app/perfil/[id]/components/EditCollectionModal.js @@ -84,9 +84,9 @@ export default function EditCollectionModal({ open, onClose, collectionId, colle }, }, }}> - <div className="flex flex-col bg-ice-HC-dark p-5 rounded-lg w-[40%] max-sm:w-[85%]"> - <div className="text-2xl font-bold text-darkGray-HC-white-underline">Editar Coleção</div> - <p className="text-lg text-darkGray-HC-white-underline font-bold mb-1 mt-4">Nome da Coleção*</p> + <div className="flex flex-col bg-ice-HC-dark p-5 rounded-lg w-[40%] max-sm:w-[85%] outline outline-1 outline-ice-HC-white"> + <div className="text-2xl font-bold text-darkGray-HC-white">Editar Coleção</div> + <p className="text-lg text-darkGray-HC-white font-bold mb-1 mt-4">Nome da Coleção*</p> <form onSubmit={handleSubmit}> <TextField size="small" @@ -94,24 +94,68 @@ export default function EditCollectionModal({ open, onClose, collectionId, colle onChange={(e) => setName(e.target.value)} value={name} required + sx={{ + '& .MuiOutlinedInput-root': { + '& fieldset': { + borderColor: 'var(--mediumGray-HC-white)', // cor da borda + }, + '&:hover fieldset': { + borderColor: 'var(--turquoise-HC-white)', // ao passar o mouse + }, + '&.Mui-focused fieldset': { + borderColor: 'var(--turquoise-HC-white)', // quando estiver focado + }, + '& input': { + color: 'var(--darkGray-HC-white)', // cor do texto digitado + }, + }, + }} /> - <p className="text-lg text-darkGray-HC-white-underline font-bold mb-3 mt-4">Esta coleção é:</p> + <p className="text-lg text-darkGray-HC-white font-bold mb-3 mt-4">Esta coleção é:</p> <FormLabel> - <RadioGroup value={privacy} onChange={(e) => setPrivacy(e.target.value)}> - <FormControlLabel value="public" control={<Radio />} label="Coleção Pública" /> - <FormControlLabel value="private" control={<Radio />} label="Coleção Privada" /> + <RadioGroup + value={privacy} + sx={{ + '& .MuiRadio-root': { + color: 'var(--darkGray-HC-white)', // Default radio color + '&.Mui-checked': { + color: 'var(--turquoise-HC-white)', // Selected radio color + }, + }, + }} + onChange={(e) => setPrivacy(e.target.value)}> + <FormControlLabel + value="public" + control={<Radio />} + label="Coleção Pública" + sx={{ + '& .MuiFormControlLabel-label': { + color: 'var(--darkGray-HC-white)', + }, + }} + /> + <FormControlLabel + value="private" + control={<Radio />} + label="Coleção Privada" + sx={{ + '& .MuiFormControlLabel-label': { + color: 'var(--darkGray-HC-white)', + }, + }} + /> </RadioGroup> </FormLabel> <div className="flex flex-row-reverse justify-center space-x-2"> <button - className="border text-sm p-2 text-ice-HC-dark border-main rounded-lg normal-case h-9 font-bold bg-turquoise hover:bg-turquoise-hover" + className="border text-sm p-2 text-white-HC-dark-underline border-ice-HC-dark hover:border-ice-HC-white hover:text-white rounded-lg normal-case h-9 font-bold bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark" type="button" // Alterado para "button" onClick={handleSubmit} // Chama a função diretamente no onClick > Salvar Alterações </button> <button - className="border text-sm p-2 text-darkGray-HC-white-underline border-main rounded-lg normal-case h-9 font-bold bg-ice-HC-dark hover:bg-ice-HC-dark-hover" + className="border text-sm p-2 text-darkGray-HC-white-underline border-main rounded-lg normal-case h-9 font-bold bg-ice-HC-dark hover:bg-lightGray-HC-dark" onClick={onClose} > Cancelar diff --git a/src/app/perfil/[id]/components/ProfileCollections.js b/src/app/perfil/[id]/components/ProfileCollections.js index a598c246..3be47b76 100644 --- a/src/app/perfil/[id]/components/ProfileCollections.js +++ b/src/app/perfil/[id]/components/ProfileCollections.js @@ -219,7 +219,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 rounded-xl outline outline-2 outline-ice-HC-white bg-ice-HC-dark hover:bg-ice-HC-dark-hover text-darkGray-HC-white font-bold normal-case max-md:my-3 flex justify-center items-center gap-2 md:px-3 md:py-2" + className="px-3 py-2 text-sm rounded-xl outline outline-1 outline-ice-HC-white bg-ice-HC-dark hover:bg-lightGray-HC-white text-darkGray-HC-white-underline hover:text-darkGray-HC-dark-underline 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 > @@ -229,7 +229,7 @@ export default function ProfileCollections({ id, idLogin }) { {/* Botão de Excluir */} <button - className="p-2 max-md:my-3 text-sm rounded-xl text-black-HC-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-red" + className="p-2 max-md:my-3 text-sm rounded-xl text-black-HC-white font-bold normal-case flex justify-center items-center gap-2 hover:bg-red-HC-white hover:text-white-HC-dark" onClick={() => { setDeleteOpen(true); setColToDelete(item.id);} } aria-label="Excluir" // Texto para leitores de tela > diff --git a/src/app/perfil/[id]/components/UserCard.js b/src/app/perfil/[id]/components/UserCard.js index a5251ea8..c29deee1 100644 --- a/src/app/perfil/[id]/components/UserCard.js +++ b/src/app/perfil/[id]/components/UserCard.js @@ -78,17 +78,13 @@ function getRandomBg(id) { const colors = [ "bg-turquoise-HC-white", "bg-orange-HC-white", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", "bg-violet-HC-white", "bg-pink-HC-white", "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/publicar/components/RevisionForm.js b/src/app/publicar/components/RevisionForm.js index b52ebb86..85c13fab 100644 --- a/src/app/publicar/components/RevisionForm.js +++ b/src/app/publicar/components/RevisionForm.js @@ -202,7 +202,7 @@ export default function RevisionForm({ setStep, draft, setDraft }) { </Button> {permission ? <Button - className="w-36 rounded-lg hover:bg-turquoise-hover border-turquoise-HC-white hover:bg-darkTurquoise-HC-dark bg-turquoise-HC-white text-base text-white-HC-dark-underline hover:text-white-HC-underline font-bold normal-case flex " + className="w-36 rounded-lg border-turquoise-HC-white hover:bg-darkTurquoise-HC-dark bg-turquoise-HC-white text-base text-white-HC-dark-underline hover:text-white-HC-underline font-bold normal-case flex " variant="outlined" onClick={fetchSubmit} > @@ -212,7 +212,7 @@ export default function RevisionForm({ setStep, draft, setDraft }) { : <Button - className=" border-secondary w-36 rounded-lg hover:bg-turquoise-hover bg-turquoise text-base text-white-HC-dark-underline font-bold normal-case flex " + className="border-turquoise-HC-white w-36 rounded-lg hover:bg-darkTurquoise-HC-dark bg-turquoise-HC-white text-base text-white-HC-dark-underline hover:text-white-HC-underline font-bold normal-case flex " variant="outlined" onClick={submitHomologation} > diff --git a/src/app/recurso/[id]/components/createComments.js b/src/app/recurso/[id]/components/createComments.js index d3e1aafe..ac216038 100644 --- a/src/app/recurso/[id]/components/createComments.js +++ b/src/app/recurso/[id]/components/createComments.js @@ -9,19 +9,15 @@ import SendIcon from '@mui/icons-material/Send'; function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/recurso/[id]/components/deleteCommentModal.js b/src/app/recurso/[id]/components/deleteCommentModal.js index 63e6186f..2e051ce6 100644 --- a/src/app/recurso/[id]/components/deleteCommentModal.js +++ b/src/app/recurso/[id]/components/deleteCommentModal.js @@ -43,15 +43,15 @@ export default function DeleteCommentModal({ open, onClose, learningObjectId, id }, }} > - <div className="bg-ice-HC-dark p-6 rounded-lg"> + <div className="bg-ice-HC-dark p-6 rounded-lg outline outline-1 outline-ice-HC-white"> <div className="flex justify-center mb-4"> - <p className="text-darkGray-HC-white-underline text-xl font-bold ">Tem certeza que deseja excluir esse comentário?</p> + <p className="text-darkGray-HC-white text-xl font-bold ">Tem certeza que deseja excluir esse comentário?</p> </div> - <p className="text-darkGray-HC-white-underline text-lg ">A exclusão de um comentário é permanente. Não é possível desfazer essa ação.</p> + <p className="text-darkGray-HC-white text-lg ">A exclusão de um comentário é permanente. Não é possível desfazer essa ação.</p> <div className="flex justify-end mt-4"> - <button onClick={onClose} className="rounded-lg p-3 bg-ice-HC-dark hover:bg-ice-HC-dark-hover text-darkGray-HC-white-underline mr-1">Cancelar</button> - <button onClick={() => deleteComment()} className="rounded-lg p-3 bg-turquoise hover:bg-turquoise-hover text-white-HC-dark-underline">Excluir Comentário</button> + <button onClick={onClose} className="rounded-lg p-3 bg-ice-HC-dark hover:bg-lightGray-HC-white text-darkGray-HC-white-underline hover:text-darkGray-HC-dark mr-1 outline outline-1 outline-ice-HC-white">Cancelar</button> + <button onClick={() => deleteComment()} className="rounded-lg p-3 bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark text-white-HC-dark-underline hover:text-white outline outline-1 outline-ice-HC-white">Excluir Comentário</button> </div> </div> </Modal> diff --git a/src/app/recurso/[id]/components/editComments.js b/src/app/recurso/[id]/components/editComments.js index d6fe2eb7..b3eb87ac 100644 --- a/src/app/recurso/[id]/components/editComments.js +++ b/src/app/recurso/[id]/components/editComments.js @@ -62,7 +62,7 @@ return ( /> <div className="flex justify-end gap-2 mt-2"> <button className="w-24 h-8 rounded-lg text-darkGray-HC-white text-sm hover:bg-ice-HC-dark" onClick={() => { setEdit(false); setEditMessage(comment?.description) }}> cancelar </button> - <button className="bg-turquoise w-24 h-8 rounded-lg text-white-HC-dark-underline text-sm hover:bg-turquoise-hover" onClick={handleSubmitEdit}> editar </button> + <button className="bg-turquoise-HC-white w-24 h-8 rounded-lg text-white-HC-dark-underline hover:text-white text-sm hover:bg-darkTurquoise-HC-dark outline outline-1 outline-ice-HC-white" onClick={handleSubmitEdit}> editar </button> </div> </div> diff --git a/src/app/recurso/[id]/components/printComments.js b/src/app/recurso/[id]/components/printComments.js index 891d6651..4f7b0b43 100644 --- a/src/app/recurso/[id]/components/printComments.js +++ b/src/app/recurso/[id]/components/printComments.js @@ -10,19 +10,15 @@ import { mecredURL } from "@/axiosConfig"; function getRandomBg(id) { const colors = [ - "bg-turquoise", - "bg-orange", - "bg-turquoise-hover", - "bg-darkOrange-HC-gray ", - "bg-violet", - "bg-pink", - "bg-red", + "bg-turquoise-HC-white", + "bg-orange-HC-white", + "bg-darkTurquoise-HC-white", + "bg-darkOrange-HC-white ", + "bg-violet-HC-white", + "bg-pink-HC-white", + "bg-red-HC-white", "bg-darkGray-HC-white", - "bg-darkGray-HC-white-click", - "bg-ice-HC-dark ", - "bg-darkGray-HC-white", - "bg-darkGray-HC-white", - "bg-turquoise-HC-dark", + "bg-ice-HC-white", ] return colors[id % colors.length]; diff --git a/src/app/recurso/[id]/page.js b/src/app/recurso/[id]/page.js index 7e49c096..f11647de 100644 --- a/src/app/recurso/[id]/page.js +++ b/src/app/recurso/[id]/page.js @@ -119,12 +119,12 @@ export default function Recurso({ params }) { </div> {state && ( <div className=" flex items-center mt-5"> - <button onClick={() => setSubmitOpen(true)} className="bg-orange p-2 text-white-HC-dark-underline font-semi-bold rounded-lg hover:bg-darkOrange-HC-gray ">Avaliar Submissão</button> + <button onClick={() => setSubmitOpen(true)} className="bg-orange-HC-white p-2 text-white-HC-dark-underline font-semi-bold rounded-lg hover:bg-darkOrange-HC-dark hover:text-white outline outline-1 outline-ice-HC-white">Avaliar Submissão</button> </div> )} {complained && ( <div className=" flex items-center mt-5"> - <button onClick={() => setSubmitComplaintOpen(true)} className="bg-orange p-2 text-white-HC-dark-underline font-semi-bold rounded-lg hover:bg-darkOrange-HC-gray ">Avaliar Denúncia</button> + <button onClick={() => setSubmitComplaintOpen(true)} className="bg-orange-HC-white p-2 text-white-HC-dark-underline font-semi-bold rounded-lg hover:bg-darkOrange-HC-dark hover:text-white outline outline-1 outline-ice-HC-white">Avaliar Denúncia</button> </div> )} </div> diff --git a/src/app/submit/components/InfoForm.js b/src/app/submit/components/InfoForm.js index d7a70a5c..47b3d709 100644 --- a/src/app/submit/components/InfoForm.js +++ b/src/app/submit/components/InfoForm.js @@ -190,7 +190,7 @@ export default function UploadForm({ setStep }) { Cancelar </Button> <Button - className=" border-secondary w-36 rounded-lg hover:bg-turquoise-hover bg-turquoise text-base text-white-HC-dark-underline font-bold normal-case flex " + className="w-36 rounded-lg border-turquoise-HC-white hover:bg-darkTurquoise-HC-dark bg-turquoise-HC-white text-base text-white-HC-dark-underline hover:text-white-HC-underline font-bold normal-case flex" variant="outlined" onClick={() => setStep((curr) => curr + 1)} > -- GitLab