Compare commits
3 Commits
83a475c708
...
446a4e2b95
| Author | SHA1 | Date | |
|---|---|---|---|
| 446a4e2b95 | |||
| d2f9d6aacc | |||
| 7ef6d71be8 |
1983
src/assets/svg/compressorA_rev.svg
Normal file
1983
src/assets/svg/compressorA_rev.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 177 KiB |
1983
src/assets/svg/compressorB_rev.svg
Normal file
1983
src/assets/svg/compressorB_rev.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 177 KiB |
1983
src/assets/svg/compressorC_rev.svg
Normal file
1983
src/assets/svg/compressorC_rev.svg
Normal file
File diff suppressed because it is too large
Load Diff
|
After Width: | Height: | Size: 177 KiB |
@@ -41,15 +41,8 @@ const LayoutHeader = () => {
|
||||
// console.log('User data di header:', userData?.user);
|
||||
|
||||
// Role handling
|
||||
const roleNameDefault =
|
||||
userData?.user?.approval ||
|
||||
userData?.user?.partner_name ||
|
||||
userData?.user?.role_name ||
|
||||
'Guest';
|
||||
|
||||
let roleName = roleNameDefault;
|
||||
const userName =
|
||||
userData?.user?.name || userData?.user?.username || userData?.user?.user_name || 'User';
|
||||
let roleName = userData?.user?.role_name || 'Guest';
|
||||
const userName = userData?.user?.name || userData?.user?.username || userData?.user?.user_name || 'User';
|
||||
|
||||
// Override jika Super Admin
|
||||
if (
|
||||
@@ -142,7 +135,7 @@ const LayoutHeader = () => {
|
||||
>
|
||||
<UserOutlined style={{ fontSize: 16, color: colorText }} />
|
||||
<Text style={{ marginLeft: 8, color: colorText }} strong>
|
||||
{userName}
|
||||
{userName} @ {roleName}
|
||||
</Text>
|
||||
</Button>
|
||||
<Link
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Card, Typography, Flex } from 'antd';
|
||||
import { setValSvg } from '../../components/Global/MqttConnection';
|
||||
import SvgTemplate from './SvgTemplate';
|
||||
import SvgViewer from './SvgViewer';
|
||||
import filePathSvg from '../../assets/svg/test-new.svg';
|
||||
import filePathSvg from '../../assets/svg/compressorA_rev.svg';
|
||||
|
||||
const { Text } = Typography;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Card, Typography, Flex } from 'antd';
|
||||
import { setValSvg } from '../../components/Global/MqttConnection';
|
||||
import SvgTemplate from './SvgTemplate';
|
||||
import SvgViewer from './SvgViewer';
|
||||
import filePathSvg from '../../assets/svg/test-new.svg';
|
||||
import filePathSvg from '../../assets/svg/compressorB_rev.svg';
|
||||
|
||||
const { Text } = Typography;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Card, Typography, Flex } from 'antd';
|
||||
import { setValSvg } from '../../components/Global/MqttConnection';
|
||||
import SvgTemplate from './SvgTemplate';
|
||||
import SvgViewer from './SvgViewer';
|
||||
import filePathSvg from '../../assets/svg/test-new.svg';
|
||||
import filePathSvg from '../../assets/svg/compressorC_rev.svg';
|
||||
|
||||
const { Text } = Typography;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user