Safet Purkovic пре 3 година
родитељ
комит
41811d2bee

+ 3
- 0
src/i18n/resources/rs.js Прегледај датотеку

usernameRequired: 'Potrebno je uneti korisničko ime.', usernameRequired: 'Potrebno je uneti korisničko ime.',
passwordRequired: 'Potrebno je uneti šifru.', passwordRequired: 'Potrebno je uneti šifru.',
forgotYourPassword: 'Zaboravio/la si šifru?', forgotYourPassword: 'Zaboravio/la si šifru?',
resetYourPassword: 'Nova šifra',
resetYourPasswordHelpText: 'Unesi novu šifru.',
forgotYourPasswordHelpText: 'Samo unesi e-mail adresu svog HR Center profila.', forgotYourPasswordHelpText: 'Samo unesi e-mail adresu svog HR Center profila.',
forgotYourPasswordButton: 'POŠALJI', forgotYourPasswordButton: 'POŠALJI',
forgotYourPasswordBackLink: 'Nazad na Login', forgotYourPasswordBackLink: 'Nazad na Login',
forgotYourPasswordConfimation: 'Proveri email adresu da bi resetovao šifru.', forgotYourPasswordConfimation: 'Proveri email adresu da bi resetovao šifru.',
passwordDontMatch: 'Šifre se ne poklapaju.',
// _useDifferentEmail: 'Use different email address or username', // _useDifferentEmail: 'Use different email address or username',
// get useDifferentEmail() { // get useDifferentEmail() {
// return this._useDifferentEmail; // return this._useDifferentEmail;

+ 4
- 0
src/pages/ForgotPasswordPage/ForgotPasswordConfirmationPageMUI.js Прегледај датотеку

import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import HrLogo from "../../assets/images/hrcenter.png"; import HrLogo from "../../assets/images/hrcenter.png";
import DiligLogo from "../../assets/images/logo_horizontal_black.png";
import { import {
Box, Box,
Container, Container,
{t('login.forgotYourPasswordBackLink')} {t('login.forgotYourPasswordBackLink')}
</Link> </Link>
</Grid> </Grid>
<div className="flex-center">
<img src={DiligLogo} style={{ margin: "70px auto 0px auto" }} />
</div>
</Box> </Box>
</Box> </Box>
</Container> </Container>

+ 4
- 0
src/pages/ForgotPasswordPage/ForgotPasswordPageMUI.js Прегледај датотеку

import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import * as Yup from 'yup'; import * as Yup from 'yup';
import HrLogo from "../../assets/images/hrcenter.png"; import HrLogo from "../../assets/images/hrcenter.png";
import DiligLogo from "../../assets/images/logo_horizontal_black.png";
import i18next from 'i18next'; import i18next from 'i18next';
import { import {
Box, Box,
{t('login.forgotYourPasswordBackLink')} {t('login.forgotYourPasswordBackLink')}
</Link> </Link>
</Grid> </Grid>
<div className="flex-center">
<img src={DiligLogo} style={{ margin: "70px auto 0px auto" }} />
</div>
</Box> </Box>
</Box> </Box>
</Container> </Container>

+ 17
- 17
src/pages/ForgotPasswordPage/ResetPasswordPageMUI.js Прегледај датотеку

import { useFormik } from 'formik'; import { useFormik } from 'formik';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
// import * as Yup from 'yup';
import DiligLogo from "../../assets/images/logo_horizontal_black.png";
import * as Yup from 'yup';
// import i18next from 'i18next'; // import i18next from 'i18next';
import HrLogo from "../../assets/images/hrcenter.png"; import HrLogo from "../../assets/images/hrcenter.png";

import { import {
Box, Box,
Container, Container,
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import { resetPassword } from '../../store/actions/login/loginActions'; import { resetPassword } from '../../store/actions/login/loginActions';


// const resetPasswordValidationSchema = Yup.object().shape({
// email: Yup.string()
// .required(i18next.t('forgotPassword.emailRequired'))
// .email(i18next.t('forgotPassword.emailFormat')),
// });
function getQueryVariable(variable) { function getQueryVariable(variable) {
var query = window.location.search.substring(1); var query = window.location.search.substring(1);
// console.log(query)//"app=article&act=news_content&aid=160990"
var vars = query.split("&"); var vars = query.split("&");
// console.log(vars) //[ 'app=article', 'act=news_content', 'aid=160990' ]
for (var i = 0; i < vars.length; i++) { for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("="); var pair = vars[i].split("=");
// console.log(pair)//[ 'app', 'article' ][ 'act', 'news_content' ][ 'aid', '160990' ]
if (pair[0] == variable) { return pair[1]; } if (pair[0] == variable) { return pair[1]; }
} }
return (false); return (false);
const handleClickShowConfirmPassword = () => setShowConfirmPassword(!showConfirmPassword); const handleClickShowConfirmPassword = () => setShowConfirmPassword(!showConfirmPassword);
const handleMouseDownConfirmPassword = () => setShowConfirmPassword(!showConfirmPassword); const handleMouseDownConfirmPassword = () => setShowConfirmPassword(!showConfirmPassword);


const resetPasswordValidationSchema = Yup.object().shape({
password: Yup.string().required(t("login.passwordRequired")),
confirmPassword: Yup.string().required(t("login.passwordRequired"))
.oneOf([Yup.ref('password'), null], t('login.passwordDontMatch'))
});


const handleSubmit = (values) => { const handleSubmit = (values) => {
const password = values.password; const password = values.password;
const confirmPassword = values.confirmPassword;
console.log(password);
console.log(confirmPassword);
if (password === confirmPassword)
// const confirmPassword = values.confirmPassword;
// if (password === confirmPassword)
{ {
const code = getQueryVariable('token'), const code = getQueryVariable('token'),
email = getQueryVariable('email');
email = getQueryVariable('email');
dispatch( dispatch(
resetPassword({ resetPassword({
code, code,
password: '', password: '',
confirmPassword: '', confirmPassword: '',
}, },
// validationSchema: resetPasswordValidationSchema,
validationSchema: resetPasswordValidationSchema,
onSubmit: handleSubmit, onSubmit: handleSubmit,
validateOnBlur: true, validateOnBlur: true,
enableReinitialize: true, enableReinitialize: true,
> >
<img src={HrLogo} className="login-logo" /> <img src={HrLogo} className="login-logo" />
<Typography variant="h5" sx={{ m: 2, mt: 3 }}> <Typography variant="h5" sx={{ m: 2, mt: 3 }}>
{t("login.forgotYourPassword")}
{t("login.resetYourPassword")}
</Typography> </Typography>
<Typography variant="p"> <Typography variant="p">
{t("login.forgotYourPasswordHelpText")}
{t("login.resetYourPasswordHelpText")}
</Typography> </Typography>
<Box <Box
component="form" component="form"
{t('login.forgotYourPasswordBackLink')} {t('login.forgotYourPasswordBackLink')}
</Link> </Link>
</Grid> </Grid>
<div className="flex-center">
<img src={DiligLogo} style={{ margin: "70px auto 0px auto" }} />
</div>
</Box> </Box>
</Box> </Box>
</Container> </Container>

Loading…
Откажи
Сачувај