Commit fd166b97 authored by Emily Jensen's avatar Emily Jensen

Fixes merge conflicts

parent 2823f02b
Pipeline #36292204 passed with stage
in 6 minutes and 54 seconds
......@@ -25,17 +25,13 @@ import * as fromSetPassword from "./reset-password/set-password/set-password.red
import {
ResetPasswordVerifyActionTypes,
ResetPasswordVerifyActionsUnion
<<<<<<< HEAD
} from "./forgot-password/reset-password-verify/reset-password-verify.actions";
import * as fromManageBackupCode from "./manage-backup-code/manage-backup-code.reducer";
=======
} from "./reset-password/reset-password-verify/reset-password-verify.actions";
>>>>>>> dev
import {
SetPasswordSuccess,
SetPasswordActionTypes,
ForceSetPassword
} from "./reset-password/set-password/set-password.actions";
import * as fromManageBackupCode from "./manage-backup-code/manage-backup-code.reducer";
export interface IAuthState {
email: string | null;
......
......@@ -41,20 +41,14 @@ import { ResetPasswordVerifyComponent } from "./reset-password/reset-password-ve
import { ResetPasswordVerifyContainer } from "./reset-password/reset-password-verify/reset-password-verify.container";
import { ResetPasswordVerifyEffects } from "./reset-password/reset-password-verify/reset-password-verify.effects";
import { PasswordInputComponent } from "./change-password/password-input/password-input.component";
<<<<<<< HEAD
import { SetPasswordComponent } from "./forgot-password/set-password/set-password.component";
import { ManageBackupCodeComponent } from "./manage-backup-code/manage-backup-code.component";
import { ManageBackupCodeContainer } from "./manage-backup-code/manage-backup-code.container";
import { SetPasswordContainer } from "./forgot-password/set-password/set-password.container";
import { SetPasswordEffects } from "./forgot-password/set-password/set-password.effects";
import { ManageBackupCodeEffects } from "./manage-backup-code/manage-backup-code.effects";
import { BackupCodePdfService } from "./backup-code-pdf.service";
=======
import { SetPasswordComponent } from "./reset-password/set-password/set-password.component";
import { SetPasswordContainer } from "./reset-password/set-password/set-password.container";
import { SetPasswordEffects } from "./reset-password/set-password/set-password.effects";
import { ServerSelectComponent } from "./shared/server-select.component";
>>>>>>> dev
export const COMPONENTS = [
AccountComponent,
......@@ -79,13 +73,10 @@ export const COMPONENTS = [
SetPasswordComponent,
MarketingFrameComponent,
SetPasswordContainer,
<<<<<<< HEAD
ManageBackupCodeComponent,
ManageBackupCodeContainer,
=======
MarketingFrameComponent,
ServerSelectComponent
>>>>>>> dev
];
export const SERVICES = [UserService, ConfirmEmailGuard, BackupCodePdfService];
......
......@@ -18,14 +18,6 @@ import { IS_EXTENSION } from "../../constants";
`,
changeDetection: ChangeDetectionStrategy.OnPush
})
<<<<<<< HEAD:src/app/account/forgot-password/forgot-password.container.ts
export class ForgotPasswordContainer {
// fix where they're selecting from
form$ = this.store.select(fromAccount.getForgotPasswordForm);
hasStarted$ = this.store.select(fromAccount.getForgotPasswordHasStarted);
hasFinished$ = this.store.select(fromAccount.getForgotPasswordHasFinished);
errorMessage$ = this.store.select(fromAccount.getForgotPasswordErrorMessage);
=======
export class ResetPasswordContainer {
form$ = this.store.pipe(select(fromAccount.getResetPasswordForm));
hasStarted$ = this.store.pipe(select(fromAccount.getResetPasswordHasStarted));
......@@ -35,7 +27,6 @@ export class ResetPasswordContainer {
errorMessage$ = this.store.pipe(
select(fromAccount.getResetPasswordErrorMessage)
);
>>>>>>> dev:src/app/account/reset-password/reset-password.container.ts
isExtension = IS_EXTENSION;
constructor(private store: Store<fromAccount.IAuthState>) {}
......
<<<<<<< HEAD
import { take, mergeMap, map, exhaustMap } from "rxjs/operators";
=======
import { take, mergeMap, catchError } from "rxjs/operators";
>>>>>>> dev
import { take, mergeMap, map, exhaustMap, catchError } from "rxjs/operators";
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { Store, select } from "@ngrx/store";
......
......@@ -20,16 +20,10 @@ import { NoContentContainer } from "./no-content";
import { PopupLoggedInGuard } from "./guards/popup-logged-in.guard";
import { ConfirmEmailGuard } from "./account/confirm-email/confirm-email.guard";
import { ErrorReportingContainer } from "./account/error-reporting/error-reporting.container";
<<<<<<< HEAD
import { ForgotPasswordContainer } from "./account/forgot-password/forgot-password.container";
import { ResetPasswordVerifyContainer } from "./account/forgot-password/reset-password-verify/reset-password-verify.container";
import { ManageBackupCodeContainer } from "./account/manage-backup-code/manage-backup-code.container";
import { SetPasswordContainer } from "./account/forgot-password/set-password/set-password.container";
=======
import { ResetPasswordContainer } from "./account/reset-password/reset-password.container";
import { ResetPasswordVerifyContainer } from "./account/reset-password/reset-password-verify/reset-password-verify.container";
import { SetPasswordContainer } from "./account/reset-password/set-password/set-password.container";
>>>>>>> dev
/* tslint:disable:object-literal-sort-keys */
const appRoutes: Routes = [
......
......@@ -21,14 +21,9 @@ import * as fromResetPasswordVerify from "../app/account/reset-password/reset-pa
import { RouterTestingModule } from "@angular/router/testing";
import { ChangePasswordComponent } from "../app/account/change-password";
import { PasswordInputComponent } from "../app/account/change-password/password-input/password-input.component";
<<<<<<< HEAD
import { SetPasswordComponent } from "../app/account/forgot-password/set-password/set-password.component";
import { ResetPasswordVerifyComponent } from "../app/account/forgot-password/reset-password-verify/reset-password-verify.component";
import { ManageBackupCodeComponent } from "../app/account/manage-backup-code/manage-backup-code.component";
=======
import { SetPasswordComponent } from "../app/account/reset-password/set-password/set-password.component";
import { ResetPasswordVerifyComponent } from "../app/account/reset-password/reset-password-verify/reset-password-verify.component";
>>>>>>> dev
storiesOf("Account", module)
.addDecorator(withKnobs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment