Index: trip-planner-front/src/app/homepage/homepage.component.html
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.html	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
+++ trip-planner-front/src/app/homepage/homepage.component.html	(revision bdd64917749115bbdd228a9569a675d590c112e3)
@@ -13,5 +13,4 @@
   <header>
     <nav class="navbar navbar-expand-sm bg-light">
-      <img src={{myLogo}} />
       <strong class="navbar-brand">Trivia Trip</strong>
 
@@ -30,6 +29,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,8 +90,7 @@
       </div>
     </div>
--->
-  
+
   </main>
-<br>
+  <br>
 
   <footer class="bg-dark text-center text-white">
@@ -102,35 +100,23 @@
       <section class="mb-4">
         <!-- Facebook -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-facebook-f"></i
-        ></a>
-  
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-facebook-f"></i></a>
+
         <!-- Twitter -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-twitter"></i
-        ></a>
-  
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-twitter"></i></a>
+
         <!-- Google -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-google"></i
-        ></a>
-  
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-google"></i></a>
+
         <!-- Instagram -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-instagram"></i
-        ></a>
-  
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-instagram"></i></a>
+
         <!-- Linkedin -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-linkedin-in"></i
-        ></a>
-  
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-linkedin-in"></i></a>
+
         <!-- Github -->
-        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"
-          ><i class="fab fa-github"></i
-        ></a>
+        <a class="btn btn-outline-light btn-floating m-1" href="#!" role="button"><i class="fab fa-github"></i></a>
       </section>
       <!-- Section: Social media -->
-  
+
       <!-- Section: Form -->
       <section class="">
@@ -145,5 +131,5 @@
             </div>
             <!--Grid column-->
-  
+
             <!--Grid column-->
             <div class="col-md-5 col-12">
@@ -155,5 +141,5 @@
             </div>
             <!--Grid column-->
-  
+
             <!--Grid column-->
             <div class="col-auto">
@@ -169,5 +155,5 @@
       </section>
       <!-- Section: Form -->
-  
+
       <!-- Section: Text -->
       <section class="mb-4">
@@ -179,5 +165,5 @@
       </section>
       <!-- Section: Text -->
-  
+
       <!-- Section: Links -->
       <section class="">
@@ -187,68 +173,68 @@
           <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
             <h5 class="text-uppercase">Links</h5>
-  
-            <ul class="list-unstyled mb-0">
-              <li>
-                <a href="#!" class="text-white">Link 1</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 2</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 3</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 4</a>
-              </li>
-            </ul>
-          </div>
-          <!--Grid column-->
-  
-          <!--Grid column-->
-          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
-            <h5 class="text-uppercase">Links</h5>
-  
-            <ul class="list-unstyled mb-0">
-              <li>
-                <a href="#!" class="text-white">Link 1</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 2</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 3</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 4</a>
-              </li>
-            </ul>
-          </div>
-          <!--Grid column-->
-  
-          <!--Grid column-->
-          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
-            <h5 class="text-uppercase">Links</h5>
-  
-            <ul class="list-unstyled mb-0">
-              <li>
-                <a href="#!" class="text-white">Link 1</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 2</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 3</a>
-              </li>
-              <li>
-                <a href="#!" class="text-white">Link 4</a>
-              </li>
-            </ul>
-          </div>
-          <!--Grid column-->
-  
-          <!--Grid column-->
-          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
-            <h5 class="text-uppercase">Links</h5>
-  
+
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a href="#!" class="text-white">Link 1</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 2</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 3</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 4</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+
+          <!--Grid column-->
+          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
+            <h5 class="text-uppercase">Links</h5>
+
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a href="#!" class="text-white">Link 1</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 2</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 3</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 4</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+
+          <!--Grid column-->
+          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
+            <h5 class="text-uppercase">Links</h5>
+
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a href="#!" class="text-white">Link 1</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 2</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 3</a>
+              </li>
+              <li>
+                <a href="#!" class="text-white">Link 4</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+
+          <!--Grid column-->
+          <div class="col-lg-3 col-md-6 mb-4 mb-md-0">
+            <h5 class="text-uppercase">Links</h5>
+
             <ul class="list-unstyled mb-0">
               <li>
@@ -273,5 +259,5 @@
     </div>
     <!-- Grid container -->
-  
+
     <!-- Copyright -->
     <div class="text-center p-3" style="background-color: rgba(0, 0, 0, 0.2);">
Index: trip-planner-front/src/app/homepage/homepage.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.ts	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
+++ trip-planner-front/src/app/homepage/homepage.component.ts	(revision bdd64917749115bbdd228a9569a675d590c112e3)
@@ -1,2 +1,3 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
@@ -50,5 +51,4 @@
 
    ngOnInit(): void {
-/*
       this.locationService.getWeekendGetaways().subscribe(
          data => {
@@ -61,5 +61,5 @@
          }
       );
-      */
+
    }
 
@@ -73,14 +73,18 @@
 
       this.ref.onClose.subscribe((user: UserDto) => {
-         this.userService.registerUser(user).subscribe(
-            data  => {
-               console.log(data);
-              
-            }
-         );
-      });
+         if (user) {
+            this.userService.registerUser(user).subscribe(
+               data => {
+                  console.log(data);
+               }
+            );
+         }
+      },
+         err => {
+
+         });
    }
 
-   
+
    onClickLogIn() {
       this.ref = this.dialogService.open(LoginComponent, {
@@ -90,14 +94,22 @@
          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']);
+      this.ref.onClose.subscribe((loginRequest: LoginRequest) => {
+         if (loginRequest) {
+            this.userService.authenticateUser(loginRequest).subscribe(
+               (data: any) => {
+                  console.log(data);
+                  if (this.userService.isUserLoggedIn()) {
+                     this.router.navigate(['planners']);
+                  }
                }
-            }
-         );
+            );
+         }
       });
    }
+
+   ngOnDestroy() {
+      if (this.ref) {
+         this.ref.close();
+      }
+   }
 }
Index: trip-planner-front/src/app/homepage/register/register.component.html
===================================================================
--- trip-planner-front/src/app/homepage/register/register.component.html	(revision 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
+++ trip-planner-front/src/app/homepage/register/register.component.html	(revision bdd64917749115bbdd228a9569a675d590c112e3)
@@ -1,36 +1,43 @@
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
+    integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
 
-    <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 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"
+                class="form-control">
+
         </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="Email address (Username)" [(ngModel)]="user.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-user"></i></span>
+            <input type="text" pInputText placeholder="Email address (Username)" [(ngModel)]="user.username"
+                name="username">
         </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" [(ngModel)]="user.password" name="password"
-                >         
-            </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" [(ngModel)]="user.password" name="password">
         </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="Repeat password" [(ngModel)]="user.confirmPassword" name="confirmPassword"
-                >         
-            </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="Repeat password" [(ngModel)]="user.confirmPassword"
+                name="confirmPassword">
         </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>  
+    </div>
+
+    <div class="p-col-12 p-md-4">
+        <button pButton pRipple label="Submit" class="p-button-secondary" type="button"
+            (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 84d0fbb56bfbe319ba63e3327f1777ac5d841f83)
+++ trip-planner-front/src/app/homepage/register/register.component.ts	(revision bdd64917749115bbdd228a9569a675d590c112e3)
@@ -1,3 +1,4 @@
 import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { DynamicDialogRef } from 'primeng/dynamicdialog';
 import { UserDto } from 'src/app/_models/dto/userDto';
@@ -10,16 +11,28 @@
 export class RegisterComponent implements OnInit {
 
-  user : UserDto;
+  user: UserDto;
+  myForm: FormGroup;
 
-  constructor(private ref: DynamicDialogRef) {
+  constructor(private ref: DynamicDialogRef, private fb: FormBuilder) {
     this.user = new UserDto();
-   }
+    this.myForm = fb.group({
+      title: fb.control('initial value', Validators.required)
+    });
+  }
 
   ngOnInit(): void {
+    this.myForm = this.fb.group({
+      fullName: this.fb.control('', Validators.required),
+      username: this.fb.control('', Validators.required),
+      password: this.fb.control('', Validators.required),
+      confirmPassword: this.fb.control('', Validators.required)
+    });
   }
-  
-  onFormSubmitSignUp(user){
+
+  onFormSubmitSignUp(user) {
     this.ref.close(user);
     //window.location.reload();
+
   }
+
 }
