merge

src/i18n/resources/rs.js

@@ -88,6 +88,7 @@ export default {
         terms: "Uslove Korišćenja",
         success: 'Registracija Uspešna',
         PIBTaken: "PIB je zauzet!",
+        PIBnoOfCharacters: "PIB mora imati 9 karaktera!",
         welcome: 'Dobro došli na trampu, želimo vam uspešno trampovanje!',
       },
       forgotPassword: {

src/initialValues/forgotPasswordInitialValues.js

@@ -0,0 +1,3 @@
+export default {
+  email: "",
+};

src/initialValues/loginInitialValues.js

@@ -0,0 +1,4 @@
+export default {
+  email: "",
+  password: "",
+};

src/initialValues/registerInitialValues/firstPartInitialValues.js

@@ -0,0 +1,4 @@
+export default {
+  mail: "",
+  password: "",
+};

src/initialValues/registerInitialValues/secondPartInitialValues.js

@@ -0,0 +1,4 @@
+export default {
+  nameOfFirm: "",
+  PIB: "",
+};

src/initialValues/registerInitialValues/thirdPartInitialValues.js

@@ -0,0 +1,5 @@
+export default {
+  phoneNumber: "",
+  location: "",
+  website: "",
+};

src/initialValues/resetPasswordInitialValues.js

@@ -0,0 +1,4 @@
+export default {
+  password: "",
+  passwordConfirm: "",
+};

src/pages/LoginPage/LoginPage.js

@@ -32,6 +32,8 @@ import {
   ErrorMessage,
 } from "./Login.styled";
 import selectedTheme from "../../themes";
+import loginValidation from "../../validations/loginValidation";
+import loginInitialValues from "../../initialValues/loginInitialValues";
 
 const LoginPage = ({ history }) => {
   const dispatch = useDispatch();
@@ -71,7 +73,6 @@ const LoginPage = ({ history }) => {
   };
 
   const handleSubmit = (values) => {
-    console.log('ddedede');
     const { email, password: password } = values;
     dispatch(clearLoginErrors());
     dispatch(
@@ -84,16 +85,8 @@ const LoginPage = ({ history }) => {
   };
 
   const formik = useFormik({
-    initialValues: {
-      email: "",
-      password: "",
-    },
-    validationSchema: Yup.object().shape({
-      email: Yup.string().required(t("login.mailRequired")),
-      password: Yup.string()
-        .required(t("login.passwordRequired"))
-        .min(8, t("login.passwordLength")),
-    }),
+    initialValues: loginInitialValues,
+    validationSchema: loginValidation,
     onSubmit: handleSubmit,
     validateOnBlur: true,
     enableReinitialize: true,

src/pages/RegisterPages/Register/FirstPart/FirstPartOfRegistration.js

@@ -68,12 +68,6 @@ const FirstPartOfRegistration = (props) => {
         fullWidth
       />
 
-      {formik.errors.mail && formik.touched.mail ? (
-        <ErrorMessage>{formik.errors.mail}</ErrorMessage>
-      ) : (
-        <></>
-      )}
-
       <TextField
         name="password"
         placeholder={t("common.labelPassword")}
@@ -94,11 +88,22 @@ const FirstPartOfRegistration = (props) => {
           ),
         }}
       />
+<<<<<<< HEAD
       {formik.errors.password && formik.touched.password ? (
+=======
+
+      {formik.errors.mail && formik.touched.mail ? (
+        <ErrorMessage>{formik.errors.mail}</ErrorMessage>
+      ) : formik.errors.password && formik.touched.password ? (
+>>>>>>> master
         <ErrorMessage>{formik.errors.password}</ErrorMessage>
       ) : (
         <></>
       )}
+<<<<<<< HEAD
+=======
+      
+>>>>>>> master
       {props.error && <ErrorMessage>{props.errorMessage}</ErrorMessage>}
 
       <PrimaryButton

src/validations/forgotPasswordValidation.js

@@ -0,0 +1,8 @@
+import * as Yup from "yup";
+import i18n from "../i18n";
+
+export default Yup.object().shape({
+  email: Yup.string()
+    .required(i18n.t("forgotPassword.emailRequired"))
+    .email(i18n.t("forgotPassword.emailFormat")),
+});

src/validations/loginValidation.js

@@ -0,0 +1,9 @@
+import * as Yup from "yup";
+import i18n from "../i18n";
+
+export default Yup.object().shape({
+  email: Yup.string().email(i18n.t("login.emailFormat")).required(i18n.t("login.mailRequired")),
+  password: Yup.string()
+    .required(i18n.t("login.passwordRequired"))
+    .min(8, i18n.t("login.passwordLength")),
+});

src/validations/registerValidations/firstPartValidation.js

@@ -0,0 +1,10 @@
+import * as Yup from "yup";
+import i18n from "../../i18n";
+export default Yup.object().shape({
+  mail: Yup.string()
+    .email(i18n.t("forgotPassword.emailFormat"))
+    .required(i18n.t("login.usernameRequired")),
+  password: Yup.string()
+    .required(i18n.t("login.passwordRequired"))
+    .min(8, i18n.t("login.passwordLength")),
+});

src/validations/registerValidations/secondPartValidation.js

@@ -0,0 +1,10 @@
+import * as Yup from "yup";
+import i18n from "../../i18n";
+
+export default Yup.object().shape({
+  nameOfFirm: Yup.string().required(i18n.t("login.usernameRequired")),
+  PIB: Yup.number()
+    .required(i18n.t("login.passwordRequired"))
+    .min(100000000, i18n.t("register.PIBnoOfCharacters"))
+    .max(999999999, i18n.t("register.PIBnoOfCharacters")),
+});

src/validations/registerValidations/thirdPartValidation.js

@@ -0,0 +1,10 @@
+import * as Yup from "yup";
+import i18n from "../../i18n";
+
+export default Yup.object().shape({
+  phoneNumber: Yup.number().required(i18n.t("login.usernameRequired")),
+  location: Yup.string().required(i18n.t("login.passwordRequired")),
+  website: Yup.string().matches(
+    /^((ftp|http|https):\/\/)?(www.)?(?!.*(ftp|http|https|www.))[a-zA-Z0-9_-]+(\.[a-zA-Z]+)+((\/)[\w#]+)*(\/\w+\?[a-zA-Z0-9_]+=\w+(&[a-zA-Z0-9_]+=\w+)*)?$/gm
+  ),
+});

src/validations/resetPasswordValidation.js

@@ -0,0 +1,6 @@
+import * as Yup from "yup";
+
+export default Yup.object().shape({
+  password: Yup.string().required().min(8),
+  passwordConfirm: Yup.string().oneOf([Yup.ref("password"), null]),
+});