Skip to content
Merged
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
5 changes: 5 additions & 0 deletions src/app/styles/antd.less
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,8 @@
p:last-of-type {
margin-bottom: 0;
}

.ant-layout-header {
padding-left: 10px;
padding-right: 20px;
}
3 changes: 3 additions & 0 deletions src/features/auth/Login/assets/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Logo from './logo.svg';

export { Logo };
110 changes: 110 additions & 0 deletions src/features/auth/Login/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/features/auth/Login/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +19,8 @@ export const Login = () => {

return (
<div className={classes.wrapper}>
<Title>{t('auth')}</Title>
<Logo className={classes.logo} />
<Title level={2}>{t('auth')}</Title>
<ManagedForm mutationFunction={authService.login} onSuccess={onSuccess}>
<Form.Item label={t('username')} name="username" rules={[{ required: true }]}>
<Input size="large" />
Expand Down
5 changes: 5 additions & 0 deletions src/features/auth/Login/styles.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@
background-color: @white;
border-radius: 16px;
box-shadow: @box-shadow-base;

.logo {
width: auto;
height: auto;
}
}
3 changes: 3 additions & 0 deletions src/widgets/layout/Header/assets/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Logo from './logo.svg';

export { Logo };
92 changes: 92 additions & 0 deletions src/widgets/layout/Header/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/widgets/layout/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,9 +18,8 @@ export const Header = () => {

return (
<AntdHeader className={classes.header}>
{/* TODO: [DOP-20026] Need to add logo */}
<div className={classes.left}>
<div className={classes.logo} />
<Logo className={classes.logo} />
<div className={classes.select}>
<SelectGroup />
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/widgets/layout/Header/styles.module.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
.left {
display: flex;
align-items: center;
gap: 40px;

.logo {
min-width: 200px;
width: auto;
height: 64px;
padding: 10px;
}

.select {
Expand Down