From 529df01353342173948e1c03177dc76a75c2423d Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Thu, 7 Aug 2025 12:30:54 +0200 Subject: [PATCH] JDG-7502 Rebranding changes with PTF6 --- src/app/AppLayout/AppLayout.tsx | 31 +++--- src/app/Welcome/Welcome.tsx | 24 ++--- src/app/assets/images/brand.svg | 22 ++--- src/app/assets/images/brand_dark.svg | 138 ++++++++++++++++++++++++++- 4 files changed, 168 insertions(+), 47 deletions(-) diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx index e0c46f8..1e48017 100644 --- a/src/app/AppLayout/AppLayout.tsx +++ b/src/app/AppLayout/AppLayout.tsx @@ -3,11 +3,11 @@ import React, { useContext, useEffect, useState } from 'react'; import { Brand, Button, - Content, - ContentVariants, Dropdown, DropdownGroup, DropdownItem, + Flex, + FlexItem, Masthead, MastheadBrand, MastheadContent, @@ -33,11 +33,12 @@ import { } from '@patternfly/react-core'; import logo from '!!url-loader!@app/assets/images/logo.png'; import brand from '!!url-loader!@app/assets/images/brand.svg'; +import brandDark from '!!url-loader!@app/assets/images/brand_dark.svg'; import { Link, NavLink } from 'react-router-dom'; import { IAppRoute, routes } from '@app/routes'; import { ActionResponseAlert } from '@app/Common/ActionResponseAlert'; import { Navigate, useLocation, useNavigate } from 'react-router'; -import {global_spacer_md, global_spacer_sm, global_spacer_xs} from '@patternfly/react-tokens'; +import {t_global_spacer_xs} from '@patternfly/react-tokens'; import { About } from '@app/About/About'; import { ErrorBoundary } from '@app/ErrorBoundary'; import { BannerAlert } from '@app/Common/BannerAlert'; @@ -90,25 +91,12 @@ const AppLayout: React.FunctionComponent = ({ children }) => { - - - - - - - - {/**/} - {/* */} - {/* {t('layout.console-name')}*/} - {/* */} - {/**/} ); @@ -179,9 +167,12 @@ const AppLayout: React.FunctionComponent = ({ children }) => { - - {t('layout.console-name')} - + + + + {/**/} + {/* {t('layout.console-name')}*/} + {/**/} diff --git a/src/app/Welcome/Welcome.tsx b/src/app/Welcome/Welcome.tsx index 2555a77..424c3b8 100644 --- a/src/app/Welcome/Welcome.tsx +++ b/src/app/Welcome/Welcome.tsx @@ -12,23 +12,18 @@ import { Flex, FlexItem, Gallery, - GalleryItem, Grid, GridItem, + GalleryItem, Spinner, Stack, StackItem, - Text, TextContent, - TextVariants, - Title, - TitleSizes } from '@patternfly/react-core'; import logo from '!!url-loader!@app/assets/images/logo.png'; -import brand from '!!url-loader!@app/assets/images/brand.svg'; import { CatalogIcon, DownloadIcon, GithubIcon, UnknownIcon } from '@patternfly/react-icons'; import { chart_color_blue_500, - chart_global_Fill_Color_white, global_spacer_md, - global_spacer_sm, - global_spacer_xs + chart_global_Fill_Color_white, + t_global_spacer_sm, + t_global_spacer_xs } from '@patternfly/react-tokens'; import { ConsoleBackground } from '@app/Common/ConsoleBackground/ConsoleBackground'; import { Support } from '@app/Support/Support'; @@ -39,7 +34,6 @@ import { useAppInitState, useConnectedUser } from '@app/services/userManagementH import { useFetchVersion } from '@app/services/serverHook'; import { aboutLink, apacheLicenseLink, blogLink, hotRodClientsLink, tutorialsLink } from '@app/utils/links'; import './Welcome.css'; -import {Link} from "react-router-dom"; const Welcome = () => { const { init } = useAppInitState(); @@ -119,15 +113,15 @@ const Welcome = () => { - - - { brandname } {t('layout.console-name')} - + + + { brandname } {t('layout.console-name')} + {/**/} {/* */} diff --git a/src/app/assets/images/brand.svg b/src/app/assets/images/brand.svg index 658adee..cdf49c2 100644 --- a/src/app/assets/images/brand.svg +++ b/src/app/assets/images/brand.svg @@ -24,7 +24,7 @@ rdf:about="">image/svg+xml \ No newline at end of file + + + +image/svg+xmlSERVER ADMINISTRATION CONSOLE + -- 2.39.5 (Apple Git-154)