From 754d0aeb83b2e46f013aae0355cb40193dcd3462 Mon Sep 17 00:00:00 2001 From: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> Date: Tue, 31 Oct 2023 10:04:03 +0100 Subject: [PATCH 1/2] update readme file --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 14bc8755b..fc430d143 100644 --- a/README.md +++ b/README.md @@ -200,8 +200,8 @@ But if you'd like to check it out more news and website you can always check it ## License IDURAR is [fair-code](http://faircode.io) distributed under the -[**Developer Trial Use Licensee**](https://github.com/idurar/idurar-erp-crm/blob/master/LICENSE.md) and the -[**IDURAR Enterprise License**](https://github.com/idurar/idurar-erp-crm/blob/master/LICENSE_EE.md). +[**Developer Trial Use Licensee**](https://github.com/idurar/idurar-erp-crm/blob/master/LICENSE) and the +[**IDURAR Enterprise License**](https://github.com/idurar/idurar-erp-crm/blob/master/LICENSE_EE). Proprietary licenses are available for enterprise customers. [Get in touch](mailto:hello@idurarapp.com) From 133bafbf9c4e3401b6611e16f053febc45fbee20 Mon Sep 17 00:00:00 2001 From: Salah Eddine Lalami <50052356+idurar@users.noreply.github.com> Date: Tue, 31 Oct 2023 10:10:14 +0100 Subject: [PATCH 2/2] update header photo profile ui --- frontend/src/apps/components/HeaderContent.jsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/src/apps/components/HeaderContent.jsx b/frontend/src/apps/components/HeaderContent.jsx index af0d0fcc9..8beb8ae5d 100644 --- a/frontend/src/apps/components/HeaderContent.jsx +++ b/frontend/src/apps/components/HeaderContent.jsx @@ -1,15 +1,15 @@ -import { useDispatch, useSelector } from 'react-redux'; +import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; import { Avatar, Dropdown, Layout } from 'antd'; // import Notifications from '@/components/Notification'; -import { AppstoreOutlined, SettingOutlined, LogoutOutlined } from '@ant-design/icons'; +import { SettingOutlined, LogoutOutlined } from '@ant-design/icons'; import { checkImage } from '@/request'; import { selectCurrentAdmin } from '@/redux/auth/selectors'; -import { translateAction } from '@/redux/translate/actions'; + import { useNavigate } from 'react-router-dom'; import { BASE_URL } from '@/config/serverApiConfig'; @@ -21,13 +21,11 @@ export default function HeaderContent() { const currentAdmin = useSelector(selectCurrentAdmin); const { Header } = Layout; - const dispatch = useDispatch(); - const translate = useLanguage(); - const srcImgProfile = checkImage(BASE_URL + currentAdmin?.photo) - ? BASE_URL + currentAdmin?.photo - : null; + const hasPhotoprofile = checkImage(BASE_URL + currentAdmin?.photo); + + const srcImgProfile = hasPhotoprofile ? BASE_URL + currentAdmin?.photo : null; const ProfileDropdown = () => { const navigate = useNavigate(); @@ -37,7 +35,7 @@ export default function HeaderContent() { size="large" className="last" src={srcImgProfile} - style={{ color: '#f56a00', backgroundColor: !srcImgProfile ? '#fde3cf' : 'none' }} + style={{ color: '#f56a00', backgroundColor: !hasPhotoprofile ? '#fde3cf' : '#f9fafc' }} > {currentAdmin?.name.charAt(0).toUpperCase()} @@ -113,7 +111,7 @@ export default function HeaderContent() { src={srcImgProfile} style={{ color: '#f56a00', - backgroundColor: !srcImgProfile ? '#fde3cf' : 'none', + backgroundColor: !hasPhotoprofile ? '#fde3cf' : '#f9fafc', float: 'right', }} size="large"