Skip to content

Commit

Permalink
chore: rename HeaderV3 to Header
Browse files Browse the repository at this point in the history
  • Loading branch information
Riippi committed Dec 11, 2024
1 parent dc8d2ae commit e291a79
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Button, IconLock, IconSpeechbubbleText } from 'hds-react';
import noop from 'lodash/noop';
import { useRouter } from 'next/router';
import * as React from 'react';
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import { getFullName } from 'shared/utils/application.utils';

import Messenger from '../messenger/Messenger';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import { respondAbovePx } from 'shared/styles/mediaQueries';
import styled from 'styled-components';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import useUserQuery from 'kesaseteli/employer/hooks/backend/useUserQuery';
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
import React from 'react';
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import { Language, SUPPORTED_LANGUAGES } from 'shared/i18n/i18n';
import { OptionType } from 'shared/types/common';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { IconMover } from 'hds-react';
import { useTranslation } from 'next-i18next';
import React from 'react';
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import useLocale from 'shared/hooks/useLocale';

const Header: React.FC = () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/kesaseteli/youth/src/components/header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
import React from 'react';
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import { SUPPORTED_LANGUAGES } from 'shared/i18n/i18n';
import { OptionType } from 'shared/types/common';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export type HeaderProps = {
customActiveItemFn?: (url: string) => boolean;
};

const HeaderV3: React.FC<HeaderProps> = ({
const Header: React.FC<HeaderProps> = ({
className,
customActiveItemFn,
customItems,
Expand All @@ -62,15 +62,8 @@ const HeaderV3: React.FC<HeaderProps> = ({
title,
titleUrl,
}) => {
const {
closeMenu,
handleLogin,
handleLogout,
locale,
logoLang,
t,
toggleMenu,
} = useHeader(login);
const { closeMenu, handleLogin, handleLogout, logoLang, t, toggleMenu } =
useHeader(login);

const goToPage = useGoToPage();

Expand Down Expand Up @@ -140,7 +133,6 @@ const HeaderV3: React.FC<HeaderProps> = ({
onMenuClick={toggleMenu}
>
{customItems}

{login && !login?.isAuthenticated && !hideLogin && (
<Header.ActionBarButton
id="sign-in"
Expand All @@ -151,6 +143,8 @@ const HeaderV3: React.FC<HeaderProps> = ({
/>
)}

<div className="flex items-center space-x-4"></div>

{login && login?.isAuthenticated && !hideLogin && (
<Header.ActionBarItem
id="sign-out"
Expand Down Expand Up @@ -196,4 +190,4 @@ const HeaderV3: React.FC<HeaderProps> = ({
);
};

export default HeaderV3;
export default Header;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { axe } from 'jest-axe';
import React from 'react';
import { render } from 'shared/__tests__/utils/test-utils';

import Header from '../HeaderV3';
import Header from '../Header';

// "svg elements with an img role have an alternative text (svg-img-alt)"
test.skip('test for accessibility violations', async () => {
Expand Down
2 changes: 1 addition & 1 deletion frontend/shared/src/components/header/useHeader.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TFunction, useTranslation } from 'next-i18next';
import { useState } from 'react';
import { HeaderProps } from 'shared/components/header/HeaderV3';
import { HeaderProps } from 'shared/components/header/Header';
import useLocale from 'shared/hooks/useLocale';
import { Language } from 'shared/i18n/i18n';

Expand Down
2 changes: 1 addition & 1 deletion frontend/tet/admin/src/components/header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRouter } from 'next/router';
import { useTranslation } from 'next-i18next';
import React from 'react';
import BaseHeader from 'shared/components/header/HeaderV3';
import BaseHeader from 'shared/components/header/Header';
import { SUPPORTED_LANGUAGES } from 'shared/i18n/i18n';
import { OptionType } from 'shared/types/common';
import useLogin from 'tet/admin/hooks/backend/useLogin';
Expand Down

0 comments on commit e291a79

Please sign in to comment.