Merge pull request #19 from freekode/fix-static-ui

Fix static content serving

README.md

@@ -2,11 +2,12 @@
 [![release](https://img.shields.io/github/release/freekode/tp2intervals)](https://github.com/freekode/tp2intervals/releases/latest)
 
 # Third Party to Intervals.icu
-Sync workouts and activities between TrainingPeaks and Intervals.icu.
+App to sync workouts and activities between TrainingPeaks and Intervals.icu.
 
-Plan workouts for today and tomorrow from Intervals to TrainingPeaks.
+* Sync planned workouts between Intervals.icu and TrainingPeaks for today and tomorrow (free TP account)
+* Copy planned workouts for date range from TrainingPeaks to Intervals.icu Training Plan
 
-Executables for MacOS (DMG), Windows (EXE installer), Linux (AppImage) are available on [latest release](https://github.com/freekode/tp2intervals/releases/latest) page
+Executables for MacOS (DMG), Windows (EXE installer), Linux (AppImage) are available for download [here](https://github.com/freekode/tp2intervals/releases/latest)
 
 **Only for educational purposes**
 

boot/build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
 }
 
 group = "org.freekode"
+version = "0.3.3"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
@@ -64,3 +65,7 @@ tasks.withType<KotlinCompile> {
 tasks.withType<Test> {
     useJUnitPlatform()
 }
+
+tasks.bootJar {
+    archiveFileName.set("${project.name}.jar")
+}

boot/src/main/kotlin/org/freekode/tp2intervals/config/WebConfiguration.kt

@@ -2,14 +2,14 @@ package org.freekode.tp2intervals.config
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.CorsRegistry
-import org.springframework.web.servlet.config.annotation.EnableWebMvc
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 
 
 @Configuration
-@EnableWebMvc
 class WebConfig : WebMvcConfigurer {
     override fun addCorsMappings(registry: CorsRegistry) {
-        registry.addMapping("/**")
+        registry
+            .addMapping("/api/**")
+            .allowedMethods("GET", "POST", "PUT")
     }
 }

boot/src/main/resources/application.yaml

@@ -18,3 +18,14 @@ spring:
   jpa:
     open-in-view: false
     database-platform: org.hibernate.community.dialect.SQLiteDialect
+
+management:
+  info:
+    git:
+      mode: full
+  endpoints:
+    web:
+      exposure:
+        include: 'health,info'
+      cors:
+        allowed-origins: '*'

devops/build-jar.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-cd ./ui
-npm ci
-npm run build
+npm ci --prefix ui
+npm run build  --prefix ui
 
-cd ../
 cp -r ui/dist/ui/browser boot/src/main/resources/static
 
 cd ./boot

electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tp2intervals",
   "productName": "tp2intervals",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Third Party synchronization with Intervals.icu",
   "keywords": [
     "trainingpeaks",

electron/src/preload/index.ts

@@ -1,4 +1,4 @@
-import { contextBridge, ipcRenderer } from 'electron';
+import { contextBridge } from 'electron';
 import {
   appVersionSupplier,
   bootAddressSupplier,
@@ -7,8 +7,10 @@ import {
   subscriptions
 } from "./renderer";
 
-contextBridge.exposeInMainWorld('bootAddress', bootAddressSupplier())
-contextBridge.exposeInMainWorld('bootHealthy', bootHealthySupplier());
-contextBridge.exposeInMainWorld('appVersion', appVersionSupplier());
-contextBridge.exposeInMainWorld('appPlatform', platformSupplier());
-contextBridge.exposeInMainWorld('subscriptions', subscriptions);
+contextBridge.exposeInMainWorld('electron', {
+  bootAddress: bootAddressSupplier(),
+  bootHealthy: bootHealthySupplier(),
+  appVersion: appVersionSupplier(),
+  appPlatform: platformSupplier(),
+  subscriptions: subscriptions,
+})

ui/angular.json

@@ -26,7 +26,7 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "src/favicon.ico",
+              "src/favicon.png",
               "src/assets"
             ],
             "styles": [
@@ -88,7 +88,7 @@
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "src/favicon.ico",
+              "src/favicon.png",
               "src/assets"
             ],
             "styles": [

ui/src/app/app.component.ts

@@ -5,7 +5,8 @@ import { MatCardModule } from "@angular/material/card";
 import { MatIconModule } from "@angular/material/icon";
 import { MatToolbarModule } from "@angular/material/toolbar";
 import { MatButtonModule } from "@angular/material/button";
-import { UpdateService } from "app/update.service";
+import { UpdateService } from "infrastructure/update.service";
+import { EnvironmentService } from "infrastructure/environment.service";
 
 
 @Component({
@@ -16,14 +17,18 @@ import { UpdateService } from "app/update.service";
   styleUrl: './app.component.scss'
 })
 export class AppComponent implements OnInit {
-  appVersion = window.appVersion || 'static'
+  appVersion: string
 
   constructor(
-    private updateService: UpdateService
+    private updateService: UpdateService,
+    private environmentService: EnvironmentService
   ) {
   }
 
   ngOnInit(): void {
     this.updateService.init()
+    this.environmentService.getVersion().subscribe(version => {
+      this.appVersion = version
+    })
   }
 }

ui/src/assets/loading.html

@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Loading</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="../favicon.ico">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <style type="text/css">

ui/src/index.html

@@ -5,7 +5,7 @@
   <title>tp2intervals</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="favicon.png">
   <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>

ui/src/infrastructure/environment.service.ts

@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from "@angular/common/http";
+import { map, Observable, of } from 'rxjs';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EnvironmentService {
+
+  constructor(private httpClient: HttpClient) {
+  }
+
+  getBootAddress() {
+    return window.electron?.bootAddress || ''
+  }
+
+  getVersion(): Observable<string> {
+    if (window.electron) {
+      return of(window.electron.appVersion)
+    } else {
+      return this.httpClient.get(`/actuator/info`).pipe(
+        map((response: any) => response.build.version)
+      )
+    }
+  }
+}

ui/src/infrastructure/http.interceptors.ts

@@ -2,8 +2,7 @@ import { HttpHandlerFn, HttpInterceptorFn, HttpRequest } from "@angular/common/h
 import { inject } from "@angular/core";
 import { catchError, throwError } from "rxjs";
 import { NotificationService } from "infrastructure/notification.service";
-
-let host = window.bootAddress || ''
+import { EnvironmentService } from "infrastructure/environment.service";
 
 export const httpErrorInterceptor: HttpInterceptorFn = (
   req: HttpRequest<any>,
@@ -13,7 +12,8 @@ export const httpErrorInterceptor: HttpInterceptorFn = (
 
   return next(req).pipe(
     catchError((err) => {
-      notificationService.error(err.error.error)
+      let errorMessage = err.error.error ? err.error.error : err.message
+      notificationService.error(errorMessage)
       return throwError(() => err)
     })
   );
@@ -23,6 +23,9 @@ export const httpHostInterceptor: HttpInterceptorFn = (
   req: HttpRequest<any>,
   next: HttpHandlerFn,
 ) => {
+  let environmentService = inject(EnvironmentService)
+  let host = environmentService.getBootAddress()
+
   const apiReq = req.clone({url: `${host}/${req.url.replace(/^\/|\/$/g, '')}`});
   return next(apiReq);
 };

ui/src/app/update.service.ts → ui/src/infrastructure/update.service.ts

@@ -12,14 +12,19 @@ export class UpdateService {
   }
 
   init() {
-    window.subscriptions.appUpdateAvailable(updateInfo => {
+    if (!window.electron) {
+      console.log("Non-electron environment")
+      return
+    }
+
+    window.electron.subscriptions.appUpdateAvailable(updateInfo => {
       console.log('Update available', updateInfo)
-      if (window.appPlatform === 'darwin') {
+      if (window.electron.appPlatform === 'darwin') {
         this.notificationService.success(`New version ${updateInfo.version} available for download.\nCheck GitHub page`)
       }
     })
 
-    window.subscriptions.appUpdateDownloaded(updateInfo => {
+    window.electron.subscriptions.appUpdateDownloaded(updateInfo => {
       console.log('Update downloaded', updateInfo)
       this.notificationService.success(`New version ${updateInfo.version} will be automatically installed.`)
     })

ui/src/proxy.conf.json

@@ -2,5 +2,9 @@
   "/api": {
     "target": "http://localhost:8080",
     "secure": false
+  },
+  "/actuator": {
+    "target": "http://localhost:8080",
+    "secure": false
   }
 }

ui/src/types.d.ts

@@ -1,13 +1,15 @@
 declare global {
   interface Window {
-    bootAddress: string;
-    bootHealthy: () => boolean;
-    appVersion: string;
-    appPlatform: string;
-    subscriptions: {
-      'appUpdateAvailable',
-      'appUpdateDownloaded'
-    };
+    electron: {
+      bootAddress: string;
+      bootHealthy: () => boolean;
+      appVersion: string;
+      appPlatform: string;
+      subscriptions: {
+        'appUpdateAvailable',
+        'appUpdateDownloaded'
+      };
+    }
   }
 }