diff --git a/package.json b/package.json index 8326917d..52bfbfe9 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "npm": ">10" }, "lint-staged": { - "src/**/*": "prettier --write --list-different", + "src/**/*.{ts,tsx,js,jsx,json,css,less}": "prettier --write --list-different", "src/**/*.{ts,tsx}": "eslint --fix" } } diff --git a/src/app/styles/antd.less b/src/app/styles/antd.less index f3745e77..3bb6a0bf 100644 --- a/src/app/styles/antd.less +++ b/src/app/styles/antd.less @@ -63,3 +63,8 @@ p:last-of-type { margin-bottom: 0; } + +.ant-layout-header { + padding-left: 10px; + padding-right: 20px; +} diff --git a/src/features/auth/Login/assets/index.ts b/src/features/auth/Login/assets/index.ts new file mode 100644 index 00000000..96d53932 --- /dev/null +++ b/src/features/auth/Login/assets/index.ts @@ -0,0 +1,3 @@ +import Logo from './logo.svg'; + +export { Logo }; diff --git a/src/features/auth/Login/assets/logo.svg b/src/features/auth/Login/assets/logo.svg new file mode 100644 index 00000000..21c04ce5 --- /dev/null +++ b/src/features/auth/Login/assets/logo.svg @@ -0,0 +1,110 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/features/auth/Login/index.tsx b/src/features/auth/Login/index.tsx index 3674baa2..fd0877cc 100644 --- a/src/features/auth/Login/index.tsx +++ b/src/features/auth/Login/index.tsx @@ -4,6 +4,7 @@ import { authService, LoginResponse, useLogin } from '@entities/auth'; import { Form, Input, Typography } from 'antd'; import { useTranslation } from 'react-i18next'; +import { Logo } from './assets'; import classes from './styles.module.less'; const { Title } = Typography; @@ -18,7 +19,8 @@ export const Login = () => { return (
- {t('auth')} + + {t('auth')} diff --git a/src/features/auth/Login/styles.module.less b/src/features/auth/Login/styles.module.less index b8a476b7..92c6e365 100644 --- a/src/features/auth/Login/styles.module.less +++ b/src/features/auth/Login/styles.module.less @@ -7,4 +7,9 @@ background-color: @white; border-radius: 16px; box-shadow: @box-shadow-base; + + .logo { + width: auto; + height: auto; + } } diff --git a/src/widgets/layout/Header/assets/index.ts b/src/widgets/layout/Header/assets/index.ts new file mode 100644 index 00000000..96d53932 --- /dev/null +++ b/src/widgets/layout/Header/assets/index.ts @@ -0,0 +1,3 @@ +import Logo from './logo.svg'; + +export { Logo }; diff --git a/src/widgets/layout/Header/assets/logo.svg b/src/widgets/layout/Header/assets/logo.svg new file mode 100644 index 00000000..96d3d052 --- /dev/null +++ b/src/widgets/layout/Header/assets/logo.svg @@ -0,0 +1,92 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/widgets/layout/Header/index.tsx b/src/widgets/layout/Header/index.tsx index 2d1d0514..0336d90b 100644 --- a/src/widgets/layout/Header/index.tsx +++ b/src/widgets/layout/Header/index.tsx @@ -8,6 +8,7 @@ import { ChangeLanguageSelect } from '@shared/config'; import classes from './styles.module.less'; import { LogoutButton } from './components'; +import { Logo } from './assets'; const { Header: AntdHeader } = Layout; const { Text } = Typography; @@ -17,9 +18,8 @@ export const Header = () => { return ( - {/* TODO: [DOP-20026] Need to add logo */}
-
+
diff --git a/src/widgets/layout/Header/styles.module.less b/src/widgets/layout/Header/styles.module.less index 2ad81434..bfe5d9a7 100644 --- a/src/widgets/layout/Header/styles.module.less +++ b/src/widgets/layout/Header/styles.module.less @@ -6,9 +6,13 @@ .left { display: flex; align-items: center; + gap: 40px; .logo { min-width: 200px; + width: auto; + height: 64px; + padding: 10px; } .select {