Merge pull request #17604 from mozilla/rename-reset-password-redesign…

…-folder rename ResetPasswordRedesign folder to ResetPassword
mozilla · Sep 13, 2024 · dea2cd7 · dea2cd7
2 parents f8eaff4 + b7d3616
commit dea2cd7
Show file tree

Hide file tree

Showing 40 changed files with 10 additions and 11 deletions.
diff --git a/packages/fxa-settings/src/components/App/index.tsx b/packages/fxa-settings/src/components/App/index.tsx
@@ -53,12 +53,12 @@ import Legal from '../../pages/Legal';
 import LegalPrivacy from '../../pages/Legal/Privacy';
 import LegalTerms from '../../pages/Legal/Terms';
 import ThirdPartyAuthCallback from '../../pages/PostVerify/ThirdPartyAuthCallback';
-import ResetPasswordContainer from '../../pages/ResetPasswordRedesign/ResetPassword/container';
-import ConfirmResetPasswordContainer from '../../pages/ResetPasswordRedesign/ConfirmResetPassword/container';
-import CompleteResetPasswordContainer from '../../pages/ResetPasswordRedesign/CompleteResetPassword/container';
-import AccountRecoveryConfirmKeyContainer from '../../pages/ResetPasswordRedesign/AccountRecoveryConfirmKey/container';
-import ResetPasswordConfirmed from '../../pages/ResetPasswordRedesign/ResetPasswordConfirmed';
-import ResetPasswordWithRecoveryKeyVerified from '../../pages/ResetPasswordRedesign/ResetPasswordWithRecoveryKeyVerified';
+import ResetPasswordContainer from '../../pages/ResetPassword/ResetPassword/container';
+import ConfirmResetPasswordContainer from '../../pages/ResetPassword/ConfirmResetPassword/container';
+import CompleteResetPasswordContainer from '../../pages/ResetPassword/CompleteResetPassword/container';
+import AccountRecoveryConfirmKeyContainer from '../../pages/ResetPassword/AccountRecoveryConfirmKey/container';
+import ResetPasswordConfirmed from '../../pages/ResetPassword/ResetPasswordConfirmed';
+import ResetPasswordWithRecoveryKeyVerified from '../../pages/ResetPassword/ResetPasswordWithRecoveryKeyVerified';
 import CompleteSigninContainer from '../../pages/Signin/CompleteSignin/container';
 import SigninContainer from '../../pages/Signin/container';
 import ReportSigninContainer from '../../pages/Signin/ReportSignin/container';

diff --git a/...n/AccountRecoveryConfirmKey/container.tsx → ...d/AccountRecoveryConfirmKey/container.tsx b/...n/AccountRecoveryConfirmKey/container.tsx → ...d/AccountRecoveryConfirmKey/container.tsx
diff --git a/...Redesign/AccountRecoveryConfirmKey/en.ftl → ...Password/AccountRecoveryConfirmKey/en.ftl b/...Redesign/AccountRecoveryConfirmKey/en.ftl → ...Password/AccountRecoveryConfirmKey/en.ftl
diff --git a/...Redesign/AccountRecoveryConfirmKey/gql.ts → ...Password/AccountRecoveryConfirmKey/gql.ts b/...Redesign/AccountRecoveryConfirmKey/gql.ts → ...Password/AccountRecoveryConfirmKey/gql.ts
diff --git a/...countRecoveryConfirmKey/index.stories.tsx → ...countRecoveryConfirmKey/index.stories.tsx b/...countRecoveryConfirmKey/index.stories.tsx → ...countRecoveryConfirmKey/index.stories.tsx
@@ -9,7 +9,7 @@ import { withLocalization } from 'fxa-react/lib/storybooks';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/AccountRecoveryConfirmKey',
+  title: 'Pages/ResetPassword/AccountRecoveryConfirmKey',
   component: AccountRecoveryConfirmKey,
   decorators: [withLocalization],
 } as Meta;

diff --git a/.../AccountRecoveryConfirmKey/index.test.tsx → .../AccountRecoveryConfirmKey/index.test.tsx b/.../AccountRecoveryConfirmKey/index.test.tsx → .../AccountRecoveryConfirmKey/index.test.tsx
diff --git a/...esign/AccountRecoveryConfirmKey/index.tsx → ...sword/AccountRecoveryConfirmKey/index.tsx b/...esign/AccountRecoveryConfirmKey/index.tsx → ...sword/AccountRecoveryConfirmKey/index.tsx
diff --git a/...n/AccountRecoveryConfirmKey/interfaces.ts → ...d/AccountRecoveryConfirmKey/interfaces.ts b/...n/AccountRecoveryConfirmKey/interfaces.ts → ...d/AccountRecoveryConfirmKey/interfaces.ts
diff --git a/...esign/AccountRecoveryConfirmKey/mocks.tsx → ...sword/AccountRecoveryConfirmKey/mocks.tsx b/...esign/AccountRecoveryConfirmKey/mocks.tsx → ...sword/AccountRecoveryConfirmKey/mocks.tsx
diff --git a/...esign/CompleteResetPassword/container.tsx → ...sword/CompleteResetPassword/container.tsx b/...esign/CompleteResetPassword/container.tsx → ...sword/CompleteResetPassword/container.tsx
diff --git a/...wordRedesign/CompleteResetPassword/en.ftl → ...esetPassword/CompleteResetPassword/en.ftl b/...wordRedesign/CompleteResetPassword/en.ftl → ...esetPassword/CompleteResetPassword/en.ftl
diff --git a/...n/CompleteResetPassword/index.stories.tsx → ...d/CompleteResetPassword/index.stories.tsx b/...n/CompleteResetPassword/index.stories.tsx → ...d/CompleteResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import { Subject } from './mocks';
 import CompleteResetPassword from '.';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/CompleteResetPassword',
+  title: 'Pages/ResetPassword/CompleteResetPassword',
   component: CompleteResetPassword,
   decorators: [withLocalization],
 } as Meta;

diff --git a/...sign/CompleteResetPassword/index.test.tsx → ...word/CompleteResetPassword/index.test.tsx b/...sign/CompleteResetPassword/index.test.tsx → ...word/CompleteResetPassword/index.test.tsx
diff --git a/...dRedesign/CompleteResetPassword/index.tsx → ...tPassword/CompleteResetPassword/index.tsx b/...dRedesign/CompleteResetPassword/index.tsx → ...tPassword/CompleteResetPassword/index.tsx
diff --git a/...esign/CompleteResetPassword/interfaces.ts → ...sword/CompleteResetPassword/interfaces.ts b/...esign/CompleteResetPassword/interfaces.ts → ...sword/CompleteResetPassword/interfaces.ts
diff --git a/...dRedesign/CompleteResetPassword/mocks.tsx → ...tPassword/CompleteResetPassword/mocks.tsx b/...dRedesign/CompleteResetPassword/mocks.tsx → ...tPassword/CompleteResetPassword/mocks.tsx
diff --git a/...design/ConfirmResetPassword/container.tsx → ...ssword/ConfirmResetPassword/container.tsx b/...design/ConfirmResetPassword/container.tsx → ...ssword/ConfirmResetPassword/container.tsx
diff --git a/...swordRedesign/ConfirmResetPassword/en.ftl → ...ResetPassword/ConfirmResetPassword/en.ftl b/...swordRedesign/ConfirmResetPassword/en.ftl → ...ResetPassword/ConfirmResetPassword/en.ftl
diff --git a/...gn/ConfirmResetPassword/index.stories.tsx → ...rd/ConfirmResetPassword/index.stories.tsx b/...gn/ConfirmResetPassword/index.stories.tsx → ...rd/ConfirmResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import ConfirmResetPassword from '.';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/ConfirmResetPassword',
+  title: 'Pages/ResetPassword/ConfirmResetPassword',
   component: ConfirmResetPassword,
   decorators: [withLocalization],
 } as Meta;

diff --git a/...esign/ConfirmResetPassword/index.test.tsx → ...sword/ConfirmResetPassword/index.test.tsx b/...esign/ConfirmResetPassword/index.test.tsx → ...sword/ConfirmResetPassword/index.test.tsx
@@ -136,7 +136,6 @@ describe('ConfirmResetPassword', () => {
     expect(mockResendCode).toHaveBeenCalledTimes(1);
   });
 
-
   it('handles Use different account link', async () => {
     let hardNavigateSpy: jest.SpyInstance;
     hardNavigateSpy = jest

diff --git a/...rdRedesign/ConfirmResetPassword/index.tsx → ...etPassword/ConfirmResetPassword/index.tsx b/...rdRedesign/ConfirmResetPassword/index.tsx → ...etPassword/ConfirmResetPassword/index.tsx
diff --git a/...design/ConfirmResetPassword/interfaces.ts → ...ssword/ConfirmResetPassword/interfaces.ts b/...design/ConfirmResetPassword/interfaces.ts → ...ssword/ConfirmResetPassword/interfaces.ts
diff --git a/...rdRedesign/ConfirmResetPassword/mocks.tsx → ...etPassword/ConfirmResetPassword/mocks.tsx b/...rdRedesign/ConfirmResetPassword/mocks.tsx → ...etPassword/ConfirmResetPassword/mocks.tsx
diff --git a/...swordRedesign/ResetPassword/container.tsx → ...ResetPassword/ResetPassword/container.tsx b/...swordRedesign/ResetPassword/container.tsx → ...ResetPassword/ResetPassword/container.tsx
diff --git a/...esetPasswordRedesign/ResetPassword/en.ftl → .../pages/ResetPassword/ResetPassword/en.ftl b/...esetPasswordRedesign/ResetPassword/en.ftl → .../pages/ResetPassword/ResetPassword/en.ftl
diff --git a/...dRedesign/ResetPassword/index.stories.tsx → ...tPassword/ResetPassword/index.stories.tsx b/...dRedesign/ResetPassword/index.stories.tsx → ...tPassword/ResetPassword/index.stories.tsx
@@ -9,7 +9,7 @@ import { withLocalization } from 'fxa-react/lib/storybooks';
 import { Subject } from './mocks';
 
 export default {
-  title: 'Pages/ResetPasswordRedesign/ResetPassword',
+  title: 'Pages/ResetPassword/ResetPassword',
   component: ResetPassword,
   decorators: [withLocalization],
 } as Meta;

diff --git a/...wordRedesign/ResetPassword/index.test.tsx → ...esetPassword/ResetPassword/index.test.tsx b/...wordRedesign/ResetPassword/index.test.tsx → ...esetPassword/ResetPassword/index.test.tsx
diff --git a/...tPasswordRedesign/ResetPassword/index.tsx → ...ges/ResetPassword/ResetPassword/index.tsx b/...tPasswordRedesign/ResetPassword/index.tsx → ...ges/ResetPassword/ResetPassword/index.tsx
diff --git a/...swordRedesign/ResetPassword/interfaces.ts → ...ResetPassword/ResetPassword/interfaces.ts b/...swordRedesign/ResetPassword/interfaces.ts → ...ResetPassword/ResetPassword/interfaces.ts
diff --git a/...tPasswordRedesign/ResetPassword/mocks.tsx → ...ges/ResetPassword/ResetPassword/mocks.tsx b/...tPasswordRedesign/ResetPassword/mocks.tsx → ...ges/ResetPassword/ResetPassword/mocks.tsx
diff --git a/.../ResetPasswordConfirmed/index.stories.tsx → .../ResetPasswordConfirmed/index.stories.tsx b/.../ResetPasswordConfirmed/index.stories.tsx → .../ResetPasswordConfirmed/index.stories.tsx
diff --git a/...ign/ResetPasswordConfirmed/index.test.tsx → ...ord/ResetPasswordConfirmed/index.test.tsx b/...ign/ResetPasswordConfirmed/index.test.tsx → ...ord/ResetPasswordConfirmed/index.test.tsx
diff --git a/...Redesign/ResetPasswordConfirmed/index.tsx → ...Password/ResetPasswordConfirmed/index.tsx b/...Redesign/ResetPasswordConfirmed/index.tsx → ...Password/ResetPasswordConfirmed/index.tsx
diff --git a/...sign/ResetPasswordConfirmed/interfaces.ts → ...word/ResetPasswordConfirmed/interfaces.ts b/...sign/ResetPasswordConfirmed/interfaces.ts → ...word/ResetPasswordConfirmed/interfaces.ts
diff --git a/...setPasswordWithRecoveryKeyVerified/en.ftl → ...setPasswordWithRecoveryKeyVerified/en.ftl b/...setPasswordWithRecoveryKeyVerified/en.ftl → ...setPasswordWithRecoveryKeyVerified/en.ftl
diff --git a/...WithRecoveryKeyVerified/index.stories.tsx → ...WithRecoveryKeyVerified/index.stories.tsx b/...WithRecoveryKeyVerified/index.stories.tsx → ...WithRecoveryKeyVerified/index.stories.tsx
diff --git a/...ordWithRecoveryKeyVerified/index.test.tsx → ...ordWithRecoveryKeyVerified/index.test.tsx b/...ordWithRecoveryKeyVerified/index.test.tsx → ...ordWithRecoveryKeyVerified/index.test.tsx
diff --git a/...PasswordWithRecoveryKeyVerified/index.tsx → ...PasswordWithRecoveryKeyVerified/index.tsx b/...PasswordWithRecoveryKeyVerified/index.tsx → ...PasswordWithRecoveryKeyVerified/index.tsx
diff --git a/...wordWithRecoveryKeyVerified/interfaces.ts → ...wordWithRecoveryKeyVerified/interfaces.ts b/...wordWithRecoveryKeyVerified/interfaces.ts → ...wordWithRecoveryKeyVerified/interfaces.ts
diff --git a/...PasswordWithRecoveryKeyVerified/mocks.tsx → ...PasswordWithRecoveryKeyVerified/mocks.tsx b/...PasswordWithRecoveryKeyVerified/mocks.tsx → ...PasswordWithRecoveryKeyVerified/mocks.tsx