Commit Graph

202 Commits

Author SHA1 Message Date
4e3d1135f5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/home/home.component.html
#	src/app/service/readjson.service.ts
2023-04-06 14:30:25 +02:00
8563bce135 cloud 2023-04-06 14:28:53 +02:00
grata
8c22716f67 Implemented read locations from json, minor bug fixes and implementations 2023-04-05 13:49:27 +02:00
grata
1d32976a2e Merge remote-tracking branch 'origin/dev' into dev 2023-04-03 15:40:10 +02:00
grata
96b93d4d42 created service to calculate distance between two coordinates 2023-04-03 15:39:55 +02:00
a08125c32f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/app.module.ts
#	src/app/home/home.component.html
#	src/app/home/home.component.ts
2023-04-03 14:58:32 +02:00
5fe2d7e044 cloud 2023-04-03 14:53:06 +02:00
grata
be9bbe76cf pls work 2023-04-03 14:19:46 +02:00
grata
f0d5e72d65 pls work 2023-04-03 14:18:10 +02:00
grata
dc8d60ff06 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/home/home.component.ts
2023-04-03 14:17:30 +02:00
grata
98fad879f6 added data.json for soring waypoints data 2023-04-03 14:10:18 +02:00
fe105a7924 changes 2023-03-07 15:56:14 +01:00
20040d9a2f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/app.module.ts
2023-03-07 15:55:28 +01:00
f15b2e91aa created services readjson 2023-03-07 15:54:42 +01:00
tito
bb91dcea03 Merge remote-tracking branch 'origin/dev' into dev 2023-03-07 14:50:29 +01:00
tito
531f7b7ff9 integrazione api mappa google 2023-03-07 14:50:21 +01:00
869935dc40 Merge remote-tracking branch 'origin/dev' into dev 2023-03-07 14:04:04 +01:00
18878ae343 adding params on routing configuration 2023-03-07 14:03:55 +01:00
tito
a158be3066 Merge remote-tracking branch 'origin/dev' into dev 2023-03-07 09:21:07 +01:00
tito
112e5817f4 creazione pagina detail 2023-03-07 09:20:59 +01:00
grata
5eb3a521c6 Merge remote-tracking branch 'origin/dev' into dev 2023-03-07 09:20:52 +01:00
grata
5be1482bc4 added data.json for soring waypoints data 2023-03-07 09:20:44 +01:00
133e56bcb1 Merge remote-tracking branch 'origin/dev' into dev 2023-03-07 09:11:11 +01:00
ca0c8eb90b fix img path 2023-03-07 09:11:02 +01:00
grata
ae129e0781 started to add "spotlight" 2023-03-06 15:18:56 +01:00
grata
49b53590b6 stated to add "spotlight" 2023-03-06 15:18:23 +01:00
374eba2dc0 fix 2023-02-02 10:26:12 +01:00
tito
863cb8d046 creazione pagina detail 2023-02-01 15:59:09 +01:00
tito
3204d68e56 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/app/detail/detail.component.html
2023-02-01 15:52:08 +01:00
tito
c9e976aa96 creazione pagina detail 2023-02-01 15:51:20 +01:00
7a73f45d9f Merge remote-tracking branch 'origin/dev' into dev 2023-02-01 13:25:26 +01:00
1f0791f9e3 package cleanup 2023-02-01 13:25:14 +01:00
grata
0ff7ebeb88 Deleted spec file 2023-02-01 13:10:47 +01:00
e149d40396 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	package-lock.json
2023-02-01 13:05:51 +01:00
36bfb90a29 translate service created 2023-02-01 13:05:17 +01:00
8483253a62 spec file deleted 2023-02-01 13:02:18 +01:00
grata
e679b043dd Merge remote-tracking branch 'origin/dev' into dev 2023-01-31 15:55:23 +01:00
grata
07ade0aa6d Added google api package 2023-01-31 15:55:13 +01:00
be568dc118 get location home component 2023-01-31 15:54:13 +01:00
21f2d2d002 Merge remote-tracking branch 'origin/dev' into dev 2023-01-31 15:18:42 +01:00
95ceb01667 added OnInit 2023-01-31 15:18:29 +01:00
grata
5d5c78ca14 Added home backgroung image and centered input 2023-01-31 15:10:27 +01:00
bbacc0016b Merge remote-tracking branch 'origin/main' 2023-01-31 14:30:45 +01:00
f2dab91a1d changes 2023-01-31 14:30:30 +01:00
grata
e2330d0465 Added home backgroung image 2023-01-31 14:28:40 +01:00
6c1a3436a5 changes 2023-01-30 16:00:07 +01:00
1bb4893cc7 changes 2023-01-30 15:49:12 +01:00
2955f42b6e Merge remote-tracking branch 'origin/main' 2023-01-30 15:10:00 +01:00
dac6576ac2 changes 2023-01-30 15:09:48 +01:00
grata
a8051cc509 Generated Home page 2023-01-30 15:09:29 +01:00