upd build script

upd favicon
freekode · Feb 21, 2024 · 08e3bdb · 08e3bdb
1 parent 23e4506
commit 08e3bdb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/devops/build-jar.sh b/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

diff --git a/ui/angular.json b/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": [

diff --git a/ui/src/assets/loading.html b/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">

diff --git a/ui/src/favicon.ico b/ui/src/favicon.ico
diff --git a/ui/src/favicon.png b/ui/src/favicon.png
diff --git a/ui/src/index.html b/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>

diff --git a/ui/src/infrastructure/environment.service.ts b/ui/src/infrastructure/environment.service.ts
@@ -12,7 +12,7 @@ export class EnvironmentService {
   }
 
   getBootAddress() {
-    return window.electron?.bootAddress || 'http://localhost:8080'
+    return window.electron?.bootAddress || ''
   }
 
   getVersion(): Observable<string> {

diff --git a/ui/src/proxy.conf.json b/ui/src/proxy.conf.json
@@ -2,5 +2,9 @@
   "/api": {
     "target": "http://localhost:8080",
     "secure": false
+  },
+  "/actuator": {
+    "target": "http://localhost:8080",
+    "secure": false
   }
 }