brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tidio' into dev_environment

Browse source
This commit is contained in:
Carter 2025-12-17 14:32:34 -06:00
commit 429549a305
4 changed files with 10 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

34
index.html
View file

@ -6,40 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title id="title-id">Adaptive Dashboard</title> <title id="title-id">Adaptive Dashboard</title>
<link rel="manifest" id="manifest-link" /> <link rel="manifest" id="manifest-link" />
<style>
#tidio-chat-iframe {
bottom: 0px !important; /* Adjust this value – higher number = moved further up from the bottom */
right: 20px !important; /* Optional: tweak horizontal position if needed */
}
/* Optional: Different position on mobile (to avoid overlaps there) */
@media only screen and (max-width: 980px) {
#tidio-chat-iframe {
bottom: 0px !important; /* Example for mobile – test and adjust */
}
}
</style>
</head> </head>
<script src="//code.tidio.co/ojd4ex1awaevuymq9oijcmh7yln2pown.js" async></script> <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="80170383-b426-43c0-8f66-8e20a05bcdce";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
<script>
function onTidioChatApiReady() {
// Move higher on desktop (increase value to move further up, e.g., 100px, 150px)
tidioChatApi.adjustStyles('#tidio { bottom: 0px !important; }');
// Optional: Separate adjustment for mobile (overrides desktop if needed)
tidioChatApi.adjustStyles(
'#tidio { bottom: 0px !important; }',
'@media only screen and (max-width: 980px)'
);
}
// Wait for the widget to be ready
if (window.tidioChatApi) {
tidioChatApi.on('ready', onTidioChatApiReady);
} else {
document.addEventListener('tidioChat-ready', onTidioChatApiReady);
}
</script>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/app/main.tsx"></script> <script type="module" src="/src/app/main.tsx"></script>

34
indexV2.html
View file

@ -6,40 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title id="title-id">Adaptive Dashboard</title> <title id="title-id">Adaptive Dashboard</title>
<link rel="manifest" id="manifest-link" /> <link rel="manifest" id="manifest-link" />
<style>
#tidio-chat-iframe {
bottom: 0px !important; /* Adjust this value – higher number = moved further up from the bottom */
right: 20px !important; /* Optional: tweak horizontal position if needed */
}
/* Optional: Different position on mobile (to avoid overlaps there) */
@media only screen and (max-width: 980px) {
#tidio-chat-iframe {
bottom: 0px !important; /* Example for mobile – test and adjust */
}
}
</style>
</head> </head>
<script src="//code.tidio.co/ojd4ex1awaevuymq9oijcmh7yln2pown.js" async></script> <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="80170383-b426-43c0-8f66-8e20a05bcdce";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
<script>
function onTidioChatApiReady() {
// Move higher on desktop (increase value to move further up, e.g., 100px, 150px)
tidioChatApi.adjustStyles('#tidio { bottom: 0px !important; }');
// Optional: Separate adjustment for mobile (overrides desktop if needed)
tidioChatApi.adjustStyles(
'#tidio { bottom: 0px !important; }',
'@media only screen and (max-width: 980px)'
);
}
// Wait for the widget to be ready
if (window.tidioChatApi) {
tidioChatApi.on('ready', onTidioChatApiReady);
} else {
document.addEventListener('tidioChat-ready', onTidioChatApiReady);
}
</script>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="module" src="/src/app/main.tsx"></script> <script type="module" src="/src/app/main.tsx"></script>

3
src/pages/Terminals.tsx
View file

@ -181,7 +181,8 @@ export default function Terminals(props: Props) {
const load = useCallback(() => { const load = useCallback(() => {
if(loading) return if(loading) return
setLoading(true) setLoading(true)
terminalAPI.listTerminals(200, 0, "asc", "name", as).then(resp => { terminalAPI.listTerminals(200, 0, "asc", "name", undefined, as).then(resp => {
console.log(resp.data)
if(resp.data.terminals){ if(resp.data.terminals){
setTerminals(resp.data.terminals.map(a => Terminal.any(a))); setTerminals(resp.data.terminals.map(a => Terminal.any(a)));
} }

12
src/user/UserMenu.tsx
View file

@ -166,7 +166,7 @@ export default function UserMenu() {
); );
}; };
if (user.id().length < 1) return unauthenticatedUserMenu() if (user.id()?.length < 1) return unauthenticatedUserMenu()
const hasAdmin = user.hasFeature ? user.hasFeature("admin") : false; const hasAdmin = user.hasFeature ? user.hasFeature("admin") : false;
@ -182,7 +182,7 @@ export default function UserMenu() {
<UserTeamName user={user} team={team} /> <UserTeamName user={user} team={team} />
</Box> </Box>
<Box style={{ marginLeft: theme.spacing(1) }}> <Box style={{ marginLeft: theme.spacing(1) }}>
{picture && hasTeams && team.id().length > 0 ? ( {picture && hasTeams && team.id()?.length > 0 ? (
<div> <div>
<UserAvatar <UserAvatar
user={user} user={user}
@ -238,7 +238,7 @@ export default function UserMenu() {
{hasTeams && ( {hasTeams && (
<MenuItem <MenuItem
onClick={() => { onClick={() => {
if (as.length > 1) { if (as?.length > 1) {
user.settings.useTeam = false; user.settings.useTeam = false;
dispatch({ key: "as", value: "" }); dispatch({ key: "as", value: "" });
userAPI.updateUser(user.id(), user.protobuf()).then(_resp => { userAPI.updateUser(user.id(), user.protobuf()).then(_resp => {
@ -252,13 +252,13 @@ export default function UserMenu() {
}); });
} }
}} }}
disabled={user.settings.defaultTeam.length < 1} disabled={user.settings.defaultTeam?.length < 1}
aria-label="Open Team Menu" aria-label="Open Team Menu"
dense> dense>
<ListItemIcon> <ListItemIcon>
<Checkbox <Checkbox
disabled={user.settings.defaultTeam.length < 1} disabled={user.settings.defaultTeam?.length < 1}
checked={as.length > 1} checked={as?.length > 1}
style={{ margin: 0, padding: 0 }} style={{ margin: 0, padding: 0 }}
/> />
</ListItemIcon> </ListItemIcon>