diff --git a/.DS_Store b/.DS_Store index 47cf38d..4dcd149 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/db_app/src/components/MenuExpansion.js b/db_app/src/components/MenuExpansion.js index 5c2be46..3d6b657 100644 --- a/db_app/src/components/MenuExpansion.js +++ b/db_app/src/components/MenuExpansion.js @@ -1,4 +1,4 @@ -import React,{useState, useEffect} from 'react'; +import React,{useState} from 'react'; import {Routes, Route, useNavigate} from 'react-router-dom'; import './Login.css'; import Button from "@mui/material/Button"; @@ -36,19 +36,14 @@ const theme = createTheme({ }, }); - +function Menus() { - const getEatery = () => { - return ReactSession.get("eatery"); - } - - function MenuExpansion() { - const navigate = useNavigate(); + const navigate = useNavigate(); const Home = () => { navigate('/Plan'); } - const Menus = () => { + const Menus = () => { navigate('/Menus'); } const Past = () => { @@ -57,22 +52,38 @@ const theme = createTheme({ const navigateLogin = () => { navigate('/'); } +const makeEateryUrl = (eatery) => `http://3.219.93.142:8000/api/eatery/${eatery}`; +const getEatery = () => { + return ReactSession.get("eatery"); +} -const makeEateryUrl = (eatery) => `http://3.219.93.142:8000/eatery/${eatery}`; const getMenu = () => { - const eatery_to_query = getEatery(); - Axios.get(makeEateryUrl(eatery_to_query)).then((response) => { - console.log(response.data); - }); -}; +const eatery_to_query = getEatery(); + Axios.get(makeEateryUrl(eatery_to_query)).then((response) => { + console.log(response.data); + setmenuItems(response.data); +}); + +} +const [menuItems, setmenuItems] = useState([{}]); +const doMenu = () => { + const data = getMenu(); + setmenuItems(data); +} +const buttonTime = () => { + getMenu(); + console.log(menuItems); +} + + + -return( - + return ( @@ -94,10 +105,13 @@ return( + + + + - -) - + + ); } -export default MenuExpansion; \ No newline at end of file +export default Menus; \ No newline at end of file diff --git a/db_app/src/components/Menus.js b/db_app/src/components/Menus.js index 955cd63..0d0b9a4 100644 --- a/db_app/src/components/Menus.js +++ b/db_app/src/components/Menus.js @@ -37,7 +37,8 @@ const theme = createTheme({ }); function Menus() { - const navigate = useNavigate(); + + const navigate = useNavigate(); const Home = () => { navigate('/Plan'); diff --git a/db_app/src/components/images/logo.jpg b/db_app/src/components/images/logo.jpg new file mode 100644 index 0000000..b606165 Binary files /dev/null and b/db_app/src/components/images/logo.jpg differ