Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CIF-1084 - Implement the password reset page #60

Merged
merged 5 commits into from
Sep 25, 2020
Merged

CIF-1084 - Implement the password reset page #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ef5946
CIF-1084 - Add reset password page
herzog31 Sep 21, 2020
d51d02d
CIF-1084 - Add reset password form component
herzog31 Sep 22, 2020
999d6a8
CIF-1084 - Add ResetPassword component
herzog31 Sep 23, 2020
e746317
Merge branch 'dev' into issue/CIF-1084-2
herzog31 Sep 23, 2020
287c52e
CIF-1084 - Add feedback
herzog31 Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ui.apps/src/main/content/jcr_root/apps/venia/components/commerce/resetpassword/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:title="Reset Password Form"
sling:resourceSuperType="core/cif/components/commerce/resetpassword/v1/resetpassword"
jcr:primaryType="cq:Component" />
44 changes: 44 additions & 0 deletions ...t/src/main/content/jcr_root/content/venia/language-masters/en/reset-password/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:lastModified="{Date}2020-09-17T16:00:12.953+02:00"
cq:lastModifiedBy="admin"
cq:template="/conf/venia/settings/wcm/templates/page-content"
jcr:primaryType="cq:PageContent"
jcr:title="Venia Demo Store - Reset Password"
sling:resourceType="venia/components/page"
pageTitle="Reset Password"
hideInNav="{Boolean}true">
<root
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container">
<container
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container">
<title
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/title"/>
<container
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container"
layout="responsiveGrid">
<title
jcr:created="{Date}2020-09-17T15:59:06.020+02:00"
jcr:createdBy="admin"
jcr:lastModified="{Date}2020-09-17T16:00:05.129+02:00"
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/title"/>
<resetpassword
jcr:created="{Date}2020-09-22T16:06:43.023+02:00"
jcr:createdBy="admin"
jcr:lastModified="{Date}2020-09-22T16:06:43.023+02:00"
jcr:lastModifiedBy="admin"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/commerce/resetpassword"/>
</container>
</container>
</root>
</jcr:content>
</jcr:root>
65 changes: 65 additions & 0 deletions ui.content/src/main/content/jcr_root/content/venia/us/en/reset-password/.content.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:lastModified="{Date}2020-09-17T16:03:08.083+02:00"
cq:lastModifiedBy="admin"
cq:lastRolledout="{Date}2020-09-17T16:03:08.085+02:00"
cq:lastRolledoutBy="admin"
cq:template="/conf/venia/settings/wcm/templates/page-content"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="cq:PageContent"
jcr:title="Venia Demo Store - Reset Password"
sling:resourceType="venia/components/page"
pageTitle="Reset Password"
hideInNav="{Boolean}true">
<root
cq:lastRolledout="{Date}2020-09-17T16:03:08.051+02:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container">
<container
cq:lastRolledout="{Date}2020-09-17T16:03:08.059+02:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container">
<title
cq:lastRolledout="{Date}2020-09-17T16:03:08.064+02:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/title"/>
<container
cq:lastRolledout="{Date}2020-09-17T16:03:08.073+02:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/container"
layout="responsiveGrid">
<title
cq:lastRolledout="{Date}2020-09-17T16:03:08.079+02:00"
cq:lastRolledoutBy="admin"
jcr:created="{Date}2020-09-17T15:59:06.020+02:00"
jcr:createdBy="admin"
jcr:lastModified="{Date}2020-09-17T16:03:08.075+02:00"
jcr:lastModifiedBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/title"/>
<resetpassword
cq:lastRolledout="{Date}2020-09-22T16:07:54.874+02:00"
cq:lastRolledoutBy="admin"
jcr:created="{Date}2020-09-22T16:06:43.023+02:00"
jcr:createdBy="admin"
jcr:lastModified="{Date}2020-09-22T16:06:43.023+02:00"
jcr:lastModifiedBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="venia/components/commerce/resetpassword"/>
</container>
</container>
</root>
</jcr:content>
</jcr:root>
8 changes: 7 additions & 1 deletion ui.frontend/src/main/components/App/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import {
AuthBar,
AccountContainer,
AddressBook,
BundleProductOptions
BundleProductOptions,
ResetPassword
} from '@adobe/aem-core-cif-react-components';

import i18n from './i18n';
Expand Down Expand Up @@ -62,6 +63,11 @@ const App = () => {
<AddressBook />
</Portal>
</Route>
<Route path={pagePaths.resetPassword}>
<Portal selector={mountingPoints.resetPasswordPage}>
<ResetPassword />
</Portal>
</Route>
<Portal selector={mountingPoints.bundleProductOptionsContainer}>
<BundleProductOptions />
</Portal>
Expand Down
6 changes: 4 additions & 2 deletions ui.frontend/src/main/components/App/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ export default {
cartTrigger: '.header__cartTrigger',
navPanel: 'aside.navigation__root',
bundleProductOptionsContainer: '#bundle-product-options',
minicart: '#minicart'
minicart: '#minicart',
resetPasswordPage: '#reset-password-page'
},
pagePaths: {
addressBook: '/content/venia/us/en/my-account/address-book.html'
addressBook: '/content/venia/us/en/my-account/address-book.html',
resetPassword: '/content/venia/us/en/reset-password.html'
}
};