Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PortalMEC-React
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PortalMEC
PortalMEC-React
Commits
992ae5a7
Commit
992ae5a7
authored
4 years ago
by
mrp19
Browse files
Options
Downloads
Plain Diff
Merge branch 'homologa' of gitlab.c3sl.ufpr.br:portalmec/portalmec-react into fix/homologa_luis
parents
a3e37041
71d1752c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
4 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
,
!39
Update admin system
,
!32
Homologa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Components/ReportModal.js
+12
-13
12 additions, 13 deletions
src/Components/ReportModal.js
src/Components/ReportUserForm.js~fead909286087ce07b01b25f6d8f46f74dc494c8
+0
-179
0 additions, 179 deletions
...eportUserForm.js~fead909286087ce07b01b25f6d8f46f74dc494c8
with
12 additions
and
192 deletions
src/Components/ReportModal.js
+
12
−
13
View file @
992ae5a7
...
@@ -88,18 +88,18 @@ export default function ReportModal (props) {
...
@@ -88,18 +88,18 @@ export default function ReportModal (props) {
}
}
}
}
/
/
const renderForm = (formType) => {
/
*
const renderForm = (formType) => {
//
switch (formType) {
switch (formType) {
//
case 'colecao':
case 'colecao':
//
return (
return (
//
<ReportCollectionForm
<ReportCollectionForm
//
handleClose={props.handleClose}
handleClose={props.handleClose}
//
handleSubmit={handleSubmit}
handleSubmit={handleSubmit}
//
/>
/>
//
);
);
//
break;
break;
//
}
}
// }
} */
return
(
return
(
<
StyledModal
<
StyledModal
...
@@ -197,4 +197,3 @@ const ReportContainer = styled.div`
...
@@ -197,4 +197,3 @@ const ReportContainer = styled.div`
height : 100%;
height : 100%;
}
}
`
`
This diff is collapsed.
Click to expand it.
src/Components/ReportUserForm.js~fead909286087ce07b01b25f6d8f46f74dc494c8
deleted
100644 → 0
+
0
−
179
View file @
a3e37041
/*Copyright (C) 2019 Centro de Computacao Cientifica e Software Livre
Departamento de Informatica - Universidade Federal do Parana
This file is part of Plataforma Integrada MEC.
Plataforma Integrada MEC is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Plataforma Integrada MEC is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with Plataforma Integrada MEC. If not, see <http://www.gnu.org/licenses/>.*/
import React, {useState, useContext} from 'react';
import { Button } from '@material-ui/core';
import styled from 'styled-components'
import Radio from '@material-ui/core/Radio';
import RadioGroup from '@material-ui/core/RadioGroup';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormControl from '@material-ui/core/FormControl';
import TextField from '@material-ui/core/TextField';
export default function ReportForm (props) {
const [value, setValue] = React.useState(-1);
const handleChange = (event) => {
setValue(event.target.value);
};
/*values are set according to backend complaint id*/
const [options] = React.useState([
{value : "6", text :'Esta pessoa está fingindo ser eu ou alguém que eu conheço.'},
{value : "4", text : 'Essa pessoa envia spam.'},
{value : "3", text : 'Essa é uma conta falsa.'},
{value : "1", text : ' A publicação dessa pessoa viola os diretos autorais.'},
{value : "2", text : 'As publicações dessa pessoa contém conteúdo ofensivo/abusivo.'}
])
const [moreInfo, setMoreInfo] = React.useState({
key : false,
value : "",
})
const handleChangeMoreInfo = (e) => {
const userInput = e.target.value
const flag = userInput.length > 150 ? true : false
setMoreInfo({...moreInfo,
key : flag,
value : userInput
})
}
const formSubmit = (e) => {
e.preventDefault()
const finalRadioValue = value
const finalMoreInfo = moreInfo
if( finalRadioValue != -1 && !(finalMoreInfo.key)) {
props.handleSubmit(finalRadioValue, finalMoreInfo.value)
}
}
return (
<form onSubmit={(e) => {formSubmit(e)}}>
<StyledFormControl component="fieldset">
<RadioGroup value={value} onChange={handleChange}>
{
options.map(option =>
<FormControlLabel value={option.value} control={<Radio color="orange"/>} label={option.text} />
)
}
</RadioGroup>
</StyledFormControl>
<StyledTextField
id = {"Escreva mais sobre o problema"}
label={"Escreva mais sobre o problema"}
type = {"text"}
value = {moreInfo.value}
onChange = {e => handleChangeMoreInfo(e)}
helperText = {moreInfo.value.length + '/150'}
multiline={true}
rowsMax = {"5"}
error = {moreInfo.key}
required = {false}
style={{width:"100%"}}
/>
<ButtonsDiv>
<ButtonCancelar onClick={props.handleClose}>CANCELAR</ButtonCancelar>
<ButtonEnviar type="submit">ENVIAR</ButtonEnviar>
</ButtonsDiv>
</form>
);
}
export const ButtonsDiv = styled.div`
display : flex;
flex-direction : row;
justify-content : flex-end;
align-items : center;
`
export const ButtonCancelar = styled(Button)`
&:hover {
background-color : rgba(158,158,158,0.2) !important;
}
height : 36px !important;
padding-left : 16px !important;
padding-right : 16px !important;
font-weight : 500 !important;
border-radius : 3px !important;
color :#666 !important;
background-color: transparent;
min-width : 88px !important;
height : 36px !important;
`
export const ButtonEnviar = styled(Button)`
background-color : #ff7f00 !important;
color : #fff !important;
font-size: 14px !important;
font-weight: 500 !important;
height: 36px !important;
border-radius: 3px !important;
padding-left: 16px !important;
padding-right: 16px !important;
box-shadow: 0 2px 5px 0 rgba(0,0,0,.26) !important;
outline : none !important;
min-width : 88px !important;
vertical-align : middle !important;
margin : 6px 8px !important;
text-decoration : none !important;
.MuiButton-label {
padding-right : 16px;
padding-left : 16px;
}
`
export const StyledTextField = styled(TextField)`
.MuiFormHelperText-root {
text-align : right;
}
label.Mui-focused {
color : orange;
}
label.Mui-focused.Mui-error {
color : red;
}
.MuiInput-underline::after {
border-bottom: 2px solid orange;
}
`
export const StyledFormControl = styled(FormControl)`
.MuiFormControlLabel-root {
color : #666;
}
.MuiIconButton-label {
color : #666;
}
.PrivateRadioButtonIcon-checked {
color : orange;
}
.MuiTypography-body1 {
font-size : 14px;
}
`
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment