Esqueceu a senha?
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index f8ceeb32..b87adb2b 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -37,7 +37,7 @@ export class LoginComponent implements OnInit {
this.navigator('/profile');
},
error: (error) => {
- console.error(error);
+ this.alertService.showMessage("error", "Erro", error.error);
},
});
} else {
diff --git a/src/app/pages/profile/profile.component.ts b/src/app/pages/profile/profile.component.ts
index 74f5549b..3fa27686 100644
--- a/src/app/pages/profile/profile.component.ts
+++ b/src/app/pages/profile/profile.component.ts
@@ -41,13 +41,6 @@ export class ProfileComponent {
}
navigatorEdit(): void {
-
- const navigationExtras: NavigationExtras = {
- state: {
- user: this.user
- }
- };
- this.router.navigate([`/editUser`], navigationExtras);
+ this.router.navigate([`/editUser/${this.user.id}`]);
}
-
}
diff --git a/src/app/pages/register/register.component.html b/src/app/pages/register/register.component.html
index 820ea2f4..076a33a5 100644
--- a/src/app/pages/register/register.component.html
+++ b/src/app/pages/register/register.component.html
@@ -2,24 +2,23 @@
diff --git a/src/app/pages/register/register.component.spec.ts b/src/app/pages/register/register.component.spec.ts
index af78b8bd..2fc969bf 100644
--- a/src/app/pages/register/register.component.spec.ts
+++ b/src/app/pages/register/register.component.spec.ts
@@ -6,6 +6,8 @@ import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
import { of, throwError } from 'rxjs';
import { RouterTestingModule } from '@angular/router/testing';
import { ActiveAccountComponent } from '../active-account/active-account.component';
+import { AlertService } from 'src/app/services/alert.service';
+import { DropdownModule } from 'primeng/dropdown';
const mockData: any = {
"name": "Mario",
@@ -22,21 +24,29 @@ class AuthServiceMock {
}
}
+class AlertServiceMock {
+ constructor() { }
+ showMessage() {
+ return of({ success: true });
+ }
+}
+
describe('RegisterComponent', () => {
let component: RegisterComponent;
let fixture: ComponentFixture
;
let authService: AuthService;
+ let alertService: AlertService;
beforeEach(async () => {
await TestBed.configureTestingModule({
- imports: [HttpClientTestingModule, ReactiveFormsModule,
+ imports: [HttpClientTestingModule, ReactiveFormsModule, DropdownModule,
RouterTestingModule.withRoutes(
[
{ path: 'activateAccount', component: ActiveAccountComponent },
]
)
],
- providers: [{ provide: AuthService, useValue: new AuthServiceMock() }, FormBuilder],
+ providers: [{ provide: AuthService, useValue: new AuthServiceMock() }, FormBuilder, {provide: AlertService, useValue: new AlertServiceMock()}],
declarations: [RegisterComponent]
})
.compileComponents();
@@ -44,6 +54,7 @@ describe('RegisterComponent', () => {
fixture = TestBed.createComponent(RegisterComponent);
component = fixture.componentInstance;
authService = TestBed.inject(AuthService);
+ alertService = TestBed.inject(AlertService);
fixture.detectChanges();
});
@@ -70,19 +81,6 @@ describe('RegisterComponent', () => {
expect(component.register).toHaveBeenCalled();
});
- it('should call alert when form is not valid', () => {
- spyOn(component, 'register').and.callThrough();
- const alertSpy = spyOn(window, 'alert');
- fixture.detectChanges();
-
- const submitButton = fixture.nativeElement.querySelector(
- 'button[type="submit"]'
- );
- submitButton.click();
-
- expect(alertSpy).toHaveBeenCalledWith('Preencha todos os campos corretamente!');
- });
-
it('should call register and return an error', () => {
fixture.detectChanges();
const form = component.userForm;
@@ -92,4 +90,13 @@ describe('RegisterComponent', () => {
expect(mySpy).toHaveBeenCalled();
});
+ // it('test AlertService', () => {
+ // fixture.detectChanges();
+ // const form = component.userForm;
+ // form.setValue(mockData);
+ // const mySpy = spyOn(alertService, 'showMessage').and.callThrough();
+ // component.register();
+ // expect(mySpy).toHaveBeenCalled();
+ // });
+
});
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts
index 4c7eb7c1..147db421 100644
--- a/src/app/pages/register/register.component.ts
+++ b/src/app/pages/register/register.component.ts
@@ -2,8 +2,9 @@ import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { MustMatch } from 'src/app/helper/must-match.validator';
-import { AuthService } from '../../services/auth.service';
import { AlertService } from 'src/app/services/alert.service';
+import { UserService } from '../../services/user.service';
+import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-register',
@@ -12,35 +13,56 @@ import { AlertService } from 'src/app/services/alert.service';
})
export class RegisterComponent implements OnInit {
userForm!: FormGroup;
+ vinculo: any = {};
constructor(
private router: Router,
private fb: FormBuilder,
+ private userService: UserService,
private authService: AuthService,
- private alertService: AlertService,
+ private alertService: AlertService
) {}
ngOnInit(): void {
+ this.getVinculo();
this.userForm = this.fb.group(
{
name: ['', [Validators.required]],
email: ['', [Validators.email, Validators.required]],
- connection: ['', [Validators.required]],
+ connection: [[], [Validators.required]],
password: ['', [Validators.required]],
confirmPassword: ['', [Validators.required]],
- },
- {
+ },{
validator: MustMatch('password', 'confirmPassword'),
}
);
}
+ getVinculo() {
+ this.userService.getVinculo().subscribe({
+ next: (data) => {
+ this.vinculo = data.map((name: any) => {
+ return {
+ name: name,
+ }
+ });
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ });
+ }
+
register() {
if (this.userForm.valid) {
- this.authService.registerUser(this.userForm.value).subscribe({
+ const data = {...this.userForm.value, connection: this.userForm.value.connection.name};
+ this.authService.registerUser(data).subscribe({
next: (data) => {
- console.log(data);
- this.alertService.showMessage("success", "Sucesso", "Usuário cadastrado com sucesso!");
+ this.alertService.showMessage(
+ 'success',
+ 'Sucesso',
+ 'Usuário cadastrado com sucesso!'
+ );
this.navigator('/activeAccount');
},
error: (error) => {
@@ -48,7 +70,11 @@ export class RegisterComponent implements OnInit {
},
});
} else {
- this.alertService.showMessage("info", "Alerta", "Preencha todos os campos corretamente!");
+ this.alertService.showMessage(
+ 'info',
+ 'Alerta',
+ 'Preencha todos os campos corretamente!'
+ );
}
}
diff --git a/src/app/pages/reset-password/reset-password.component.html b/src/app/pages/reset-password/reset-password.component.html
index 94ffa173..c4229ae4 100644
--- a/src/app/pages/reset-password/reset-password.component.html
+++ b/src/app/pages/reset-password/reset-password.component.html
@@ -2,16 +2,16 @@
diff --git a/src/app/pages/suggest-agenda/suggest-agenda.component.html b/src/app/pages/suggest-agenda/suggest-agenda.component.html
index 53e492f6..4f292f22 100644
--- a/src/app/pages/suggest-agenda/suggest-agenda.component.html
+++ b/src/app/pages/suggest-agenda/suggest-agenda.component.html
@@ -2,13 +2,13 @@