Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 4 insertions, 2 deletions

diff --git a/frontend/src/app/_modals/register-modal/register-modal.component.ts b/frontend/src/app/_modals/register-modal/register-modal.component.ts
index c045f1ce..13ef7eba 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { AuthService } from 'src/app/_services/auth.service';
+import User from 'src/app/_data/User';
 
 @Component({
   selector: 'app-register-modal',
@@ -124,12 +125,13 @@ export class RegisterModalComponent implements OnInit {
     if (!(this.wrongFirstNameBool || this.wrongLastNameBool || this.wrongUsernameBool ||
       this.wrongEmailBool || this.wrongPass1Bool || this.wrongPass2Bool)) { //sve ok, registruj ga
 
-      let user = {
+      let user: User = {
         firstName: this.firstName,
         lastName: this.lastName,
         username: this.username,
         password: this.pass1,
-        email: this.email
+        email: this.email,
+        photoId: "1"
       }
 
       this.authService.register(user)