Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 71 additions & 0 deletions frontend/src/assets/outshift/logo-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions frontend/src/assets/outshift/logo-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions frontend/src/components/layout/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Logo from '@/assets/header/header.svg?react';
import {globalConfig} from '@/config/global';
import {cn} from '@/lib/utils';
import {isMultiTenant} from '@/utils/get-auth-config';
import outshiftLogo from '@/assets/outshift/logo-color.svg';

export const Header = () => {
const {isMobile} = useWindowSize();
Expand All @@ -46,11 +47,11 @@ export const Header = () => {
<SparkHeader
logo={
<Link to={PATHS.dashboard}>
<div className="flex items-center gap-2">
<div className="w-12">
<img src="/logo.svg" alt="Logo" className="w-full" />
<div className="flex items-center gap-2 md:gap-2 lg:gap-0">
<div className="w-20 lg:w-34">
<img src={outshiftLogo} alt="Logo" className="w-full" />
</div>
<Logo className="w-[200px] md:w-[300px] lg:w-full" />
<Logo className="w-[200px] md:w-[250px] lg:w-full" data-testid="header-logo-svg" />
</div>
</Link>
}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/layout/public-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ import {Button, Header} from '@open-ui-kit/core';
import {useAuth} from '@/hooks';
import {ReactNode} from 'react';
import Logo from '@/assets/header/header.svg?react';
import outshiftLogo from '@/assets/outshift/logo-color.svg';

export const PublicHeader = ({userSection}: {userSection?: ReactNode}) => {
const {login, register} = useAuth();
return (
<Header
logo={
<div className="flex items-center gap-2">
<div className="w-12">
<img src="/logo.svg" alt="Logo" className="w-full" />
<div className="flex items-center gap-2 md:gap-2 lg:gap-0">
<div className="w-20 lg:w-34">
<img src={outshiftLogo} alt="Logo" className="w-full" />
</div>
<Logo className="w-[200px] md:w-[300px] lg:w-full" data-testid="header-logo-svg" />
<Logo className="w-[200px] md:w-[250px] lg:w-full" data-testid="header-logo-svg" />
</div>
}
position="fixed"
Expand Down
8 changes: 0 additions & 8 deletions frontend/src/components/layout/tests/public-header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@ describe('PublicHeader', () => {
expect(header).toHaveAttribute('data-use-divider', 'false');
});

it('renders logo with responsive classes', () => {
renderWithClient(<PublicHeader />);

const logoSvg = screen.getByTestId('header-logo-svg');
// Check the actual classes used in the component
expect(logoSvg).toHaveClass('w-[200px]', 'md:w-[300px]', 'lg:w-full');
});

it('renders default user section with login and register buttons when no userSection provided', () => {
renderWithClient(<PublicHeader />);

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/welcome/welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {docs} from '@/utils/docs';
import LandingLogo from '@/assets/welcome/landing.svg?react';
import * as CookieConsentVanilla from 'vanilla-cookieconsent';
import {globalConfig} from '@/config/global';
import outshiftLogo from '@/assets/outshift/logo-white.svg';
import '@/styles/welcome.css';

const Welcome = () => {
Expand All @@ -24,8 +25,8 @@ const Welcome = () => {
Get started with
</div>
<div className="flex justify-center items-start gap-2">
<div className="w-32">
<img src="/logo.svg" alt="Logo" className="w-full fill-white stroke-white" />
<div className="w-64">
<img src={outshiftLogo} alt="Logo" className="w-full fill-white stroke-white" />
</div>
<LandingLogo className="max-w-[350px] md:max-w-[700px] lg:max-w-[914px] max-h-[54px] md:max-h-[104px] lg:max-h-full" />
</div>
Expand Down
Loading