Update frontend

Angular 18 and Node 22

Author: xela92

.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

.idea/.gitignore

@@ -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

.idea/engarde.iml

@@ -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)))

.idea/inspectionProfiles/Project_Default.xml

@@ -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)