Merge branch 'master' into yourPlan

db_app/src/components/Login.css

@@ -13,6 +13,15 @@ position:fixed;
   margin-right:20vw;
 }
 
+.logbox2 {
+  background-color: rgba(255, 255, 255, 0.33);
+  padding: 10px;
+  margin-top:2vh;
+  margin-bottom:2vh;
+  margin-left:20vw;
+  margin-right:20vw;
+}
+
 .formbox {
   background-color: rgba(255, 255, 255, 0.6);
   margin:10px;

db_app/src/components/Login.js

@@ -103,7 +103,7 @@ const login = () => {
           title="Logo"
           sx={{ width: 300, height:100}}
           alt="logo"
-        
+
         />
         </Card>
         </div>

db_app/src/components/MenuExpansion.js

@@ -68,9 +68,6 @@ const getMenu = () => {
 };
 
 
-
-
-
 return(
 
 
@@ -96,6 +93,7 @@ return(
 </AppBar>
 
 <Button onClick={getMenu}>Test get menu</Button>
+
 </ThemeProvider>
 )
 

db_app/src/components/Menus.js

@@ -73,6 +73,7 @@ const menuExpansion = () => {
 
   const setMoma = () => {
     ReactSession.set("eatery", 7);
+   
     menuExpansion();
   }
 
@@ -96,10 +97,7 @@ const menuExpansion = () => {
     menuExpansion();
   }
 
- 
   
- 
-
   return (
 
     <ThemeProvider theme={theme}>

db_app/src/components/Plan.js

@@ -194,10 +194,9 @@ const submitSearchHandler = evt => {
         console.log(response.status);
       })
   };
-
   
-  return (
-  <ThemeProvider theme={theme}>  
+    return (
+    <ThemeProvider theme={theme}>  
     <div>
       <AppBar position="static">
         <Toolbar variant="dense">
@@ -399,46 +398,6 @@ const submitSearchHandler = evt => {
         </Table>
       </TableContainer>
     
-      <h3>
-        &nbsp; &nbsp;
-        Weekly Totals
-      </h3>
-
-      <TableContainer component={Paper}>
-        <Table sx={{ maxWidth: 1200 }}>
-          <TableHead>
-            <TableRow>
-              <TableCell align="left">Calories</TableCell>
-              <TableCell align="left">Fat&nbsp;(g)</TableCell>
-              <TableCell align="left">Saturated Fat&nbsp;(g)</TableCell>
-              <TableCell align="left">TransFat&nbsp;(g)</TableCell>
-              <TableCell align="left">Carbs&nbsp;(g)</TableCell>
-              <TableCell align="left">Fiber&nbsp;(g)</TableCell>
-              <TableCell align="left">Sugar&nbsp;(g)</TableCell>
-              <TableCell align="left">Protein&nbsp;(g)</TableCell>
-              <TableCell align="left">Sodium&nbsp;(mg)</TableCell>
-              <TableCell align="left">Potassium&nbsp;(mg)</TableCell>
-              <TableCell align="left">Cholesterol&nbsp;(mg)</TableCell>
-            </TableRow>
-          </TableHead>
-
-          <TableBody>
-            <TableRow>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-              <TableCell> </TableCell>
-            </TableRow>
-          </TableBody>
-        </Table>
-      </TableContainer>
-
       <br></br>
       <Stack direction="row" spacing={2}>
         &nbsp; &nbsp;
@@ -641,6 +600,7 @@ const submitSearchHandler = evt => {
             Submit</Button>
       </form>
     </div>
+
     </ThemeProvider>
   
     );