From 82514eb9708491ffd0e610a9fd6baa774e65f250 Mon Sep 17 00:00:00 2001
From: csawatzky <chris@adaptiveagriculture.ca>
Date: Thu, 8 May 2025 16:26:34 -0600
Subject: [PATCH] time bar font colour, moved visual farm in the side navigator
 to the top

---
 src/common/time/TimeBar.tsx      | 19 +++++++++++--------
 src/navigation/SideNavigator.tsx | 28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/common/time/TimeBar.tsx b/src/common/time/TimeBar.tsx
index 73f6d3d..14ce04a 100644
--- a/src/common/time/TimeBar.tsx
+++ b/src/common/time/TimeBar.tsx
@@ -2,7 +2,7 @@ import {
   Button,
   DialogActions,
   DialogContent,
-  Grid,
+  Grid2 as Grid,
   TextField,
   Theme,
   Typography
@@ -15,6 +15,7 @@ import { DateRangePreset, GetDefaultDateRange, SetDefaultPreset } from "./DateRa
 import { useThemeType } from "hooks";
 import { makeStyles } from "@mui/styles";
 import { cloneDeep } from "lodash";
+import { color } from "@mui/system";
 
 interface Props {
   startDate: Moment;
@@ -28,10 +29,12 @@ type DateRange<T> = [T | null, T | null];
 const useStyles = makeStyles((_theme: Theme) => {
   return ({
     activeButtonLight: {
-      border: "1px solid black"
+      border: "1px solid black",
+      color: "black"
     },
     acitveButtonDark: {
-      border: "1px solid white"
+      border: "1px solid white",
+      color: "white"
     }
   })
 });
@@ -128,7 +131,7 @@ export default function TimeBar(props: Props) {
     <React.Fragment>
       {datePickerDialog()}
       <Grid container direction="row" spacing={1} wrap="nowrap">
-        <Grid item>
+        <Grid>
           <Button
             style={{ borderRadius: "25px" }}
             className={
@@ -145,7 +148,7 @@ export default function TimeBar(props: Props) {
             <Typography style={{ fontWeight: 650 }}>1H</Typography>
           </Button>
         </Grid>
-        <Grid item>
+        <Grid>
           <Button
             style={{ borderRadius: "25px" }}
             className={
@@ -162,7 +165,7 @@ export default function TimeBar(props: Props) {
             <Typography style={{ fontWeight: 650 }}>1D</Typography>
           </Button>
         </Grid>
-        <Grid item>
+        <Grid>
           <Button
             style={{ borderRadius: "25px" }}
             className={
@@ -179,7 +182,7 @@ export default function TimeBar(props: Props) {
             <Typography style={{ fontWeight: 650 }}>1W</Typography>
           </Button>
         </Grid>
-        <Grid item>
+        <Grid>
           <Button
             style={{ borderRadius: "25px" }}
             className={
@@ -196,7 +199,7 @@ export default function TimeBar(props: Props) {
             <Typography style={{ fontWeight: 650 }}>1M</Typography>
           </Button>
         </Grid>
-        <Grid item>
+        <Grid>
           <Button
             style={{ borderRadius: "25px" }}
             className={
diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx
index 8b66057..88399b0 100644
--- a/src/navigation/SideNavigator.tsx
+++ b/src/navigation/SideNavigator.tsx
@@ -160,6 +160,20 @@ export default function SideNavigator(props: Props) {
     const isAdCon = IsAdCon()
     return (
       <List className={classes.list} component="nav">
+        {(isAg || user.hasFeature("admin")) && (
+        <Tooltip title="Visual Farm" placement="right">
+          <ListItemButton
+            id="tour-visual-farm"
+            onClick={() => goTo("/visualFarm")}
+            classes={getClasses("/visualFarm")}
+            >
+            <ListItemIcon>
+              <FieldsIcon />
+            </ListItemIcon>
+            {open && <ListItemText primary="Visual Farm" />}
+          </ListItemButton>
+        </Tooltip>
+        )}
         {(isAg || user.hasFeature("admin")) && (
         <Tooltip title="Bins" placement="right">
           <ListItemButton
@@ -239,20 +253,6 @@ export default function SideNavigator(props: Props) {
           </ListItemButton>
         </Tooltip>
         {(isAg || user.hasFeature("admin")) && (
-        <Tooltip title="Visual Farm" placement="right">
-          <ListItemButton
-            id="tour-visual-farm"
-            onClick={() => goTo("/visualFarm")}
-            classes={getClasses("/visualFarm")}
-            >
-            <ListItemIcon>
-              <FieldsIcon />
-            </ListItemIcon>
-            {open && <ListItemText primary="Visual Farm" />}
-          </ListItemButton>
-        </Tooltip>
-        )}
-        {(isAg || user.hasFeature("admin")) && (
         <Tooltip title="My Fields" placement="right">
           <ListItemButton
             id="tour-field-list"