diff --git a/src/app/component/detail/detail.component.html b/src/app/component/detail/detail.component.html index d0cefde..3d353de 100644 --- a/src/app/component/detail/detail.component.html +++ b/src/app/component/detail/detail.component.html @@ -32,7 +32,7 @@ {{ distance ? distance : '' }} Km -
{{ waypointInfo?.description ? waypointInfo.description : 'pippo says that you are serching in a unknown location' }}
+{{ waypointInfo?.description ? waypointInfo.description : 'pippo says that you are serching in a unknown location' }}
diff --git a/src/app/component/detail/detail.component.ts b/src/app/component/detail/detail.component.ts index c36f712..6934833 100755 --- a/src/app/component/detail/detail.component.ts +++ b/src/app/component/detail/detail.component.ts @@ -8,7 +8,7 @@ import {detailTranslations} from "../../interface/translations"; import * as qrcode from 'qrcode'; import {WaypointsVisitedEntity} from "../../interface/WaypointsVisitedEntity"; import {ReadTranslateJsonService} from "../../service/language/readTranslateJson.service"; -import {CookieService} from "ngx-cookie-service"; +import {cookieService} from "../../service/cookie.service"; import {UserService} from "../../service/http/user.service"; import {UserEntity} from "../../interface/UserEntity"; import { trigger, state, transition, animate } from '@angular/animations'; @@ -45,7 +45,7 @@ export class DetailComponent implements OnInit { intervalID: any; constructor(private route: ActivatedRoute, private positionService: positionService, private waypointService: WaypointService, private waypointVisitedService: WaypointVisitedService, private readTranslationJsonService: ReadTranslateJsonService, - private userService: UserService, private cookieService: CookieService, private router: Router) { + private userService: UserService, private cookieService: cookieService, private router: Router) { } @@ -95,10 +95,9 @@ export class DetailComponent implements OnInit { this.distance = this.positionService.getDistanceBetweenCoordinates(this.cord?.lat, this.cord?.lon, this.waypointInfo.lat, this.waypointInfo.lon); if (this.distance < 0.05) { this.generateQR() - // implement this nex line in angular ts this.myModal.nativeElement.checked = true; - this.userService.getUser("tito").subscribe(user => { + this.userService.getUser(this.cookieService.getUsername()).subscribe(user => { if (user?.id !== undefined) { let waypointVisited: WaypointsVisitedEntity = {userId: user.id , waypointId: this.waypointInfo.id} console.log("waypointVisited", waypointVisited) diff --git a/src/assets/waypointImages/102542_66209661f75b2d6737f3f14c9f0566cb.jpeg b/src/assets/waypointImages/102542_66209661f75b2d6737f3f14c9f0566cb.jpeg new file mode 100644 index 0000000..1ac2371 Binary files /dev/null and b/src/assets/waypointImages/102542_66209661f75b2d6737f3f14c9f0566cb.jpeg differ diff --git a/src/assets/waypointImages/CastelliDiBellinzona.jpeg b/src/assets/waypointImages/CastelliDiBellinzona.jpeg new file mode 100644 index 0000000..2d1684e Binary files /dev/null and b/src/assets/waypointImages/CastelliDiBellinzona.jpeg differ diff --git a/src/assets/waypointImages/ChiesaDiSantaMariaDegliAngeli.jpeg b/src/assets/waypointImages/ChiesaDiSantaMariaDegliAngeli.jpeg new file mode 100644 index 0000000..0d205d2 Binary files /dev/null and b/src/assets/waypointImages/ChiesaDiSantaMariaDegliAngeli.jpeg differ diff --git a/src/assets/waypointImages/LagoMaggiore.jpeg b/src/assets/waypointImages/LagoMaggiore.jpeg new file mode 100644 index 0000000..659855a Binary files /dev/null and b/src/assets/waypointImages/LagoMaggiore.jpeg differ diff --git a/src/assets/waypointImages/MonteBre.jpeg b/src/assets/waypointImages/MonteBre.jpeg new file mode 100644 index 0000000..94ac54e Binary files /dev/null and b/src/assets/waypointImages/MonteBre.jpeg differ diff --git a/src/assets/waypointImages/MonteGeneroso.jpeg b/src/assets/waypointImages/MonteGeneroso.jpeg new file mode 100644 index 0000000..5440387 Binary files /dev/null and b/src/assets/waypointImages/MonteGeneroso.jpeg differ diff --git a/src/assets/waypointImages/MonteSanGiorigio.jpeg b/src/assets/waypointImages/MonteSanGiorigio.jpeg new file mode 100644 index 0000000..5e47796 Binary files /dev/null and b/src/assets/waypointImages/MonteSanGiorigio.jpeg differ diff --git a/src/assets/waypointImages/MonteTamaro.jpeg b/src/assets/waypointImages/MonteTamaro.jpeg new file mode 100644 index 0000000..21c4f64 Binary files /dev/null and b/src/assets/waypointImages/MonteTamaro.jpeg differ diff --git a/src/assets/waypointImages/MuseoDarteDellaSvizzeraItaliana.jpg,1600 b/src/assets/waypointImages/MuseoDarteDellaSvizzeraItaliana.jpg,1600 new file mode 100644 index 0000000..1b7eb5c Binary files /dev/null and b/src/assets/waypointImages/MuseoDarteDellaSvizzeraItaliana.jpg,1600 differ diff --git a/src/assets/waypointImages/ParcoCiani.jpeg b/src/assets/waypointImages/ParcoCiani.jpeg new file mode 100644 index 0000000..82343dc Binary files /dev/null and b/src/assets/waypointImages/ParcoCiani.jpeg differ diff --git a/src/assets/waypointImages/SantuarioDellaMadonnaDelSasso.jpeg b/src/assets/waypointImages/SantuarioDellaMadonnaDelSasso.jpeg new file mode 100644 index 0000000..467af2e Binary files /dev/null and b/src/assets/waypointImages/SantuarioDellaMadonnaDelSasso.jpeg differ diff --git a/src/assets/waypointImages/SassoSanGottardo.jpeg b/src/assets/waypointImages/SassoSanGottardo.jpeg new file mode 100644 index 0000000..b844780 Binary files /dev/null and b/src/assets/waypointImages/SassoSanGottardo.jpeg differ diff --git a/src/assets/waypointImages/ValleVerzasca.jpeg b/src/assets/waypointImages/ValleVerzasca.jpeg new file mode 100644 index 0000000..a1afaa0 Binary files /dev/null and b/src/assets/waypointImages/ValleVerzasca.jpeg differ