Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • simmctic/form-creator/form-creator-ui
1 result
Select Git revision
Show changes
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
src/components/fieldsSignUp/FormInput.jsx
View file @ 46e2ad2f
......@@ -21,7 +21,6 @@ function FormInput(props) {
: "text"
}
autoComplete="off"
onFocusOut={props.verify}
></TextField>
);
}
......
src/contexts/useForm.js
View file @ 46e2ad2f
......@@ -8,7 +8,7 @@ import {
selectOptionsTesting,
testSubformSchema,
selectOptionTextTesting,
testTextValidation
testTextValidation,
} from "../components/fieldsDisplayForm/utils/schemas";
import {
pushTitle,
......@@ -16,7 +16,7 @@ import {
pushSelect,
pushRadio,
pushCheckbox,
pushSubform
pushSubform,
} from "../components/fieldsDisplayForm/utils/FormComposition";
import api from "../api";
......@@ -248,13 +248,13 @@ const useForm = () => {
"question",
"description",
"options",
"subformId"
"subformId",
]) !==
JSON.stringify(form[j], [
"question",
"description",
"options",
"subformId"
"subformId",
]) ||
differentValidation(backForm[i], form[j])
) {
......@@ -279,8 +279,8 @@ const useForm = () => {
const post_response = await api
.put(`/form/${routeId}`, data, {
headers: {
authorization: `bearer ${window.sessionStorage.getItem("token")}`
}
authorization: `bearer ${window.sessionStorage.getItem("token")}`,
},
})
.then(function (error) {
if (!error.response)
......@@ -304,15 +304,13 @@ const useForm = () => {
const post_response = await api
.post(`/form`, await createBackendForm(form), {
headers: {
authorization: `bearer ${window.sessionStorage.getItem("token")}`
}
authorization: `bearer ${window.sessionStorage.getItem("token")}`,
},
})
.then(function (error) {
if (!error.response) alert("Seu formulário foi criado com sucesso.");
else console.log("ERROR NO POST_RESPONSE", error);
})
.catch(function (error) {
console.log("ERROR NO POST RESPONSE", error.response);
alert("Um erro ocorreu.");
});
}
......@@ -338,7 +336,7 @@ const useForm = () => {
setValidationValue,
removeValidation,
onDragEnd,
submit
submit,
};
};
......
src/pages/SignIn.js
View file @ 46e2ad2f
......@@ -9,7 +9,7 @@ import FormInput from "../components/fieldsSignUp/FormInput";
import Paper from "@material-ui/core/Paper";
import api from "../api";
const useStyles = makeStyles(theme => ({
const useStyles = makeStyles((theme) => ({
register: {
maxWidth: "1000px",
background: "#ffffff",
......@@ -17,22 +17,22 @@ const useStyles = makeStyles(theme => ({
padding: "2% 1%",
margin: "0 auto",
marginTop: "9%",
width: "95%"
width: "95%",
},
custom_strong: {
fontSize: "25px",
textAlign: "center",
display: "block",
color: "#46525d"
color: "#46525d",
},
strong_description: {
fontSize: "14px",
color: "#c2c6ca"
color: "#c2c6ca",
},
form: {
marginTop: "3%",
alignItems: "center",
textAlign: "center"
textAlign: "center",
},
button: {
type: "submit",
......@@ -43,12 +43,12 @@ const useStyles = makeStyles(theme => ({
padding: "10px 20px",
fontSize: "18px",
"&:hover": {
backgroundColor: "rgb(25, 109, 23)"
backgroundColor: "rgb(25, 109, 23)",
},
["@media (max-width:550px)"]: {
width: "55%"
}
}
width: "55%",
},
},
}));
export default function SignIn() {
const classes = useStyles();
......@@ -56,13 +56,13 @@ export default function SignIn() {
const [values, setValues] = React.useState({
email: "",
password: "",
emailError: false
emailError: false,
});
async function update(prop, event) {
await setValues({ ...values, [prop]: event.target.value });
}
const handleChange = prop => event => {
const handleChange = (prop) => (event) => {
if (!checkEmail()) {
values.emailError = true;
} else {
......@@ -71,10 +71,11 @@ export default function SignIn() {
update(prop, event);
};
function checkEmail() {
if (/^[a-zA-Z0-9._-]+@[a-zA-Z0-9]+\.[A-Za-z]+$/.test(values.email)) {
return true;
}
return false;
return values.email
? /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(values.email)
? true
: false
: true;
}
function verifyValues() {
if (values.email && values.password) {
......@@ -95,7 +96,7 @@ export default function SignIn() {
const response = await api
.post(`/user/signIn`, {
email: values.email,
hash: values.password
hash: values.password,
})
.then(function (response) {
if (!response.data.error) {
......@@ -123,19 +124,19 @@ export default function SignIn() {
const theme = createMuiTheme({
overrides: {
root: {
color: "white"
color: "white",
},
MuiInput: {
underline: {
"&:before": {
borderBottom: "1px solid #35c7fc"
borderBottom: "1px solid #35c7fc",
},
"&:after": {
borderBottom: "1px solid #3f51b5"
}
}
}
}
borderBottom: "1px solid #3f51b5",
},
},
},
},
});
return (
<MuiThemeProvider theme={theme}>
......@@ -152,8 +153,7 @@ export default function SignIn() {
label="E-mail"
param="email"
onUpdate={handleChange}
verify={checkEmail}
error={values.emailError}
error={!checkEmail()}
/>
</Grid>
<Grid>
......
src/pages/SignUp.js
View file @ 46e2ad2f
import React from "react";
import React, { useEffect } from "react";
import Grid from "@material-ui/core/Grid";
import { createMuiTheme, MuiThemeProvider } from "@material-ui/core";
import IconButton from "@material-ui/core/IconButton";
......@@ -9,7 +9,7 @@ import FormInput from "../components/fieldsSignUp/FormInput";
import Paper from "@material-ui/core/Paper";
import api from "../api";
const useStyles = makeStyles(theme => ({
const useStyles = makeStyles((theme) => ({
register: {
maxWidth: "1000px",
background: "#ffffff",
......@@ -17,21 +17,21 @@ const useStyles = makeStyles(theme => ({
padding: "2% 1%",
marginTop: "3%",
margin: "0 auto",
width: "95%"
width: "95%",
},
custom_strong: {
fontSize: "25px",
textAlign: "center",
display: "block",
color: "#46525d"
color: "#46525d",
},
strong_description: {
fontSize: "14px",
color: "#c2c6ca"
color: "#c2c6ca",
},
form: {
alignItems: "center",
textAlign: "center"
textAlign: "center",
},
button: {
type: "submit",
......@@ -43,45 +43,34 @@ const useStyles = makeStyles(theme => ({
padding: "10px 20px",
fontSize: "18px",
"&:hover": {
backgroundColor: "rgb(25, 109, 23)"
backgroundColor: "rgb(25, 109, 23)",
},
["@media (max-width:550px)"]: {
width: "55%"
}
}
width: "55%",
},
},
}));
export default function SignUp() {
const history = useHistory();
const classes = useStyles();
const [values, setValues] = React.useState({
name: "",
email: "",
password: "",
password_confirm: "",
nameError: false,
emailError: false
emailError: false,
});
async function update(prop, event) {
await setValues({ ...values, [prop]: event.target.value });
}
useEffect(() => {
!checkName() ? (values.nameError = true) : (values.nameError = false);
}, [values.name]);
useEffect(() => {
!checkEmail() ? (values.emailError = true) : (values.emailError = false);
}, [values.email]);
const handleChange = prop => event => {
switch (prop) {
case "name":
if (!checkName()) {
values.nameError = true;
} else {
values.nameError = false;
}
break;
case "email":
if (!checkEmail()) {
values.emailError = true;
} else {
values.emailError = false;
}
}
update(prop, event);
const handleChange = (prop) => (event) => {
setValues({ ...values, [prop]: event.target.value });
};
function checkPassword() {
if (values.password !== values.password_confirm) {
......@@ -91,20 +80,19 @@ export default function SignUp() {
return true;
}
function checkName() {
if (
/^[a-zA-Z ]+$/.test(values.name) &&
!/^$|\s+/.test(values.name) &&
return values.name
? /^[A-Za-záàâãéèêíïóôõöúçñÁÀÂÃÉÈÍÏÓÔÕÖÚÇÑ ]+$/.test(values.name) &&
values.name.length <= 225
) {
return true;
}
return false;
? true
: false
: true;
}
function checkEmail() {
if (/^[a-zA-Z0-9._-]+@[a-zA-Z0-9]+\.[A-Za-z]+$/.test(values.email)) {
return true;
}
return false;
return values.email
? /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(values.email)
? true
: false
: true;
}
function verifyValues() {
if (
......@@ -113,7 +101,9 @@ export default function SignUp() {
values.password &&
values.password_confirm
) {
if (verifyValuesContent()) {
return true;
} else return false;
}
return false;
}
......@@ -136,7 +126,7 @@ export default function SignUp() {
.post(`/user/signUp`, {
email: values.email,
name: values.name,
hash: values.password
hash: values.password,
})
.then(function (error) {
if (!error.response) {
......@@ -166,27 +156,25 @@ export default function SignUp() {
}
function submit() {
if (verifyValues()) {
if (verifyValuesContent()) {
handleSubmit();
}
}
}
const theme = createMuiTheme({
overrides: {
root: {
color: "white"
color: "white",
},
MuiInput: {
underline: {
"&:before": {
borderBottom: "1px solid #35c7fc"
borderBottom: "1px solid #35c7fc",
},
"&:after": {
borderBottom: "1px solid #3f51b5"
}
}
}
}
borderBottom: "1px solid #3f51b5",
},
},
},
},
});
return (
<MuiThemeProvider theme={theme}>
......@@ -203,7 +191,7 @@ export default function SignUp() {
label="Nome Completo"
param="name"
onUpdate={handleChange}
error={values.nameError}
error={!checkName()}
/>
</Grid>
<Grid>
......@@ -211,8 +199,7 @@ export default function SignUp() {
label="E-mail"
param="email"
onUpdate={handleChange}
verify={checkEmail}
error={values.emailError}
error={!checkEmail()}
/>
</Grid>
<Grid>
......@@ -223,6 +210,13 @@ export default function SignUp() {
label="Confirmar Senha"
param="password_confirm"
onUpdate={handleChange}
error={
values.password_confirm
? values.password === values.password_confirm
? false
: true
: false
}
/>
</Grid>
<Grid>
......