Index: trip-planner-front/src/app/homepage/homepage.component.html
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.html	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/homepage.component.html	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -21,5 +21,5 @@
         </li>
         <li class="nav-item">
-          <button class="btn btn-dark">Sign in</button>
+          <button class="btn btn-dark" (click)="onClickLogIn()">Sign in</button>
         </li>
       </ul>
@@ -30,6 +30,6 @@
     <img src={{imageURI}} />
     <h4></h4>
-
-    <div class="content-section implementation carousel-demo" style="padding-top: 2em;">
+<!--
+  <div class="content-section implementation carousel-demo" style="padding-top: 2em;">
       <div class="card">
         <p-carousel [value]="locations" [numVisible]="3" [numScroll]="3" [circular]="false"
@@ -91,4 +91,6 @@
       </div>
     </div>
+-->
+  
   </main>
 <br>
Index: trip-planner-front/src/app/homepage/homepage.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.ts	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/homepage.component.ts	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -1,6 +1,11 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog';
+import { LoginRequest } from '../_models/dto/loginRequest';
+import { UserDto } from '../_models/dto/userDto';
 import { Location } from '../_models/location';
 import { LocationService } from '../_services/location.service';
+import { UserService } from '../_services/user.service';
+import { LoginComponent } from './login/login.component';
 import { RegisterComponent } from './register/register.component';
 
@@ -20,5 +25,6 @@
    ref: DynamicDialogRef;
 
-   constructor(private locationService: LocationService, private dialogService: DialogService) {
+   constructor(private locationService: LocationService, private dialogService: DialogService, private userService: UserService,
+      private router: Router) {
       this.responsiveOptions = [
          {
@@ -44,5 +50,5 @@
 
    ngOnInit(): void {
-
+/*
       this.locationService.getWeekendGetaways().subscribe(
          data => {
@@ -55,8 +61,8 @@
          }
       );
+      */
    }
 
-   onClickSignUp(){
-      console.log("VLEGOV");
+   onClickSignUp() {
       this.ref = this.dialogService.open(RegisterComponent, {
          header: 'Register form',
@@ -64,5 +70,34 @@
          contentStyle: { "max-height": "500px", "overflow": "auto" },
          baseZIndex: 10000
-       });
+      });
+
+      this.ref.onClose.subscribe((user: UserDto) => {
+         this.userService.registerUser(user).subscribe(
+            data  => {
+               console.log(data);
+              
+            }
+         );
+      });
+   }
+
+   
+   onClickLogIn() {
+      this.ref = this.dialogService.open(LoginComponent, {
+         header: 'Log in if you already have an account',
+         width: '70%',
+         contentStyle: { "max-height": "500px", "overflow": "auto" },
+         baseZIndex: 10000
+      });
+      this.ref.onClose.subscribe((loginRequest : LoginRequest) => {
+         this.userService.authenticateUser(loginRequest).subscribe(
+            (data : any)  => {
+               console.log(data);
+               if(this.userService.isUserLoggedIn()){
+                  this.router.navigate(['planners']);
+               }
+            }
+         );
+      });
    }
 }
Index: trip-planner-front/src/app/homepage/login/login.component.html
===================================================================
--- trip-planner-front/src/app/homepage/login/login.component.html	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/login/login.component.html	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -1,1 +1,18 @@
-<p>login works!</p>
+<div class="p-col-12 p-md-4">
+    <div class="p-inputgroup">
+        <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>
+        <input type="text" pInputText placeholder="Email address (Username)" 
+             [(ngModel)]="loginRequest.username" name="username">
+    </div>
+</div>
+<div class="p-col-12 p-md-4">
+    <div class="p-inputgroup">
+        <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>
+        <input type="password" pInputText placeholder="Password" name="password" [(ngModel)]="loginRequest.password">
+    </div>
+</div>
+
+<div class="p-col-12 p-md-4">
+    <button pButton pRipple label="Log in" class="p-button-secondary" type="submit"
+        (click)="onFormLogIn(loginRequest)"></button>
+</div>
Index: trip-planner-front/src/app/homepage/login/login.component.spec.ts
===================================================================
--- trip-planner-front/src/app/homepage/login/login.component.spec.ts	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ 	(revision )
@@ -1,25 +1,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LoginComponent } from './login.component';
-
-describe('LoginComponent', () => {
-  let component: LoginComponent;
-  let fixture: ComponentFixture<LoginComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ LoginComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LoginComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
Index: trip-planner-front/src/app/homepage/login/login.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/login/login.component.ts	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/login/login.component.ts	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -1,3 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { DynamicDialogRef } from 'primeng/dynamicdialog';
+import { LoginRequest } from 'src/app/_models/dto/loginRequest';
+import { UserService } from 'src/app/_services/user.service';
 
 @Component({
@@ -8,8 +12,18 @@
 export class LoginComponent implements OnInit {
 
-  constructor() { }
+
+  loginRequest : LoginRequest;
+
+  constructor(private ref: DynamicDialogRef, private router: Router, private userService : UserService) { 
+    this.loginRequest = new LoginRequest();
+    
+  }
 
   ngOnInit(): void {
   }
 
+  onFormLogIn(loginRequest){
+    this.ref.close(loginRequest);
+   
+  }
 }
Index: trip-planner-front/src/app/homepage/register/register.component.html
===================================================================
--- trip-planner-front/src/app/homepage/register/register.component.html	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/register/register.component.html	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -1,31 +1,36 @@
-<div class="p-grid p-fluid">
-    <div class="p-col-12 p-md-4">
-        <div class="p-inputgroup">
-            <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>
-            <input type="text" pInputText placeholder="Full name">         
+
+    <div class="p-grid p-fluid">
+        <div class="p-col-12 p-md-4">
+            <div class="p-inputgroup">
+                <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>
+                <input type="text" pInputText placeholder="Full name" [(ngModel)]="user.fullName" name="fullName"
+            >         
+            </div>
         </div>
-    </div>
-
-    <div class="p-col-12 p-md-4">
-        <div class="p-inputgroup">
-            <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>
-            <input type="text" pInputText placeholder="Ema address (Username)">         
+    
+        <div class="p-col-12 p-md-4">
+            <div class="p-inputgroup">
+                <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>
+                <input type="text" pInputText placeholder="Email address (Username)" [(ngModel)]="user.username" name="username"
+              >         
+            </div>
         </div>
-    </div>
-    <div class="p-col-12 p-md-4">
-        <div class="p-inputgroup">
-            <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>
-            <input type="text" pInputText placeholder="Password">         
+        <div class="p-col-12 p-md-4">
+            <div class="p-inputgroup">
+                <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>
+                <input type="password" pInputText placeholder="Password" [(ngModel)]="user.password" name="password"
+                >         
+            </div>
         </div>
-    </div>
-    <div class="p-col-12 p-md-4">
-        <div class="p-inputgroup">
-            <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>
-            <input type="text" pInputText placeholder="Repeat password">         
+        <div class="p-col-12 p-md-4">
+            <div class="p-inputgroup">
+                <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>
+                <input type="password" pInputText placeholder="Repeat password" [(ngModel)]="user.confirmPassword" name="confirmPassword"
+                >         
+            </div>
         </div>
-    </div>
-
-    <div class="p-col-12 p-md-4">
-        <button pButton pRipple type="button" label="Submit" class="p-button-secondary"></button>
-    </div>
-</div>
+    
+        <div class="p-col-12 p-md-4">
+            <button pButton pRipple label="Submit" class="p-button-secondary" type="submit" (click)="onFormSubmitSignUp(user)"></button>
+        </div>
+    </div>  
Index: trip-planner-front/src/app/homepage/register/register.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/register/register.component.ts	(revision 1ad8e64a349fcc7c996155279b16efc2cfe001dd)
+++ trip-planner-front/src/app/homepage/register/register.component.ts	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
@@ -1,3 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { DynamicDialogRef } from 'primeng/dynamicdialog';
+import { UserDto } from 'src/app/_models/dto/userDto';
 
 @Component({
@@ -8,8 +10,16 @@
 export class RegisterComponent implements OnInit {
 
-  constructor() { }
+  user : UserDto;
+
+  constructor(private ref: DynamicDialogRef) {
+    this.user = new UserDto();
+   }
 
   ngOnInit(): void {
   }
-
+  
+  onFormSubmitSignUp(user){
+    this.ref.close(user);
+    //window.location.reload();
+  }
 }
