MISC: Rearrange forms

client/react/src/forms/NewGenusForm.js → client/react/src/forms/create/NewGenusForm.js

@@ -9,21 +9,11 @@ import CloseSharpIcon from '@mui/icons-material/CloseSharp';
 import FingerprintSharpIcon from '@mui/icons-material/FingerprintSharp';
 
 
-const NewGenusForm = ({ isOpen, onRequestClose }) => {
+const NewGenusForm = ({ isOpen, onRequestClose, allGenus }) => {
   const [name, setName] = useState('');
   const [watering, setWatering] = useState(0);
-  const [allGenus, setAllGenus] = useState([]);
   const [submitted, setSubmitted] = useState(false); // Initialize submitted state
 
-  useEffect(() => {
-    if (isOpen) {
-      fetch('http://127.0.0.1:5000/genus')
-        .then((response) => response.json())
-        .then((data) => setAllGenus(data))
-        .catch((error) => console.error('Error fetching genus data:', error));
-    }
-  }, []);
-
   useEffect(() => {
     if (submitted) {
       const requestOptions = {

client/react/src/pages/Home.js

@@ -3,9 +3,9 @@ import GrassOutlinedIcon from '@mui/icons-material/GrassOutlined';
 import System from './System'
 import ButtonGroup from '@mui/material/ButtonGroup';
 import AddSharpIcon from '@mui/icons-material/AddSharp';
-import NewPlantForm from '../forms/NewPlantForm';
-import NewGenusForm from '../forms/NewGenusForm';
-import NewSystemForm from '../forms/NewSystemForm';
+import NewPlantForm from '../forms/create/NewPlantForm';
+import NewGenusForm from '../forms/create/NewGenusForm';
+import NewSystemForm from '../forms/create/NewSystemForm';
 import FingerprintSharpIcon from '@mui/icons-material/FingerprintSharp';
 import PointOfSaleIcon from '@mui/icons-material/PointOfSale';
 import React, { useState, useEffect } from 'react';
@@ -15,8 +15,8 @@ import Box from '@mui/material/Box';
 import CloseSharpIcon from '@mui/icons-material/CloseSharp';
 import VisibilitySharpIcon from '@mui/icons-material/VisibilitySharp';
 import ReportGmailerrorredSharpIcon from '@mui/icons-material/ReportGmailerrorredSharp';
-import NewLightForm from '../forms/NewLightForm';
-import NewTypeForm from '../forms/NewTypeForm';
+import NewLightForm from '../forms/create/NewLightForm';
+import NewTypeForm from '../forms/create/NewTypeForm';
 import TungstenSharpIcon from '@mui/icons-material/TungstenSharp';
 import Modal from '@mui/material/Modal';
 import CallSplitSharpIcon from '@mui/icons-material/CallSplitSharp';

client/react/src/pages/Plants.js

@@ -1,15 +1,15 @@
 // Plants.js
 import React, { useState, useEffect } from 'react';
-import UpdatePlantForm from '../forms/UpdatePlantForm';
-import WaterPlantsForm from '../forms/WaterPlantsForm';
-import FertilizePlantsForm from '../forms/FertilizePlantsForm';
-import RepotPlantsForm from '../forms/RepotPlantsForm';
+import UpdatePlantForm from '../forms/update/UpdatePlantForm';
+import WaterPlantsForm from '../forms/update/WaterPlantsForm';
+import FertilizePlantsForm from '../forms/update/FertilizePlantsForm';
+import RepotPlantsForm from '../forms/update/RepotPlantsForm';
 import IconButton from '@mui/material/IconButton';
 import DeleteOutlineSharpIcon from '@mui/icons-material/DeleteOutlineSharp';
 import WaterDropOutlinedIcon from '@mui/icons-material/WaterDropOutlined';
 import LunchDiningIcon from '@mui/icons-material/LunchDining';
 import EditSharpIcon from '@mui/icons-material/EditSharp';
-import KillPlantsForm from '../forms/KillPlantsForm';
+import KillPlantsForm from '../forms/update/KillPlantsForm';
 import ParkSharpIcon from '@mui/icons-material/ParkSharp';
 import { DataGrid,GridToolbarContainer,
   GridToolbarColumnsButton,