merged main

Author: qvalentin

.github/workflows/featureRelease.yml

@@ -37,4 +37,4 @@ jobs:
         name: Build and push
         run: |
           docker build -t filefighter/frontend:feature webapp_provider/
-          docker push filefighter/frontend:feature
+          docker push filefighter/frontend:feature

.github/workflows/stableRelease.yml

@@ -2,13 +2,8 @@ name: Stable Release
 
 on:
   push:
-    branches:
-      - 'master'
     tags:
       - 'v*.*.*'
-    paths:
-      - 'webapp_frontend/**'
-      - 'webapp_provider/**'
 
 jobs:
   Build_Docker_Image_on_new_Tag:
@@ -40,4 +35,4 @@ jobs:
         run: |
           VERSION=${{ steps.vars.outputs.tag }}
           docker build -t filefighter/frontend:$VERSION webapp_provider/
-          docker push filefighter/frontend:$VERSION
+          docker push filefighter/frontend:$VERSION

README.md

@@ -1,7 +1,8 @@
 # WebApp
 Frontend Web Application for FileFighter.  
 ![Latest Release](https://github.com/FileFighter/WebApp/workflows/Latest%20Release/badge.svg)
-![Stable Release](https://github.com/FileFighter/WebApp/workflows/Stable%20Release/badge.svg)  
+![Stable Release](https://github.com/FileFighter/WebApp/workflows/Stable%20Release/badge.svg)
+![CodeFactor](https://www.codefactor.io/repository/github/filefighter/webapp/badge)  
 ![Docker Release](https://img.shields.io/github/v/release/filefighter/webapp?color=dark-green&label=Stable%20Version&logo=docker&style=for-the-badge)
 ![Docker Pulls](https://img.shields.io/docker/pulls/filefighter/frontend?logo=docker&style=for-the-badge)
 

webapp_frontend/public/backend.cfg

@@ -0,0 +1 @@
+8080

webapp_frontend/src/api.ts

@@ -1,6 +1,22 @@
-import Axios from "axios";
+import Axios, {AxiosResponse} from "axios";
 
-const uri = "http://localhost:8080";
+let uri:string;
+const localhost:string = "http://localhost:";
+const backendPortFilePath:string = "./backend.cfg";
+
+function setBackendPort():Promise<string>{
+    return new Promise((resolve, reject) => {
+        Axios.get(backendPortFilePath)
+            .then((data:AxiosResponse<string>) => {
+                uri = localhost + data.data;
+                console.log(`[API] ${uri}`)
+                resolve(data.data);
+            })
+            .catch(((error:any) => {
+                reject(error);
+            }));
+    });
+}
 
 interface BackendHealthData {
     uptimeInSeconds: number;
@@ -19,4 +35,4 @@ function callBackendHealth():Promise<BackendHealthData>{
     });
 }
 
-export {callBackendHealth}
+export {setBackendPort, callBackendHealth}

webapp_frontend/src/components/App.tsx

@@ -1,16 +1,34 @@
 import React, {ReactElement, useEffect, useState} from 'react';
 import logo from '../assets/images/logos/logo.png';
 import './App.css';
-import {callBackendHealth} from "../api";
+import {setBackendPort, callBackendHealth} from "../api";
+
+
 import {Button, Table, Container} from 'react-bootstrap';
 
 function App():ReactElement {
     const [backendLiveTime, setBackendLiveTime] = useState<number | string>("not reachable");
     const [backendUserCount, setBackendUserCount] = useState<number | string>("not reachable");
 
+
+
+
+
     useEffect(() => {
+        Promise.resolve(setBackendPort())
+            .then((backendPort:string) => {
+                console.log("[APP] Backend-Port = " + backendPort)
+                callInitialBackendRequests()
+            })
+            .catch((error:any) => {
+                alert("Error: Problems with backend.cfg - " + error)
+            })
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    },[]);
+
+    function callInitialBackendRequests():void {
         updateVariables()
-    });
+    }
 
     function updateVariables(): void {
         Promise.all([callBackendHealth()])