Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Wazuh logo and titles #3

Merged
merged 7 commits into from
May 11, 2023
Merged

Change Wazuh logo and titles #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ecc5721
Change Wazuh logo and titles
asteriscos Apr 20, 2023
316949d
Don't force custom logo to have 100% width
yenienserrano May 9, 2023
80ec6e9
Add comment
yenienserrano May 9, 2023
bf8041f
Fix lint
yenienserrano May 9, 2023
568ed24
Merge branch '2.4.1' into change-wazuh-title-and-logos
yenienserrano May 10, 2023
e86ec44
Fix prettier
yenienserrano May 10, 2023
c53e44c
Update snapshots
yenienserrano May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions public/apps/login/login-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
} from '@elastic/eui';
import { CoreStart } from '../../../../../src/core/public';
import { ClientConfigType } from '../../types';
import defaultBrandImage from '../../assets/opensearch_logo_h.svg';
import defaultBrandImage from '../../assets/ui/wazuh_logo.svg';
import { validateCurrentPassword } from '../../utils/login-utils';
import {
ANONYMOUS_AUTH_LOGIN,
Expand Down Expand Up @@ -239,23 +239,19 @@ export function LoginPage(props: LoginPageDeps) {
};

// TODO: Get brand image from server config
// Don't force custom logo to have 100% width. It should be handled in the svg properties if needed. (Removed fullWidth in the image)
return (
<EuiListGroup className="login-wrapper">
{props.config.ui.basicauth.login.showbrandimage && (
<EuiImage
size="fullWidth"
alt=""
url={props.config.ui.basicauth.login.brandimage || defaultBrandImage}
/>
<EuiImage alt="" url={props.config.ui.basicauth.login.brandimage || defaultBrandImage} />
)}
<EuiSpacer size="s" />
<EuiText size="m" textAlign="center">
{props.config.ui.basicauth.login.title || 'Log in to OpenSearch Dashboards'}
{props.config.ui.basicauth.login.title || ''}
</EuiText>
<EuiSpacer size="s" />
<EuiText size="s" textAlign="center">
{props.config.ui.basicauth.login.subtitle ||
'If you have forgotten your username or password, contact your system administrator.'}
{props.config.ui.basicauth.login.subtitle || ''}
</EuiText>
<EuiSpacer size="s" />
<EuiForm component="form">
Expand Down
21 changes: 4 additions & 17 deletions public/apps/login/test/__snapshots__/login-page.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ exports[`Login page renders renders with config value for multiauth 1`] = `
>
<EuiImage
alt=""
size="fullWidth"
url="http://localhost:5601/images/test.png"
/>
<EuiSpacer
Expand Down Expand Up @@ -159,7 +158,6 @@ exports[`Login page renders renders with config value: string 1`] = `
>
<EuiImage
alt=""
size="fullWidth"
url="http://localhost:5601/images/test.png"
/>
<EuiSpacer
Expand Down Expand Up @@ -262,7 +260,6 @@ exports[`Login page renders renders with config value: string array 1`] = `
>
<EuiImage
alt=""
size="fullWidth"
url="http://localhost:5601/images/test.png"
/>
<EuiSpacer
Expand Down Expand Up @@ -365,7 +362,6 @@ exports[`Login page renders renders with default value: string 1`] = `
>
<EuiImage
alt=""
size="fullWidth"
url="test-file-stub"
/>
<EuiSpacer
Expand All @@ -374,18 +370,14 @@ exports[`Login page renders renders with default value: string 1`] = `
<EuiText
size="m"
textAlign="center"
>
Log in to OpenSearch Dashboards
</EuiText>
/>
<EuiSpacer
size="s"
/>
<EuiText
size="s"
textAlign="center"
>
If you have forgotten your username or password, contact your system administrator.
</EuiText>
/>
<EuiSpacer
size="s"
/>
Expand Down Expand Up @@ -468,7 +460,6 @@ exports[`Login page renders renders with default value: string array 1`] = `
>
<EuiImage
alt=""
size="fullWidth"
url="test-file-stub"
/>
<EuiSpacer
Expand All @@ -477,18 +468,14 @@ exports[`Login page renders renders with default value: string array 1`] = `
<EuiText
size="m"
textAlign="center"
>
Log in to OpenSearch Dashboards
</EuiText>
/>
<EuiSpacer
size="s"
/>
<EuiText
size="s"
textAlign="center"
>
If you have forgotten your username or password, contact your system administrator.
</EuiText>
/>
<EuiSpacer
size="s"
/>
Expand Down
Loading