Add support for URLs as logo image source (#904)

* add support for URLs as logo image source

* update Rene + add Roche as contributor

* add Logo path changes to readme

* add missing type

Author: FischerRene

aas-web-ui/src/assets/Companies/Roche_Logo.svg

@@ -336,9 +336,13 @@
         }
 
         if (isDark.value && envStore.getEnvLogoDarkPath.trim().length > 0) {
-            return logoFolder + envStore.getEnvLogoDarkPath;
+            return validURL(envStore.getEnvLogoDarkPath)
+                ? envStore.getEnvLogoDarkPath
+                : logoFolder + envStore.getEnvLogoDarkPath;
         } else {
-            return logoFolder + envStore.getEnvLogoLightPath;
+            return validURL(envStore.getEnvLogoLightPath)
+                ? envStore.getEnvLogoLightPath
+                : logoFolder + envStore.getEnvLogoLightPath;
         }
     });
     const showMobileMenu = computed(() => isMobile.value && !mainMenu.value);
@@ -416,4 +420,17 @@
         infrastructureMenu.value = false;
         infrastructureManagementDialog.value = true;
     }
+
+    function validURL(str: string) {
+        var pattern = new RegExp(
+            '^(https?:\\/\\/)?' + // protocol
+                '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
+                '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
+                '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
+                '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
+                '(\\#[-a-z\\d_]*)?$',
+            'i'
+        ); // fragment locator
+        return !!pattern.test(str);
+    }
 </script>

aas-web-ui/src/components/AppNavigation/AppNavigation.vue

@@ -164,6 +164,7 @@
     import IDTALogo from '@/assets/Companies/IDTA_Logo.png';
     import IESELogoDark from '@/assets/Companies/IESE_Logo_dark.svg';
     import IESELogoLight from '@/assets/Companies/IESE_Logo_light.svg';
+    import RocheLogo from '@/assets/Companies/Roche_Logo.svg'; // Logo only for AAS UI permitted
     // Import contributor images
     import Buettner from '@/assets/Contributors/Buettner.jpg';
     import Eicke from '@/assets/Contributors/Eicke.jpg';
@@ -236,6 +237,12 @@
             srcLight: ARENA2036LogoLight,
             altText: 'ARENA2036 Logo',
         },
+        {
+            href: 'https://www.roche.com/',
+            isDynamic: false,
+            srcStatic: RocheLogo,
+            altText: 'Roche Logo',
+        },
     ]);
 
     // Array of contributor objects with imported images
@@ -265,9 +272,9 @@
             linkedin_link: 'https://www.linkedin.com/in/fiona-helena-buettner',
         },
         {
-            name: 'Rene Pascal Fischer',
-            company: 'Fraunhofer IESE',
-            email: 'Rene-Pascal.Fischer@iese.fraunhofer.de',
+            name: 'Rene-Pascal Fischer',
+            company: 'F. Hoffmann-La Roche AG',
+            email: 'Rene-Pascal.Fischer@roche.com',
             image: Fischer,
             github_link: 'https://github.com/FischerRene',
             linkedin_link: 'https://www.linkedin.com/in/fischer-rene',