yogiedigital/cod-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'lavoce' (#16) from lavoce into main

Browse Source 
Reviewed-on: #16
This commit is contained in:
Bragas Rexita Ecos Fernanda
2025-11-10 06:33:35 +00:00
parent 83a475c708 d2f9d6aacc
commit 446a4e2b95
7 changed files with 5955 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1983
src/assets/svg/compressorA_rev.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

1983
src/assets/svg/compressorB_rev.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

1983
src/assets/svg/compressorC_rev.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

13
src/layout/LayoutHeader.jsx
View File

@@ -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

2
src/pages/home/SvgCompressorA.jsx
View File

@@ -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;

2
src/pages/home/SvgCompressorB.jsx
View File

@@ -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;

2
src/pages/home/SvgCompressorC.jsx
View File

@@ -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;