External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 18:21:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Source default login logo from static files

Browse Source
This commit is contained in:
Jake McDermott
2020-11-23 13:20:28 -05:00
parent a28c44e509
commit c81bc60a33
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
awx/ui_next/src/screens/Login/brand-logo.svg → awx/ui_next/public/static/media/logo-login.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

8
awx/ui_next/src/screens/Login/Login.jsx
View File

@@ -7,7 +7,7 @@ import { LoginForm, LoginPage as PFLoginPage } from '@patternfly/react-core';
import { RootAPI } from '../../api'; import { RootAPI } from '../../api';
import { BrandName } from '../../variables'; import { BrandName } from '../../variables';
import brandLogo from './brand-logo.svg'; const loginLogoSrc = '/static/media/logo-login.svg';
const LoginPage = styled(PFLoginPage)` const LoginPage = styled(PFLoginPage)`
& .pf-c-brand { & .pf-c-brand {
@@ -46,11 +46,13 @@ class AWXLogin extends Component {
const { const {
data: { custom_logo, custom_login_info }, data: { custom_logo, custom_login_info },
} = await RootAPI.read(); } = await RootAPI.read();
const logo = custom_logo ? `data:image/jpeg;${custom_logo}` : brandLogo; const logo = custom_logo
? `data:image/jpeg;${custom_logo}`
: loginLogoSrc;
this.setState({ logo, loginInfo: custom_login_info }); this.setState({ logo, loginInfo: custom_login_info });
} catch (err) { } catch (err) {
this.setState({ logo: brandLogo }); this.setState({ logo: loginLogoSrc });
} finally { } finally {
this.setState({ isLoading: false }); this.setState({ isLoading: false });
} }

6
awx/ui_next/src/screens/Login/Login.test.jsx
View File

@@ -98,7 +98,8 @@ describe('<Login />', () => {
); );
const { loginHeaderLogo } = await findChildren(loginWrapper); const { loginHeaderLogo } = await findChildren(loginWrapper);
const { alt, src } = loginHeaderLogo.props(); const { alt, src } = loginHeaderLogo.props();
expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']); expect(alt).toEqual('AWX');
expect(src).toContain('logo-login.svg');
done(); done();
}); });
@@ -109,7 +110,8 @@ describe('<Login />', () => {
); );
const { loginHeaderLogo } = await findChildren(loginWrapper); const { loginHeaderLogo } = await findChildren(loginWrapper);
const { alt, src } = loginHeaderLogo.props(); const { alt, src } = loginHeaderLogo.props();
expect([alt, src]).toEqual(['AWX', 'brand-logo.svg']); expect(alt).toEqual('AWX');
expect(src).toContain('logo-login.svg');
done(); done();
}); });