Ver código fonte

Fixed bug 524

feature/587
Djordje Mitrovic 3 anos atrás
pai
commit
095c0811b7

BIN
public/favicon.png Ver arquivo


+ 16
- 4
public/index.html Ver arquivo

<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Poppins">
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Mulish">
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<link
rel="stylesheet"
type="text/css"
href="https://fonts.googleapis.com/css?family=Open+Sans"
/>
<link
rel="stylesheet"
type="text/css"
href="https://fonts.googleapis.com/css?family=Poppins"
/>
<link
rel="stylesheet"
type="text/css"
href="https://fonts.googleapis.com/css?family=Mulish"
/>
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta

+ 1
- 0
src/i18n/resources/rs.js Ver arquivo

average: "srednja", average: "srednja",
good: "dobra", good: "dobra",
strong: "jaka", strong: "jaka",
strongPassword: "Lozinka mora imati barem jedan veliki karakter, jedan mali karakter i jedan znak!"
}, },
register: { register: {
title: "Registruj se", title: "Registruj se",

+ 3
- 9
src/pages/RegisterPages/Register/FirstPart/FirstPartOfRegistration.js Ver arquivo

RegisterDescription, RegisterDescription,
} from "./FirstPartOfRegistration.styled"; } from "./FirstPartOfRegistration.styled";
import { useFormik } from "formik"; import { useFormik } from "formik";
import * as Yup from "yup";
// import * as Yup from "yup";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { TextField } from "../../../../components/TextFields/TextField/TextField"; import { TextField } from "../../../../components/TextFields/TextField/TextField";
import { IconButton } from "../../../../components/Buttons/IconButton/IconButton"; import { IconButton } from "../../../../components/Buttons/IconButton/IconButton";
import { ReactComponent as VisibilityOff } from "../../../../assets/images/svg/eye-striked.svg"; import { ReactComponent as VisibilityOff } from "../../../../assets/images/svg/eye-striked.svg";
import { PrimaryButton } from "../../../../components/Buttons/PrimaryButton/PrimaryButton"; import { PrimaryButton } from "../../../../components/Buttons/PrimaryButton/PrimaryButton";
import selectedTheme from "../../../../themes"; import selectedTheme from "../../../../themes";
import firstPartValidation from "../../../../validations/registerValidations/firstPartValidation";


const FirstPartOfRegistration = (props) => { const FirstPartOfRegistration = (props) => {
const [showPassword, setShowPassword] = useState(false); const [showPassword, setShowPassword] = useState(false);
mail: "", mail: "",
password: "", password: "",
}, },
validationSchema: Yup.object().shape({
mail: Yup.string()
.email(t("forgotPassword.emailFormat"))
.required(t("login.usernameRequired")),
password: Yup.string()
.required(t("login.passwordRequired"))
.min(8, t("login.passwordLength")),
}),
validationSchema: firstPartValidation,
onSubmit: props.handleSubmit, onSubmit: props.handleSubmit,
validateOnBlur: true, validateOnBlur: true,
enableReinitialize: true, enableReinitialize: true,

+ 5
- 1
src/validations/registerValidations/firstPartValidation.js Ver arquivo

.required(i18n.t("login.usernameRequired")), .required(i18n.t("login.usernameRequired")),
password: Yup.string() password: Yup.string()
.required(i18n.t("login.passwordRequired")) .required(i18n.t("login.passwordRequired"))
.min(8, i18n.t("login.passwordLength")),
.min(8, i18n.t("login.passwordLength"))
.matches(
/^(?=.*[a-z])(?=.*[A-Z])(?=.*[#$^+=!*()@%&]).{8,25}$/g,
i18n.t("password.strongPassword")
),
}); });

Carregando…
Cancelar
Salvar