Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add api services #19

Merged
merged 12 commits into from
Jul 18, 2024
Merged

add api services #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
48e36f2
add api services
bastyen Jul 9, 2024
fb8d55d
get data from api
bastyen Jul 10, 2024
e52383b
send observation
bastyen Jul 15, 2024
08aa562
send photos
bastyen Jul 16, 2024
1b4d6c6
handle offline settings
bastyen Jul 16, 2024
22ad4dd
handle map settings
bastyen Jul 17, 2024
334b30d
improve get observations
bastyen Jul 17, 2024
27faceb
add learn more and legal notice pages
bastyen Jul 18, 2024
e843689
prettier
bastyen Jul 18, 2024
d01954d
edit environment
bastyen Jul 18, 2024
348ba06
improve new observation init
bastyen Jul 18, 2024
ccd9d7b
add .env
bastyen Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions front-end/angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:application",
"builder": "@ngx-env/builder:application",
"options": {
"outputPath": "dist/regard-d-altitude",
"index": "src/index.html",
"browser": "src/main.ts",
"polyfills": ["zone.js"],
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand Down Expand Up @@ -79,7 +81,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@ngx-env/builder:dev-server",
"configurations": {
"production": {
"buildTarget": "regard-d-altitude:build:production"
Expand All @@ -91,12 +93,15 @@
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n"
"builder": "@ngx-env/builder:extract-i18n"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@ngx-env/builder:karma",
"options": {
"polyfills": ["zone.js", "zone.js/testing"],
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"assets": [
Expand All @@ -122,4 +127,4 @@
}
}
}
}
}
265 changes: 265 additions & 0 deletions front-end/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions front-end/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@angular-devkit/build-angular": "^18.0.6",
"@angular/cli": "^18.0.6",
"@angular/compiler-cli": "^18.0.5",
"@ngx-env/builder": "^18.0.1",
"@types/express": "^4.17.17",
"@types/jasmine": "~5.1.0",
"@types/leaflet": "^1.9.12",
Expand Down
13 changes: 10 additions & 3 deletions front-end/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<button mat-icon-button (click)="sidenav.toggle()">
<mat-icon
aria-hidden="false"
[matBadge]="this.offlineService.observationsPending | async"
[matBadge]="
(authService.isAuth | async)
? (offlineService.observationsPending | async)
: null
"
>account_circle</mat-icon
>
</button>
Expand All @@ -18,7 +22,10 @@
</button>
<span>{{ title }}</span>
</mat-toolbar>
<mat-sidenav-container [style.marginTop.px]="0">
<mat-sidenav-container
[class.mat-sidenav-container-home]="!backButton"
[style.marginTop.px]="0"
>
<mat-sidenav
#sidenav
mode="over"
Expand All @@ -42,7 +49,7 @@
<div
[matBadge]="
currentSideNavItem.observationsPending
? (this.offlineService.observationsPending | async)
? (offlineService.observationsPending | async)
: null
"
>
Expand Down
Loading
Loading