diff --git a/src/app/components/navbar/navbar.component.html b/src/app/components/navbar/navbar.component.html
index 533724cf..a82554f5 100644
--- a/src/app/components/navbar/navbar.component.html
+++ b/src/app/components/navbar/navbar.component.html
@@ -2,18 +2,7 @@
   <div class="container-fluid">
     <!-- Brand -->
     <a class="h4 mb-0 text-white text-uppercase d-none d-lg-inline-block" routerLinkActive="active" [routerLink]="['/dashboard']">{{getTitle()}}</a>
-    <!-- Form -->
-    <form class="navbar-search navbar-search-dark form-inline mr-3 d-none d-md-flex ml-lg-auto">
-      <div class="form-group mb-0" [ngClass]="{ 'focused': focus === true }">
-        <div class="input-group input-group-alternative">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fas fa-search"></i></span>
-          </div>
-          <input class="form-control" placeholder="Search" type="text" (focus)="focus = true"
-          (blur)="focus = false">
-        </div>
-      </div>
-    </form>
+
     <!-- User -->
     <ul class="navbar-nav align-items-center d-none d-md-flex">
       <li class="nav-item" ngbDropdown placement="bottom-right">
@@ -31,24 +20,11 @@
           <div class=" dropdown-header noti-title">
             <h6 class="text-overflow m-0">Welcome!</h6>
           </div>
-          <a routerLinkActive="active" [routerLink]="['/user-profile']" class="dropdown-item">
-            <i class="ni ni-single-02"></i>
-            <span>My profile</span>
-          </a>
-          <a routerLinkActive="active" [routerLink]="['/user-profile']" class="dropdown-item">
-            <i class="ni ni-settings-gear-65"></i>
-            <span>Settings</span>
-          </a>
-          <a routerLinkActive="active" [routerLink]="['/user-profile']" class="dropdown-item">
-            <i class="ni ni-calendar-grid-58"></i>
-            <span>Activity</span>
-          </a>
-          <a routerLinkActive="active" [routerLink]="['/user-profile']" class="dropdown-item">
-            <i class="ni ni-support-16"></i>
-            <span>Support</span>
-          </a>
+       
+          
+        
           <div class="dropdown-divider"></div>
-          <a href="#!" class="dropdown-item">
+          <a routerLinkActive="active" [routerLink]="['/login']" class="dropdown-item">
             <i class="ni ni-user-run"></i>
             <span>Logout</span>
           </a>
diff --git a/src/app/components/navbar/navbar.component.ts b/src/app/components/navbar/navbar.component.ts
index e4dd9fb8..b7a63cf1 100644
--- a/src/app/components/navbar/navbar.component.ts
+++ b/src/app/components/navbar/navbar.component.ts
@@ -30,7 +30,7 @@ export class NavbarComponent implements OnInit {
             return this.listTitles[item].title;
         }
     }
-    return 'Dashboard';
+    return 'Login';
   }
 
 }
diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html
index 35a9e3e1..22cb6430 100644
--- a/src/app/pages/login/login.component.html
+++ b/src/app/pages/login/login.component.html
@@ -31,7 +31,7 @@ <h1 class="text-white">Bienvenue!</h1>
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="ni ni-email-83"></i></span>
                 </div>
-                <input class="form-control" [(ngModel)]="form.email" name="email" placeholder="Email" type="text">
+                <input class="form-control" [(ngModel)]="form.email" name="email" placeholder="Email" type="email">
               </div>
             </div>
             <div class="form-group">
diff --git a/src/app/pages/register/register.component.html b/src/app/pages/register/register.component.html
index 965900a2..d3439c45 100644
--- a/src/app/pages/register/register.component.html
+++ b/src/app/pages/register/register.component.html
@@ -44,7 +44,7 @@ <h1 class="text-white">Welcome!</h1>
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="ni ni-hat-3"></i></span>
                 </div>
-                <input class="form-control" placeholder="Name" type="text">
+                <input class="form-control" [(ngModel)]="form.username" name="username" placeholder="Name" type="text">
               </div>
             </div>
             <div class="form-group">
@@ -52,7 +52,7 @@ <h1 class="text-white">Welcome!</h1>
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="ni ni-email-83"></i></span>
                 </div>
-                <input class="form-control" placeholder="Email" type="email">
+                <input class="form-control" placeholder="Email" [(ngModel)]="form.email" name="email" type="email">
               </div>
             </div>
             <div class="form-group">
@@ -60,7 +60,7 @@ <h1 class="text-white">Welcome!</h1>
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="ni ni-lock-circle-open"></i></span>
                 </div>
-                <input class="form-control" placeholder="Password" type="password">
+                <input class="form-control" placeholder="Password"  [(ngModel)]="form.password" name="password" type="password">
               </div>
             </div>
             <div class="text-muted font-italic"><small>password strength: <span class="text-success font-weight-700">strong</span></small></div>
@@ -75,7 +75,7 @@ <h1 class="text-white">Welcome!</h1>
               </div>
             </div>
             <div class="text-center">
-              <button type="button" class="btn btn-primary mt-4">Create account</button>
+              <button type="button" (click)="onSubmit()" class="btn btn-primary mt-4">Create account</button>
             </div>
           </form>
         </div>
diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts
index 21cfa54e..565a9d69 100644
--- a/src/app/pages/register/register.component.ts
+++ b/src/app/pages/register/register.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
   selector: 'app-register',
@@ -7,9 +9,38 @@ import { Component, OnInit } from '@angular/core';
 })
 export class RegisterComponent implements OnInit {
 
-  constructor() { }
+  form: any = {
+    username: null,
+    email: null,
+    password: null
+  };
+  isSuccessful = false;
+  isSignUpFailed = false;
+  errorMessage = '';
 
-  ngOnInit() {
+  constructor(private authService: AuthService,private router:Router) { }
+
+  ngOnInit(): void {
   }
+  onSubmit(): void {
+    const { username, email, password } = this.form;
 
+    this.authService.register(username, email, password).subscribe(
+      data => {
+        console.log(data);
+        this.isSuccessful = true;
+        this.isSignUpFailed = false;
+        console.log('ok');
+        this.router.navigate(['/login'] );   
+      },
+      err => {
+        this.errorMessage = err.error.message;
+        this.isSignUpFailed = true;
+      }
+    );
+  }
 }
+
+  
+
+
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index c1c8dbbf..209ea218 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -23,6 +23,8 @@ export class AuthService {
   }
 
   register(username: string, email: string, password: string): Observable<any> {
+    console.log(username,email,password);
+
     return this.http.post(AUTH_API + 'register', {
       username,
       email,
diff --git a/src/app/services/user.service.service.ts b/src/app/services/user.service.service.ts
index 97fa5f49..dd91265e 100644
--- a/src/app/services/user.service.service.ts
+++ b/src/app/services/user.service.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 
-const API_URL = 'http://localhost:8080/api/tsst/';
+const API_URL = 'http://localhost:8080/api/auth/';
 
 @Injectable({
   providedIn: 'root'
@@ -17,6 +17,9 @@ export class UserService {
   getUserBoard(): Observable<any> {
     return this.http.get(API_URL + 'user', { responseType: 'text' });
   }
+  getUser(): Observable<any> {
+    return this.http.get(API_URL + 'login', { responseType: 'text' });
+  }
 
   getModeratorBoard(): Observable<any> {
     return this.http.get(API_URL + 'mod', { responseType: 'text' });