merged stella changes

Author: patpat20

app/components/Occupied.tsx

@@ -41,6 +41,8 @@ type ClickEvent = React.MouseEvent<HTMLElement>;
 const Occupied: React.FC = () => {
   const { applications, getApplications, deleteApp } = useContext(DashboardContext);
   const [open, setOpen] = useState<boolean>(false);
+  const [addOpen, setAddOpen] = useState<boolean>(false);
+
   const [index, setIndex] = useState<number>(0);
   const [app, setApp] = useState<string>('');
 
@@ -128,7 +130,7 @@ const Occupied: React.FC = () => {
 
         <div className="cardContainer">
           <div className="card" id={`card-add`}>
-            <Button className={classes.paper} onClick={() => setOpen(true)}>
+            <Button className={classes.paper} onClick={() => setAddOpen(true)}>
               <AddCircleOutlineTwoToneIcon className={classes.icon} />
             </Button>
           </div>
@@ -158,12 +160,12 @@ const Occupied: React.FC = () => {
               </Card>
             </div>
           ))}
-          {/* <Modal open={open} onClose={() => setOpen(false)}>
-            <ServicesModal open={open} onClose={() => setOpen(false)} i={index} app={app} />
-          </Modal> */}
-          {/* <Modal open={open} onClose={() => setOpen(false)}>
-            <AddModal open={open} onClose={() => setOpen(false)} setOpen={setOpen} />
-          </Modal> */}
+          <Modal open={addOpen} onClose={() => setAddOpen(false)}>
+            <AddModal setOpen={setAddOpen} />
+          </Modal>
+          <Modal open={open} onClose={() => setOpen(false)}>
+            <ServicesModal i={index} app={app} />
+          </Modal>
         </div>
       </div>
     </div>