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

Merge branch 'issue-277/HC-of-the-profile-reporting-modal' into 'develop' 

Issue #277: FIX Modal correction for reporting a user

See merge request !261
parents b3514588 23f00b7f
No related branches found
No related tags found
1 merge request!261Issue #277: FIX Modal correction for reporting a user
Pipeline #41674 passed
Stage: test
Show whitespace changes
Inline Side-by-side
src/app/perfil/[id]/components/GroupButton.js
+ 4
− 4
View file @ 285949f0
...@@ -92,15 +92,15 @@ export default function GroupButton({ profileData, idLogin }) { ...@@ -92,15 +92,15 @@ export default function GroupButton({ profileData, idLogin }) {
}, },
}, },
}}> }}>
<div className="flex flex-col justify-center bg-ice-HC-dark p-5 rounded"> <div className="flex flex-col justify-center bg-ice-HC-dark p-5 rounded outline outline-1 outline-ice-HC-white">
<p className="text-xl justify-center flex text-darkGray-HC-white-underline mb-2">O usuário já foi denunciado!</p> <p className="text-xl justify-center flex text-darkGray-HC-white mb-2">O usuário já foi denunciado!</p>
<div className="flex flex-row justify-center mt-2"> <div className="flex flex-row justify-center mt-2">
<button <button
className=" text-sm p-2 mr-1 text-darkGray-HC-white-underline border-main rounded-lg normal-case h-9 font-bold bg-white-HC-dark hover:bg-ice-HC-dark-hover" className=" text-sm p-2 mr-1 text-white-HC-dark-underline border-main rounded-lg normal-case h-9 font-bold outline outline-1 outline-ice-HC-white bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark hover:text-white-HC-underline"
onClick={onClose} onClick={onClose}
> >
Ok OK
</button> </button>
</div> </div>
</div> </div>
......
src/app/perfil/[id]/components/ReportProfileModal.js
+ 35
− 7
View file @ 285949f0
...@@ -77,19 +77,30 @@ export default function ReportProfileModal({ open, onClose, profile, idLogin, se ...@@ -77,19 +77,30 @@ export default function ReportProfileModal({ open, onClose, profile, idLogin, se
}, },
}} }}
> >
<div className="flex flex-col bg-ice-HC-dark p-3 rounded-lg"> <div className="flex flex-col bg-ice-HC-dark p-3 rounded-lg outline outline-1 outline-ice-HC-white">
<div className="px-3 flex justify-between"> <div className="px-3 flex justify-between">
<div className="text-2xl font-bold text-darkGray-HC-white-underline">Reportar</div> <div className="text-2xl font-bold text-darkGray-HC-white">Reportar</div>
<button onClick={onClose} className="text-2xl font-bold text-darkGray-HC-white-underline hover:bg-ice-HC-dark-hover p-1 px-2 rounded-full">X</button> <button onClick={onClose} className="text-2xl font-bold text-darkGray-HC-white hover:bg-ice-HC-dark-hover p-1 px-2 rounded-full">X</button>
</div> </div>
<div className="p-3 flex flex-col"> <div className="p-3 flex flex-col">
<div className="text-base font-bold text-darkGray-HC-white-underline"> <div className="text-base font-bold text-darkGray-HC-white">
O que está acontecendo? O que está acontecendo?
</div> </div>
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
<FormControl className="p-3 text-darkGray-HC-white-underline"> <FormControl className="p-3 text-darkGray-HC-white">
<RadioGroup defaultValue={"1"} name="report-radio-group"> <RadioGroup
defaultValue={"1"}
name="report-radio-group"
sx={{
'& .MuiRadio-root': {
color: 'var(--darkGray-HC-white)', // Default radio color
'&.Mui-checked': {
color: 'var(--turquoise-HC-white)', // Selected radio color
},
},
}}
>
{options.map((option, i) => { {options.map((option, i) => {
return ( return (
<FormControlLabel <FormControlLabel
...@@ -113,12 +124,29 @@ export default function ReportProfileModal({ open, onClose, profile, idLogin, se ...@@ -113,12 +124,29 @@ export default function ReportProfileModal({ open, onClose, profile, idLogin, se
label="Escreva mais sobre o problema" label="Escreva mais sobre o problema"
variant="standard" variant="standard"
error={info.length > 150 } error={info.length > 150 }
sx={{
'& .MuiInputBase-input': {
color: 'var(--darkGray-HC-white)', // Cor do texto dentro do input
},
'& .MuiInput-underline:before': {
borderBottomColor: 'var(--darkGray-HC-white)', // Cor da borda padrão
},
'& .MuiInput-underline:after': {
borderBottomColor: 'var(--turquoise-HC-white)', // Cor da borda ao focar
},
'& .MuiInputLabel-root': {
color: 'var(--darkGray-HC-white)', // Cor do texto do label
},
'& .MuiInputLabel-root.Mui-focused': {
color: 'var(--turquoise-HC-white)', // Cor do label ao focar
},
}}
/> />
<Button <Button
type="submit" type="submit"
variant="contained" variant="contained"
disabled={info.length > 150} disabled={info.length > 150}
className="bg-turquoise hover:bg-black-HC-gray disabled:bg-red mt-3 text-white-HC-dark-underline hover:text-turquoise-HC-underline shadow-none rounded normal-case text-base font-bold" className="bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark disabled:bg-red mt-3 text-white-HC-dark-underline hover:text-white-HC-underline shadow-none rounded normal-case text-base font-bold outline outline-1 outline-ice-HC-white"
> >
Enviar Enviar
</Button> </Button>
......
src/app/perfil/[id]/components/UserCard.js
+ 5
− 5
View file @ 285949f0
...@@ -76,13 +76,13 @@ const roles = [ ...@@ -76,13 +76,13 @@ const roles = [
function getRandomBg(id) { function getRandomBg(id) {
const colors = [ const colors = [
"bg-turquoise", "bg-turquoise-HC-white",
"bg-orange", "bg-orange-HC-white",
"bg-turquoise-hover", "bg-turquoise-hover",
"bg-darkOrange-HC-gray ", "bg-darkOrange-HC-gray ",
"bg-violet", "bg-violet-HC-white",
"bg-pink", "bg-pink-HC-white",
"bg-red", "bg-red-HC-white",
"bg-darkGray-HC-white", "bg-darkGray-HC-white",
"bg-darkGray-HC-white-click", "bg-darkGray-HC-white-click",
"bg-ice-HC-dark ", "bg-ice-HC-dark ",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment