phil/treetrail-frontend
1
0
Fork 0
forked from philorg/treetrail-frontend
Code Pull requests Activity

Merge branch 'main'

Browse source
This commit is contained in:
phil 2024-10-25 05:22:31 +02:00
commit f7c2a384dc
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.conf.json --port 4201", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail",
"build": "ng build", "build": "ng build",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test", "test": "ng test",

8
proxy.conf.json
View file

@ -1,17 +1,17 @@
{ {
"/static": { "/treetrail/static": {
"target": "http://127.0.0.1:5002", "target": "http://127.0.0.1:5002",
"secure": false "secure": false
}, },
"/v1": { "/treetrail/v1": {
"target": "http://127.0.0.1:5002", "target": "http://127.0.0.1:5002",
"secure": false "secure": false
}, },
"/attachment": { "/treetrail/attachment": {
"target": "http://127.0.0.1:5002", "target": "http://127.0.0.1:5002",
"secure": false "secure": false
}, },
"/tiles": { "/treetrail/tiles": {
"target": "http://127.0.0.1:5002", "target": "http://127.0.0.1:5002",
"secure": false "secure": false
} }

2
src/app/map/map.component.ts
View file

@ -80,7 +80,7 @@ export class MapComponent implements AfterContentInit, OnInit {
let conf = this.configService.conf.value let conf = this.configService.conf.value
let bms = conf.background let bms = conf.background
if (conf.bootstrap.baseMapStyles.embedded.indexOf(bms) >= 0) { if (conf.bootstrap.baseMapStyles.embedded.indexOf(bms) >= 0) {
this.styleUrl = `/tiles/style/${bms}` this.styleUrl = `tiles/style/${bms}`
} }
else { else {
this.styleUrl = conf.bootstrap.baseMapStyles.external[bms] this.styleUrl = conf.bootstrap.baseMapStyles.external[bms]

4
src/app/settings/settings.component.html
View file

@ -40,7 +40,7 @@
<div> <div>
<mat-button-toggle-group #background="matButtonToggleGroup" <mat-button-toggle-group #background="matButtonToggleGroup"
[value]="conf.background || conf.map?.background" [value]="conf.background || conf.map?.background"
(change)="configService.setUserPref('background', background.value)" (change)="configService.setUserPref('background', background.value) ; router.navigate(['/map'])"
> >
<mat-button-toggle <mat-button-toggle
*ngFor="let bms of conf.bootstrap.baseMapStyles.embedded" *ngFor="let bms of conf.bootstrap.baseMapStyles.embedded"
@ -55,7 +55,7 @@
<mat-label>Types of zones displayed on the map</mat-label> <mat-label>Types of zones displayed on the map</mat-label>
<div class="settings"> <div class="settings">
<mat-checkbox *ngFor="let item of conf.showZones | keyvalue" [checked]="item.value" <mat-checkbox *ngFor="let item of conf.showZones | keyvalue" [checked]="item.value"
(change)="configService.setUserPrefValue('showZones', item.key, $event.checked)"> (change)="configService.setUserPrefValue('showZones', item.key, $event.checked) ; router.navigate(['/map'])">
{{ item.key }} {{ item.key }}
</mat-checkbox> </mat-checkbox>
</div> </div>