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

src/navigation/Router.tsx

@@ -18,6 +18,7 @@ import Site from "pages/Site";
 import Heaters from "pages/Heaters";
 import Heater from "pages/Heater";
 import Tasks from "pages/Tasks";
+import Transactions from "pages/Transactions";
 //import Site from "pages/Site";
 
 const DeviceHistory = lazy(() => import("pages/DeviceHistory"));
@@ -301,6 +302,7 @@ export default function Router(props: Props) {
           {/* <Route index element={<Typography>Hello!</Typography>} /> */}
           <Route path="users" element={<Users/>} />
           <Route path="tasks" element={<Tasks />} />
+          <Route path="transactions" element={<Transactions />} />
           
           {/* Map pages */}
           <Route path="visualFarm" element={<FieldMap />} />

src/navigation/SideNavigator.tsx

@@ -1,4 +1,4 @@
-import { ChevronRight, People, Person } from "@mui/icons-material";
+import { ChevronRight, People, Person, SyncAlt } from "@mui/icons-material";
 import ChevronLeft from "@mui/icons-material/ChevronLeft";
 import { 
   darken, 
@@ -307,7 +307,19 @@ export default function SideNavigator(props: Props) {
             <ListItemIcon>
               <TasksIcon />
             </ListItemIcon>
-            {open && <ListItemText primary="Heaters" />}
+            {open && <ListItemText primary="Tasks" />}
+          </ListItemButton>
+        </Tooltip>
+        <Tooltip title="Transactions" placement="right">
+          <ListItemButton
+            id="tour-transactions"
+            onClick={() => goTo("/transactions")}
+            classes={getClasses("/transactions")}
+            >
+            <ListItemIcon>
+              <SyncAlt />
+            </ListItemIcon>
+            {open && <ListItemText primary="Transactions" />}
           </ListItemButton>
         </Tooltip>
       </List>