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.

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

Feat: my account v2 (holidays) #18348

Merged
merged 213 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
213 commits
Select commit Hold shift + click to select a range
41950b3
CXSPA-4442: 1st version
scarai-sap Sep 18, 2023
4da3f6f
Add license header
github-actions[bot] Sep 18, 2023
e0ac698
CXSPA-4442: style fixing
scarai-sap Sep 18, 2023
038e246
CXSPA-4491: draft
i53577 Sep 18, 2023
083ab58
CXSPA-4442: style fixing
scarai-sap Sep 18, 2023
46c06b1
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 18, 2023
71f4a9e
CXSPA-4491: move code from feature/CXSPA-4492
i53577 Sep 18, 2023
0f3f6f4
CXSPA-4491: move code from feature/CXSPA-4492
i53577 Sep 18, 2023
6d50bf0
CXSPA-4491: adjust css to make pipeline happy
i53577 Sep 18, 2023
9475ca6
CXSPA-4442: adding msgstrips
scarai-sap Sep 18, 2023
fe6ba12
CXSPA-4442: adding UT for msgstrips
scarai-sap Sep 18, 2023
fda4262
CXSPA-4442: adding UT for msgstrips
scarai-sap Sep 19, 2023
89f03ca
CXSPA-4491: adjust css to make pipeline happy
i53577 Sep 19, 2023
e755f42
Merge branch 'develop-6.5.x' into feature/CXSPA-4491
i53577 Sep 19, 2023
73d66d8
New Notification Preference Component
Melody-zhou-512 Sep 19, 2023
05673ec
CXSPA-4491: adjust html to make pipeline happy
i53577 Sep 19, 2023
dca33a0
Merge branch 'feature/CXSPA-4491' of spa:/SAP/spartacus into feature/…
i53577 Sep 19, 2023
eda046a
Changes from code review comments
Melody-zhou-512 Sep 19, 2023
6e4bdc5
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
scarai-sap Sep 19, 2023
7000bfb
CXSPA-4442: update code after code review
scarai-sap Sep 19, 2023
6dd8a39
CXSPA-4442: fix styling
scarai-sap Sep 19, 2023
cb980ae
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 19, 2023
ffe2659
CXSPA-4491: add cms config for NewConsentManagementComponent
i53577 Sep 19, 2023
f75fcec
Empty-Commit
scarai-sap Sep 19, 2023
e199b71
CXSPA-4491: add css
i53577 Sep 19, 2023
5ccd2e1
CXSPA-4442: fix styling
scarai-sap Sep 20, 2023
e711722
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
scarai-sap Sep 20, 2023
3aaebae
add cms config
Melody-zhou-512 Sep 20, 2023
f86aa98
Merge branch 'develop-6.5.x' into feature/CXSPA-4468
Melody-zhou-512 Sep 20, 2023
1975843
Empty-Commit
i53577 Sep 20, 2023
f55ff3f
Merge branch 'develop-6.5.x' into feature/CXSPA-4491
i53577 Sep 20, 2023
e6a3637
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 20, 2023
78525df
CXSPA-4491: add reject all and clear all button
i53577 Sep 21, 2023
75561b3
Merge branch 'feature/CXSPA-4491' of spa:/SAP/spartacus into feature/…
i53577 Sep 21, 2023
1f6e66e
Merge branch 'develop-6.5.x' into feature/CXSPA-4491
i53577 Sep 21, 2023
2aca4e0
Merge branch 'feature/CXSPA-4491' of spa:/SAP/spartacus into feature/…
i53577 Sep 21, 2023
46097a7
update code to v2
scarai-sap Sep 21, 2023
47bd8be
CXSPA-4442: fix issue
scarai-sap Sep 21, 2023
4f7ad4e
CXSPA-4442: Create new combined component
scarai-sap Sep 21, 2023
8b5cc73
CXSPA-4442: For yarn prettier:fix
scarai-sap Sep 21, 2023
0bdf105
Add license header
github-actions[bot] Sep 21, 2023
38efa8c
CXSPA-4442: For UT
scarai-sap Sep 21, 2023
196e776
CXSPA-4442: update css
scarai-sap Sep 21, 2023
da11e24
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 21, 2023
f6a3f2e
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
scarai-sap Sep 21, 2023
b5d0659
CXSPA-4491: adjust code to make sonar happy
i53577 Sep 21, 2023
828a191
Empty-Commit
i53577 Sep 21, 2023
11cb105
CXSPA-4491: adjust code as comments
i53577 Sep 21, 2023
731e50a
CXSPA-4491: revert change for consentManagementComponentService
i53577 Sep 21, 2023
fab5db9
CXSPA-4442: adding padding as code reviewer suggested
scarai-sap Sep 21, 2023
14bcac0
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 21, 2023
26be22c
CXSPA-4442: adding padding as code reviewer v2
scarai-sap Sep 21, 2023
e718574
CXSPA-4442: Adjust edit button
scarai-sap Sep 21, 2023
1d75022
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
scarai-sap Sep 22, 2023
ffd2a17
Adapt codes as comments
Melody-zhou-512 Sep 22, 2023
47e8f9b
adapt codes as some checks
Melody-zhou-512 Sep 22, 2023
4135a20
Merge branch 'develop-6.5.x' into feature/CXSPA-4468
Melody-zhou-512 Sep 22, 2023
311a6af
CXSPA-4442: Adjust line
scarai-sap Sep 22, 2023
5b6bef0
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Sep 22, 2023
40bd73c
rerun pp
scarai-sap Sep 22, 2023
b0ce6ac
trigger pp again
scarai-sap Sep 22, 2023
9aef2b7
Merge branch 'develop-6.5.x' into feature/CXSPA-4491
i53577 Sep 22, 2023
c93b406
Empty-Commit
i53577 Sep 25, 2023
81469df
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
giancorderoortiz Oct 1, 2023
80de133
Merge branch 'develop-6.5.x' into feature/CXSPA-4491
giancorderoortiz Oct 1, 2023
14a1af8
bug fix: CDC installation Issue (#17898)
anjana-bl Oct 5, 2023
745466c
fix: add FeaturesConfigModule to CheckoutReviewSubmitModule (#17921)
rmch91 Oct 6, 2023
61fd9cd
chore: release 6.5.1 (#17930)
kpawelczak Oct 10, 2023
4750d94
Merge branch 'develop-6.5.x' into feature/CXSPA-4442
scarai-sap Nov 21, 2023
2e75c7c
Merge branch 'develop-6.7.x' of https://github.com/SAP/spartacus into…
scarai-sap Nov 21, 2023
f970e74
Merge branch 'develop-6.7.x' into feature/CXSPA-4491
i53577 Nov 21, 2023
a2b4e84
rename v1
scarai-sap Nov 21, 2023
47b4c2a
rename v2
scarai-sap Nov 21, 2023
c3f771b
CXSPA-4442: update code with rename and test
scarai-sap Nov 21, 2023
7c02b5b
CXSPA-4442: Fix issue for i18n
scarai-sap Nov 21, 2023
d18ffff
CXSPA-8132: rename files with myaccountv2
i53577 Nov 21, 2023
7960594
CXSPA-4442: Fix issue can;'t display properly
scarai-sap Nov 22, 2023
d9081e2
CXSPA-4442: use USE_MY_ACCOUNT_V2_PROFILE and USE_MY_ACCOUNT_V2_EMAIL
scarai-sap Nov 22, 2023
29ab549
CXSPA-4442: Fix format
scarai-sap Nov 22, 2023
05c5d38
Add license header
github-actions[bot] Nov 22, 2023
7d4e7b6
CXSPA-4442: Fix format
scarai-sap Nov 22, 2023
2e1bae1
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Nov 22, 2023
eb3965a
CXSPA-4491:add feature flag
i53577 Nov 22, 2023
1c212fc
Add license header
github-actions[bot] Nov 22, 2023
7b0032e
CXSPA-4491:add feature flag
i53577 Nov 22, 2023
47adac1
Add license header
github-actions[bot] Nov 22, 2023
83ae771
CXSPA-4491:formate code
i53577 Nov 22, 2023
14f652b
Merge branch 'feature/CXSPA-4491' of spa:/SAP/spartacus into feature/…
i53577 Nov 22, 2023
98b4323
CXSPA-4442: make feature available in lib level
scarai-sap Nov 22, 2023
8dd9b10
Merge remote-tracking branch 'origin/develop-6.7.x' into feature/CXSP…
Melody-zhou-512 Nov 22, 2023
9fb3bde
Merge branch 'develop-6.7.x' into feature/CXSPA-4442
scarai-sap Nov 22, 2023
487876f
test for update dependencies.json
scarai-sap Nov 22, 2023
2df7929
enable feature flag for update password
evy-yang01 Nov 22, 2023
a7f5a82
Add license header
github-actions[bot] Nov 23, 2023
1f86c76
CXSPA-4442: Add IT and bug fixing
scarai-sap Nov 23, 2023
7ec37e2
Add e2e test
evy-yang01 Nov 23, 2023
9881526
Merge branch 'feature/CXSPA-4455-new' of https://github.com/SAP/spart…
evy-yang01 Nov 23, 2023
110d6f4
update code with rename relocate and fix css issue
scarai-sap Nov 23, 2023
1c03474
format prettier
scarai-sap Nov 23, 2023
209ffd6
CXSPA-4491:add feature flag binding
i53577 Nov 24, 2023
1454820
CXSPA-4491: fix ut
i53577 Nov 24, 2023
5abb88b
add feature flag
Melody-zhou-512 Nov 24, 2023
3e75acd
Merge branch 'develop-6.7.x' into feature/CXSPA-4442
scarai-sap Nov 24, 2023
9a71df7
CXSPA-4442: Fix typo
scarai-sap Nov 24, 2023
a36c3f0
add feature flags
Melody-zhou-512 Nov 24, 2023
562a124
Merge remote-tracking branch 'origin/develop-6.7.x' into feature/CXSP…
Melody-zhou-512 Nov 24, 2023
b4a875d
CXSPA-4498: add e2e tests
i53577 Nov 24, 2023
c9c5723
CXSPA-4491: formate code
i53577 Nov 24, 2023
2be1658
Merge branch 'feature/CXSPA-4498' into feature/CXSPA-4491
i53577 Nov 24, 2023
51feb39
Merge branch 'develop-6.7.x' into feature/CXSPA-4491
i53577 Nov 24, 2023
70eb5c2
fix issue
Melody-zhou-512 Nov 24, 2023
060aa75
remove useless space
evy-yang01 Nov 24, 2023
f0b8c92
sync files
evy-yang01 Nov 24, 2023
1b3eeac
add feature flag
Melody-zhou-512 Nov 24, 2023
67619b5
Merge branch 'feature/CXSPA-4442' into feature/CXSPA-4455-new
evy-yang01 Nov 24, 2023
c827cb5
fix issue
Melody-zhou-512 Nov 24, 2023
9eed9e2
fix sonar issue
Melody-zhou-512 Nov 24, 2023
352025f
fix issue
Melody-zhou-512 Nov 24, 2023
f9ae452
Merge branch 'develop-6.7.x' into feature/CXSPA-4442
scarai-sap Nov 27, 2023
3a9acd3
Merge remote-tracking branch 'origin/develop-6.7.x' into feature/CXSP…
Melody-zhou-512 Nov 27, 2023
3e1b125
fix check issue
Melody-zhou-512 Nov 27, 2023
c1f105e
CXSPA-4491: add index
i53577 Nov 27, 2023
1260f2f
Merge branch 'develop-6.7.x' into feature/CXSPA-4491
i53577 Nov 27, 2023
ae071f3
CXSPA-4491: add provider to spartacus-features.module.ts
i53577 Nov 28, 2023
fe9fdbc
Merge branch 'develop-6.7.x' into feature/CXSPA-4491
i53577 Nov 28, 2023
3fc180e
add e2e test
Melody-zhou-512 Nov 28, 2023
979710c
Merge remote-tracking branch 'origin/develop-6.7.x' into feature/CXSP…
Melody-zhou-512 Nov 28, 2023
430e520
fix sonar issue
Melody-zhou-512 Nov 28, 2023
996641f
fix e2e test issue
Melody-zhou-512 Nov 28, 2023
5260493
Merge remote-tracking branch 'origin/develop-6.7.x' into feature/CXSP…
Melody-zhou-512 Nov 30, 2023
99c23d1
CXSPA-4491: add traceability to e2e test
i53577 Nov 30, 2023
872c67e
Merge branch 'develop-6.7.x' into feature/CXSPA-4491
i53577 Nov 30, 2023
f202ec4
Merge branch 'feature/CXSPA-4442' of https://github.com/SAP/spartacus…
scarai-sap Dec 1, 2023
de9637f
Merge branch 'feature/CXSPA-4491' of https://github.com/SAP/spartacus…
scarai-sap Dec 1, 2023
7ac485a
integrate all
scarai-sap Dec 1, 2023
aacc219
Fix issue reported by QA
scarai-sap Dec 4, 2023
49977cc
fix: CXSPA-5565(Consent) : If enable all consent when there has one c…
i53577 Dec 8, 2023
0bbb60a
CXSPA-4736, accessibility test for my account v2 update password view
evy-yang01 Dec 11, 2023
c2576e5
Revert "CXSPA-4736, accessibility test for my account v2 update passw…
evy-yang01 Dec 11, 2023
4451fdd
CXSPA-5564: fix long name and email
scarai-sap Dec 11, 2023
e13925a
test:CXSPA-4736, Develop E2E and accessibility tests for Update Passw…
evy-yang01 Dec 12, 2023
84b61b5
Merge branch 'develop-6.8.x' into feature/my-account-v2-holidays
i53577 Jan 9, 2024
0f992b2
Add license header
github-actions[bot] Jan 9, 2024
a2a59c5
fix sonar issue
i53577 Jan 10, 2024
8814848
use padding instead of padding-right
i53577 Jan 10, 2024
d04eae0
Trigger Build
i53577 Jan 11, 2024
beb9400
Trigger Build
i53577 Jan 11, 2024
818464f
Trigger Build
i53577 Jan 11, 2024
b89e22a
Merge branch 'develop-6.8.x' into feature/my-account-v2-holidays
i53577 Jan 12, 2024
ad8d197
fix e2e tests
i53577 Jan 12, 2024
442a27b
Merge branch 'feature/my-account-v2-holidays' of spa:/SAP/spartacus i…
i53577 Jan 12, 2024
892221d
fix e2e tests
i53577 Jan 15, 2024
606c95f
revert change on env-cmdrc
i53577 Jan 15, 2024
c4a5807
Merge branch 'develop-6.8.x' into feature/my-account-v2-holidays
i53577 Jan 15, 2024
e8f3c71
Merge branch 'develop-6.8.x' into feature/my-account-v2-holidays
i53577 Jan 18, 2024
e9d0b24
fix: make approved time in seperate line
i53577 Jan 18, 2024
1e3956b
fix: CXSPA-5853
Jan 22, 2024
a781935
Merge branch 'develop-6.8.x' into feature/my-account-v2-holidays
i53577 Jan 22, 2024
1a0ca75
fix: CXSPA-5853
i53577 Jan 24, 2024
f56baa9
Merge latest develop-next-major
i53577 Jan 24, 2024
7a42b7f
fix UT
i53577 Jan 24, 2024
6c860d0
Merge latest develop-next-major
i53577 Jan 24, 2024
f2f3293
Merge branch 'develop-next-major' into feature/my-account-v2-holidays
scarai-sap Jan 31, 2024
e1dcd42
For changes (#18438)
scarai-sap Feb 1, 2024
39eda15
address part of comments
i53577 Feb 1, 2024
6d9d2fe
address part of comments
i53577 Feb 1, 2024
852973f
remove unused ToolHeaderUtilitySeparator.
i53577 Feb 1, 2024
cbd82f1
rename files
i53577 Feb 1, 2024
5782a5e
rename files
i53577 Feb 1, 2024
89c68f4
use inject instead of constructor
i53577 Feb 1, 2024
bf9aa11
rename feature flags
i53577 Feb 1, 2024
9ecd84e
rename css
i53577 Feb 1, 2024
8eb5392
rename css
i53577 Feb 1, 2024
8e65d6d
revert change in env-cmdrc
i53577 Feb 1, 2024
0f0cb79
Update accessibility test for my account email & profile (#18183)
scarai-sap Feb 1, 2024
7fa73f8
Add license header
github-actions[bot] Feb 1, 2024
9cdc75c
Merge branch 'develop-next-major' into feature/my-account-v2-holidays
scarai-sap Feb 1, 2024
3f1f1fc
update code based on comments
scarai-sap Feb 1, 2024
85941c0
formate code
i53577 Feb 2, 2024
b9b3f67
Trigger Build
i53577 Feb 2, 2024
4485fa0
revert cdc changes
scarai-sap Feb 3, 2024
448735b
Merge branch 'feature/my-account-v2-holidays' of https://github.com/S…
scarai-sap Feb 3, 2024
0b89476
add new line
scarai-sap Feb 3, 2024
91b9e3d
update code for comments
scarai-sap Feb 5, 2024
778f38d
Using flexbox
scarai-sap Feb 5, 2024
31a6e26
Update code based on comments
scarai-sap Feb 5, 2024
f306afe
Merge branch 'develop-next-major' into feature/my-account-v2-holidays
scarai-sap Feb 5, 2024
9bf82b6
use relative path
scarai-sap Feb 5, 2024
2de41de
Merge branch 'feature/my-account-v2-holidays' of https://github.com/S…
scarai-sap Feb 5, 2024
569c68a
declear interface
scarai-sap Feb 5, 2024
52e043e
test again
scarai-sap Feb 5, 2024
102f0e8
Fix UT
scarai-sap Feb 5, 2024
4594f84
Fix code style
scarai-sap Feb 5, 2024
6cfc28b
chore: create json files for migrations (#18447)
kpawelczak Feb 5, 2024
e4cdc1c
Update code based on comments
scarai-sap Feb 6, 2024
1fdf6ca
relocate code
scarai-sap Feb 6, 2024
8f3bcec
Merge branch 'develop-next-major' into feature/my-account-v2-holidays
scarai-sap Feb 6, 2024
3382a10
Update code for self review
scarai-sap Feb 6, 2024
66e2412
Merge branch 'feature/my-account-v2-holidays' of https://github.com/S…
scarai-sap Feb 6, 2024
94701f0
update code
scarai-sap Feb 6, 2024
6784a7e
update changes
scarai-sap Feb 6, 2024
660bfd4
update for code style
scarai-sap Feb 6, 2024
2651607
update for code style
scarai-sap Feb 6, 2024
f350d4a
update code with not using bootstrap
scarai-sap Feb 7, 2024
fc22ba6
remove important
scarai-sap Feb 7, 2024
4be3653
Add name for it
scarai-sap Feb 7, 2024
1a43ef1
update code and fix UT
scarai-sap Feb 7, 2024
40a0bb6
Update css as suggested
scarai-sap Feb 8, 2024
700f2a1
fix style
scarai-sap Feb 8, 2024
5e5904b
Merge branch 'develop' into feature/my-account-v2-holidays
scarai-sap Feb 8, 2024
08eceaf
have the checkbox focus size and placement fixed before mergin
scarai-sap Feb 8, 2024
1d03ba8
Merge branch 'feature/my-account-v2-holidays' of https://github.com/S…
scarai-sap Feb 8, 2024
88a3d57
use checkbox as suggested
scarai-sap Feb 9, 2024
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
File renamed without changes.
1 change: 1 addition & 0 deletions docs/migration/2211_0/migration-comments-api-elements.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
1 change: 1 addition & 0 deletions docs/migration/2211_0/migration-comments-members.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
1 change: 1 addition & 0 deletions docs/migration/2211_0/renamed-api-mappings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
3 changes: 2 additions & 1 deletion feature-libs/user/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
$skipComponentStyles: () !default;
$selectors: cx-address-book, cx-address-form, cx-suggested-addresses-dialog,
cx-login, cx-login-form, cx-register, cx-reset-password, cx-close-account,
cx-close-account-modal !default;
cx-close-account-modal, cx-my-account-v2-profile, cx-my-account-v2-email,
cx-my-account-v2-password !default;

@each $selector in $selectors {
#{$selector} {
Expand Down
6 changes: 6 additions & 0 deletions feature-libs/user/profile/assets/translations/en/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
* SPDX-License-Identifier: Apache-2.0
*/

import { myAccountV2UserProfile } from './my-account-v2-user-profile.18n';
import { myAccountV2Email } from './my-account-v2-email.18n';
import { myAccountV2Password } from './my-account-v2-password.i18n';
import userProfile from './userProfile.json';
import address from './address.json';

export const en = {
userProfile,
myAccountV2UserProfile,
myAccountV2Email,
myAccountV2Password,
address,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
* SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
*
* SPDX-License-Identifier: Apache-2.0
*/

export const myAccountV2Email = {
myAccountV2Email: {
myEmailAddress: 'My Email Address',
email: 'Email',
emailAddress: 'Email Address',
newEmailAddress: 'New Email Address',
confirmNewEmailAddress: 'Confirm New Email Address',
emailPlaceHolder: 'Enter email',
passwordPlaceHolder: 'Enter password',
password: 'Password',
reloginIndicator:
'You need to log in again after setting a new email address.',
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
* SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
*
* SPDX-License-Identifier: Apache-2.0
*/

export const myAccountV2Password = {
myAccountV2PasswordForm: {
oldPassword: {
label: 'Old Password',
placeholder: 'Enter Old Password',
},
oldPasswordIsRequired: 'Old password is required.',
newPassword: {
label: 'New Password',
placeholder: 'Enter New Password',
},
passwordMinRequirements:
'Password must be six characters minimum, with one uppercase letter, one number, one symbol',
confirmPassword: {
label: 'Confirm New Password',
placeholder: 'Confirm New Password',
},
reloginIndicator: 'You need to log in again after setting password.',
bothPasswordMustMatch: 'Both password must match',
passwordUpdateSuccess: 'Password updated with success',
accessDeniedError: 'Access is denied',
newPasswordTitle: 'My Password',
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
* SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
*
* SPDX-License-Identifier: Apache-2.0
*/

export const myAccountV2UserProfile = {
myAccountV2UserProfile: {
myEmailAddress: 'My Email Address',
myInformation: 'My Information',
name: 'Name',
customerId: 'CustomerId',
title: 'Title',
firstName: 'First name',
lastName: 'Last name',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export const userProfileTranslations: TranslationResources = {

export const userProfileTranslationChunksConfig: TranslationChunksConfig = {
userProfile: ['updateEmailForm', 'register', 'forgottenPassword'],
myAccountV2UserProfile: ['myAccountV2UserProfile'],
myAccountV2Email: ['myAccountV2Email'],
myAccountV2Password: ['myAccountV2PasswordForm'],
address: [
'addressForm',
'addressBook',
Expand Down
2 changes: 2 additions & 0 deletions feature-libs/user/profile/components/update-email/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
export * from './update-email-component.service';
export * from './update-email.component';
export * from './update-email.module';
export * from './use-my-account-v2-email.ts';
export * from './my-account-v2-email.component';
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<cx-spinner
class="overlay"
*ngIf="(isUpdating$ | async) || !(user$ | async); $"
>
</cx-spinner>
<div>
<div class="flex-line">
<label class="headertext"
>{{ 'myAccountV2Email.myEmailAddress' | cxTranslate }}
</label>
<button class="editButton" *ngIf="!isEditing" (click)="onEdit()">
{{ 'common.edit' | cxTranslate }}
</button>
</div>
<div>
<div *ngIf="!isEditing">
<div class="flex-line">
<label class="text-head">
{{ 'myAccountV2Email.email' | cxTranslate }}
</label>
<label class="value">
{{ (user$ | async)?.uid }}
</label>
</div>
</div>
</div>
<cx-message
*ngIf="isEditing && showingAlert"
[text]="'myAccountV2Email.reloginIndicator' | cxTranslate"
[type]="globalMessageType.MSG_TYPE_INFO"
(closeMessage)="closeDialogConfirmationAlert()"
></cx-message>
<div *ngIf="isEditing" class="email-editing-area">
<form (ngSubmit)="onSubmit()" [formGroup]="form">
<label>
<span class="text-head">{{
'myAccountV2Email.emailAddress' | cxTranslate
}}</span>
<input
type="text"
class="form-control"
[value]="(user$ | async)?.uid"
readonly
/>
</label>

<label>
<span class="text-head">{{
'myAccountV2Email.newEmailAddress' | cxTranslate
}}</span>
<input
required="true"
type="email"
name="email"
formControlName="email"
placeholder="{{ 'myAccountV2Email.emailPlaceHolder' | cxTranslate }}"
class="form-control"
/>
<cx-form-errors [control]="form.get('email')"></cx-form-errors>
</label>

<label>
<span class="text-head">{{
'myAccountV2Email.confirmNewEmailAddress' | cxTranslate
}}</span>
<input
required="true"
type="email"
name="confirmEmail"
formControlName="confirmEmail"
placeholder="{{ 'myAccountV2Email.emailPlaceHolder' | cxTranslate }}"
class="form-control"
/>
<cx-form-errors [control]="form.get('confirmEmail')"></cx-form-errors>
</label>

<label>
<span class="label-content, text-head">{{
'myAccountV2Email.password' | cxTranslate
}}</span>
<input
required="true"
type="password"
name="password"
formControlName="password"
placeholder="{{
'myAccountV2Email.passwordPlaceHolder' | cxTranslate
}}"
class="form-control"
autocomplete="new-password"
[attr.aria-label]="
'myAccountV2Email.passwordPlaceHolder' | cxTranslate
"
cxPasswordVisibilitySwitch
/>
<cx-form-errors [control]="form.get('password')"></cx-form-errors>
</label>

<div class="btn-group-row">
<div class="btn-group">
<button class="btn button-cancel button" (click)="cancelEdit()">
{{ 'common.cancel' | cxTranslate }}
</button>
<button
class="btn btn-primary button"
(click)="onSubmit()"
[disabled]="form.disabled"
>
{{ 'common.save' | cxTranslate }}
</button>
</div>
</div>
</form>
</div>
</div>
Loading
Loading