From 55db2069f70669d08f343a98d6fc2212cfd40832 Mon Sep 17 00:00:00 2001 From: kevinpauer Date: Sat, 7 May 2022 18:41:12 +0200 Subject: [PATCH] Fix #133 --- .../Views/register/register.component.html | 5 ++- .../Views/register/register.component.scss | 6 ++++ .../app/Views/register/register.component.ts | 32 ++++++++++++------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/Views/register/register.component.html b/frontend/src/app/Views/register/register.component.html index 6b21679..6834c44 100644 --- a/frontend/src/app/Views/register/register.component.html +++ b/frontend/src/app/Views/register/register.component.html @@ -77,7 +77,7 @@ type="password" class="form-control" name="passwordRepeat" - [(ngModel)]="form.password" + [(ngModel)]="form.passwordRepeat" required minlength="6" #passwordRepeat="ngModel" @@ -88,6 +88,9 @@ +
+ Password does not match, make sure it is the same! +
diff --git a/frontend/src/app/Views/register/register.component.scss b/frontend/src/app/Views/register/register.component.scss index 8ca95ae..de4d27e 100644 --- a/frontend/src/app/Views/register/register.component.scss +++ b/frontend/src/app/Views/register/register.component.scss @@ -11,4 +11,10 @@ .backgorund { background-color: #181a1b; color: white; + padding-top: 2vh; +} + +.profile-img-card { + border-radius: 2%; + box-shadow: 0 0 0 500px #181a1b; } diff --git a/frontend/src/app/Views/register/register.component.ts b/frontend/src/app/Views/register/register.component.ts index ce9bb65..519e4b1 100644 --- a/frontend/src/app/Views/register/register.component.ts +++ b/frontend/src/app/Views/register/register.component.ts @@ -11,29 +11,37 @@ export class RegisterComponent { form: any = { email: null, password: null, + passwordRepeat: null, username: null, }; isSuccessful = false; isSignUpFailed = false; errorMessage = ''; + checkPasswordFailed = false; + /** * @param {AuthService} privateauthService * @param {Router} privaterouter */ constructor(private authService: AuthService, private router: Router) {} onSubmit(): void { - const { email, username, password } = this.form; - this.authService.register(email, username, password).subscribe( - (data) => { - this.isSuccessful = true; - this.isSignUpFailed = false; - this.router.navigate(['/login']); - }, - (err) => { - this.errorMessage = err.error.message; - this.isSignUpFailed = true; - } - ); + if (this.form.password === this.form.passwordRepeat) { + this.checkPasswordFailed = false; + const { email, username, password } = this.form; + this.authService.register(email, username, password).subscribe( + (data) => { + this.isSuccessful = true; + this.isSignUpFailed = false; + this.router.navigate(['/login']); + }, + (err) => { + this.errorMessage = err.error.message; + this.isSignUpFailed = true; + } + ); + } else { + this.checkPasswordFailed = true; + } } }