Index: trip-planner-front/src/app/_models/city.ts
===================================================================
--- trip-planner-front/src/app/_models/city.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/_models/city.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -7,6 +7,6 @@
     constructor(){
         this.id = 1;
-        this.name= '';
-        this.description= '';
+        this.name= 'City name';
+        this.description= 'City description';
     }
 }
Index: trip-planner-front/src/app/_models/dto/locationDto.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/locationDto.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,37 +1,0 @@
-import { Byte } from "@angular/compiler/src/util";
-
-export class LocationDto {
-    name: string;
-
-    description: string;
-
-    address: string;
-
-    priority: string;
-
-    duration: number;
-
-    trivia: string;
-
-    photo: Byte[];
-
-    region: number;
-
-    city: number;
-
-    user: string;
-
-
-    constructor() {
-        this.name = '';
-        this.description = '';
-        this.address = '';
-        this.priority = '';
-        this.duration = 0;
-        this.trivia = '';
-        this.photo = [];
-        this.city = 0;
-        this.region = 0;
-        this.user = '';
-    }
-}
Index: trip-planner-front/src/app/_models/dto/loginRequest.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/loginRequest.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,12 +1,0 @@
-export class LoginRequest{
-
-    username: string;
-    password: string;
-
-
-
-    constructor(){
-        this.username = '';
-        this.password = '';
-    }
-}
Index: trip-planner-front/src/app/_models/dto/plannerDto.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/plannerDto.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,12 +1,0 @@
-
-export class PlannerDto{
-    name: string;
-    description: string;
-
-
-    constructor(){
-        this.name = '';
-        this.description = '';
-      
-    }
-}
Index: trip-planner-front/src/app/_models/dto/plannerLocationDto.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/plannerLocationDto.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,10 +1,0 @@
-
-export class PlannerLocationDto {
-    locationId: number;
-    plannerId: number;
-
-    constructor(){
-     this.locationId = 1;
-     this.plannerId = 1;
-    }
-}
Index: trip-planner-front/src/app/_models/dto/userDto.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/userDto.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,16 +1,0 @@
-export class UserDto{
-
-    username: string;
-    fullName: string;
-    password: string;
-    confirmPassword: string;
-
-
-    constructor(){
-        this.username = '';
-        this.fullName = '';
-        this.password = '';
-        this.confirmPassword = '';
-
-    }
-}
Index: trip-planner-front/src/app/_models/dto/usernameDto.ts
===================================================================
--- trip-planner-front/src/app/_models/dto/usernameDto.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,8 +1,0 @@
-export class UsernameDto{
-
-    username: string;
-    
-    constructor(){
-        this.username = '';
-    }
-}
Index: trip-planner-front/src/app/_models/images.ts
===================================================================
--- trip-planner-front/src/app/_models/images.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,9 +1,0 @@
-export class Images{
-    id: number;
-    content: any[];
-
-    constructor(){
-        this.id = 1;
-        this.content = [];
-    }
-}
Index: trip-planner-front/src/app/_models/location.ts
===================================================================
--- trip-planner-front/src/app/_models/location.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/_models/location.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,3 +1,2 @@
-
 export class Location{
     
@@ -8,6 +7,4 @@
     priority: string;
     duration: number;
-    trivia: string;
-    photo: any[];
 
     constructor(){
@@ -18,6 +15,4 @@
         this.priority = 'Location priority';
         this.duration = 1;
-        this.trivia = '';
-        this.photo = [];
     }
 }
Index: trip-planner-front/src/app/_models/planner.ts
===================================================================
--- trip-planner-front/src/app/_models/planner.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/_models/planner.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,4 +1,3 @@
 export class Planner{
-    
     id: number;
     name: string;
@@ -7,6 +6,6 @@
     constructor(){
         this.id = 1;
-        this.name = '';
-        this.description = '';
+        this.name = 'Planner name';
+        this.description = 'Planner description';
     }
 }
Index: trip-planner-front/src/app/_models/region.ts
===================================================================
--- trip-planner-front/src/app/_models/region.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,10 +1,0 @@
-export class Region{
-
-    id:number;
-    name: string;
-
-    constructor(){
-        this.id = 1;
-        this.name = '';
-    }
-}
Index: trip-planner-front/src/app/_models/user.ts
===================================================================
--- trip-planner-front/src/app/_models/user.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,20 +1,0 @@
-export class User{
-
-    id: number;
-    username: string;
-    fullName: string;
-    password: string;
-    confirmPassword: string;
-    create_At: Date;
-    update_At:Date;
-
-    constructor(){
-        this.id = 1;
-        this.username = '';
-        this.fullName = '';
-        this.password = '';
-        this.confirmPassword = '';
-        this.create_At = new Date();
-        this.update_At = new Date();
-    }
-}
Index: trip-planner-front/src/app/_services/city.service.ts
===================================================================
--- trip-planner-front/src/app/_services/city.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/_services/city.service.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -7,4 +7,5 @@
     providedIn:'root'
 })
+
 export class CityService{
     constructor(private httpClient: HttpClient){
Index: trip-planner-front/src/app/_services/images.service.ts
===================================================================
--- trip-planner-front/src/app/_services/images.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,17 +1,0 @@
-import { HttpClient } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
-import { Images } from "../_models/images";
-
-@Injectable({
-    providedIn:'root'
-})
-export class ImagesService{
-    constructor(private httpClient: HttpClient){
-    }
-
-    getAllImagesForLocation(locationId : number):Observable<Images[]>{
-        let url = "http://localhost:8080/api/images";
-        return this.httpClient.get<Images[]>(url + "?locationId=" + locationId);
-    }
-}
Index: trip-planner-front/src/app/_services/location.service.ts
===================================================================
--- trip-planner-front/src/app/_services/location.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,80 +1,0 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
-import { LocationDto } from "../_models/dto/locationDto";
-import { PlannerLocationDto } from "../_models/dto/plannerLocationDto";
-import { Location } from "../_models/location";
-
-@Injectable({
-    providedIn: 'root'
-})
-export class LocationService{
-
-    httpHeaders: HttpHeaders = new HttpHeaders({
-        'Authorization': '' + sessionStorage.getItem("token"),
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-    });
-
-    constructor(private httpClient : HttpClient){}
-
-    getLocationsFromCity(cityId: number, companionId: number, lengthOfStay: number, categoryIds: string): Observable<Location[]>{
-        let url = "http://localhost:8080/api/city/locations";
-        return this.httpClient.get<Location[]>(url + '?cityId=' + cityId + '&companionId=' + companionId + '&lengthOfStay=' + lengthOfStay + '&categoryIds='+ categoryIds);
-    }
-
-    getLocationsFromRegion(regionId: number, companionId: number, lengthOfStay: number, categoryIds: string):Observable<Object[]>{
-        let url = "http://localhost:8080/api/region/locations";
-        return this.httpClient.get<Location[]>(url + '?regionId=' + regionId + '&companionId=' + companionId + '&lengthOfStay=' + lengthOfStay + '&categoryIds='+ categoryIds);
-    }
-
-    postLocationToPlanner(plannerLocationDto : PlannerLocationDto) : Observable<Location>{
-        let url = "http://localhost:8080/api/add-location";
-        return this.httpClient.post<Location>(url, plannerLocationDto);
-    }
-
-    getLocationsForPlanner(plannerId : number) : Observable<Location[]>{
-        let url = "http://localhost:8080/api/planner/locations";
-        return this.httpClient.get<Location[]>(url + '?plannerId=' + plannerId);
-    }
-
-    getAllLocations() : Observable<Location[]> {
-        let url = "http://localhost:8080/api/locations";
-        return this.httpClient.get<Location[]>(url);
-    }
-
-    getWeekendGetaways() : Observable<Location[]>{
-        let url = "http://localhost:8080/api/weekend";
-        return this.httpClient.get<Location[]>(url);
-    }
-
-    getVillages() : Observable<Location[]>{
-        let url = "http://localhost:8080/api/villages";
-        return this.httpClient.get<Location[]>(url);
-    }
-
-    getLocation(id : number) :Observable<Location>{
-        let url = "http://localhost:8080/api/location/" + id;
-        return this.httpClient.get<Location>(url);
-    }
-
-    getAllLocationsForPlanner(id: number): Observable<Location[]>{
-        let url = "http://localhost:8080/api/planner/locations";
-        return this.httpClient.get<Location[]>(url + "?plannerId=" + id);
-    }
-
-    getAllLocationIdsForPlanner(id:number):Observable<number[]>{
-        let url = "http://localhost:8080/api/planner/locationIds";
-        return this.httpClient.get<number[]>(url + "?plannerId="+id);
-    }
-    
-    getAllLocationsSearch(place : string) : Observable<Location[]>{
-        let url="http://localhost:8080/api/all"; 
-        return this.httpClient.get<Location[]>(url + "?place=" + place);
-    }
-
-    save(locationDto : LocationDto) : Observable<Location>{
-        let url = "http://localhost:8080/api/add";
-        return this.httpClient.post<Location>(url, locationDto, {headers: this.httpHeaders});
-    }
-}
Index: trip-planner-front/src/app/_services/places.service.ts
===================================================================
--- trip-planner-front/src/app/_services/places.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,17 +1,0 @@
-import { HttpClient } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
-import { CityService } from "./city.service";
-import { CountryService } from "./country.service";
-import { forkJoin  } from 'rxjs';
-
-@Injectable({
-    providedIn: 'root'
-})
-
-export class PlaceService{
-
-    constructor(private httpClient : HttpClient, private cityService: CityService, private countryService : CountryService){}
-    
-    
-}
Index: trip-planner-front/src/app/_services/planner.service.ts
===================================================================
--- trip-planner-front/src/app/_services/planner.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/_services/planner.service.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,7 +1,5 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";
-import { PlannerDto } from "../_models/dto/plannerDto";
-import { PlannerLocationDto } from "../_models/dto/plannerLocationDto";
 import { Planner } from "../_models/planner";
 
@@ -9,54 +7,10 @@
     providedIn: 'root'
 })
-export class PlannerService {
-
-    httpHeaders: HttpHeaders = new HttpHeaders({
-        'Authorization': '' + sessionStorage.getItem("token"),
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-    });
-
-    constructor(private httpClient: HttpClient) {
+export class PlannerService{
+    constructor(private httpClient: HttpClient){
     }
-
-
-    getAllPlanners(): Observable<Planner[]> {
-        let url = "http://localhost:8080/api/planners/user";
-        console.log("SERVID: " + sessionStorage.getItem("token"));
-        console.log(this.httpHeaders.get('Authorization'));
-        return this.httpClient.get<Planner[]>(url, { headers: this.httpHeaders });
+    getAllPlanners():Observable<Planner[]>{
+        let url = "http://localhost:8080/api/planners";
+        return this.httpClient.get<Planner[]>(url);
     }
-
-    postInitialPlanner(plannerDto: PlannerDto): Observable<Planner> {
-        let url = "http://localhost:8080/api/planner/new";
-        return this.httpClient.post<Planner>(url, plannerDto, {headers: this.httpHeaders});
-    }
-
-    updatePlanner(id: number, plannerDto: PlannerDto): Observable<Planner> {
-        let url = "http://localhost:8080/api/edit/planner/" + id;
-        return this.httpClient.put<Planner>(url, plannerDto, { headers: this.httpHeaders });
-    }
-
-    getPlannerById(id: number): Observable<Planner> {
-        let url = "http://localhost:8080/api/planner/" + id;
-        return this.httpClient.get<Planner>(url);
-    }
-
-    deletePlannerById(id: number): Observable<Planner> {
-        let url = "http://localhost:8080/api/delete/" + id;
-        return this.httpClient.delete<Planner>(url, { headers: this.httpHeaders });
-    }
-
-    deleteLocationFromPlanner(plannerLocationDto : PlannerLocationDto) {
-        let url = "http://localhost:8080/api/delete-location";
-        const options = {
-            body: {
-                "plannerId": plannerLocationDto.plannerId, 
-                "locationId": plannerLocationDto.locationId
-            } 
-        }
-        return this.httpClient.request('delete', url, options);
-    }
- 
-
 }
Index: trip-planner-front/src/app/_services/region.service.ts
===================================================================
--- trip-planner-front/src/app/_services/region.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,22 +1,0 @@
-import { HttpClient } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
-import { Region } from "../_models/region";
-
-@Injectable({
-    providedIn: 'root'
-})
-export class RegionService{
-    constructor(private httpClient: HttpClient){
-    }
-
-    getAllRegions():Observable<Region[]>{
-        let url = "http://localhost:8080/api/regions";
-        return this.httpClient.get<Region[]>(url);
-    }
-
-    getAllCitiesAndRegions() :Observable<string[]>{
-        let url = "http://localhost:8080/api/places";
-        return this.httpClient.get<string[]>(url);
-    }
-}
Index: trip-planner-front/src/app/_services/user.service.ts
===================================================================
--- trip-planner-front/src/app/_services/user.service.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,65 +1,0 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-import { Observable } from "rxjs";
-import { map } from "rxjs/operators";
-import { LoginRequest } from "../_models/dto/loginRequest";
-import { UserDto } from "../_models/dto/userDto";
-import { User } from "../_models/user";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class UserService {
-
-  headers = new HttpHeaders({
-    'Content-Type': 'application/json',
-    'Access-Control-Allow-Headers': 'Content-Type',
-
-  });
-
-  constructor(private httpClient: HttpClient) {
-
-  }
-
-  registerUser(user: UserDto): Observable<User> {
-    let url = "http://localhost:8080/api/users/register";
-    return this.httpClient.post<User>(url, user, { headers: this.headers });
-  }
-
-  authenticateUser(loginResult: LoginRequest) {
-    let url = "http://localhost:8080/api/users/login";
-    return this.httpClient.post<any>(url, loginResult)
-      .pipe(
-        map(userData => {
-          sessionStorage.setItem("username", loginResult.username);
-          let tokenStr = userData.token;
-          sessionStorage.setItem("token", tokenStr);
-          return userData;
-        })
-      );
-  }
-
-  isUserLoggedIn() {
-    let user = sessionStorage.getItem("username");
-    let token = sessionStorage.getItem("token");
-    return !(user === null);
-  }
-
-  getAllUsernames() {
-    let url = "http://localhost:8080/api/users/usernames";
-    return this.httpClient.get<string[]>(url);
-  }
-
-  getPassword(loginRequest : LoginRequest){
-    let url="http://localhost:8080/api/users/password";
-    const options = {
-      
-      body: {
-          "username": loginRequest.username
-          
-      } 
-  }
-    return this.httpClient.request('get', url, options);
-  }
-
-}
Index: trip-planner-front/src/app/app-routing.module.ts
===================================================================
--- trip-planner-front/src/app/app-routing.module.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/app-routing.module.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,28 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { ExploreResultComponent } from './explore/explore-result/explore-result.component';
-import { ExploreComponent } from './explore/explore.component';
-import { HomepageComponent } from './homepage/homepage.component';
-import { LoginComponent } from './homepage/login/login.component';
-import { AddLocationComponent } from './location/add-location/add-location.component';
-import { LocationDetailsComponent } from './location/location-details/location-details.component';
-import { LocationComponent } from './location/location.component';
-import { LocationsFormComponent } from './locations-form/locations-form.component';
-import { EditPlannerComponent } from './planner/edit-planner/edit-planner.component';
-import { PlannerComponent } from './planner/planner.component';
 
-
-const routes: Routes = [
-  {path: 'planners', component: PlannerComponent},
-  {path: 'form', component: LocationsFormComponent},
-  {path: 'edit/planner/:id', component: EditPlannerComponent},
-  {path: 'locations', component: LocationComponent},
-  {path: '', component: HomepageComponent},
-  {path: '', component:LoginComponent},
-  {path: 'location', component: LocationDetailsComponent},
-  {path: 'explore', component: ExploreComponent},
-  {path: 'results', component: ExploreResultComponent},
-  {path: 'add-location', component: AddLocationComponent}
-];
+const routes: Routes = [];
 
 @NgModule({
Index: trip-planner-front/src/app/app.component.html
===================================================================
--- trip-planner-front/src/app/app.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/app.component.html	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,3 +1,3 @@
-  <router-outlet></router-outlet>
 
-
+  <app-planner>
+  </app-planner>
Index: trip-planner-front/src/app/app.component.ts
===================================================================
--- trip-planner-front/src/app/app.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/app.component.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -13,5 +13,3 @@
   ngOnInit(): void {
   }
-
- 
 }
Index: trip-planner-front/src/app/app.module.ts
===================================================================
--- trip-planner-front/src/app/app.module.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/app.module.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -2,7 +2,7 @@
 import { AppComponent } from './app.component';
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import {FormsModule} from '@angular/forms';
+import {HttpClient, HttpClientModule} from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CategoryService } from './_services/cateogry.service';
@@ -10,50 +10,16 @@
 import { LocationComponent } from './location/location.component';
 import { MatIconModule } from '@angular/material/icon';
+import {MatListModule} from '@angular/material/list';
 import { MatSelectModule } from '@angular/material/select';
-import { MatInputModule } from '@angular/material/input';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatTabsModule } from '@angular/material/tabs';
-import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { MatBadgeModule } from '@angular/material/badge';
-import { MatDividerModule } from '@angular/material/divider';
-import { MatCardModule } from '@angular/material/card';
+import {MatInputModule} from '@angular/material/input';
+import {MatChipsModule} from '@angular/material/chips';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatDialogModule} from '@angular/material/dialog';
+import {MatBadgeModule} from '@angular/material/badge';
+import {MatDividerModule} from '@angular/material/divider';
+import {MatCardModule} from '@angular/material/card';
 import { PlannerService } from './_services/planner.service';
 import { MatButtonModule } from '@angular/material/button';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { CreateInitialPlannerComponent } from './create-initial-planner/create-initial-planner.component';
-import { LocationsFormComponent } from './locations-form/locations-form.component';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { EditPlannerComponent } from './planner/edit-planner/edit-planner.component';
-import { AddLocationToPlannerPanelComponent } from './location/add-location-to-planner-panel/add-location-to-planner-panel.component';
-import { HomepageComponent } from './homepage/homepage.component';
-import { AccordionModule } from 'primeng/accordion';     //accordion and accordion tab
-import { CarouselModule } from 'primeng/carousel';
-import { ButtonModule } from 'primeng/button';
-import { ToastModule } from 'primeng/toast';
-import { TabViewModule } from 'primeng/tabview';
-import { LocationDetailsComponent } from './location/location-details/location-details.component';
-import { GalleriaModule } from 'primeng/galleria';
-import { DialogService, DynamicDialogModule } from 'primeng/dynamicdialog';
-import { MessageService, SharedModule, ConfirmationService } from 'primeng/api';
-import { TableModule } from 'primeng/table';
-import { MessagesModule } from 'primeng/messages';
-import { MessageModule } from 'primeng/message';
-import { InputTextModule } from 'primeng/inputtext';
-import { RippleModule } from 'primeng/ripple';
-import { PaginatorModule } from 'primeng/paginator';
-import { CardModule } from 'primeng/card';
-import { RegisterComponent } from './homepage/register/register.component';
-import { LoginComponent } from './homepage/login/login.component';
-import { AuthGuard } from './auth/auth.guard';
-import { AuthInterceptor } from './auth/auth.interceptor';
-import { ExploreComponent } from './explore/explore.component';
-import {AutoCompleteModule} from 'primeng/autocomplete';
-import { ExploreResultComponent } from './explore/explore-result/explore-result.component';
-import {RatingModule} from 'primeng/rating';
-import { AddLocationComponent } from './location/add-location/add-location.component';
-import {StepsModule} from 'primeng/steps';
-import {MatStepperModule} from '@angular/material/stepper';
-import {FileUploadModule} from 'primeng/fileupload';
+import {MatGridListModule} from '@angular/material/grid-list';
 
 @NgModule({
@@ -61,17 +27,6 @@
     AppComponent,
     PlannerComponent,
-    LocationComponent,
-    CreateInitialPlannerComponent,
-    LocationsFormComponent,
-    EditPlannerComponent,
-    AddLocationToPlannerPanelComponent,
-    HomepageComponent,
-    LocationDetailsComponent,
-    RegisterComponent,
-    LoginComponent,
-    ExploreComponent,
-    ExploreResultComponent,
-    AddLocationComponent
-    ],
+    LocationComponent
+  ],
   imports: [
     BrowserModule,
@@ -89,61 +44,12 @@
     MatCardModule,
     MatButtonModule,
-    MatGridListModule,
-    MatFormFieldModule,
-    MatAutocompleteModule,
-    HttpClientModule,
-    ReactiveFormsModule,
-    MatSelectModule,
-    AccordionModule,
-    CarouselModule,
-    ButtonModule,
-    ToastModule,
-    TabViewModule,
-    GalleriaModule,
-    DynamicDialogModule,
-    MatIconModule,
-    SharedModule,
-    MatDialogModule,
-    TableModule,
-    MessagesModule,
-    MessageModule,
-    InputTextModule,
-    RippleModule,
-    FormsModule,
-    PaginatorModule,
-    CardModule,
-    AutoCompleteModule,
-    RatingModule,
-    StepsModule,
-    MatStepperModule,
-    FileUploadModule
-    ],
-
-
+    MatGridListModule
+  ],
   providers: [
     CategoryService,
-    PlannerService,
-    {
-      provide: MatDialogRef,
-      useValue: {},
-
-    },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: AuthInterceptor,
-      multi: true
-    },
-    DialogService,
-    MessageService,
-    ConfirmationService,
-    AuthGuard
+    PlannerService
   ],
-
-  entryComponents: [
-    AddLocationToPlannerPanelComponent
-  ],
-  bootstrap: [AppComponent],
-  schemas: [NO_ERRORS_SCHEMA],
-
+  bootstrap: [AppComponent]
+  
 })
 export class AppModule { }
Index: trip-planner-front/src/app/auth/auth.guard.ts
===================================================================
--- trip-planner-front/src/app/auth/auth.guard.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,21 +1,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { Observable } from 'rxjs';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class AuthGuard implements CanActivate {
-
-  constructor(private router : Router){}
-  canActivate(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): boolean{
-    
-      if(localStorage.getItem('token') != null)
-      return true;
-      this.router.navigate(['planners']);
-      return false;
-  }
-  
-}
Index: trip-planner-front/src/app/auth/auth.interceptor.ts
===================================================================
--- trip-planner-front/src/app/auth/auth.interceptor.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,22 +1,0 @@
-import { HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from "@angular/common/http";
-import { Injectable } from "@angular/core";
-
-@Injectable({
-  providedIn: "root"
-})
-export class AuthInterceptor implements HttpInterceptor {
-
-  constructor() { }
-
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
-
-    if (sessionStorage.getItem('username') && sessionStorage.getItem('token')) {
-      req = req.clone({
-        headers: req.headers.set("Authorization", "" + sessionStorage.getItem("token"))
-      });
-    }
-
-    return next.handle(req);
-
-  }
-}
Index: trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.html
===================================================================
--- trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<div mat-dialog-content>
-  <p>Planner name</p>
-  <mat-form-field appearance="fill">
-    <input matInput type="text" [(ngModel)]="plannerDto.name" name="plannerName" placeholder="Planner name">
-
-  </mat-form-field>
-  <p>Planner description</p>
-  <mat-form-field appearance="fill">
-    <textarea matInput name="description" [(ngModel)]="plannerDto.description" type="text"
-      placeholder="Planner description"></textarea>
-  </mat-form-field>
-</div>
-<div mat-dialog-actions>
-  <button pButton pRipple type="button" label="Save" class="p-button-outlined p-button-rounded p-button-help"
-    (click)="onFormSubmitPlanner(plannerDto)"></button>
-</div>
Index: trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.ts
===================================================================
--- trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,30 +1,0 @@
-import { PlatformModule } from '@angular/cdk/platform';
-import { Component, OnInit } from '@angular/core';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
-import { PlannerDto } from '../_models/dto/plannerDto';
-import { Planner } from '../_models/planner';
-
-@Component({
-  selector: 'app-create-initial-planner',
-  templateUrl: './create-initial-planner.component.html',
-  styleUrls: ['./create-initial-planner.component.css']
-})
-export class CreateInitialPlannerComponent implements OnInit {
-
-  plannerDto: PlannerDto;
-
-  constructor( private ref: DynamicDialogRef) {
-                this.plannerDto = new PlannerDto();
-              }
-
-  ngOnInit(): void {
-    this.plannerDto = new PlannerDto();
-  }
-
-  onFormSubmitPlanner(plannerDto){
-    this.ref.close(plannerDto);
-    window.location.reload();
-  }
-
-
-}
Index: trip-planner-front/src/app/explore/explore-result/explore-result.component.css
===================================================================
--- trip-planner-front/src/app/explore/explore-result/explore-result.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,3 +1,0 @@
-.container {
-    background-color: #F9F2E8;
-}
Index: trip-planner-front/src/app/explore/explore-result/explore-result.component.html
===================================================================
--- trip-planner-front/src/app/explore/explore-result/explore-result.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
-  integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-
-  <title></title>
-</head>
-
-<body>
-
-  <header>
-  </header>
-
-  <main role="main">
-    <h1 style="color: #F77D62; display: inline;">Explore</h1>
-    <h1 style=" display: inline;">{{place}}</h1>
-    <div class="lightbox" *ngFor="let l of allLocation">
-      <div class="row">
-        <div class="col-lg-6">
-          <img src="data:image/png;base64,{{l.photo}}"
-          class="w-100 mb-2 mb-md-4 shadow-1-strong rounded"/>
-      </div>
-      </div>
-    </div>
-
-
-    
-    <div class="container">
-      <li *ngFor="let location of allLocation">
-        <ol>{{location.name}}</ol>
-      </li>
-    </div>
-  </main>
-  <br>
-
-  <footer class="bg-dark text-center text-white">
-
-  </footer>
-</body>
-
-</html>
Index: trip-planner-front/src/app/explore/explore-result/explore-result.component.ts
===================================================================
--- trip-planner-front/src/app/explore/explore-result/explore-result.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,47 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { LocationService } from 'src/app/_services/location.service';
-
-@Component({
-  selector: 'app-explore-result',
-  templateUrl: './explore-result.component.html',
-  styleUrls: ['./explore-result.component.css']
-})
-export class ExploreResultComponent implements OnInit {
-
-  place: string;
-  allLocation: any[] = [];
-
-  constructor(private route: ActivatedRoute, private locationService : LocationService) {
-    this.place = '';
-  }
-
-  responsiveOptions:any[] = [
-    {
-        breakpoint: '1024px',
-        numVisible: 5
-    },
-    {
-        breakpoint: '768px',
-        numVisible: 3
-    },
-    {
-        breakpoint: '560px',
-        numVisible: 1
-    }
-];
-  ngOnInit(): void {
-    this.route.queryParams
-      .subscribe(params => {
-        this.place = params.place;
-      }
-    );
-
-      this.locationService.getAllLocationsSearch(this.place).subscribe(
-        res => {
-          this.allLocation = res;
-        }
-    )
-  }
-
-}
Index: trip-planner-front/src/app/explore/explore.component.css
===================================================================
--- trip-planner-front/src/app/explore/explore.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#button{
-    margin-left: 20px;
-}
Index: trip-planner-front/src/app/explore/explore.component.html
===================================================================
--- trip-planner-front/src/app/explore/explore.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
-  integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>Explore</title>
-</head>
-
-<body>
-  <header>
-    <nav class="navbar navbar-expand-sm">
-      <strong class="navbar-brand">Trivia Trip</strong>
-      <ul class="navbar-nav ml-auto">
-        <li class="nav-item">
-
-          <form class="example-form">
-            <mat-form-field class="example-full-width" appearance="fill">
-              <input type="text" matInput [formControl]="myControl" [matAutocomplete]="auto"
-                [(ngModel)]="selectedPlace">
-              <mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn">
-                <mat-option *ngFor="let option of filteredOptions | async" [value]="option"
-                  (click)="onPlaceSelected(selectedPlace)">
-                  {{option}}
-                </mat-option>
-              </mat-autocomplete>
-            </mat-form-field>
-            <p-button label="Search" icon="pi pi-search" [loading]="loading[0]" (click)="load(0)" id="button">
-            </p-button>
-          </form>
-        </li>
-      </ul>
-    </nav>
-  </header>
-
-</body>
-
-</html>
Index: trip-planner-front/src/app/explore/explore.component.ts
===================================================================
--- trip-planner-front/src/app/explore/explore.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,68 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import { Router } from '@angular/router';
-import { Observable, Subscription } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
-import { LocationService } from '../_services/location.service';
-import { RegionService } from '../_services/region.service';
-
-
-@Component({
-  selector: 'app-explore',
-  templateUrl: './explore.component.html',
-  styleUrls: ['./explore.component.css']
-})
-export class ExploreComponent implements OnInit {
-
-  text: string;
-  loading = [false, false, false, false];
-  regions: string[] = [];
-  filteredOptions: Observable<any[]> = new Observable<any[]>();
-  myControl = new FormControl();
-  cityName: string = '';
-  selectedPlace: string = '';
-  thirdSubscription: Subscription = new Subscription;
-
-  constructor(private locationService: LocationService,
-    private regionService: RegionService, private router: Router) {
-    this.text = '';
-  }
-
-  ngOnInit(): void {
-
-    this.regionService.getAllCitiesAndRegions().subscribe(
-      data => {
-        this.regions = data;
-      }
-    );
-
-    this.filteredOptions = this.myControl.valueChanges.pipe(
-      startWith(''),
-      map(value => (typeof value === 'string' ? value : value.name)),
-      map(name => (name ? this._filter(name) : this.regions.slice())),
-    );
-  }
-
-  displayFn(city: string): string {
-    return city && city ? city : '';
-  }
-
-  private _filter(name: string): any[] {
-    const filterValue = name.toLowerCase();
-    return this.regions.filter(option => option.toLowerCase().includes(filterValue));
-  }
-
-  load(index) {
-    this.loading[index] = true;
-    setTimeout(() => this.loading[index] = false, 1000);
-    this.locationService.getAllLocationsSearch(this.selectedPlace).subscribe(
-      data => {
-        this.router.navigate(['results'], { queryParams: { place: this.selectedPlace } });
-      }
-    );
-  }
-
-  onPlaceSelected(selectedPlace) {
-    console.log(this.selectedPlace); // get from view 
-  }
-}
Index: trip-planner-front/src/app/homepage/homepage.component.css
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,38 +1,0 @@
-header, main{
-    margin:auto;
-    max-width: 80%;
-}
-
-main img {
-    width: 100%;
-    height: 400px;
-}
-
-header img{
-    width: 50px;
-    height: 50px;
-}
-nav button{
-    border-radius: 30px;
-}
-
-.navbar-nav {
-    margin-left: auto;
-}
-
-.product-item-content {
-    border: 1px solid var(--surface-d);
-    border-radius: 3px;
-    margin: .3rem;
-    text-align: center;
-    padding: 2rem 0;
-}
-
-.product-image {
-    width: 50%;
-    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-}
-
-.p-mb-3 img {
-    height: 300px;
-}
Index: trip-planner-front/src/app/homepage/homepage.component.html
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
-  integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-
-  <title></title>
-</head>
-
-<body>
-  <p-toast></p-toast>
-  <header>
-    <nav class="navbar navbar-expand-sm bg-light">
-      <strong class="navbar-brand">Trivia Trip</strong>
-
-      <ul class="navbar-nav ml-auto">
-        <li class="nav-item">
-          <button class="btn btn-dark" (click)="onClickSignUp()" type="button">Sign up</button>
-        </li>
-        <li class="nav-item">
-          <button class="btn btn-dark" (click)="onClickLogIn()">Sign in</button>
-        </li>
-      </ul>
-    </nav>
-  </header>
-
-  <main role="main">
-    <img src={{imageURI}} />
-    <h4></h4>
-
-    <div class="content-section implementation carousel-demo" style="padding-top: 2em;">
-      <div class="card">
-        <p-carousel [value]="locations" [numVisible]="3" [numScroll]="3" [circular]="false"
-          [responsiveOptions]="responsiveOptions">
-          <ng-template pTemplate="header">
-            <h5>Weekend favourites</h5>
-          </ng-template>
-          <ng-template let-data pTemplate="item">
-            <div class="product-item">
-              <div class="product-item-content">
-                <div class="p-mb-3">
-                  <img src="data:image/png;base64,{{data.photo}}" class="product-image" />
-                </div>
-                <div>
-                  <h4 class="p-mb-1">{{data.name}}</h4>
-                  <div class="car-buttons p-mt-5">
-                    <p-button type="button" styleClass="p-button p-button-rounded p-mr-2" icon="pi pi-search">
-                    </p-button>
-                    <p-button type="button" styleClass="p-button-success p-button-rounded p-mr-2"
-                      icon="pi pi-star-fill"></p-button>
-                    <p-button type="button" styleClass="p-button-help p-button-rounded" icon="pi pi-cog"></p-button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </ng-template>
-        </p-carousel>
-      </div>
-    </div>
-
-
-    <div class="content-section implementation carousel-demo" style="padding-top: 2em;">
-      <div class="card">
-        <p-carousel [value]="villages" [numVisible]="3" [numScroll]="3" [circular]="false"
-          [responsiveOptions]="responsiveOptions">
-          <ng-template pTemplate="header">
-            <h5>Rural tourism</h5>
-          </ng-template>
-          <ng-template let-village pTemplate="item">
-            <div class="product-item">
-              <div class="product-item-content">
-                <div class="p-mb-3">
-                  <img src="data:image/png;base64,{{village.photo}}" class="product-image" />
-                </div>
-                <div>
-                  <h4 class="p-mb-1">{{village.name}}</h4>
-                  <div class="car-buttons p-mt-5">
-                    <p-button type="button" styleClass="p-button p-button-rounded p-mr-2" icon="pi pi-search">
-                    </p-button>
-                    <p-button type="button" styleClass="p-button-success p-button-rounded p-mr-2"
-                      icon="pi pi-star-fill"></p-button>
-                    <p-button type="button" styleClass="p-button-help p-button-rounded" icon="pi pi-cog"></p-button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </ng-template>
-        </p-carousel>
-      </div>
-    </div>
-
-  </main>
-  <br>
-
-  <footer class="bg-dark text-center text-white">
-    <!-- Grid container -->
-    <div class="container p-4">
-      <!-- Section: Social media -->
-      <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>
-
-        <!-- Twitter -->
-        <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>
-
-        <!-- Instagram -->
-        <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>
-
-        <!-- Github -->
-        <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="">
-        <form action="">
-          <!--Grid row-->
-          <div class="row d-flex justify-content-center">
-            <!--Grid column-->
-            <div class="col-auto">
-              <p class="pt-2">
-                <strong>Sign up for our newsletter</strong>
-              </p>
-            </div>
-            <!--Grid column-->
-
-            <!--Grid column-->
-            <div class="col-md-5 col-12">
-              <!-- Email input -->
-              <div class="form-outline form-white mb-4">
-                <input type="email" id="form5Example21" class="form-control" />
-                <label class="form-label" for="form5Example21">Email address</label>
-              </div>
-            </div>
-            <!--Grid column-->
-
-            <!--Grid column-->
-            <div class="col-auto">
-              <!-- Submit button -->
-              <button type="submit" class="btn btn-outline-light mb-4">
-                Subscribe
-              </button>
-            </div>
-            <!--Grid column-->
-          </div>
-          <!--Grid row-->
-        </form>
-      </section>
-      <!-- Section: Form -->
-
-      <!-- Section: Text -->
-      <section class="mb-4">
-        <p>
-          Lorem ipsum dolor sit amet consectetur adipisicing elit. Sunt distinctio earum
-          repellat quaerat voluptatibus placeat nam, commodi optio pariatur est quia magnam
-          eum harum corrupti dicta, aliquam sequi voluptate quas.
-        </p>
-      </section>
-      <!-- Section: Text -->
-
-      <!-- Section: Links -->
-      <section class="">
-        <!--Grid row-->
-        <div class="row">
-          <!--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-->
-        </div>
-        <!--Grid row-->
-      </section>
-      <!-- Section: Links -->
-    </div>
-    <!-- Grid container -->
-
-    <!-- Copyright -->
-    <div class="text-center p-3" style="background-color: rgba(0, 0, 0, 0.2);">
-      © 2020 Copyright:
-      <a class="text-white" href="#">Trivia trip</a>
-    </div>
-    <!-- Copyright -->
-  </footer>
-  <!-- Footer -->
-</body>
-
-</html>
Index: trip-planner-front/src/app/homepage/homepage.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/homepage.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,115 +1,0 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { identifierModuleUrl } from '@angular/compiler';
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import { MessageService } from 'primeng/api';
-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';
-
-
-@Component({
-   selector: 'app-homepage',
-   templateUrl: './homepage.component.html',
-   styleUrls: ['./homepage.component.css']
-})
-export class HomepageComponent implements OnInit {
-
-   imageURI = 'https://i.pinimg.com/736x/a1/1a/57/a11a572a1ec4e07039bbd04661a3b035.jpg';
-   responsiveOptions;
-   locations: Location[];
-   villages: Location[];
-   ref: DynamicDialogRef;
-
-   constructor(private locationService: LocationService, private dialogService: DialogService, private userService: UserService,
-      private router: Router, private messageService: MessageService) {
-      this.responsiveOptions = [
-         {
-            breakpoint: '1024px',
-            numVisible: 3,
-            numScroll: 3
-         },
-         {
-            breakpoint: '768px',
-            numVisible: 2,
-            numScroll: 2
-         },
-         {
-            breakpoint: '560px',
-            numVisible: 1,
-            numScroll: 1
-         }
-      ];
-      this.locations = [];
-      this.villages = [];
-      this.ref = new DynamicDialogRef;
-   }
-
-   ngOnInit(): void {
-      this.locationService.getWeekendGetaways().subscribe(
-         data => {
-            this.locations = data;
-         });
-
-      this.locationService.getVillages().subscribe(
-         village => {
-            this.villages = village;
-         }
-      );
-   }
-
-   onClickSignUp() {
-      this.ref = this.dialogService.open(RegisterComponent, {
-         header: 'Register form',
-         width: '70%',
-         contentStyle: { "max-height": "500px", "overflow": "auto" },
-         baseZIndex: 10000
-      });
-
-      this.ref.onClose.subscribe((user: UserDto) => {
-         if (user) {
-            this.userService.registerUser(user).subscribe(
-               data => {
-                  console.log(data);
-               }
-            );
-         }
-      },
-         err => {
-            console.log("oops");
-         });
-   }
-
-
-   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) => {
-         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/login/login.component.html
===================================================================
--- trip-planner-front/src/app/homepage/login/login.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<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="readersack">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-6 offset-md-3">
-                <form [formGroup]="form" #myform="ngForm" (ngSubmit)="onFormLogIn(loginRequest)">
-                    <div class="form-group">
-
-                        <label>Username (email)</label>
-                        <input formControlName="username" id="username" type="text" class="form-control"
-                            [(ngModel)]="loginRequest.username"
-                            [ngClass]="{ 'is-invalid': myform.submitted && (form.get('username')?.errors?.['required'] 
-                        || form.get('username')?.errors?.['validateUser'])}" />
-                        <div *ngIf="form.get('username')?.hasError('required') && myform.submitted"
-                            class="invalid-feedback">
-                            Username is required
-                        </div>
-                        <div *ngIf="form.get('username')?.hasError('validateUser') && myform.submitted"
-                            class="invalid-feedback">
-                            Invalid username
-                        </div>
-
-                        <label>Password</label>
-                        <input formControlName="password" id="password" type="password" class="form-control"
-                            [(ngModel)]="loginRequest.password" [ngClass]="{ 'is-invalid': myform.submitted && form.get('password')?.errors?.['required']}" />
-                        <div *ngIf="form.get('password')?.hasError('required') && myform.submitted"
-                            class="invalid-feedback">
-                            Password is required</div>
-                        
-
-                        <div class="p-col-12 p-md-4">
-                            <button type="submit" pButton pRipple class="p-button-secondary">Submit</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
Index: trip-planner-front/src/app/homepage/login/login.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/login/login.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,76 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
-import { LoginRequest } from 'src/app/_models/dto/loginRequest';
-import { PlannerLocationDto } from 'src/app/_models/dto/plannerLocationDto';
-import { UserDto } from 'src/app/_models/dto/userDto';
-import { UsernameDto } from 'src/app/_models/dto/usernameDto';
-import { UserService } from 'src/app/_services/user.service';
-
-@Component({
-  selector: 'app-login',
-  templateUrl: './login.component.html',
-  styleUrls: ['./login.component.css']
-})
-export class LoginComponent implements OnInit {
-
-  form: FormGroup;
-  loginRequest: LoginRequest;
-  usernames: string[];
-
-  constructor(private ref: DynamicDialogRef, private userService: UserService, formBuilder: FormBuilder) {
-    this.loginRequest = new LoginRequest();
-    this.usernames = [];
-
-    this.form = formBuilder.group({
-      username: new FormControl('', [Validators.required]),
-      password: new FormControl('', [Validators.required, Validators.minLength(6)]),
-    },
-      {
-        validators: [
-          this.validateUser('username')
-        ]
-      }
-    );
-  }
-
-  ngOnInit(): void {
-
-  }
-
-  onFormLogIn(loginRequest) {
-    const { valid } = this.form;
-    if (valid) {
-      this.ref.close(loginRequest);
-    }
-  }
-
-  validateUser(username: string) {
-    return (formGroup: FormGroup) => {
-      const control = formGroup.controls[username];
-
-      if (control.errors && !control.errors.validateUser) {
-        return;
-      }
-
-      this.userService.getAllUsernames().subscribe(
-        data => {
-          this.usernames = data;
-          for (let i = 0; i < this.usernames.length; i++) {
-            if (control.value === this.usernames[i]) {
-              control.setErrors(null);
-             
-              break;
-            } else {
-              control.setErrors({ validateUser: true });
-            }
-
-          }
-        }
-      );
-      return null;
-  
-    };
-
-  }
-}
Index: trip-planner-front/src/app/homepage/register/register.component.html
===================================================================
--- trip-planner-front/src/app/homepage/register/register.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<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="readersack">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-6 offset-md-3">
-                <form [formGroup]="form" #myform="ngForm" (ngSubmit)="onFormSubmitSignUp(user)">
-                    <div class="form-group">
-                        <label>Full name</label>
-                        <input formControlName="fullName" id="fullName" type="text" class="form-control"
-                            [(ngModel)]="user.fullName"
-                            [ngClass]="{ 'is-invalid': myform.submitted && form.get('fullName')?.errors?.['required']}" />
-                        <div *ngIf="myform.submitted && form.get('fullName')?.errors" class="invalid-feedback">
-                            <div *ngIf="form.get('fullName')?.hasError('required') && myform.submitted">
-                                Full Name is required
-                            </div>
-                        </div>
-
-                        <label>Username (email)</label>
-                        <input formControlName="username" id="username" type="text" class="form-control"
-                            [(ngModel)]="user.username"
-                            [ngClass]="{ 'is-invalid': myform.submitted && (form.get('username')?.errors?.['required'] || 
-                            form.get('username')?.errors?.['email'] || form.get('username')?.hasError('validateUsername'))}" />
-                        <div *ngIf="form.get('username')?.hasError('required') && myform.submitted"
-                            class="invalid-feedback">
-                            Username is required</div>
-                        <div *ngIf="form.get('username')?.hasError('email') && myform.submitted"
-                            class="invalid-feedback">
-                            Please enter valid email.</div>
-                        <div *ngIf="form.get('username')?.hasError('validateUsername') && myform.submitted"
-                            class="invalid-feedback">
-                            Username already exists</div>
-
-
-
-                        <label>Password</label>
-                        <input formControlName="password" id="password" type="password" class="form-control"
-                            [(ngModel)]="user.password" [ngClass]="{ 'is-invalid': myform.submitted && (form.get('password')?.errors?.['required'] ||
-                            form.get('password')?.errors?.['minlength'])}" />
-                        <div *ngIf="form.get('password')?.hasError('required') && myform.submitted"
-                            class="invalid-feedback">
-                            Password is required</div>
-                        <div *ngIf="form.get('password')?.errors?.['minlength'] && myform.submitted"
-                            class="invalid-feedback">
-                            Password must be at least 6 characters long.
-                        </div>
-
-                        <label>Confirm password</label>
-                        <input formControlName="confirmPassword" id="confirmPassword" type="password"
-                            class="form-control" [(ngModel)]="user.confirmPassword"
-                            [ngClass]="{ 'is-invalid': myform.submitted && (form.get('confirmPassword')?.errors?.['required'] || 
-                            form.get('confirmPassword')?.errors?.['minlength'] || form.get('confirmPassword')?.errors?.['mustMatch'])}" />
-                        <div *ngIf="form.get('confirmPassword')?.hasError('required') && myform.submitted"
-                            class="invalid-feedback">
-                            Confirm Password is required</div>
-                        <div *ngIf="form.get('confirmPassword')?.errors?.['minlength'] && myform.submitted"
-                            class="invalid-feedback">
-                            Confirm Password must be at least 6 characters long.
-                        </div>
-                        <div *ngIf="form.get('confirmPassword')?.errors?.['mustMatch'] && myform.submitted"
-                            class="invalid-feedback">Password and confirm password must match
-                        </div>
-
-                        <div class="p-col-12 p-md-4">
-                            <button type="submit" pButton pRipple class="p-button-secondary">Submit</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
Index: trip-planner-front/src/app/homepage/register/register.component.ts
===================================================================
--- trip-planner-front/src/app/homepage/register/register.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,74 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
-import { CustomValidators } from 'src/app/providers/CustomValidators';
-import { UserDto } from 'src/app/_models/dto/userDto';
-import { UserService } from 'src/app/_services/user.service';
-
-@Component({
-  selector: 'app-register',
-  templateUrl: './register.component.html',
-  styleUrls: ['./register.component.css']
-})
-export class RegisterComponent implements OnInit {
-
-  user: UserDto;
-  form: FormGroup;
-  usernames: string[];
-
-
-  constructor(private ref: DynamicDialogRef, 
-    formBuilder: FormBuilder, private userService: UserService) {
-    this.user = new UserDto();
-    this.usernames = [];
-
-    this.form = formBuilder.group({
-      fullName: new FormControl('', [Validators.required, Validators.minLength(3)]),
-      username: new FormControl('', [Validators.required, Validators.email]),
-      password: new FormControl('', [Validators.required, Validators.minLength(6)]),
-      confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)])
-    }, {
-      validators: [
-        CustomValidators.mustMatch('password', 'confirmPassword'),
-        this.validateUsername('username')
-      ]
-    });
-  }
-
-  ngOnInit(): void {
-  }
-
-  onFormSubmitSignUp(user) {
-    const { valid } = this.form;
-    if (valid) {
-      this.ref.close(user);
-    }
-  }
-
-  validateUsername(username: string) {
-    return (formGroup: FormGroup) => {
-      const control = formGroup.controls[username];
-
-      if (control.errors && !control.errors.validateUsername) {
-        return;
-      }
-
-      this.userService.getAllUsernames().subscribe(
-        data => {
-          this.usernames = data;
-          for (let i = 0; i < this.usernames.length; i++) {
-            if (control.value === this.usernames[i]) {
-              control.setErrors({ validateUsername: true });
-              break;
-            } else {
-              control.setErrors(null);
-            }
-          }
-        }
-      );
-      return null;
-    };
-
-  }
-
-}
Index: trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html
===================================================================
--- trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<p-table [value]="planners" [paginator]="true" [rows]="3" [responsive]="true">
-    <ng-template pTemplate="header">
-        <tr>
-            <th pSortableColumn="name">Name <p-sortIcon field="vin"></p-sortIcon>
-            </th>
-            <th style="width:4em"></th>
-        </tr>
-    </ng-template>
-    <ng-template pTemplate="body" let-planner>
-        <tr>
-            <td>{{planner.name}}</td>
-            <td>
-                <button pButton pRipple type="button" icon="pi pi-heart" class="p-button-rounded p-button-help"
-                    (click)="selectPlanner(planner)"></button>
-            </td>
-        </tr>
-    </ng-template>
-</p-table>
Index: trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts
===================================================================
--- trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,34 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Planner } from 'src/app/_models/planner';
-import { PlannerService } from 'src/app/_services/planner.service';
-import { DynamicDialogRef } from 'primeng/dynamicdialog';
-
-
-
-@Component({
-  selector: 'app-add-location-to-planner-panel',
-  templateUrl: './add-location-to-planner-panel.component.html',
-  styleUrls: ['./add-location-to-planner-panel.component.css']
-})
-export class AddLocationToPlannerPanelComponent implements OnInit {
-
-  planners: Planner[];
-  
-  constructor(private plannerService: PlannerService, private ref: DynamicDialogRef) {
-    this.planners = [];
-  }
-
-  ngOnInit(): void {
-
-    this.plannerService.getAllPlanners().subscribe(
-      planner => {
-        this.planners = planner;
-      }
-    );
-  }
-
-  selectPlanner(planner: Planner) {
-    this.ref.close(planner);
-  }
-
-}
Index: trip-planner-front/src/app/location/add-location/add-location.component.css
===================================================================
--- trip-planner-front/src/app/location/add-location/add-location.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,23 +1,0 @@
-.example-form {
-    min-width: 150px;
-    max-width: 380px;
-    width: 100%;
-  }
-  
-  .example-full-width {
-    width: 100%;
-  }
-  
-  mat-icon {
-    height: 20px;
-    width: 20px;
-    font-size: 20px;
-    margin-right: 5px;
-  }
-  button{
-    float: right;
-  }
-  
-  .yellow{
-    background-color:yellow;
-  }
Index: trip-planner-front/src/app/location/add-location/add-location.component.html
===================================================================
--- trip-planner-front/src/app/location/add-location/add-location.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<mat-stepper linear #stepper>
-    <mat-step [stepControl]="firstFormGroup" [editable]="isEditable" [completed]="isCompleted">
-        <form [formGroup]="firstFormGroup">
-            <ng-template matStepLabel>Location properties</ng-template>
-            <mat-form-field appearance="fill">
-                <mat-label>Name</mat-label>
-                <input matInput [(ngModel)]="name" formControlName="name" required>
-            </mat-form-field>
-<label></label>
-            <mat-form-field appearance="fill">
-                <mat-label>Description</mat-label>
-                <input matInput [(ngModel)]="desc" formControlName="desc" required>
-            </mat-form-field>
-<label></label>
-            <mat-form-field appearance="fill">
-                <mat-label>Address</mat-label>
-                <input matInput [(ngModel)]="address" formControlName="address" required>
-            </mat-form-field>
-
-            <mat-form-field appearance="fill">
-                <mat-label>Duration</mat-label>
-                <input matInput [(ngModel)]="duration" type="number" formControlName="duration" required>
-            </mat-form-field>
-
-            <mat-form-field appearance="fill">
-                <mat-label>Trivia</mat-label>
-                <input matInput [(ngModel)]="trivia" formControlName="trivia" required>
-            </mat-form-field>
-
-            <mat-form-field appearance="fill">
-              <mat-label>Priority</mat-label>
-              <mat-select [(ngModel)]="priority" name="priority" [ngModelOptions]="{standalone: true}" >
-                <mat-option *ngFor="let priority of priorities" [value]="priority.value">
-                  {{priority.viewValue}}
-                </mat-option>
-              </mat-select>
-            </mat-form-field>
-            
-            <label>
-                <h5>Please select a city</h5>
-            </label>
-            <mat-form-field appearance="fill" class="example-full-width">
-                <mat-label>Please select a city</mat-label>
-                <mat-select [(ngModel)]="cityId" placeholder="Select city" name="city" [ngModelOptions]="{standalone: true}">
-                    <mat-option [value]="city.id" *ngFor="let city of cities"> {{city.name}}</mat-option>
-                </mat-select>
-            </mat-form-field>
-            
-            <label>
-                <h5>Please select a region</h5>
-              </label>
-              <mat-form-field appearance="fill" class="example-full-width">
-                <mat-label>Please select a region</mat-label>
-                <mat-select [(ngModel)]="regionId" placeholder="Select region" name="region" [ngModelOptions]="{standalone: true}">
-                  <mat-option [value]="region.id" *ngFor="let region of regions" [value]="region.id"> {{region.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-form-field>
-
-              <p-fileUpload #fubauto mode="basic" name="demo[]" url=""  chooseLabel="Image"></p-fileUpload>
-
-            <div>
-                <button mat-button matStepperNext (click)="submitLocation()">Next</button>
-            </div>
-        </form>
-    </mat-step>
-    <mat-step [stepControl]="secondFormGroup" [editable]="isEditable" [completed]="isCompletedSecond">
-        <form [formGroup]="secondFormGroup">
-            <ng-template matStepLabel>Add companion for the location</ng-template>
-            <mat-form-field appearance="fill">
-                <mat-label>Companion</mat-label>
-                <mat-select [formControl]="companionForm" multiple>
-                  <mat-select-trigger>
-                    {{companionForm.value ? companionForm.value[0] : ''}}
-                    <span *ngIf="companionForm.value?.length > 1" class="example-additional-selection">
-                      (+{{companionForm.value.length - 1}} {{companionForm.value?.length === 2 ? 'other' : 'others'}})
-                    </span>
-                  </mat-select-trigger>
-                  <mat-option *ngFor="let companion of companions" [value]="companion">{{companion.type}}</mat-option>
-                </mat-select>
-              </mat-form-field>
-            <div>
-                <button mat-button matStepperNext (click)="onClickSecondForm()">Next</button>
-            </div>
-        </form>
-    </mat-step>
-
-    <mat-step [stepControl]="thirdFormGroup" [editable]="isEditable">
-        <form [formGroup]="thirdFormGroup">
-            <ng-template matStepLabel>Add categories for the location</ng-template>
-            <mat-chip-list selectable multiple>
-                <mat-chip #c="matChip" selected *ngFor="let category of categories" (click)="toggleSelection(c, category)"
-                  [ngClass]="{'yellow' : toggle}" name="chips">
-                  <mat-icon *ngIf="!c.selected">check</mat-icon>
-                  {{category.name}}
-                </mat-chip>
-              </mat-chip-list>
-            <div>
-                <button mat-button matStepperNext>Next</button>
-            </div>
-        </form>
-    </mat-step>
-    <mat-step>
-        <ng-template matStepLabel>Done</ng-template>
-        <p>You are now done.</p>
-        <div>
-            <button mat-button (click)="stepper.reset()">Reset</button>
-        </div>
-    </mat-step>
-</mat-stepper>
Index: trip-planner-front/src/app/location/add-location/add-location.component.ts
===================================================================
--- trip-planner-front/src/app/location/add-location/add-location.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,147 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { MatChip } from '@angular/material/chips';
-import { Category } from 'src/app/_models/category';
-import { City } from 'src/app/_models/city';
-import { Companion } from 'src/app/_models/companion';
-import { LocationDto } from 'src/app/_models/dto/locationDto';
-import { Region } from 'src/app/_models/region';
-import { CategoryService } from 'src/app/_services/cateogry.service';
-import { CityService } from 'src/app/_services/city.service';
-import { CompanionService } from 'src/app/_services/companion.service';
-import { LocationService } from 'src/app/_services/location.service';
-import { RegionService } from 'src/app/_services/region.service';
-
-@Component({
-  selector: 'app-add-location',
-  templateUrl: './add-location.component.html',
-  styleUrls: ['./add-location.component.css']
-})
-export class AddLocationComponent implements OnInit {
-    firstFormGroup: FormGroup;
-    secondFormGroup: FormGroup;
-    thirdFormGroup : FormGroup;
-    isEditable = false;
-    categories : Category[] = [];
-    companions : Companion[] = [];
-    cities : City[] = [];
-    cityId : number = 0;
-    regionId : number = 0;
-    regions : Region[] = [];
-    priority: string = '';
-    name: string = '';
-    desc: string = '';
-    address: string = '';
-    duration: number = 0;
-    trivia: string = '';
-    isCompleted = false;
-    locationDto : LocationDto = new LocationDto();
-    companionForm = new FormControl();
-    chipsSeletion: number[] = [];
-    toggle = true;
-    isCompletedSecond = false;
-  
-    priorities: any[] = [
-      {value: 'high', viewValue: 'High'},
-      {value: 'medium', viewValue: 'Medium'},
-      {value: 'low', viewValue: 'Low'},
-    ];
-  
-    constructor(private fb: FormBuilder, private categoryService : CategoryService, 
-      private companionService : CompanionService, private cityService : CityService, private regionService : RegionService,
-      private locationService : LocationService) {
-        this.firstFormGroup = fb.group({
-            title: fb.control('initial value', Validators.required)
-          });
-          this.secondFormGroup = fb.group({
-            title: fb.control('initial value', Validators.required)
-          });
-          this.thirdFormGroup = fb.group({
-            title: fb.control('initial value', Validators.required)
-
-          })
-    }
-  
-    ngOnInit() {
-      this.firstFormGroup = this.fb.group({
-        name: ['', Validators.required],
-        desc: ['', Validators.required],
-        address: ['', Validators.required],
-        priority: ['', Validators.required],
-        trivia: ['', Validators.required],
-        duration: ['', Validators.required],
-      });
-
-      this.secondFormGroup = this.fb.group({
-        secondCtrl: ['', Validators.required],
-      });
-
-      this.categoryService.getAllCategories().subscribe(
-        data => {
-          this.categories = data;
-        }
-      );
-  
-      this.companionService.getAllCompanions().subscribe(
-        data => {
-          this.companions = data;
-        }
-      );
-
-      
-      this.cityService.getAllCities().subscribe(
-        data => {
-          this.cities = data;
-        }
-      );
-
-      this.regionService.getAllRegions().subscribe(
-        data => {
-          this.regions = data;
-        }
-      );
-    }
-
-    submitLocation(){
-      this.locationDto.name = this.name;
-      this.locationDto.description = this.desc;
-      this.locationDto.address = this.address;
-      this.locationDto.duration = this.duration;
-      this.locationDto.trivia = this.trivia;
-      this.locationDto.priority = this.priority;
-      this.locationDto.city = this.cityId;
-      this.locationDto.region = this.regionId;
-      if(this.name !== null && this.desc !== null && this.address !== null
-        && this.trivia != null  && this.priority !== null && this.cityId !== 0 && this.regionId !== 0){
-          this.isCompleted = true;        
-          this.locationService.save(this.locationDto).subscribe(
-            data => {
-              console.log(data);
-            }
-          );  
-         
-      }   
-    }
-
-    toggleSelection(chip: MatChip, category: Category) {
-      chip.toggleSelected();
-  
-      if (this.chipsSeletion.length > 0) {
-        if (this.chipsSeletion.indexOf(category.id) <= -1) {
-          this.chipsSeletion.push(category.id);
-        } else {
-          const index = this.chipsSeletion.indexOf(category.id);
-          this.chipsSeletion.splice(index, 1);
-        }
-      } else {
-        this.chipsSeletion.push(category.id);
-      }
-      console.log(this.chipsSeletion);
-    }
-    onClickSecondForm(){
-      if(this.companionForm.value.length >= 1){
-        this.isCompletedSecond = true;
-      }
-      console.log(this.companionForm.value.length)
-    }
-}
Index: trip-planner-front/src/app/location/location-details/location-details.component.html
===================================================================
--- trip-planner-front/src/app/location/location-details/location-details.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<p>Details for the location</p>
-<p>{{locationDetails.name}}</p>
-<p>{{locationDetails.description}}</p>
-
-<div class="content-section implementation">
-    <div class="card">
-        <p-galleria [value]="images" [responsiveOptions]="responsiveOptions" [containerStyle]="{'max-width': '640px'}"
-            [numVisible]="5" [circular]="true" [showItemNavigators]="true" [showThumbnails]="false">
-            <ng-template pTemplate="item" let-image>
-                <img src="data:image/png;base64,{{image.content}}"
-                    style="width: 100%; height: 350px; display: block;" />
-            </ng-template>
-            <ng-template pTemplate="thumbnail" let-image>
-                <div class="p-grid p-nogutter p-justify-center">
-                    <img src="data:image/png;base64,{{image.content}}"
-                        style=" display: block;" />
-                </div>
-            </ng-template>
-        </p-galleria>
-        <br>
-        <p-rating></p-rating>
-    </div>
-</div>
Index: trip-planner-front/src/app/location/location-details/location-details.component.ts
===================================================================
--- trip-planner-front/src/app/location/location-details/location-details.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,60 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Images } from 'src/app/_models/images';
-import { Location } from 'src/app/_models/location';
-import { ImagesService } from 'src/app/_services/images.service';
-import { LocationService } from 'src/app/_services/location.service';
-
-@Component({
-  selector: 'app-location-details',
-  templateUrl: './location-details.component.html',
-  styleUrls: ['./location-details.component.css']
-})
-export class LocationDetailsComponent implements OnInit {
-
-  locationId: number;
-  locationDetails: Location;
-  images: Images[];
-
-  constructor(private route: ActivatedRoute, private locationService: LocationService,
-    private imagesService: ImagesService) {
-    this.locationId = 1;
-    this.locationDetails = new Location();
-    this.images = [];
-  }
-
-  responsiveOptions:any[] = [
-    {
-        breakpoint: '1024px',
-        numVisible: 5
-    },
-    {
-        breakpoint: '768px',
-        numVisible: 3
-    },
-    {
-        breakpoint: '560px',
-        numVisible: 1
-    }
-];
-  ngOnInit(): void {
-    this.route.queryParams
-      .subscribe(params => {
-        this.locationId = params.id;
-      });
-
-    this.locationService.getLocation(this.locationId).subscribe(
-      data => {
-        this.locationDetails = data;
-      }
-    );
-
-    this.imagesService.getAllImagesForLocation(this.locationId).subscribe(
-      image => {
-        this.images = image;
-      }
-    );
-  }
-
-
-}
Index: trip-planner-front/src/app/location/location.component.css
===================================================================
--- trip-planner-front/src/app/location/location.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/location/location.component.css	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,5 +1,0 @@
-img{
-    width: 150px;
-    height: 120px;
-    display: block;
-}
Index: trip-planner-front/src/app/location/location.component.html
===================================================================
--- trip-planner-front/src/app/location/location.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/location/location.component.html	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,30 +1,17 @@
-<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 *ngFor="let category of categories">
+  {{category.name}}
+  </div>
 
-<p-toast></p-toast>
-<h3>Here are all locations</h3>
-<button pButton pRipple type="button" icon="pi pi-bell" class="p-button-rounded p-button-warning"
-  label="Back to my Planners" (click)="onClickBackToMyPlanners()"></button>
-<table class="table">
-  <thead>
-    <tr>
-      <th scope="col">#</th>
-      <th scope="col">Photo</th>
-      <th scope="col">Location name</th>
-      <th scope="col"> Add to my planner</th>
-      <th scope="col">See details </th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let location of listLocations">
-      <td>{{location.id}}</td>
-      <td><img src="data:image/png;base64,{{location.photo}}" /></td>
-      <td>{{location.name}}</td>
-      <td><button type="button" (click)="show(location)" pButton icon="pi pi-info-circle"
-          label="Add to my planner"></button></td>
-      <td><button type="button" color="primary" pButton icon="pi pi-info-circle"
-          (click)="onClickSeeDetails(location.id)" label="See details"></button>
-      </td>
-    </tr>
-  </tbody>
-</table>
+  <hr>
+
+  <div *ngFor="let city of cities">
+    {{city.name}}
+  </div>
+  <div *ngFor="let country of countries">
+    {{country.name}}
+  </div>
+
+  <hr>
+  <div *ngFor="let companion of companions">
+    {{companion.type}}
+  </div>
Index: trip-planner-front/src/app/location/location.component.ts
===================================================================
--- trip-planner-front/src/app/location/location.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/location/location.component.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,143 +1,55 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MessageService } from 'primeng/api';
-import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog';
-import { Planner } from '../_models/planner';
-import { LocationService } from '../_services/location.service';
-import { AddLocationToPlannerPanelComponent } from './add-location-to-planner-panel/add-location-to-planner-panel.component';
-import { Location } from '../_models/location';
-import { PlannerLocationDto } from '../_models/dto/plannerLocationDto';
-
+import { Category } from '../_models/category';
+import { City } from '../_models/city';
+import { Companion } from '../_models/companion';
+import { Country } from '../_models/country';
+import { CategoryService } from '../_services/cateogry.service';
+import { CityService } from '../_services/city.service';
+import { CompanionService } from '../_services/companion.service';
+import { CountryService } from '../_services/country.service';
 
 @Component({
   selector: 'app-location',
   templateUrl: './location.component.html',
-  styleUrls: ['./location.component.css'],
-  providers: [DialogService, MessageService]
+  styleUrls: ['./location.component.css']
 })
 export class LocationComponent implements OnInit {
 
-  categoryIds: string;
-  cityId: number;
-  companionId: number;
-  lengthOfStay: number;
-  listLocations: any[];
-  cityOption: boolean = false;
-  regionOption: boolean = false;
-  regionId: number;
-  locationId: number;
-  plannerLocationDto: PlannerLocationDto;
-  ref: DynamicDialogRef;
-  locationIdsPlanner: number[];
+  categories: Category[];
+  cities: City[];
+  countries:Country[];
+  companions: Companion[];
+  constructor(private categoryService: CategoryService, private cityService : CityService,
+            private countryService : CountryService, private companionService : CompanionService) {
+    this.categories = [];
+    this.cities=[];
+    this.countries = [];
+    this.companions = [];
+   }
+   
+  ngOnInit(): void {
+    this.categoryService.getAllCategories().subscribe(
+      data => {
+        this.categories = data;
+        console.log(data);
+      }
+    );
+    this.cityService.getAllCities().subscribe(
+      data => {
+        this.cities = data;
 
+      }
+    );
+    this.countryService.getAllCountries().subscribe(
+      data => {
+        this.countries = data;
+      }
+    );
 
-  constructor(private route: ActivatedRoute, private locationService: LocationService,
-    private router: Router, private dialogService: DialogService, private messageService: MessageService) {
-    this.cityId = 1;
-    this.companionId = 1;
-    this.lengthOfStay = 1;
-    this.categoryIds = '';
-    this.listLocations = [];
-    this.regionId = 1;
-    this.locationId = 1;
-    this.ref = new DynamicDialogRef();
-    this.plannerLocationDto = new PlannerLocationDto();
-    this.locationIdsPlanner = [];
+    this.companionService.getAllCompanions().subscribe(
+      data => {
+        this.companions = data;
+      }
+    );
   }
-
-  ngOnInit(): void {
-
-    this.route.queryParams
-      .subscribe(params => {
-        console.log(params);
-        this.cityId = params.cityId;
-        this.regionId = params.regionId;
-        this.companionId = params.companionId;
-        this.lengthOfStay = params.lengthOfStay;
-        this.categoryIds = params.categoryIds;
-      }
-      );
-
-    if (this.route.snapshot.queryParams['cityId']) {
-      this.locationService.getLocationsFromCity(this.cityId, this.companionId, this.lengthOfStay, this.categoryIds).subscribe(
-        result => {
-          console.log(result);
-          this.listLocations = result;
-        }
-      );
-    } else
-      if (this.route.snapshot.queryParams['regionId']) {
-        console.log("I am in region console");
-        this.locationService.getLocationsFromRegion(this.regionId, this.companionId, this.lengthOfStay, this.categoryIds).subscribe(
-          result => {
-            console.log(result);
-            this.listLocations = result;
-          }
-        );
-      }
-
-  }
-
-  onClickSeeDetails(id: number) {
-    this.router.navigate(['location'], { queryParams: { id: id } });
-  }
-
-  show(location: Location) {
-    console.log(location.id);
-    this.ref = this.dialogService.open(AddLocationToPlannerPanelComponent, {
-      header: 'Choose a Planner',
-      width: '70%',
-      contentStyle: { "max-height": "500px", "overflow": "auto" },
-      baseZIndex: 10000
-    });
-
-    this.ref.onClose.subscribe((planner: Planner) => {
-      if (planner) {
-        this.plannerLocationDto.locationId = location.id;
-        this.plannerLocationDto.plannerId = planner.id;
-        console.log("LOC ID: " + this.plannerLocationDto.locationId);
-        console.log("PLANNER ID: " + this.plannerLocationDto.plannerId);
-
-        this.locationService.getAllLocationIdsForPlanner(planner.id).subscribe(
-          lid => {
-            if (lid.length == 0) {
-              this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
-                data => {
-                  console.log(data);
-                }
-              );
-              this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name });
-
-            } else if (lid.length > 0) {
-              if (lid.indexOf(this.plannerLocationDto.locationId) !== -1) {
-                console.log("LOKACIJATA VEKE JA IMA VO PLANEROT");
-                this.messageService.add({ severity: 'error', summary: 'Location ' + location.name + ' already exists in the planner.' });
-              } else {
-                this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
-                  data => {
-                    console.log(data);
-                  }
-                );
-                this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name });
-              }
-
-            }
-          }
-        );
-      }
-    });
-
-  }
-
-  ngOnDestroy() {
-    if (this.ref) {
-      this.ref.close();
-    }
-  }
-
-  onClickBackToMyPlanners() {
-    this.router.navigate(['planners']);
-  }
-
-
 }
Index: trip-planner-front/src/app/locations-form/locations-form.component.css
===================================================================
--- trip-planner-front/src/app/locations-form/locations-form.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,23 +1,0 @@
-.example-form {
-  min-width: 150px;
-  max-width: 380px;
-  width: 100%;
-}
-
-.example-full-width {
-  width: 100%;
-}
-
-mat-icon {
-  height: 20px;
-  width: 20px;
-  font-size: 20px;
-  margin-right: 5px;
-}
-button{
-  float: right;
-}
-
-.yellow{
-  background-color:yellow;
-}
Index: trip-planner-front/src/app/locations-form/locations-form.component.html
===================================================================
--- trip-planner-front/src/app/locations-form/locations-form.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<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="example-form">
-
-  <div class="form-group">
-    <button class="btn" (click)="chooseCityOption()">
-      City
-    </button>
-    <button class="btn" (click)="chooseRegionOption()">
-      Region
-    </button>
-  </div>
-  <br>
-  <br>
-
-  <div *ngIf="cityOption">
-    <label>
-      <h5>Please select a city</h5>
-    </label>
-    <mat-form-field appearance="fill" class="example-full-width">
-      <mat-label>Please select a city</mat-label>
-      <mat-select [(ngModel)]="cityId" placeholder="Select city" name="city">
-        <mat-option [value]="city.id" *ngFor="let city of cities"> {{city.name}}</mat-option>
-      </mat-select>
-    </mat-form-field>
-  </div>
-
-  <div *ngIf="regionOption">
-    <label>
-      <h5>Please select a region</h5>
-    </label>
-    <mat-form-field appearance="fill" class="example-full-width">
-      <mat-label>Please select a region</mat-label>
-      <mat-select [(ngModel)]="regionId" placeholder="Select region" name="region">
-        <mat-option [value]="region.id" *ngFor="let region of regions"> {{region.name}}
-        </mat-option>
-      </mat-select>
-    </mat-form-field>
-  </div>
-
-  <h5>Who are you travelling with? </h5>
-  <mat-form-field appearance="fill" class="example-full-width">
-    <mat-label>Please select a companion</mat-label>
-    <mat-select [(ngModel)]="companionId" placeholder="Please select a companion" name="company">
-      <mat-option [value]="companion.id" *ngFor="let companion of companions">{{companion.type}}</mat-option>
-    </mat-select>
-  </mat-form-field>
-
-  <h5>How many days are you willing to stay ?</h5>
-  <mat-form-field class="example-full-width" appearance="fill">
-    <mat-label>Please select a number of days</mat-label>
-    <input matInput placeholder="No. Days" type="number" min="1" value="0" max="30" [constraintMaxNumberDays()]
-      [(ngModel)]="lengthOfStay" name="nomdays" [value]="lengthOfStay">
-  </mat-form-field>
-
-  <h5>What are your priorities to visit?</h5>
-  <mat-chip-list selectable multiple>
-    <mat-chip #c="matChip" selected *ngFor="let category of categories" (click)="toggleSelection(c, category)"
-      [ngClass]="{'yellow' : toggle}" name="chips">
-      <mat-icon *ngIf="!c.selected">check</mat-icon>
-      {{category.name}}
-    </mat-chip>
-  </mat-chip-list>
-  <br>
-  <button mat-raised-button color="primary" (click)="createMyPlanner()">Create my planner</button>
-
-</div>
Index: trip-planner-front/src/app/locations-form/locations-form.component.ts
===================================================================
--- trip-planner-front/src/app/locations-form/locations-form.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,171 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormControl } from '@angular/forms';
-import { map, startWith, switchMap } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { CityService } from '../_services/city.service';
-import { City } from '../_models/city';
-import { Companion } from '../_models/companion';
-import { CompanionService } from '../_services/companion.service';
-import { Category } from '../_models/category';
-import { CategoryService } from '../_services/cateogry.service';
-import { MatChip } from '@angular/material/chips';
-import { LocationService } from '../_services/location.service';
-import { Region } from '../_models/region';
-import { RegionService } from '../_services/region.service';
-import { ActivatedRoute, Router } from '@angular/router';
-
-
-
-@Component({
-  selector: 'app-locations-form',
-  templateUrl: './locations-form.component.html',
-  styleUrls: ['./locations-form.component.css']
-})
-export class LocationsFormComponent implements OnInit {
-
-  myControl = new FormControl();
-  cities: City[];
-  regions: Region[];
-  companions: Companion[];
-  categories: Category[];
-  filteredOptions: Observable<City[]>;
-  disableSelect = new FormControl(false);
-  chipsSeletion: number[];
-  categoryIds: string;
-  locationId: number;
-  regionId: number;
-  cityId: number;
-  companionId: number;
-  lengthOfStay: number;
-  cityOption: boolean = false;
-  regionOption: boolean = false;
-  value: number;
-  max: number;
-  toggle = true;
-  status = 'Enable';
-  proba: any[];
-
-
-  constructor(private cityService: CityService, private regionService: RegionService,
-    private companionService: CompanionService, private categoryService: CategoryService,
-    private locationService: LocationService, private router: Router, private fb: FormBuilder, private route: ActivatedRoute) {
-    this.filteredOptions = new Observable<City[]>();
-    this.cities = [];
-    this.regions = [];
-    this.companions = [];
-    this.categories = [];
-    this.chipsSeletion = [];
-    this.locationId = 0;
-    this.companionId = 0;
-    this.lengthOfStay = 1;
-    this.categoryIds = '';
-    this.regionId = 0;
-    this.cityId = 0;
-    this.value = 0;
-    this.max = 30;
-    this.proba = [];
-  }
-
-  ngOnInit(): void {
-
-    this.filteredOptions = this.myControl.valueChanges
-      .pipe(
-        startWith(''),
-        switchMap(val => {
-          return this.filter(val || '')
-        })
-      );
-
-    this.cityService.getAllCities().subscribe(
-      data => {
-        this.cities = data;
-      }
-    );
-
-    this.regionService.getAllRegions().subscribe(
-      data => {
-        this.regions = data;
-      }
-    );
-
-    this.categoryService.getAllCategories().subscribe(
-      data => {
-        this.categories = data;
-      }
-    );
-
-    this.companionService.getAllCompanions().subscribe(
-      data => {
-        this.companions = data;
-      }
-    );
-
-  }
-
-  filter(val: string): Observable<City[]> {
-    // call the service which makes the http-request
-    return this.cityService.getAllCities()
-      .pipe(
-        map(response => response.filter(option => {
-          return option.name.toLowerCase().indexOf(val.toLowerCase()) === 0
-        }))
-      )
-  }
-
-  toggleSelection(chip: MatChip, category: Category) {
-    chip.toggleSelected();
-
-    if (this.chipsSeletion.length > 0) {
-      if (this.chipsSeletion.indexOf(category.id) <= -1) {
-        this.chipsSeletion.push(category.id);
-      } else {
-        const index = this.chipsSeletion.indexOf(category.id);
-        this.chipsSeletion.splice(index, 1);
-      }
-    } else {
-      this.chipsSeletion.push(category.id);
-    }
-    console.log(this.chipsSeletion);
-  }
-
-
-  createMyPlanner() {
-    this.categoryIds = this.chipsSeletion.join(',');
-    console.log(this.categoryIds);
-
-    if (this.cityOption) {
-      this.locationService.getLocationsFromCity(this.cityId, this.companionId, this.lengthOfStay, this.categoryIds).subscribe(
-        result => {
-          console.log(result);
-          this.proba = result;
-          this.router.navigate(['locations'], { queryParams: { cityId: this.cityId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds } });
-        }
-      );
-    } else
-      if (this.regionOption) {
-        this.locationService.getLocationsFromRegion(this.regionId, this.companionId, this.lengthOfStay, this.categoryIds).subscribe(
-          result => {
-            console.log(result);
-            this.router.navigate(['locations'], { queryParams: { regionId: this.regionId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds } });
-          }
-        );
-      }
-  }
-
-  chooseCityOption() {
-    this.cityOption = true;
-    this.regionOption = false;
-  }
-  chooseRegionOption() {
-    this.regionOption = true;
-    this.cityOption = false;
-  }
-
-  constraintMaxNumberDays() {
-    if (this.value > this.max) {
-      this.value = this.max;
-    }
-  }
-
-
-}
Index: trip-planner-front/src/app/planner/edit-planner/edit-planner.component.css
===================================================================
--- trip-planner-front/src/app/planner/edit-planner/edit-planner.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,3 +1,0 @@
-mat-form-field{
-    width:300px;
-}
Index: trip-planner-front/src/app/planner/edit-planner/edit-planner.component.html
===================================================================
--- trip-planner-front/src/app/planner/edit-planner/edit-planner.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
-    integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
-
-<h3>Here you can edit your planner</h3>
-
-<form [formGroup]="form" (ngSubmit)="onSubmit()">
-    <div class="form-gorup">
-        <p>Planner name</p>
-        <mat-form-field appearance="fill">
-            <input matInput required type="text" formControlName="name" placeholder="Planner name">
-        </mat-form-field>
-        <p>Planner description</p>
-        <mat-form-field appearance="fill">
-            <textarea matInput required formControlName="description" type="text"
-                placeholder="Planner description"></textarea>
-        </mat-form-field>
-    </div>
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12">
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <th scope="col">Location name</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr>
-                                <td> <button mat-raised-button color="primary" (click)="onClickAddLocation()">
-                                        Add locations
-                                    </button>
-                                </td>
-                            </tr>
-                            <tr *ngFor="let location of locations">
-                                <td>
-                                    {{location.name}}
-                                </td>
-                                <td>
-                                    <button pButton pRipple type="button" icon="pi pi-times" class="p-button-rounded p-button-danger p-button-text" (click)="onClickRemoveLocation(planner, location)"></button>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-    <button pButton pRipplelabel label="Save" class="p-button-help"></button>
-</form>
-<button pButton pRipple label="Back" class="p-button-info" (click)="onClickBack()"
-    [style]="{'margin-left': '.11em'}"></button>
Index: trip-planner-front/src/app/planner/edit-planner/edit-planner.component.ts
===================================================================
--- trip-planner-front/src/app/planner/edit-planner/edit-planner.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,99 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { PlannerDto } from 'src/app/_models/dto/plannerDto';
-import { PlannerLocationDto } from 'src/app/_models/dto/plannerLocationDto';
-import { Location } from 'src/app/_models/location';
-import { Planner } from 'src/app/_models/planner';
-import { LocationService } from 'src/app/_services/location.service';
-import { PlannerService } from 'src/app/_services/planner.service';
-
-@Component({
-  selector: 'app-edit-planner',
-  templateUrl: './edit-planner.component.html',
-  styleUrls: ['./edit-planner.component.css']
-})
-export class EditPlannerComponent implements OnInit {
-
-  planner: Planner;
-  planners: Planner[];
-  form: FormGroup;
-  plannerDto: PlannerDto;
-  id: number;
-  locations: Location[];
-  plannerLocationDto: PlannerLocationDto;
-
-  constructor(private router: Router, private route: ActivatedRoute, private fb: FormBuilder, private plannerService: PlannerService,
-    private locationService: LocationService) {
-    this.planner = new Planner();
-    this.planners = [];
-    this.form = fb.group({
-      title: fb.control('initial value', Validators.required)
-    });
-    this.plannerDto = new PlannerDto();
-    this.id = 1;
-    this.locations = [];
-    this.plannerLocationDto = new PlannerLocationDto();
-  }
-
-  ngOnInit(): void {
-    this.id = this.route.snapshot.params['id'];
-
-    this.form = this.fb.group({
-      name: [''],
-      description: [''],
-      locationList: []
-    });
-
-    this.plannerService.getPlannerById(this.id)
-      .pipe()
-      .subscribe(x => this.form.patchValue(x));
-
-    this.locationService.getLocationsForPlanner(this.id).subscribe(
-      data => {
-        this.locations = data;
-      }
-    );
-  }
-
-  onSubmit() {
-    this.updatePlanner();
-
-  }
-
-  onClickAddLocation() {
-    this.router.navigate(['form']);
-  }
-
-  updatePlanner() {
-    this.plannerService.updatePlanner(this.id, this.form.value)
-      .pipe()
-      .subscribe({
-        next: () => {
-          this.router.navigate(['planners']);
-        },
-        error: error => {
-          console.log("error");
-        }
-      });
-  }
-
-  onClickBack() {
-    this.router.navigate(['planners']);
-  }
-
-  onClickRemoveLocation(planner: Planner, location: Location) {
-    planner.id = this.id;
-
-    this.plannerLocationDto.plannerId = planner.id;
-    this.plannerLocationDto.locationId = location.id;
-    console.log(this.plannerLocationDto.plannerId);
-    console.log(this.plannerLocationDto.locationId);
-    this.plannerService.deleteLocationFromPlanner(this.plannerLocationDto).subscribe(
-      data => {
-        console.log("deleted")
-      }
-    );
-    window.location.reload();
-  }
-}
Index: trip-planner-front/src/app/planner/planner.component.css
===================================================================
--- trip-planner-front/src/app/planner/planner.component.css	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/planner/planner.component.css	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,9 +1,3 @@
-mat-card  {   
-  width: 280px;   
-  height: 160px; 
-
-}
-.example-card button {
-  box-shadow:none !important;
-  cursor:pointer;
-}
+.example-card {
+    
+  }
Index: trip-planner-front/src/app/planner/planner.component.html
===================================================================
--- trip-planner-front/src/app/planner/planner.component.html	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/planner/planner.component.html	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -1,38 +1,19 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet"
-  integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
-
-<p-toast></p-toast>
-
-
-<nav class="navbar navbar-light bg-light justify-content-between">
-  <button pButton pRipple type="button" label="Create initial planner" class="p-button-help " (click)="show()"></button>
-  <form class="form-inline">
-    <span>Hello, {{userDisplayName}}</span>
-    <button class="btn btn-outline-success my-2 my-sm-0" type="submit" (click)="onClickLogout()">Log out</button>
-  </form>
-</nav>
-
-<button pButton pRipple type="button" label="Add location" class="p-button-help " (click)="onClickAddLocation()"></button>
-
-<br>
-<br>
-<p-table [value]="planners" [paginator]="true" [rows]="3" [responsive]="true">
-
-  <ng-template pTemplate="body" let-planner>
-    <td>
-      <p-card header="{{planner.name}}" subheader="Card Subheader" [style]="{width: '360px'}"
-        styleClass="p-card-shadow">
-        <ng-template pTemplate="header">
-        </ng-template>
-        <p>{{planner.description}}</p>
-        <ng-template pTemplate="footer">
-          <button pButton pRipple type="button" label="Edit" class="p-button-outlined p-button-rounded p-button-help"
-            (click)="onClickEditPlannerGet(planner.id)"></button>
-          <button pButton pRipple type="button" icon="pi pi-times"
-            class="p-button-rounded p-button-danger p-button-outlined" label="Delete"
-            [style]="{'margin-left': '.5em'}" (click)="onDeletePlanner(planner.id)"></button>
-        </ng-template>
-      </p-card>
-    </td>
-  </ng-template>
-</p-table>
+<mat-grid-list cols="4" rowHeight="250px">
+  <mat-grid-tile *ngFor="let planner of planners" >
+      <mat-card class="example-card" >
+        <mat-card-title>{{planner.name}}</mat-card-title>
+        <mat-card-content>
+          {{planner.description}}
+        </mat-card-content>
+        <mat-card-actions>
+          <button mat-raised-button color="primary">
+            <mat-icon>edit</mat-icon> Edit
+          </button>
+          
+          <button mat-raised-button color="accent">
+            <mat-icon>remove_red_eye</mat-icon>Details
+          </button>
+        </mat-card-actions>
+      </mat-card>
+  </mat-grid-tile>
+</mat-grid-list>
Index: trip-planner-front/src/app/planner/planner.component.ts
===================================================================
--- trip-planner-front/src/app/planner/planner.component.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ trip-planner-front/src/app/planner/planner.component.ts	(revision 6a3a178323fd905112b5392bd9d3cb83b66ef2d3)
@@ -2,40 +2,18 @@
 import { Planner } from '../_models/planner';
 import { PlannerService } from '../_services/planner.service';
-import { CreateInitialPlannerComponent } from '../create-initial-planner/create-initial-planner.component';
-import { Router } from '@angular/router';
-import { PlannerDto } from '../_models/dto/plannerDto';
-import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog';
-import { MessageService, PrimeNGConfig } from 'primeng/api';
-import { UserDto } from '../_models/dto/userDto';
-
 
 @Component({
   selector: 'app-planner',
   templateUrl: './planner.component.html',
-  styleUrls: ['./planner.component.css'],
-  providers: [DialogService, MessageService]
+  styleUrls: ['./planner.component.css']
 })
 export class PlannerComponent implements OnInit {
 
   planners: Planner[];
-  plannerDto: PlannerDto;
-  ref: DynamicDialogRef;
-  user: UserDto;
-  userDisplayName = '';
-  status = '';
-
-  constructor(private plannerService: PlannerService, private router: Router,
-    private dialogService: DialogService, private primengConfig: PrimeNGConfig, private messageService: MessageService) {
+  constructor(private plannerService: PlannerService) { 
     this.planners = [];
-    this.plannerDto = new PlannerDto();
-    this.ref = new DynamicDialogRef;
-    this.user = new UserDto();
   }
 
   ngOnInit(): void {
-
-    this.primengConfig.ripple = true;
-    let name1: string = sessionStorage.getItem("username") as string;
-    this.userDisplayName = name1;
     this.plannerService.getAllPlanners().subscribe(
       data => {
@@ -45,61 +23,3 @@
   }
 
-  onClickEditPlannerGet(id: number) {
-    console.log(id);
-    this.plannerService.getPlannerById(id).subscribe(
-      data => {
-        this.router.navigate(['edit/planner/', id]);
-      }
-    );
-  }
-
-  show() {
-    this.ref = this.dialogService.open(CreateInitialPlannerComponent, {
-      header: 'Create initial planner',
-      width: '70%',
-      contentStyle: { "max-height": "500px", "overflow": "auto" },
-      baseZIndex: 10000
-    });
-    this.ref.onClose.subscribe((plannerDto: PlannerDto) => {
-      if (plannerDto) {
-        console.log("NOVOKREIRANIOT NAME NA PLANNER: " + plannerDto.name);
-        this.plannerService.postInitialPlanner(plannerDto).subscribe(
-          data => {
-            console.log(data);
-          },
-          error => console.log('oops', error)
-        );
-        this.messageService.add({ severity: 'success', summary: 'The planner: ' + plannerDto.name + ' has been created.' });
-      }
-
-    });
-
-  }
-
-  ngOnDestroy() {
-    if (this.ref) {
-      this.ref.close();
-    }
-  }
-
-  onClickLogout() {
-    sessionStorage.removeItem("token");
-    console.log("SESSION HAS ENDED, THE USER IS LOGGED OUT" + sessionStorage.getItem("token"));
-    this.router.navigate(['']);
-  }
-
-  onDeletePlanner(id: number) {
-    console.log("DELETE KOCHE: " + id);
-    this.plannerService.deletePlannerById(id).subscribe(
-      (data) => {
-        console.log(data);
-      },
-      (error) => console.log('error', error)
-    );
-    window.location.reload();
-  }
-
-  onClickAddLocation(){
-    this.router.navigate(['add-location']);
-  }
 }
Index: trip-planner-front/src/app/providers/CustomValidators.ts
===================================================================
--- trip-planner-front/src/app/providers/CustomValidators.ts	(revision 571e0df9a7a5e798c9941a85842f785177bedbbd)
+++ 	(revision )
@@ -1,42 +1,0 @@
-import {
-  AbstractControl,
-  ValidatorFn,
-    FormGroup
-  } from '@angular/forms';
-
-export class CustomValidators {
-    constructor() {}
-    
-    static onlyChar(): ValidatorFn {
-      return (control: AbstractControl): { [key: string]: boolean } | null => {
-        if (control.value == '') return null;
-  
-        let re = new RegExp('^[a-zA-Z ]*$');
-        if (re.test(control.value)) {
-          return null;
-        } else {
-          return { onlyChar: true };
-        }
-      };
-    }
-
-    static mustMatch(controlName: string, matchingControlName: string)  {
-      return (formGroup: FormGroup) => {
-        const control = formGroup.controls[controlName];
-        const matchingControl = formGroup.controls[matchingControlName];
-  
-        if (matchingControl.errors && !matchingControl.errors.mustMatch) {
-          return;
-        }
-  
-        // set error on matchingControl if validation fails
-        if (control.value !== matchingControl.value) {
-            matchingControl.setErrors({ mustMatch: true });
-        } else {
-          matchingControl.setErrors(null);
-        }
-        return null;
-      };
-    }
-    
-  }
