diff --git a/src/app/components/Cards.js b/src/app/components/Cards.js
index dc837999581240dbaf2dc7221fb9209b441b4858..6b57b12e3d27fd5f82dea23021be7d4db5fcdb0c 100644
--- a/src/app/components/Cards.js
+++ b/src/app/components/Cards.js
@@ -126,7 +126,7 @@ export default function Cards(props) {
<CardMedia
id="conteudo"
tabIndex="0"
- className="hover:scale-[1.02] p-1 focus:border-turquoise focus:border-4 border-gray-color transition-transform rounded-xl flex-shrink-0 aspect-video"
+ className="hover:scale-[1.02] p-1 focus:border-turquoise-HC-white focus:border-4 border-gray-color transition-transform rounded-xl flex-shrink-0 aspect-video"
sx={{
width: 327,
height: 181,
diff --git a/src/app/components/InfiniteScrollCards.js b/src/app/components/InfiniteScrollCards.js
index d9a98e2b8960bad7d64375260360f79b7d0bd2d5..13d5663e47e72776b4e7489502498edfa4b0d04f 100644
--- a/src/app/components/InfiniteScrollCards.js
+++ b/src/app/components/InfiniteScrollCards.js
@@ -88,13 +88,13 @@ export default function InfiniteScrollCards({ data, searchClass, setNewSize, new
<div className="flex justify-between items-start">
{/* Título e autor */}
<div className="flex flex-col">
- <p className="text-2xl font-bold mb-1 text-darkGray-HC-white 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>
</p>
<p className="ml-1 text-darkGray-HC-white">
por{" "}
<Link
- className="hover:underline"
+ className="text-darkGray-HC-white-underline hover:underline"
href={`/perfil/${item.owner.id}`}
>
{item.owner.name}
diff --git a/src/app/components/ModalNotifications.js b/src/app/components/ModalNotifications.js
index 9510136d601887ea5d97852b71e3c996b8fcd2ea..b33c487b9ac46283173dc649c631fbcb317f3c16 100644
--- a/src/app/components/ModalNotifications.js
+++ b/src/app/components/ModalNotifications.js
@@ -70,7 +70,7 @@ export default function ModalNotifications({ countNotifications, notifications,
top: 20,
backgroundColor: 'transparent',
'& .MuiPaper-root': {
- backgroundColor: 'var(--main)',
+ backgroundColor: 'var(--ice-HC-dark)',
border: '2px solid var(--ice-HC-white)',
borderRadius: '8px',
}
@@ -80,10 +80,10 @@ export default function ModalNotifications({ countNotifications, notifications,
>
<div className='flex pr-2' >
<div className='text-lg py-3 font-bold text-darkGray-HC-white pl-6 pr-16'> Notificações </div>
- <button className='text-darkGray-HC-white text-sm bg-lightGray-HC-dark rounded-xl px-2 h-10 mt-1 mr-1 hover:bg-ice-HC-dark ' onClick={setViewdAllNotification}> Marcar como lidas </button>
+ <button className='text-darkGray-HC-white-underline text-sm bg-lightGray-HC-dark rounded-xl px-2 h-10 mt-1 mr-1 hover:bg-mediumGray-HC-white hover:text-darkGray-HC-dark-underline outline outline-1 outline-ice-HC-white' onClick={setViewdAllNotification}> Marcar como lidas </button>
</div>
<div className='px-4'>
- <hr className='border-main-hover' />
+ <hr className='border-lightGray-HC-white' />
</div>
<div className='w-80 h-80' >
@@ -93,7 +93,7 @@ export default function ModalNotifications({ countNotifications, notifications,
<div key={index} className='pl-2' >
<ItemNotification notification={notification} postViewNotification={postViewNotification} />
<div className='pl-4'>
- <hr className="border-turquoise h-1 my-2 "/>
+ <hr className="border-turquoise-HC-white h-1 my-2 "/>
</div>
</div>
diff --git a/src/app/components/SideBar.js b/src/app/components/SideBar.js
index 219a11d1e067689ddaeaf8281d3b0d7c9b662ecb..e570c06725f5fcd81eeecce99c7786b9a4f260d4 100644
--- a/src/app/components/SideBar.js
+++ b/src/app/components/SideBar.js
@@ -142,7 +142,7 @@ export default function SideBar({ setFilterState, filterState }) {
alt={item.title}
title={item.title}
className={`aspect-square cursor-pointer hover:bg-lightGray-HC-white hover:text-darkGray-HC-dark focus:bg-lightGray-HC-white text-center rounded-lg pt-2 w-[80px]
- ${(page === item.href) || (pathname === item.href) ? "bg-lightGray-HC-white text-darkGray-HC-dark font-bold" : ""}
+ ${(page === item.href) || (pathname.startsWith(item.href)) ? "bg-lightGray-HC-white text-darkGray-HC-dark font-bold" : ""}
`}
>
<item.icon
diff --git a/src/app/contato/page.js b/src/app/contato/page.js
index ee4b87f28959e13b6a0f3ddf4a633e5560a65fb5..bb6b42a83494968c70fc4036e947331b23e0b036 100644
--- a/src/app/contato/page.js
+++ b/src/app/contato/page.js
@@ -79,7 +79,7 @@ export default function Contact() {
setSuccessOpen(false);
}}
/>
- <div className="flex justify-center overflow-y-auto max-md:mx-8 max-md:mb-24">
+ <div className="flex justify-center overflow-y-auto max-md:mx-8 max-md:mb-24 outline outline-1 outline-ice-HC-white">
<Card
className="flex w-full h-full min-h-[700px] text-darkGray-HC-white bg-white-HC-dark outline outline-1 outline-ice-HC-white"
sx={{
@@ -100,7 +100,7 @@ export default function Contact() {
Entre em contato para enviar dúvidas, sugestões ou críticas.
</p>
<div className="w-full">
- <p className="text-darkGray-HC-white-underline text-left text-sm">Nome*</p>
+ <p className="text-darkGray-HC-white text-left text-sm">Nome*</p>
<input
className="w-full h-12 border-text-darkGray-HC-white-underline border rounded text-darkGray-HC-white-underline pl-2 bg-transparent focus:outline-none focus:border-input-focus"
type="text"
@@ -109,7 +109,7 @@ export default function Contact() {
/>
</div>
<div className="w-full">
- <p className="text-darkGray-HC-white-underline text-left text-sm">E-mail*</p>
+ <p className="text-darkGray-HC-white text-left text-sm">E-mail*</p>
<input
className="w-full h-12 border-text-darkGray-HC-white-underline border rounded text-darkGray-HC-white-underline pl-2 bg-transparent focus:outline-none focus:border-input-focus"
type="email"
@@ -118,7 +118,7 @@ export default function Contact() {
/>
</div>
<div className="w-full">
- <p className="text-darkGray-HC-white-underline text-left text-sm">Mensagem*</p>
+ <p className="text-darkGray-HC-white text-left text-sm">Mensagem*</p>
<textarea
className="w-full h-36 border-text-darkGray-HC-white-underline border rounded text-darkGray-HC-white-underline p-2 bg-transparent focus:outline-none focus:border-input-focus"
name="contents"
@@ -126,8 +126,9 @@ export default function Contact() {
></textarea>
</div>
<Button
- className="bg-turquoise text-white-HC-dark-underline hover:bg-ice-HC-dark-hover normal-case font-bold w-full text-lg"
+ className="border-turquoise-HC-white hover:border-darkTurquoise-HC-white hover:bg-darkTurquoise-HC-dark bg-turquoise-HC-white hover:bg-ice-HC-dark-hover text-white-HC-dark-underline hover:text-white-HC-underline normal-case font-bold w-full text-lg"
type="submit"
+ variant="outlined"
alt="Enviar mensagem"
title="Enviar mensagem"
>
diff --git a/src/app/perfil/[id]/components/ProfileCollections.js b/src/app/perfil/[id]/components/ProfileCollections.js
index 3d356f8f165f988134418d3af581ad8db90c56fe..a598c246027db33c658bbc59f9e6347ce2ea6455 100644
--- a/src/app/perfil/[id]/components/ProfileCollections.js
+++ b/src/app/perfil/[id]/components/ProfileCollections.js
@@ -201,10 +201,10 @@ export default function ProfileCollections({ id, idLogin }) {
<div className="flex justify-between items-start">
{/* Título e autor */}
<div className="flex flex-col">
- <p className="text-2xl font-bold mb-1 text-darkGray-HC-white 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>
</p>
- <p className="ml-1 text-darkGray-HC-white">
+ <p className="ml-1 text-darkGray-HC-white-underline">
por <Link className="hover:underline" href={`/perfil/${item.owner.id}`}>{item.owner.name}</Link>
</p>
</div>
diff --git a/src/app/perfil/[id]/components/ProfileItens.js b/src/app/perfil/[id]/components/ProfileItens.js
index 7441f526fbfbb1bbaa017489e528178e71203731..d46d37faebb2683c2f6d9fccba2fced9d9521152 100644
--- a/src/app/perfil/[id]/components/ProfileItens.js
+++ b/src/app/perfil/[id]/components/ProfileItens.js
@@ -5,7 +5,8 @@ import { Paid } from '@mui/icons-material';
import mecredApi, { mecredURL } from '@/axiosConfig';
import { getStoredValue } from "@/app/handlers/localStorageHandler";
import { useEffect, useState } from 'react';
-import { Modal } from '@mui/material';
+import { IconButton, Modal } from '@mui/material';
+import CloseIcon from '@mui/icons-material/Close';
import Link from 'next/link';
import Image from 'next/image';
@@ -41,7 +42,7 @@ export default function ProfileItens({ profileData, setItems, items, store, type
alt="gema icon"
width={15}
height={10}
- className="inline mx-1 mb-1"
+ className="inline mx-1 mb-1 invertLogo-HC-white"
/>
@@ -62,20 +63,25 @@ export default function ProfileItens({ profileData, setItems, items, store, type
}}
>
<div className="bg-ice-HC-dark outline outline-1 outline-ice-HC-white p-5 rounded-lg">
+ <div className='flex justify-end'>
+ <IconButton onClick={onClose} className='group hover:bg-ice-HC-white'>
+ <CloseIcon fontSize='large' className='text-darkGray-HC-white group-hover:text-darkGray-HC-dark' />
+ </IconButton>
+ </div>
<div className="flex flex-col gap-5 justify-center ">
<p className="font-bold text-xl text-darkGray-HC-white">Deseja realmente comprar este item?</p>
<p className="font-bold text-darkGray-HC-white">Esta compra não envolve nenhum dinheiro real.</p>
<p className="inline text-darkGray-HC-white">O item que você deseja comprar,
<span className="font-bold"> {name}</span>, custa
- <span className="font-bold text-turquoise-HC-underline "> {iconEggs} {price}</span> gemas. Você possui
- <span className="font-bold text-turquoise-HC-underline "> {iconEggs} {profileData["points"]}</span> gemas.
+ <span className="font-bold text-turquoise-HC-white "> {iconEggs} {price}</span> gemas. Você possui
+ <span className="font-bold text-turquoise-HC-white "> {iconEggs} {profileData["points"]}</span> gemas.
</p>
{restEggs < 0 ? (
<p className="font-bold text-darkGray-HC-white">Você não possui gemas o suficiente para comprar este item.</p>
) : (
<>
<p className="inline text-darkGray-HC-white">Comprar este item lhe deixará com
- <span className="font-bold text-turquoise-HC-underline "> {iconEggs} {restEggs} </span>
+ <span className="font-bold text-turquoise-HC-white "> {iconEggs} {restEggs} </span>
gemas.
</p>
</>
@@ -87,7 +93,7 @@ export default function ProfileItens({ profileData, setItems, items, store, type
<button onClick={() => {
handlePostRequestStore(id, index);
onClose(); // Fecha o modal
- }} className="bg-turquoise text-white-HC-dark-underline p-2 rounded-lg hover:bg-darkTurquoise-HC-white ml-4">Comprar</button>
+ }} className="bg-turquoise-HC-white text-white-HC-dark-underline hover:text-white-HC-underline p-2 rounded-lg hover:bg-darkTurquoise-HC-dark ml-4 outline outline-1 outline-ice-HC-white">Comprar</button>
)}
</div>
</div>
@@ -110,6 +116,11 @@ export default function ProfileItens({ profileData, setItems, items, store, type
}}
>
<div className="bg-ice-HC-dark outline outline-1 outline-ice-HC-white p-5 rounded-lg">
+ <div className='flex justify-end'>
+ <IconButton onClick={onClose} className='group hover:bg-ice-HC-white'>
+ <CloseIcon fontSize='large' className='text-darkGray-HC-white group-hover:text-darkGray-HC-dark' />
+ </IconButton>
+ </div>
<div className="flex flex-col justify-center ">
<p className="pt-3 text-xl text-darkGray-HC-white">Você só pode equipar até 3 insígnias simultaneamente</p>
</div>
@@ -255,7 +266,7 @@ export default function ProfileItens({ profileData, setItems, items, store, type
</div>
<button
- className="absolute bottom-0 pb-8 text-turquoise-HC-underline text-darkGray-HC-white-underline text-left"
+ className="absolute bottom-0 pb-8 text-turquoise-HC-white-underline hover:text-darkTurquoise-HC-white text-left"
onClick={() => setShowDescription(null)}
>
Voltar
@@ -289,7 +300,7 @@ export default function ProfileItens({ profileData, setItems, items, store, type
index={index}
id={e.id}
/>
- <button className="flex h-[43px] w-[158px] justify-center items-center bg-lightGray-HC-dark hover:bg-darkGray-HC-white rounded-[10px] outline outline-1 outline-ice-HC-white font-bold text-darkGray-HC-white hover:text-white-HC-dark-underline mt-2"
+ <button className="flex h-[43px] w-[158px] justify-center items-center bg-lightGray-HC-dark hover:bg-darkGray-HC-white rounded-[10px] outline outline-1 outline-ice-HC-white font-bold text-darkGray-HC-white-underline hover:text-white-HC-dark-underline mt-2"
onClick={() => !arrayAcquired[index] && setBuyItem(e.id)}
>
{arrayAcquired[index] ? "Adquirido" : "Comprar"}
diff --git a/src/app/perfil/[id]/components/UserCard.js b/src/app/perfil/[id]/components/UserCard.js
index 508719d62cc2e5bb1c70676031edc232b5bd1735..21213f6bd2dc7baf7d0ac89a4bc4435c07692819 100644
--- a/src/app/perfil/[id]/components/UserCard.js
+++ b/src/app/perfil/[id]/components/UserCard.js
@@ -227,7 +227,7 @@ export default function UserCard({ profileData, idLogin, achievements, progresse
{profileData["avatar"] ?
<Avatar src={mecredURL + profileData["avatar"]} sx={{ position: "inherit" }} alt="Foto de perfil" className=" h-[276px] w-[276px] " />
:
- <div className={`flex items-center justify-center text-8xl font-bold text-ice-HC-dark rounded-full h-[276px] w-[276px] ${getRandomBg(profileData["id"])}`} >{profileData["name"][0]}</div>
+ <div className={`flex items-center justify-center text-8xl font-bold text-ice-HC-dark rounded-full h-[276px] w-[276px] bg-turquoise-HC-white ${getRandomBg(profileData["id"])}`} >{profileData["name"][0]}</div>
}
</div>
diff --git a/src/app/publicar/components/CancelSubmitModal.js b/src/app/publicar/components/CancelSubmitModal.js
index 10946e5bf2de5f737e819a2e87ef217301cc3cef..d5812d4010f0475b6d55b21b6a10524e834c7b47 100644
--- a/src/app/publicar/components/CancelSubmitModal.js
+++ b/src/app/publicar/components/CancelSubmitModal.js
@@ -30,8 +30,8 @@ export default function CancelSubmitModal({ openModal, onClose }) {
>
<div className='absolute p-4 pb-14 rounded-lg self-center bg-white-HC-dark border-2 border-ice-HC-white'>
<>
- <div className='group flex justify-end'>
- <IconButton onClick={onClose} className='group-hover:bg-ice-HC-white'>
+ <div className='flex justify-end'>
+ <IconButton onClick={onClose} className='group hover:bg-ice-HC-white'>
<CloseIcon fontSize='large' className='text-darkGray-HC-white group-hover:text-darkGray-HC-dark' />
</IconButton>
</div>
diff --git a/src/app/publicar/components/ModalSuccess.js b/src/app/publicar/components/ModalSuccess.js
index 2e22ffd91683306891b8f5b91aed6209031f3ca8..aecd0b97becdf7b7231d06e47dbe66675fd1123e 100644
--- a/src/app/publicar/components/ModalSuccess.js
+++ b/src/app/publicar/components/ModalSuccess.js
@@ -55,8 +55,8 @@ export default function ModalSuccess({ openModal, onClose, permission, idResourc
>
<div className='absolute p-4 pb-14 rounded-lg self-center bg-white-HC-dark border-2 border-ice-HC-white'>
<>
- <div className='group flex justify-end'>
- <IconButton onClick={onClose} className='group-hover:bg-ice-HC-white'>
+ <div className='flex justify-end'>
+ <IconButton onClick={onClose} className='group hover:bg-ice-HC-white'>
<CloseIcon
fontSize='large'
className='text-darkGray-HC-white group-hover:text-darkGray-HC-dark'