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

Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

Browse source
This commit is contained in:
Carter 2025-04-16 09:33:53 -06:00
commit cb952b284e
17 changed files with 2300 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/navigation/Router.tsx
View file

@ -38,6 +38,8 @@ const APIDocs = lazy(() => import("pages/APIDocs"));
const Fields = lazy(()=> import("pages/Fields"));
const Marketplace = lazy(() => import("userFeatures/UserFeatures"))
const Logs = lazy(() => import("pages/Logs"))
const Firmware = lazy(() => import("pages/Firmware"));
const Nfc = lazy(() => import("pages/Nfc"));
export const appendToUrl = (appendage: number | string) => {
const basePath = location.pathname.replace(/\/$/, "");
@ -311,6 +313,10 @@ export default function Router() {
}
<Route path="fields" element={<Fields />} />
<Route path="marketplace" element={<Marketplace />} />
{user.hasFeature("admin") && (
<Route path="firmware" element={<Firmware />} />
)}
<Route path="nfc" element={<Nfc />} />
{/* Map pages */}
<Route path="visualFarm" element={<FieldMap />} />

30
src/navigation/SideNavigator.tsx
View file

@ -1,4 +1,4 @@
import { ChevronRight, Code, People, Person, SyncAlt } from "@mui/icons-material";
import { ChevronRight, Code, Memory, People, Person, SyncAlt, TapAndPlay } from "@mui/icons-material";
import ChevronLeft from "@mui/icons-material/ChevronLeft";
import {
darken,
@ -368,6 +368,20 @@ export default function SideNavigator(props: Props) {
</ListItemButton>
</Tooltip>
}
{user.hasFeature("admin") &&
<Tooltip title="Firmware" placement="right">
<ListItemButton
id="tour-firmware"
onClick={() => goTo("/firmware")}
classes={getClasses("/firmware")}
>
<ListItemIcon>
<Memory />
</ListItemIcon>
{open && <ListItemText primary="Logs" />}
</ListItemButton>
</Tooltip>
}
{user.hasFeature("admin") &&
<Tooltip title="Logs" placement="right">
<ListItemButton
@ -382,6 +396,20 @@ export default function SideNavigator(props: Props) {
</ListItemButton>
</Tooltip>
}
{user.hasFeature("admin") && window.NDEFReader &&
<Tooltip title="NFC" placement="right">
<ListItemButton
id="tour-nfc"
onClick={() => goTo("/nfc")}
classes={getClasses("/nfc")}
>
<ListItemIcon>
<TapAndPlay />
</ListItemIcon>
{open && <ListItemText primary="NFC" />}
</ListItemButton>
</Tooltip>
}
<Tooltip title="Marketplace" placement="right">
<ListItemButton
id="tour-marketplace"