Use new header and portal layout (#293)

* FIX auth callback url (#292) * Use new header and portal layout --------- Co-authored-by: Lara Miñones <[email protected]>
FIWARE-TMForum · Oct 1, 2024 · a6fa800 · a6fa800
1 parent add818a
commit a6fa800
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 19 deletions.
diff --git a/portal/bae-frontend/assets/flags/en.svg b/portal/bae-frontend/assets/flags/en.svg
diff --git a/portal/bae-frontend/assets/flags/es.svg b/portal/bae-frontend/assets/flags/es.svg
diff --git a/portal/bae-frontend/assets/flags/it.svg b/portal/bae-frontend/assets/flags/it.svg
diff --git a/portal/bae-frontend/assets/i18n/en.json b/portal/bae-frontend/assets/i18n/en.json
@@ -2,8 +2,8 @@
     "_yes": "Yes",
     "_no": "No",    
     "DASHBOARD": {
-        "_title": "YUMKET is out! See what's new",
-        "_header": "YUMKET: Cloud & Edge Services you can Trust",
+        "_title": "DOME Marketplace is out! See what's new",
+        "_header": "DOME Marketplace: Cloud & Edge Services you can Trust",
         "_subheader": "Welcome to the first open distributed marketplace ecosystem for cloud, edge & AI services in Europe",
         "_new": "New",
         "_learn_more": "Learn more",
@@ -69,7 +69,7 @@
     },
     "HOWITWORKS":{
         "_title": "How It Works",
-        "_subtitle": "Discover how YUMKET connects you to Europe's finest cloud and edge services",
+        "_subtitle": "Discover how DOME Marketplace connects you to Europe's finest cloud and edge services",
         "CUSTOMERS":{
             "_title": "For customers",
             "_subtitle": "Discover",
@@ -164,7 +164,7 @@
         "_rights": "All Rights Reserved"
     },
     "HEADER": {
-        "_marketplace": "MARKETPLACE",
+        "_marketplace": "DOME MARKETPLACE",
         "_open_menu": "Open main menu",
         "_home": "Home",
         "_catalogs": "Catalogues",
@@ -184,7 +184,11 @@
         "_knowledge": "Knowledge Base",
         "_ticketing": "Ticketing System",
         "_change_session": "Change session",
-        "_admin": "Administration"
+        "_admin": "Administration",
+        "_publish": "Publish your product",
+        "_register": "Register",
+        "_about": "About",
+        "_info": "Info"
     },
     "PRODUCT_DETAILS": {
         "_back": "Back",

diff --git a/portal/bae-frontend/assets/i18n/es.json b/portal/bae-frontend/assets/i18n/es.json
@@ -2,8 +2,8 @@
     "_yes": "Yes",
     "_no": "No",    
     "DASHBOARD": {
-        "_title": "YUMKET is out! See what's new",
-        "_header": "YUMKET: Cloud & Edge Services you can Trust",
+        "_title": "DOME Marketplace is out! See what's new",
+        "_header": "DOME Marketplace: Cloud & Edge Services you can Trust",
         "_subheader": "Welcome to the first open distributed marketplace ecosystem for cloud, edge & AI services in Europe",
         "_new": "New",
         "_learn_more": "Learn more",
@@ -69,7 +69,7 @@
     },
     "HOWITWORKS":{
         "_title": "How It Works",
-        "_subtitle": "Discover how YUMKET connects you to Europe's finest cloud and edge services",
+        "_subtitle": "Discover how DOME Marketplace connects you to Europe's finest cloud and edge services",
         "CUSTOMERS":{
             "_title": "For customers",
             "_subtitle": "Discover",
@@ -164,7 +164,7 @@
         "_rights": "All Rights Reserved"
     },
     "HEADER": {
-        "_marketplace": "MARKETPLACE",
+        "_marketplace": "DOME MARKETPLACE",
         "_open_menu": "Open main menu",
         "_home": "Home",
         "_catalogs": "Catalogues",
@@ -184,7 +184,11 @@
         "_knowledge": "Knowledge Base",
         "_ticketing": "Ticketing System",
         "_change_session": "Change session",
-        "_admin": "Administration"
+        "_admin": "Administration",
+        "_publish": "Publish your product",
+        "_register": "Register",
+        "_about": "About",
+        "_info": "Info"
     },
     "PRODUCT_DETAILS": {
         "_back": "Back",

diff --git a/portal/bae-frontend/index.html b/portal/bae-frontend/index.html
@@ -2,7 +2,7 @@
 <html lang="en" data-critters-container>
 <head><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <meta charset="utf-8">
-  <title>YUMKET deployed by the DOME Project</title>
+  <title>DOME Marketplace</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="/assets/dome_logo.PNG">
@@ -16,9 +16,9 @@
       document.documentElement.classList.remove('dark')
     }
   </script>
-<style>*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}html{font-family:Blinker,system-ui,sans-serif}*,:before,:after{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(63 131 248 / .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.h-screen{height:100vh}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}:root{--blockquote-border-color:#ccc;--blockquote-bg-color:#dde6f6;--blockquote-text-color:black}@media (prefers-color-scheme: dark){:root{--blockquote-border-color:#171717;--blockquote-bg-color:#0c1c38;--blockquote-text-color:#eee}}</style><link rel="stylesheet" href="styles.0263c55350a7a585.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.0263c55350a7a585.css"></noscript></head>
+<style>*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}html{font-family:Blinker,system-ui,sans-serif}*,:before,:after{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgb(63 131 248 / .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.h-screen{height:100vh}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255 / var(--tw-bg-opacity))}:root{--blockquote-border-color:#ccc;--blockquote-bg-color:#dde6f6;--blockquote-text-color:black}@media (prefers-color-scheme: dark){:root{--blockquote-border-color:#171717;--blockquote-bg-color:#0c1c38;--blockquote-text-color:#eee}}</style><link rel="stylesheet" href="styles.24a6b3bfeab7a908.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.24a6b3bfeab7a908.css"></noscript></head>
 <body class="h-screen bg-white dark:bg-gray-900"> <!-- class="dark:bg-gray-900" style="background-image: url('assets/logos/dome-logo-element-colour.png');"-->
   <app-root></app-root>
   <!--<script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/1.8.1/flowbite.min.js"></script>-->
-<script src="runtime.a6c447aa891d1500.js" type="module"></script><script src="polyfills.91ffa46fa0a1d50f.js" type="module"></script><script src="main.5d78c62e6ac2a5f6.js" type="module"></script></body>
-</html>
+<script src="runtime.a6c447aa891d1500.js" type="module"></script><script src="polyfills.91ffa46fa0a1d50f.js" type="module"></script><script src="main.8b759a7e06a88548.js" type="module"></script></body>
+</html>
diff --git a/portal/bae-frontend/main.5d78c62e6ac2a5f6.js b/portal/bae-frontend/main.5d78c62e6ac2a5f6.js
diff --git a/portal/bae-frontend/main.8b759a7e06a88548.js b/portal/bae-frontend/main.8b759a7e06a88548.js
diff --git a/portal/bae-frontend/styles.0263c55350a7a585.css b/portal/bae-frontend/styles.0263c55350a7a585.css
diff --git a/portal/bae-frontend/styles.24a6b3bfeab7a908.css b/portal/bae-frontend/styles.24a6b3bfeab7a908.css
diff --git a/server.js b/server.js
@@ -253,13 +253,13 @@ app.get('/auth/' + config.oauth2.provider + '/callback', passport.authenticate(c
 
     } else if (config.externalPortal == null || config.externalPortal == ''){
         // Using local new GUI
-        res.redirect('/dashboard?token=local');
+        res.redirect('/search?token=local');
     } else {
         // Using an external portal
         res.header('Access-Control-Allow-Origin', config.externalPortal)
         res.header("Access-Control-Allow-Credentials", true);
 
-        res.redirect(`${config.externalPortal}/dashboard?token=` + req.user.accessToken);
+        res.redirect(`${config.externalPortal}/search?token=` + req.user.accessToken);
     }
 });
 
@@ -359,7 +359,7 @@ if (config.siop.enabled) {
         app.get(config.siop.pollCertPath, certsValidator.checkStatus)
     } else {
         app.get('/auth/' + config.siop.provider + '/callback', passport.authenticate(config.siop.provider), (req, res) => {
-            res.redirect('/dashboard?token=local');
+            res.redirect('/search?token=local');
         })
     }
 }