robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update user and password

Browse Source
This commit is contained in:
robbond
2021-11-01 14:56:19 +00:00
parent 5c422726ef
commit 9232d073e3
8 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/account/changepassword.js
+21 -2
View File
@@ -1,6 +1,6 @@
import Link from "next/link";
import _ from "lodash";
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import {
@@ -10,6 +10,7 @@ import {
getFormSubmitErrors,
} from "redux-form";
import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import { updatePassword } from "../../actions";
const RenderTextfield = ({
id,
@@ -75,6 +76,10 @@ const ChangePassword = (props) => {
let errorsobj = {};
const onHandleSubmit = (values) => {
let contactid = props.props.accountDetails.loggedinUserId;
let updateBody = props.props.form.changepasswordForm.values.newpassword;
console.log(contactid, updateBody);
updatePassword(contactid, updateBody);
setPasswordUpdated(true);
};
@@ -123,12 +128,25 @@ const ChangePassword = (props) => {
>
Continue
</button>
<Link
href={
"/myportal?q=" +
props.accountDetails.loggedinUserId
}
>
<a className="govuk-link">Cancel</a>
</Link>
</div>
</form>
) : (
<>
<p className="govuk-body">
<Link href="/myportal">
<Link
href={
"/myportal?q=" +
props.accountDetails.loggedinUserId
}
>
<a className="govuk-link">Go to My Portal</a>
</Link>
</p>
@@ -144,6 +162,7 @@ const mapStateToProps = (state) => {
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
accountDetails: state.accountDetails,
//form: state.form,
};
};
components/account/personaldetails.js
+8
View File
@@ -226,6 +226,14 @@ let PersonalDetails = (props) => {
>
Continue
</button>
<Link
href={
"/myportal?q=" +
props.props.accountDetails.loggedinUserId
}
>
<a className="govuk-link">Cancel</a>
</Link>
</div>
</form>
) : (
components/account/personaldetailsCheck.js
+16 -10
View File
@@ -1,4 +1,5 @@
import _ from "lodash";
import Link from "next/link";
import React, { useState } from "react";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
@@ -39,7 +40,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#firstname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -62,7 +63,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#lastname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -86,7 +87,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#emailaddress1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -110,7 +111,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#telephone1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -133,7 +134,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -161,7 +162,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#address1_line1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -185,7 +186,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#address1_line2"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -209,7 +210,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#address1_city"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -233,7 +234,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#address1_county"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -257,7 +258,7 @@ const BuildCheckPersonalDetails = (props) => {
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#"
href="#address1_postalcode"
onClick={() => {
setPersonalDetailsComplete(false);
}}
@@ -282,6 +283,11 @@ const BuildCheckPersonalDetails = (props) => {
>
Continue
</button>
<Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
>
<a className="govuk-link">Cancel</a>
</Link>
</div>
</>
);
components/breadcrumbs.js
+8 -4
View File
@@ -366,9 +366,11 @@ const Breadcrumbs = (props) => {
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
router.locale == "cy"
? router.locale + "/myportal"
: "/myportal"
: "/myportal?q=" +
props.props.accountDetails
.loggedinUserId
}
>
<a className="govuk-breadcrumbs__link">
@@ -397,9 +399,11 @@ const Breadcrumbs = (props) => {
<li className="govuk-breadcrumbs__list-item">
<Link
href={
router.locale != "en"
router.locale == "cy"
? router.locale + "/myportal"
: "/myportal"
: "/myportal?q=" +
props.props.accountDetails
.loggedinUserId
}
>
<a className="govuk-breadcrumbs__link">
components/main.js
+2 -2
View File
@@ -28,8 +28,8 @@ export default function Home({ children, pages }) {
<CaseSearch />
<CaseComment />
<Dns />
{/*<Login />
<Inspectorate /> */}
<Login />
{/* <Inspectorate /> */}
</div>
</div>
</div>
pages/account/changepassword.js
+2 -1
View File
@@ -53,7 +53,7 @@ const Home = (props) => {
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-width-container">
<Breadcrumbs slug={appealtypes} />
<Breadcrumbs slug={appealtypes} props={props} />
<main
className="govuk-main-wrapper--auto-spacing"
id="main-content"
@@ -108,6 +108,7 @@ const mapStateToProps = (state) => {
appealType: state.appealType,
LPAData: state.LPAData,
form: state.form,
accountDetails: state.accountDetails,
};
};
pages/account/personaldetails.js
+1 -1
View File
@@ -50,7 +50,7 @@ const Home = (props) => {
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-width-container">
<Breadcrumbs slug={appealtypes} />
<Breadcrumbs slug={appealtypes} props={props} />
<main
className="govuk-main-wrapper--auto-spacing"
id="main-content"
pages/myportal/index.js
+3 -18
View File
@@ -16,6 +16,7 @@ import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import data from "../../data/collections.json";
import nookies from "nookies";
import { getFormCollectionByID } from "../../components/utils";
import {
setLoggedInUserId,
setAccountDetails,
@@ -222,15 +223,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
}
);
const getFormCollection = (formtype) => {
const collectionName = jsonpath.query(
data,
"$..[?(@.LogicalName=='" + formtype + "')].LogicalCollectionName"
);
//console.log(collectionName[0]);
return collectionName[0];
};
const getDetails = (token, resultsObj) => {
//console.log(resultsObj);
let detailsArr = [];
@@ -242,19 +234,12 @@ const getDetails = (token, resultsObj) => {
detailsArr.push(
getPortalModuelDetails(
token,
getFormCollection(
"pinswg_" +
searchDetail[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
]
.replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
.toLowerCase()
.slice(0, 39)
),
getFormCollectionByID(searchDetail.pinswg_appealcasetype),
searchDetail.ticketnumber
)
);
}
ß;
});
//console.log(detailsArr);
return Promise.all(detailsArr);