Feature/update frontend

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: '12.13.0'
+        node-version: '22.21.0'
 
     - name: Set up Go
       uses: actions/setup-go@v4

build-scripts/build.sh

@@ -10,11 +10,20 @@ fi
 if [ "$GITHUB_REF" != "" ]; then
     commit=$(echo "$GITHUB_SHA" | head -c 7);
     branch=${GITHUB_REF#refs/heads/};
-    version="$commit ($branch)"
+    if [ "$branch" = "master" ]; then
+        version="$commit"
+    else
+        version="$commit ($branch)"
+    fi
 elif [ $(which git) != "" ]; then
     commit=$(git rev-parse HEAD | head -c 7);
     branch=$(git rev-parse --abbrev-ref HEAD);
-    version="$commit ($branch) - UNOFFICIAL BUILD"
+    if [ "$branch" = "master" ]; then
+        version="$commit"
+    else
+        version="$commit ($branch)"
+    fi
+    version="$version - UNOFFICIAL BUILD"
 else
    version="UNOFFICIAL BUILD"
 fi

cmd/engarde-client/webserver.go

@@ -177,7 +177,7 @@ func webInclude(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var rsp []byte
-	if(isExcluded(req.Iface)) {
+	if isExcluded(req.Iface) {
 		swapExclusion(req.Iface)
 		rsp, err = json.Marshal(struct {
 			Status string `json:"status"`
@@ -213,7 +213,7 @@ func webExclude(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	var rsp []byte
-	if(!isExcluded(req.Iface)) {
+	if !isExcluded(req.Iface) {
 		swapExclusion(req.Iface)
 		rsp, err = json.Marshal(struct {
 			Status string `json:"status"`
@@ -235,7 +235,7 @@ func webExclude(w http.ResponseWriter, r *http.Request) {
 func webserver(listenAddr, username, password string) {
 	for {
 		realm := "engarde"
-		box := packr.New("webmanager", "../../webmanager/dist/webmanager")
+		box := packr.New("webmanager", "../../webmanager/dist/webmanager/browser")
 		http.HandleFunc("/", webBasicAuth(webHandleFileServer(box, "/"), username, password, realm))
 		http.HandleFunc("/api/v1/get-list", NoCache(webBasicAuth(webGetList, username, password, realm)))
 		http.HandleFunc("/api/v1/include", NoCache(webBasicAuth(webInclude, username, password, realm)))

cmd/engarde-server/webserver.go

@@ -83,7 +83,7 @@ func webGetList(w http.ResponseWriter, r *http.Request) {
 func webserver(listenAddr, username, password string) {
 	for {
 		realm := "engarde"
-		box := packr.New("webmanager", "../../webmanager/dist/webmanager")
+		box := packr.New("webmanager", "../../webmanager/dist/webmanager/browser")
 		http.HandleFunc("/", webBasicAuth(webHandleFileServer(box, "/"), username, password, realm))
 		http.HandleFunc("/api/v1/get-list", NoCache(webBasicAuth(webGetList, username, password, realm)))
 		log.Info("Management webserver listening on " + listenAddr)

webmanager/.gitignore

@@ -32,6 +32,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

webmanager/angular.json

@@ -11,12 +11,15 @@
       "schematics": {},
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/webmanager",
+            "outputPath": {
+              "base": "dist/webmanager"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
@@ -26,7 +29,7 @@
               "src/styles.css"
             ],
             "scripts": [],
-            "es5BrowserSupport": true
+            "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -39,12 +42,9 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -58,19 +58,19 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "webmanager:build",
-            "proxyConfig": "src/proxy.conf.json"
+            "proxyConfig": "src/proxy.conf.json",
+            "buildTarget": "webmanager:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "webmanager:build:production"
+              "buildTarget": "webmanager:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "webmanager:build"
+            "buildTarget": "webmanager:build"
           }
         },
         "test": {
@@ -89,18 +89,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -120,18 +108,11 @@
               "devServerTarget": "webmanager:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "webmanager"
+  "cli": {
+    "analytics": false
+  }
 }