Merge pull request #2 from ColinMcKechney/eateries

Eateries
This commit is contained in:
Ava DeCroix
2023-04-29 17:09:34 -04:00
committed by GitHub
5 changed files with 111 additions and 26 deletions

View File

@@ -2,6 +2,7 @@ import "./App.css";
import Login from "./components/Login"; import Login from "./components/Login";
import CreateAccount from "./components/CreateAccount"; import CreateAccount from "./components/CreateAccount";
import Menus from "./components/Menus"; import Menus from "./components/Menus";
import Plan from "./components/Plan";
import { import {
@@ -21,6 +22,7 @@ function App() {
<Route path='/' element={<Login/>}></Route> <Route path='/' element={<Login/>}></Route>
<Route path='/CreateAccount' element={<CreateAccount/>}></Route> <Route path='/CreateAccount' element={<CreateAccount/>}></Route>
<Route path='/Menus' element={<Menus/>}></Route> <Route path='/Menus' element={<Menus/>}></Route>
<Route path='/Plan' element={<Plan/>}></Route>
</Routes> </Routes>
</Router> </Router>
); );

View File

@@ -0,0 +1,20 @@
.bg {
position:fixed;
height: 100vh;
width: 100vw;
}
.logbox {
background-color: rgba(255, 255, 255, 0.33);
padding: 15px;
margin-top:10vh;
margin-bottom:10vh;
margin-left:20vw;
margin-right:20vw;
}
.formbox {
background-color: rgba(255, 255, 255, 0.6);
margin:10px;
padding:10px;
}

View File

@@ -1,7 +1,7 @@
import React,{useState} from 'react'; import React,{useState} from 'react';
import {Routes, Route, useNavigate} from 'react-router-dom'; import {Routes, Route, useNavigate} from 'react-router-dom';
import Axios from 'axios'; import Axios from 'axios';
import './Login.css'; import './CreateAccount.css';
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import Card from "@mui/material/Card"; import Card from "@mui/material/Card";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
@@ -12,6 +12,18 @@ import Grid from "@mui/material/Grid";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import Container from "@mui/material/Container"; 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"
const theme = createTheme({
palette: {
primary: {
main: lightGreen[700],
},
},
});
function CreateAccount() { function CreateAccount() {
@@ -51,7 +63,10 @@ function CreateAccount() {
}; };
return ( return (
<div>
<ThemeProvider theme={theme}>
<div className='bg' style={{backgroundImage: 'url(' + require('./images/main_background.jpg') + ')'}}>
<div className='logbox'>
<Box <Box
sx={{ sx={{
marginTop: 8, marginTop: 8,
@@ -63,7 +78,7 @@ function CreateAccount() {
<Typography component="h1" variant="h5">Create Account</Typography> <Typography component="h1" variant="h5">Create Account</Typography>
<form onSubmit={submitHandler}> <form className='formbox' onSubmit={submitHandler}>
<TextField <TextField
margin="normal" margin="normal"
required required
@@ -134,6 +149,8 @@ function CreateAccount() {
</Box> </Box>
</div> </div>
</div>
</ThemeProvider>
); );
} }

View File

@@ -26,7 +26,9 @@ const theme = createTheme({
palette: { palette: {
primary: { primary: {
main: lightGreen[700], main: lightGreen[700],
apple: red[500],
}, },
}, },
}); });
@@ -38,9 +40,22 @@ function Menus() {
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<AppBar position="static"> <AppBar position="static">
<Toolbar variant="dense"> <Toolbar variant="dense">
<Button variant="h6" color="inherit" component="div"> <Button variant="h6" color="main" position="right">
Photos Home</Button>
<Button variant="h6" color="main" component="div">
Menus
</Button> </Button>
<Button variant="h6" >
Past Plans</Button>
<Button variant="h6" color="main" component="div" sx={{
':hover': {
bgcolor: '#ffc6c4', // theme.palette.primary.main
color: 'red',
},
}}>
Log out
</Button>
</Toolbar> </Toolbar>
</AppBar> </AppBar>
</ThemeProvider> </ThemeProvider>

View File

@@ -1,6 +1,36 @@
import React,{useState} from 'react'; import React,{useState} from 'react';
import {Routes, Route, useNavigate} from 'react-router-dom'; import {Routes, Route, useNavigate} from 'react-router-dom';
import './Login.css'; import './Login.css';
import Button from "@mui/material/Button";
import Card from "@mui/material/Card";
import TextField from "@mui/material/TextField";
import FormControlLabel from "@mui/material/FormControlLabel";
import Checkbox from "@mui/material/Checkbox";
import Link from "@mui/material/Link";
import Grid from "@mui/material/Grid";
import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import Container from "@mui/material/Container";
import AppBar from '@mui/material/AppBar';
import Toolbar from '@mui/material/Toolbar';
import IconButton from '@mui/material/IconButton';
import Avatar from '@mui/material/Avatar';
import Tooltip from '@mui/material/Tooltip';
import Menu from '@mui/material/Menu';
import MenuIcon from '@mui/material/Menu'
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: {
main: lightGreen[700],
apple: red[500],
},
},
});
function MyPlan() { function MyPlan() {
@@ -10,32 +40,33 @@ function MyPlan() {
navigate('/'); navigate('/');
} }
const [data,setData] = useState({
username:"",
password:"",
email:"",
})
const {username,password,email} = data;
const changeHandler = e => {
setData({...data,[e.target.name]:[e.target.value]});
}
const submitHandler = e => {
e.preventDefault();
console.log(data);
}
return ( return (
<ThemeProvider theme={theme}>
<div> <div>
<center> <AppBar position="static">
<h1>My plan</h1> <Toolbar variant="dense">
<Button variant="h6" color="main" position="right">
Home</Button>
</center> <Button variant="h6" color="main" component="div">
Menus
</Button>
<Button variant="h6" >
Past Plans</Button>
<Button variant="h6" color="main" component="div" sx={{
':hover': {
bgcolor: '#ffc6c4', // theme.palette.primary.main
color: 'red',
},
}}>
Log out
</Button>
</Toolbar>
</AppBar>
</div> </div>
</ThemeProvider>
); );
} }