adjust UI

TODO.md

@@ -1,3 +1,4 @@
-- Adjust the UI
 - Create separate E2E test project which locally tests agains running angular + Spring API using Selnium. On CI it uses test containers of both images. Adding authontication headers with own server.
 - Try using WebTestClient https://docs.spring.io/spring-framework/reference/testing/webtestclient.html#webtestclient-json
+- Add pgAdmin to dev container https://www.pgadmin.org/download/pgadmin-4-container/s
+- fix client tests

client/src/app/app.component.html

@@ -1 +1 @@
-<app-weight></app-weight>
+<app-weight *ngIf="$sync | async"></app-weight>

client/src/app/app.component.ts

@@ -1,8 +1,13 @@
 import { Component } from '@angular/core';
+import { WithingsService } from './withings.service';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent {}
+export class AppComponent {
+  constructor(private withingsService: WithingsService) {}
+
+  $sync = this.withingsService.sync();
+}

client/src/app/weight.service.ts

@@ -0,0 +1,17 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable, map } from 'rxjs';
+import { WeightResponse } from './types';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class WeightService {
+  constructor(private http: HttpClient) {}
+
+  getWeight(): Observable<number | undefined> {
+    return this.http
+      .get<WeightResponse>('/api/weight')
+      .pipe(map((weightResponse) => weightResponse.weight));
+  }
+}

client/src/app/weight/weight.component.ts

@@ -1,16 +1,16 @@
 import { Component } from '@angular/core';
 import { map } from 'rxjs';
-import { WithingsService } from '../withings.service';
+import { WeightService } from '../weight.service';
 
 @Component({
   selector: 'app-weight',
   templateUrl: './weight.component.html',
   styleUrls: ['./weight.component.css'],
 })
 export class WeightComponent {
-  constructor(private withingsService: WithingsService) {}
+  constructor(private weightService: WeightService) {}
 
-  $weight = this.withingsService
+  $weight = this.weightService
     .getWeight()
     .pipe(map((weight) => weight?.toString() ?? '?'));
 }

client/src/app/withings.service.ts

@@ -1,24 +1,23 @@
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Injectable, OnInit } from '@angular/core';
-import { catchError, map, Observable, of } from 'rxjs';
-import { WeightResponse } from './types';
+import { Injectable } from '@angular/core';
+import { Observable, catchError, map, of } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
 })
 export class WithingsService {
   constructor(private http: HttpClient) {}
 
-  getWeight(): Observable<number | undefined> {
-    return this.http.get<WeightResponse>('/api/withings/weight').pipe(
-      map((weightResponse) => weightResponse.weight),
+  sync(): Observable<boolean> {
+    return this.http.post<void>('/api/withings/sync', undefined).pipe(
+      map(() => true),
       catchError((error) => {
         if (error instanceof HttpErrorResponse && error.status === 401) {
           debugger;
           window.location.href = error.error._links.oauth2Login.href;
         }
-        
-        return of(undefined);
+
+        return of();
       })
     );
   }

client/src/proxy.conf.json

@@ -2,13 +2,6 @@
   "/api": {
     "target": "http://localhost:8080",
     "secure": false,
-    "pathRewrite": {
-      "^/api": ""
-    },
-    "changeOrigin": true,
-    "xfwd": true,
-    "headers": {
-      "X-Forwarded-Prefix": "/api"
-    }
+    "changeOrigin": true
   }
 }