Merge branch 'libracart' into staging_environment

src/bin/BinsList.tsx

@@ -22,6 +22,7 @@ interface Props {
   loadMore?: () => void;
   //startingTranslate: number;
   valDisplay?: "high" | "low" | "average";
+  insert?: boolean
 }
 
 const useStyles = makeStyles((_theme) => {
@@ -39,7 +40,7 @@ const useStyles = makeStyles((_theme) => {
 });
 
 export default function BinsList(props: Props) {
-  const { bins, duplicateBin, title, gridView, loadMore, valDisplay } = props;
+  const { bins, duplicateBin, title, gridView, loadMore, valDisplay, insert } = props;
   const classes = useStyles();
   // const history = useHistory();
   const navigate = useNavigate()
@@ -114,7 +115,12 @@ export default function BinsList(props: Props) {
         {bins.map((b, i) =>
           (
             <Grid
-              size={{
+              size={insert ? {
+                xs: 6,
+                sm: 6,
+                md: 4,
+                lg: 3,
+              } : {
                 xs: 6,
                 sm: 4,
                 md: 3,

src/bin/BinyardDisplay.tsx

@@ -316,6 +316,7 @@ export default function BinyardDisplay(props: Props) {
               <Grid size={12}>
                 <BinsList
                   gridView
+                  insert
                   valDisplay="average"
                   bins={grainBins}
                   duplicateBin={duplicateBin}
@@ -332,6 +333,7 @@ export default function BinyardDisplay(props: Props) {
               <Grid size={12}>
                 <BinsList
                   gridView
+                  insert
                   valDisplay="average"
                   bins={fertBins}
                   duplicateBin={duplicateBin}
@@ -348,6 +350,7 @@ export default function BinyardDisplay(props: Props) {
               <Grid size={12}>
                 <BinsList
                   gridView
+                  insert
                   valDisplay="average"
                   bins={emptyBins}
                   duplicateBin={duplicateBin}

src/common/time/DateSelect.tsx

@@ -8,6 +8,7 @@ import {
   MenuItem,
   OutlinedInput,
   Select,
+  TextField,
   Theme
 } from "@mui/material";
 import moment, { Moment } from "moment";
@@ -16,6 +17,7 @@ import ReactDOM from "react-dom";
 import { DateRangePreset, SetDefaultPreset } from "./DateRange";
 import ResponsiveDialog from "common/ResponsiveDialog";
 import { withStyles, WithStyles } from "@mui/styles";
+import { cloneDeep } from "lodash";
 
 const styles = (_theme: Theme) => createStyles({});
 
@@ -249,18 +251,30 @@ class DateSelect extends React.Component<Props, State> {
           onClose={this.closeDateRangeDialog}
           aria-labelledby="date-range-dialog">
           <DialogContent>
-            {/* <StaticDateRangePicker
-              disableFuture
-              value={dateRange}
-              onChange={date => this.updateDateRange(date)}
-              renderInput={(startProps, endProps) => (
-                <React.Fragment>
-                  <TextField {...startProps} />
-                  <DateRangeDelimiter> to </DateRangeDelimiter>
-                  <TextField {...endProps} />
-                </React.Fragment>
-              )}
-            /> */}
+            <TextField
+              fullWidth
+              margin="normal"
+              type="date"
+              label="Start Time"
+              value={dateRange[0]?.format("YYYY-MM-DD")}
+              onChange={e => {
+                let range = cloneDeep(dateRange)
+                range[0] = moment(e.target.value)
+                this.updateDateRange(range)
+              }}
+            />
+            <TextField
+              fullWidth
+              margin="normal"
+              type="date"
+              label="End Time"
+              value={dateRange[1]?.format("YYYY-MM-DD")}
+              onChange={e => {
+                let range = cloneDeep(dateRange)
+                range[1] = moment(e.target.value)
+                this.updateDateRange(range)
+              }}
+            />
           </DialogContent>
           <DialogActions>
             <Button onClick={this.closeDateRangeDialog} color="primary">

src/integrations/LibraCart/LibraCartAccess.tsx

@@ -210,7 +210,7 @@ export default function LibraCartAccess() {
       </Grid>
       <Box paddingTop={2}>
         <Typography>
-          Libra Cart data will sync every 6 hours, if the data is needed immediately you can select the Sync button. It may take up to 15 minutes for the data to appear in our platform.
+          Libra Cart data will sync every 6 hours, if the data is needed immediately you can select the Sync button.
         </Typography>
       </Box>
 

src/userFeatures/UserFeatures.tsx

@@ -17,6 +17,7 @@ import FeatureCard from "./FeatureCard";
 //import { ImgIcon } from "common/ImgIcon";
 //images to import for the image in the card for the feature make sure to have a 2:1 aspect ratio to keep the cards symmetrical
 import FeatureImageTest from "assets/marketplaceImages/VisualFarmMPImage.png";
+import LibraCartImage from "assets/marketplaceImages/Libra_Cart_temp.jpg";
 
 // export interface FAQ {
 //   question: string;
@@ -62,14 +63,14 @@ const agFeatureList: ProductDetails[] = [
     // bulletPoints: ["bullet one", "bullet two"],
     // questions: [],
   },
-  // {
-  //   featureName: "libra-cart",
-  //   featureLogo: <LibraCartIcon />,
-  //   featureCost: 0,
-  //   cardImage: FeatureImageTest,
-  //   featureTitle: "Libra Cart",
-  //   longDescription: "Integrate with Libra Cart to bring your data into our platform"
-  // }
+  {
+    featureName: "libra-cart",
+    featureLogo: <LibraCartIcon />,
+    featureCost: 0,
+    cardImage: LibraCartImage,
+    featureTitle: "Libra Cart",
+    longDescription: "Integrate with Libra Cart to bring your data into our platform"
+  }
 ];
 
 // const constructionFeatureList: ProductDetails[] = []