diff options
5 files changed, 28 insertions, 21 deletions
diff --git a/backend/api/api/Data/UserStoreDatabaseSettings.cs b/backend/api/api/Data/UserStoreDatabaseSettings.cs index 0efd2895..0d923fc7 100644 --- a/backend/api/api/Data/UserStoreDatabaseSettings.cs +++ b/backend/api/api/Data/UserStoreDatabaseSettings.cs @@ -9,5 +9,6 @@ namespace api.Data public string ConnectionString { get; set; } = String.Empty; public string DatabaseName { get; set; } = String.Empty; public string CollectionName { get; set; } = String.Empty; + public string DatasetCollectionName { get; set; } = String.Empty; } } diff --git a/frontend/src/app/_pages/login-page/login-page.component.html b/frontend/src/app/_pages/login-page/login-page.component.html index 906eaba6..87e2a78e 100644 --- a/frontend/src/app/_pages/login-page/login-page.component.html +++ b/frontend/src/app/_pages/login-page/login-page.component.html @@ -7,9 +7,9 @@ <form> <!-- Email input --> <div class="form-outline mb-4"> - <label class="form-label" for="email">Email adresa</label> - <input [(ngModel)]="email" name="email" type="email" id="email" class="form-control form-control-lg" - placeholder="Unesite email adresu..." /> + <label class="form-label" for="username">Korisničko ime</label> + <input [(ngModel)]="username" name="username" type="text" id="username" + class="form-control form-control-lg" placeholder="Unesite korisničko ime..." /> </div> <!-- Password input --> diff --git a/frontend/src/app/_pages/login-page/login-page.component.ts b/frontend/src/app/_pages/login-page/login-page.component.ts index f8b429e3..0825d435 100644 --- a/frontend/src/app/_pages/login-page/login-page.component.ts +++ b/frontend/src/app/_pages/login-page/login-page.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { CookieService } from 'ngx-cookie-service'; import { AuthService } from 'src/app/_services/auth.service'; @@ -8,33 +9,36 @@ import { AuthService } from 'src/app/_services/auth.service'; styleUrls: ['./login-page.component.css'] }) export class LoginPageComponent implements OnInit { - email: string = ''; + //email: string = ''; + username: string = ''; password: string = ''; public wrongCreds: boolean = false; //RAZMOTRITI //public notApproved: boolean = false; //RAZMOTRITI - pattEmail: RegExp = /^[a-zA-Z0-9]+([\.\-\+][a-zA-Z0-9]+)*\@([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}$/; + //pattEmail: RegExp = /^[a-zA-Z0-9]+([\.\-\+][a-zA-Z0-9]+)*\@([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}$/; constructor( private authService: AuthService, - private cookie: CookieService + private cookie: CookieService, + private router: Router ) { } ngOnInit(): void { } onSubmit() { - if (!this.pattEmail.test(this.email)) { + /*if (!this.pattEmail.test(this.email)) { console.warn('Bad email!'); return; } - else { - this.authService.login(this.email, this.password).subscribe((response) => { - console.log(response); - this.cookie.set('token', response); - }) - } + else {*/ + this.authService.login(this.username, this.password).subscribe((response) => { + console.log(response); + this.cookie.set('token', response); + this.router.navigate(['add-model']); + // }) + }); } } diff --git a/frontend/src/app/_pages/register-page/register-page.component.ts b/frontend/src/app/_pages/register-page/register-page.component.ts index e8d4c036..712fc55e 100644 --- a/frontend/src/app/_pages/register-page/register-page.component.ts +++ b/frontend/src/app/_pages/register-page/register-page.component.ts @@ -104,7 +104,7 @@ export class RegisterPageComponent implements OnInit { this.firstNameValidation(); this.lastNameValidation(); - this.nickNameValidation(); + //this.nickNameValidation(); this.emailValidation(); this.passwordValidation(); @@ -114,19 +114,21 @@ export class RegisterPageComponent implements OnInit { let user = { firstName: this.firstName, lastName: this.lastName, - nickName: this.nickName, - email: this.email, - password: this.pass1 + username: this.nickName, + password: this.pass1, + email: this.email } this.authService.register(user) .subscribe( (response) => { console.log(response); - /*if () + if (response === 'User added') this.router.navigate(['/login']); //registracija uspesna, idi na login - else if () - alert('Nalog sa unetim email-om već postoji!');*/ + else if (response === 'Email Already Exists') + alert('Nalog sa unetim email-om već postoji!'); + else if (response === 'Username Already Exists') + alert('Nalog sa unetim korisnićkim imenom već postoji!'); } ); } diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts index 7129b95b..c96c2dae 100644 --- a/frontend/src/app/_services/auth.service.ts +++ b/frontend/src/app/_services/auth.service.ts @@ -18,7 +18,7 @@ export class AuthService { } register(user: any) { - return this.http.post(`${API_SETTINGS.apiURL}/auth/register`, user); + return this.http.post(`${API_SETTINGS.apiURL}/auth/register`, { ...user }, { responseType: 'text' }); } isAuthenticated(): boolean { |