From 86ecb279defc1e191127096ebd4bfa0df2c83823 Mon Sep 17 00:00:00 2001 From: Ava DeCroix Date: Sat, 29 Apr 2023 21:19:57 -0400 Subject: [PATCH] updates --- .DS_Store | Bin 6148 -> 6148 bytes db_app/package-lock.json | 15 +++ db_app/package.json | 1 + db_app/src/App.js | 3 +- db_app/src/components/Login.css | 4 + db_app/src/components/Login.js | 22 ++-- db_app/src/components/Menus.js | 170 ++++++++++++++++++++++++- db_app/src/components/Plan.js | 31 +++-- db_app/src/components/images/abp.jpg | Bin 0 -> 3969985 bytes db_app/src/components/images/chick.jpg | Bin 0 -> 2059710 bytes db_app/src/components/images/flip.jpg | Bin 0 -> 1227771 bytes db_app/src/components/images/moma.jpg | Bin 0 -> 45231 bytes db_app/src/components/images/smash.jpg | Bin 0 -> 538359 bytes db_app/src/components/images/south.jpg | Bin 0 -> 640671 bytes db_app/src/components/images/starb.jpg | Bin 0 -> 27316 bytes db_app/src/components/images/taco.jpg | Bin 0 -> 525903 bytes 16 files changed, 218 insertions(+), 28 deletions(-) create mode 100644 db_app/src/components/images/abp.jpg create mode 100644 db_app/src/components/images/chick.jpg create mode 100644 db_app/src/components/images/flip.jpg create mode 100644 db_app/src/components/images/moma.jpg create mode 100644 db_app/src/components/images/smash.jpg create mode 100644 db_app/src/components/images/south.jpg create mode 100644 db_app/src/components/images/starb.jpg create mode 100644 db_app/src/components/images/taco.jpg diff --git a/.DS_Store b/.DS_Store index c383892847665e2fb96e4c61ebd9b5e3429fd7c8..47cf38d62b410e97144d021f4a0fdbfdf45a3507 100644 GIT binary patch delta 21 ccmZoMXffDez{+7_V4|a7VrjhDg7u6L06(z>r~m)} delta 21 ccmZoMXffDez{+7^Vxps9YHYOGg7u6L06*;ossI20 diff --git a/db_app/package-lock.json b/db_app/package-lock.json index 5395d92..65c69ac 100644 --- a/db_app/package-lock.json +++ b/db_app/package-lock.json @@ -15,6 +15,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", + "react-client-session": "^0.0.8", "react-dom": "^18.2.0", "react-router-dom": "^6.10.0", "react-scripts": "5.0.1", @@ -14668,6 +14669,14 @@ "node": ">=14" } }, + "node_modules/react-client-session": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/react-client-session/-/react-client-session-0.0.8.tgz", + "integrity": "sha512-wHCTD4lEE8mzl6kxL8viL4q5kGx2TJJNaWdvzmx3KeiMgP+Yv5/Bx476jCpPD0pKc5VvdVuhkH4EM20XqtT/sQ==", + "peerDependencies": { + "react": "^17.0.1" + } + }, "node_modules/react-dev-utils": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", @@ -28099,6 +28108,12 @@ "whatwg-fetch": "^3.6.2" } }, + "react-client-session": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/react-client-session/-/react-client-session-0.0.8.tgz", + "integrity": "sha512-wHCTD4lEE8mzl6kxL8viL4q5kGx2TJJNaWdvzmx3KeiMgP+Yv5/Bx476jCpPD0pKc5VvdVuhkH4EM20XqtT/sQ==", + "requires": {} + }, "react-dev-utils": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", diff --git a/db_app/package.json b/db_app/package.json index ae4b996..6a3de9e 100644 --- a/db_app/package.json +++ b/db_app/package.json @@ -10,6 +10,7 @@ "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", + "react-client-session": "^0.0.8", "react-dom": "^18.2.0", "react-router-dom": "^6.10.0", "react-scripts": "5.0.1", diff --git a/db_app/src/App.js b/db_app/src/App.js index 4e9096b..e5fc508 100644 --- a/db_app/src/App.js +++ b/db_app/src/App.js @@ -3,7 +3,7 @@ import Login from "./components/Login"; import CreateAccount from "./components/CreateAccount"; import Menus from "./components/Menus"; import Plan from "./components/Plan"; - +import { ReactSession } from 'react-client-session'; import { BrowserRouter as Router, @@ -12,6 +12,7 @@ import { useNavigate, } from 'react-router-dom'; +ReactSession.setStoreType("localStorage"); function App() { diff --git a/db_app/src/components/Login.css b/db_app/src/components/Login.css index e07ba93..22ce585 100644 --- a/db_app/src/components/Login.css +++ b/db_app/src/components/Login.css @@ -18,3 +18,7 @@ position:fixed; margin:10px; padding:10px; } + +.bar{ + margin-bottom: 15px; +} \ No newline at end of file diff --git a/db_app/src/components/Login.js b/db_app/src/components/Login.js index 691bfa8..6411062 100644 --- a/db_app/src/components/Login.js +++ b/db_app/src/components/Login.js @@ -15,6 +15,7 @@ import Container from "@mui/material/Container"; import {red, green, lightBlue, lightGreen} from '@mui/material/colors'; import { ThemeProvider, createTheme } from '@mui/material/styles'; import image from "./images/main_background.jpg" +import { ReactSession } from 'react-client-session'; const theme = createTheme({ palette: { @@ -24,18 +25,20 @@ const theme = createTheme({ }, }); -function Login() { + + +export function Login() { const navigate = useNavigate(); const navigateCreateAccount = () => { navigate('/CreateAccount'); } - const [data,setData] = useState({ +const [data,setData] = useState({ net_id:"", password:"" }) - + const {net_id,password} = data; const changeHandler = e => { @@ -47,6 +50,8 @@ function Login() { console.log(data); console.log(net_id[0]) login(); + ReactSession.set("username", net_id[0]); + ReactSession.set("password", password[0]); } @@ -61,23 +66,16 @@ const getHello = () => { const login = () => { Axios.post("http://3.219.93.142:8000/api/auth", {net_id: net_id[0], password: password[0],}).then((response) => { console.log(response); - console.log(response.headers) + console.log(response.status) }); }; - - - - return (
- - -
{ } export default Login; + + diff --git a/db_app/src/components/Menus.js b/db_app/src/components/Menus.js index 32fdb8c..933d447 100644 --- a/db_app/src/components/Menus.js +++ b/db_app/src/components/Menus.js @@ -3,6 +3,7 @@ import {Routes, Route, useNavigate} from 'react-router-dom'; import './Login.css'; import Button from "@mui/material/Button"; import Card from "@mui/material/Card"; +import { CardMedia, CardContent } from '@mui/material'; import TextField from "@mui/material/TextField"; import FormControlLabel from "@mui/material/FormControlLabel"; import Checkbox from "@mui/material/Checkbox"; @@ -33,21 +34,34 @@ const theme = createTheme({ }); function Menus() { - + const navigate = useNavigate(); + + const Home = () => { + navigate('/Plan'); + } + const Menus = () => { + navigate('/Menus'); + } + const Past = () => { + navigate('/Past'); +} +const navigateLogin = () => { + navigate('/'); +} return ( - + - - - - - + + + + + + + + Dining Hall + + + + + + + + + + Starbucks + + + + + + + + + + + + ABP + + + + + + + + + + Chick-fil-a + + + + + + + + + + + Flip Kitchen + + + + + + + + + + Modern Market + + + + + + + + + + + Taco Bell + + + + + + + + + + Smashburger + + + + + + + ); diff --git a/db_app/src/components/Plan.js b/db_app/src/components/Plan.js index d48f7a5..c09ff4f 100644 --- a/db_app/src/components/Plan.js +++ b/db_app/src/components/Plan.js @@ -22,6 +22,9 @@ import MenuItem from '@mui/material/MenuItem'; import {red, green, lightBlue, lightGreen} from '@mui/material/colors'; import { ThemeProvider, createTheme } from '@mui/material/styles'; + + + const theme = createTheme({ palette: { primary: { @@ -36,25 +39,35 @@ function MyPlan() { const navigate = useNavigate(); - const navigateLogin = () => { - navigate('/'); - } - - + const Home = () => { + navigate('/Plan'); + } + const Menus = () => { + navigate('/Menus'); + } + const Past = () => { + navigate('/Past'); +} +const navigateLogin = () => { + navigate('/'); +} return ( + + +
- - - -