Changeset 59329aa for trip-planner-front/src

Timestamp:

11/23/21 14:58:44 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

e29cc2e

Parents:

ceaed42

Message:

adding photos

Location:

trip-planner-front/src

Files:

• app/_models/images.ts (added)
• app/_models/location.ts (modified) (3 diffs)
• app/_services/images.service.ts (added)
• app/_services/location.service.ts (modified) (1 diff)
• app/_services/planner.service.ts (modified) (1 diff)
• app/app-routing.module.ts (modified) (2 diffs)
• app/app.module.ts (modified) (4 diffs)
• app/homepage/homepage.component.css (added)
• app/homepage/homepage.component.html (added)
• app/homepage/homepage.component.ts (added)
• app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html (modified) (1 diff)
• app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts (modified) (5 diffs)
• app/location/location-details/location-details.component.css (added)
• app/location/location-details/location-details.component.html (added)
• app/location/location-details/location-details.component.ts (added)
• app/location/location.component.html (modified) (1 diff)
• app/location/location.component.ts (modified) (4 diffs)
• app/locations-form/locations-form.component.html (modified) (1 diff)
• app/planner/edit-planner/edit-planner.component.ts (modified) (1 diff)
• styles.css (modified) (1 diff)

trip-planner-front/src/app/_models/location.ts

@@ +1 @@
+
 export class Location{
     
@@ -7 +8 @@
     priority: string;
     duration: number;
+    photo: any[];
 
     constructor(){
@@ -15 +17 @@
         this.priority = 'Location priority';
         this.duration = 1;
+        this.photo = [];
     }
 }

trip-planner-front/src/app/_services/location.service.ts

@@ -26 +26 @@
     }
 
-    getLocationsFroPlanner(plannerId : number) : Observable<Location[]>{
+    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);
+    }
+    
 }

trip-planner-front/src/app/_services/planner.service.ts

@@ -1 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import { Observable } from "rxjs";

trip-planner-front/src/app/app-routing.module.ts

@@ -1 +1 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { HomepageComponent } from './homepage/homepage.component';
+import { LocationDetailsComponent } from './location/location-details/location-details.component';
 import { LocationComponent } from './location/location.component';
 import { LocationsFormComponent } from './locations-form/locations-form.component';
@@ -10 +12 @@
   {path: 'form', component: LocationsFormComponent},
   {path: 'edit/planner/:id', component: EditPlannerComponent},
-  {path: 'locations', component: LocationComponent}
+  {path: 'locations', component: LocationComponent},
+  {path: '', component: HomepageComponent},
+  {path: 'location', component: LocationDetailsComponent}
 ];
 

trip-planner-front/src/app/app.module.ts

@@ -10 +10 @@
 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';
@@ -29 +28 @@
 import { DetailPlannerComponent } from './planner/detail-planner/detail-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 {MenuItem} from 'primeng/api'; 
+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';
 
 @NgModule({
@@ -39 +47 @@
     EditPlannerComponent,
     DetailPlannerComponent,
-    AddLocationToPlannerPanelComponent
+    AddLocationToPlannerPanelComponent,
+    HomepageComponent,
+    LocationDetailsComponent
     ],
   imports: [
@@ -61 +71 @@
     HttpClientModule,
     ReactiveFormsModule,
-    MatSelectModule
-    
+    MatSelectModule,
+    AccordionModule,
+    CarouselModule,
+    ButtonModule,
+    ToastModule,
+    TabViewModule,
+    GalleriaModule
   ],
   providers: [

trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html

@@ -13 +13 @@
   </form>
   
-  <button mat-button (click)="onCancelClick()">Cancel</button>
+  <button type="button"  mat-button (click)="onCancelClick()">Cancel</button>

trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { NgForm } from '@angular/forms';
 import { MatDialogRef } from '@angular/material/dialog';
 import { ActivatedRoute } from '@angular/router';
@@ -21 +20 @@
   locationId: number;
   plannerLocationDto: PlannerLocationDto;
+  locationsInPlanner: Location[];
+
 
   constructor(private dialogRef: MatDialogRef<AddLocationToPlannerPanelComponent>, private plannerService: PlannerService,
@@ -29 +30 @@
     this.locationId = 1;
     this.plannerLocationDto = new PlannerLocationDto();
+    this.locationsInPlanner = [];
   }
 
@@ -56 +58 @@
     this.plannerLocationDto.locationId = this.locationId;
     this.plannerLocationDto.plannerId = plannerId;
+    /*
     this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
       data => {
@@ -61 +64 @@
       }
     );
-  }
+    */
+
+   // window.location.reload();
+    }
 
 }

trip-planner-front/src/app/location/location.component.html

@@ -18 +18 @@
       <td>{{location.name}}</td>
       <td><button mat-raised-button color="primary" (click)="openDialogSave(location.id)">Add to my planner</button></td>
-      <td><button mat-raised-button color="primary">See details</button></td>
+      <td><button mat-raised-button color="primary" (click)="onClickSeeDetails(location.id)">See details</button></td>
     </tr>  
   </tbody>

trip-planner-front/src/app/location/location.component.ts

@@ -1 @@
-import { Route } from '@angular/compiler/src/core';
 import { Component, Input, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Location } from '../_models/location';
 import { LocationService } from '../_services/location.service';
 import { AddLocationToPlannerPanelComponent } from './add-location-to-planner-panel/add-location-to-planner-panel.component';
@@ -24 +22 @@
   regionOption: boolean = false;
   regionId: number;
+  locationId: number;
 
   constructor(private fb: FormBuilder, private route: ActivatedRoute, private locationService: LocationService,
@@ -36 +35 @@
     this.listLocations = [];
     this.regionId = 1;
+    this.locationId = 1;
   }
 
@@ -71 +71 @@
   }
 
-  openDialogSave(locationId: number){
-    console.log(locationId);
+  openDialogSave(locationId){
+   // console.log(locationId);
       const dialogRef = this.dialog.open(AddLocationToPlannerPanelComponent, {
         width: '250px',
         data: {}
       });
-      this.router.navigate(['locations'], {queryParams: {locationId: locationId}});
+      this.router.navigate(['locations'], {queryParams: {regionId: this.regionId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds, locationId: locationId}});
+      
   }
 
+  onClickSeeDetails(id: number){
+    this.router.navigate(['location'], {queryParams: {id: id}});
+  }
 }

trip-planner-front/src/app/locations-form/locations-form.component.html

@@ -22 +22 @@
         <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-select [(ngModel)]="cityId" placeholder="Select city" name="city" >
             <mat-option [value]="city.id" *ngFor="let city of cities" > {{city.name}}</mat-option>
           </mat-select>

trip-planner-front/src/app/planner/edit-planner/edit-planner.component.ts

@@ -48 +48 @@
       .subscribe(x => this.form.patchValue(x));
 
-    this.locationService.getLocationsFroPlanner(this.id).subscribe(
+    this.locationService.getLocationsForPlanner(this.id).subscribe(
       data => {
           this.locations = data;

trip-planner-front/src/styles.css

@@ -1 +1 @@
 /* You can add global styles to this file, and also import other style files */
 @import "../node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css";
-
-
+@import url("../node_modules/primeicons/primeicons.css");
+@import url("../node_modules/primeng/resources/themes/saga-orange/theme.css");
+@import url("../node_modules/primeng/resources/primeng.min.css");
+body {
+    padding: 2em;
+    font-family: -apple-system, BlinkMacSystemFont, “Segoe UI”, Roboto, Helvetica, Arial, sans-serif, “Apple Color Emoji”, “Segoe UI Emoji”, “Segoe UI Symbol”;
+  }