diff --git a/Hotel app/frontend/src/components/Card.js b/Hotel app/frontend/src/components/Card.js
new file mode 100644
index 0000000..ffe32fa
--- /dev/null
+++ b/Hotel app/frontend/src/components/Card.js
@@ -0,0 +1,63 @@
+import React,{useState, useEffect} from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Card from '@material-ui/core/Card';
+import CardActions from '@material-ui/core/CardActions';
+import CardContent from '@material-ui/core/CardContent';
+import Button from '@material-ui/core/Button';
+import Typography from '@material-ui/core/Typography';
+
+
+
+const useStyles = makeStyles({
+ card: {
+ minWidth: 300,
+ maxWidth: 1000,
+ margin: "auto",
+ marginTop: 20,
+ marginBottom: 20,
+ borderRadius: 10
+ },
+ bullet: {
+ display: 'inline-block',
+ margin: '0 2px',
+ transform: 'scale(0.8)',
+ },
+ title: {
+ fontSize: 14,
+ },
+ pos: {
+ marginBottom: 12,
+ },
+});
+
+
+export default function SimpleCard(props) {
+ const classes = useStyles();
+ const bull = •;
+ const additem = props.additem
+ return (
+
+ {props.data.map((x,i) => (
+
+
+
+ FoodItem-ID: {x.id}
+
+
+ {x.name}
+
+
+ {x.description}
+
+
+ Price: Rs.{x.amount}
+
+
+
+
+
+
+ ))}
+
+ );
+}
\ No newline at end of file
diff --git a/Hotel app/frontend/src/components/Cart.js b/Hotel app/frontend/src/components/Cart.js
new file mode 100644
index 0000000..9097dfc
--- /dev/null
+++ b/Hotel app/frontend/src/components/Cart.js
@@ -0,0 +1,83 @@
+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Button from '@material-ui/core/Button';
+import Dialog from '@material-ui/core/Dialog';
+import ListItemText from '@material-ui/core/ListItemText';
+import ListItem from '@material-ui/core/ListItem';
+import List from '@material-ui/core/List';
+import Divider from '@material-ui/core/Divider';
+import AppBar from '@material-ui/core/AppBar';
+import Toolbar from '@material-ui/core/Toolbar';
+import IconButton from '@material-ui/core/IconButton';
+import Typography from '@material-ui/core/Typography';
+import CloseIcon from '@material-ui/icons/Close';
+import Slide from '@material-ui/core/Slide';
+import AddIcon from '@material-ui/icons/Add';
+import RemoveIcon from '@material-ui/icons/Remove';
+
+const useStyles = makeStyles(theme => ({
+ appBar: {
+ position: 'relative',
+ backgroundColor: 'black'
+ },
+ title: {
+ marginLeft: theme.spacing(2),
+ flex: 1,
+ },
+ but: {
+ margin: "auto"
+ }
+}));
+
+const Transition = React.forwardRef(function Transition(props, ref) {
+ return ;
+});
+
+
+
+export default function FullScreenDialog(props) {
+ const classes = useStyles();
+ const [open, setOpen] = React.useState(false);
+ const handleClickOpen = () => {
+ setOpen(true);
+ };
+
+ const handleClose = () => {
+ setOpen(false);
+ };
+
+ return (
+
+
+
+
+
+
Wanna Order Again??
+
+ See you next time ;)
+
+
+
+
+
+
Customer Details
+ this.setState({ name: event.target.value })}
+ error={this.toggle}
+ helperText={this.state.nameError}
+ variant="outlined"
+ fullWidth="true"
+ margin="normal"
+ />
+
+ this.setState({ email: event.target.value })}
+ error={this.toggle}
+ helperText={this.state.emailError}
+ variant="outlined"
+ margin="normal"
+ fullWidth="true"
+ />
+
+ this.setState({ mobileno: event.target.value })}
+ error={this.toggle}
+ helperText={this.state.mobileError}
+ variant="outlined"
+ margin="normal"
+ fullWidth="true"
+ />
+
+ this.setState({ guests: event.target.value })}
+ error={this.toggle}
+ helperText={this.state.guestsError}
+ variant="outlined"
+ margin="normal"
+ fullWidth="true"
+ />
+
+
+
+
+
+
+
+
+
PROJECT: DINE-IN
+
+
+
+
+
- {
- Object.keys(fooditem).map(key => {
- return - {key} x{fooditem[key]}
- })
- }
-
+
+ {fooditem.map((x,i) => {
+ const hh = x.quantity*x.price;
+ return - {x.name} x{x.quantity}: Rs.{hh}
+ })}
+
)
}
@@ -56,6 +55,7 @@ const row = (x,i,props) => {
{header.map((y, k) => (
+ {console.log(x['food'])}
{y.prop === 'food' ? test(JSON.parse(x[y.prop])) : x[y.prop]}
))}
diff --git a/Hotel app/frontend/src/components/Pay.js b/Hotel app/frontend/src/components/Pay.js
new file mode 100644
index 0000000..5eea974
--- /dev/null
+++ b/Hotel app/frontend/src/components/Pay.js
@@ -0,0 +1,139 @@
+import React, { useEffect } from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Card from '@material-ui/core/Card';
+import CardActions from '@material-ui/core/CardActions';
+import CardContent from '@material-ui/core/CardContent';
+import Button from '@material-ui/core/Button';
+import Typography from '@material-ui/core/Typography';
+import TextField from '@material-ui/core/TextField';
+import './customer.css';
+
+const useStyles = makeStyles({
+ card: {
+ minWidth: 275,
+ maxWidth: 700,
+ margin: "auto",
+ marginTop: 200,
+ borderRadius: "1rem",
+ border: "2px solid black"
+ },
+ bullet: {
+ display: 'inline-block',
+ margin: '0 2px',
+ transform: 'scale(0.8)',
+ },
+ title: {
+ fontSize: 14,
+ },
+ pos: {
+ marginBottom: 12,
+ },
+});
+
+
+
+export default function SimpleCard() {
+ const classes = useStyles();
+ const bull = •;
+ const [data1, setData] = React.useState([]);
+ const [name, setName] = React.useState("");
+ const [number,setNumber] = React.useState(0);
+ const [nameError, setNameerror] = React.useState("");
+ const [numberError, setNumbererror] = React.useState("");
+ const [toggle, setToggle] = React.useState(false);
+
+ useEffect(() => {
+ const sessid = localStorage.getItem("customer_access_token");
+ fetch("/getpayment",{
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify({'sessionid':sessid})
+ }).then( res => res.json()).then(data =>{
+ setData(data.customer_details)
+ console.log(data)
+ })
+ },[]);
+
+ const validate = () => {
+ let namet = "";
+ let numbert = "";
+ if (!name) {
+ namet="Field Empty"
+ }
+
+ if(!number){
+ numbert="Field Empty"
+ }
+
+ if (namet || numbert) {
+ setNameerror(namet);
+ setNumbererror(numbert);
+ setToggle(true);
+ return false;
+ }
+
+ return true;
+};
+
+const handleClick = () => {
+ if(validate()){
+ console.log("hi")
+ window.location.replace("/checkout")
+ }
+ else{
+ console.log("hello")
+ }
+}
+
+ return (
+
+
+
+
+
+ {data1.name}
+
+
+ Order Id: {data1.orderid}
+
+ Table No: {data1.tableno}
+
+ Subtotal: {data1.amount}
+
+
+
+ setName(event.target.value)}
+ error={toggle}
+ helperText={nameError}
+ variant="outlined"
+ margin="normal"
+ fullWidth="true"
+ />
+
+ setNumber(event.target.value)}
+ error={toggle}
+ helperText={numberError}
+ variant="outlined"
+ margin="normal"
+ fullWidth="true"
+ />
+
+
+
+
+
+
+
+
+
+
+
+
Result: {this.state.result}
+
+
-
+
diff --git a/Hotel app/frontend/src/components/auth.js b/Hotel app/frontend/src/components/auth.js
index 7a675b0..ccbc18d 100644
--- a/Hotel app/frontend/src/components/auth.js
+++ b/Hotel app/frontend/src/components/auth.js
@@ -1,16 +1,36 @@
-export function isLoggedIn() {
+export function isLoggedInManager() {
return localStorage.getItem("access_token")!==null && localStorage.getItem("access_token")!=="undefined";
}
+
+export function isLoggedInCustomer() {
+ return localStorage.getItem("customer_access_token")!==null && localStorage.getItem("customer_access_token")!=="undefined";
+}
export function deleteTokens(){
localStorage.removeItem("access_token");
- localStorage.removeItem("username");
+ localStorage.removeItem("email");
}
+
+ export function deleteTokensCustomer(){
+ localStorage.removeItem("customer_access_token");
+ localStorage.removeItem("customer_email");
+ }
+
export function requiredAuth(nextState, replace) {
- if (!isLoggedIn()) {
+ if (!isLoggedInManager()) {
replace({
pathname: '/',
state: { nextPathname: nextState.location.pathname }
})
}
- }
\ No newline at end of file
+ }
+
+ export function requiredAuthCustomer(nextState, replace) {
+ if (!isLoggedInCustomer()) {
+ replace({
+ pathname: '/customer',
+ state: { nextPathname: nextState.location.pathname }
+ })
+ }
+ }
+
diff --git a/Hotel app/frontend/src/components/customer.css b/Hotel app/frontend/src/components/customer.css
new file mode 100644
index 0000000..332964e
--- /dev/null
+++ b/Hotel app/frontend/src/components/customer.css
@@ -0,0 +1,56 @@
+.bg {
+ /* The image used */
+ background-image: url(../images/Foodbg.jpg) ;
+ height: 100%;
+ width: 100%;
+ position: fixed;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+}
+
+.cuss {
+ background-color: wheat;
+ min-width: 300px;
+ max-width: 700px;
+ margin: auto;
+ margin-top: 200px;
+ box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+ border: 2px solid black;
+ border-radius: 5%;
+}
+
+.bg2 {
+ background-image: url(../images/menuwall.jpg) ;
+ height: 100%;
+ width: 100%;
+ position: fixed;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+}
+
+.bg3 {
+ background-image: url(../images/jj.jpg) ;
+ height: 100%;
+ width: 100%;
+ position: fixed;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+}
+
+.border {
+ border-style: solid;
+ border-width: 5px;
+}
+
+.bghome {
+ background-image: url(../images/home.jpg) ;
+ height: 100%;
+ width: 100%;
+ position: fixed;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: cover;
+}
\ No newline at end of file
diff --git a/Hotel app/frontend/src/images/Foodbg.jpg b/Hotel app/frontend/src/images/Foodbg.jpg
new file mode 100644
index 0000000..a16b8a8
Binary files /dev/null and b/Hotel app/frontend/src/images/Foodbg.jpg differ
diff --git a/Hotel app/frontend/src/images/home.jpg b/Hotel app/frontend/src/images/home.jpg
new file mode 100644
index 0000000..ecf9ee5
Binary files /dev/null and b/Hotel app/frontend/src/images/home.jpg differ
diff --git a/Hotel app/frontend/src/images/jj.jpg b/Hotel app/frontend/src/images/jj.jpg
new file mode 100644
index 0000000..2204ac2
Binary files /dev/null and b/Hotel app/frontend/src/images/jj.jpg differ
diff --git a/Hotel app/frontend/src/images/menuwall.jpg b/Hotel app/frontend/src/images/menuwall.jpg
new file mode 100644
index 0000000..4e7fb1e
Binary files /dev/null and b/Hotel app/frontend/src/images/menuwall.jpg differ
diff --git a/Hotel app/server/app.py b/Hotel app/server/app.py
index 1fc531f..af7501d 100644
--- a/Hotel app/server/app.py
+++ b/Hotel app/server/app.py
@@ -1,7 +1,10 @@
+from datetime import datetime
from flask import Flask, request, render_template, jsonify
from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import desc
from flask_jwt_extended import JWTManager
from flask_jwt_extended import (create_access_token, create_refresh_token)
+import json
app = Flask(__name__)
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///site.db'
@@ -19,19 +22,33 @@ class User(db.Model):
password = db.Column(db.String(60), nullable=False)
def __repr__(self):
- return f"User('{self.firstname}','{self.lastname}', '{self.email}','{self.password}')"
+ return f"User('{self.id}', '{self.firstname}', '{self.lastname}', '{self.email}', '{self.password}')"
+
+
+class Customer(db.Model):
+ customer_id = db.Column(db.Integer, primary_key=True)
+ customer_name = db.Column(db.String(20), nullable=False)
+ customer_email = db.Column(db.String(120), nullable=False)
+ mobileno = db.Column(db.Integer, nullable=False)
+ no_of_guests = db.Column(db.Integer, nullable=False)
+ sessionid = db.Column(db.String(120), nullable=False)
+ tableno = db.Column(db.String(40))
+ orders = db.relationship('Order', backref='author', lazy=True)
+
+ def __repr__(self):
+ return f"Customer('{self.customer_id}', '{self.customer_name}', '{self.customer_email}', '{self.mobileno}', '{self.no_of_guests}', '{self.tableno}')"
class Order(db.Model):
orderid = db.Column(db.Integer, unique=True, nullable=False, primary_key=True)
- status = db.Column(db.String(30),nullable=False)
- userid = db.Column(db.Integer, unique=True, nullable=False)
+ status = db.Column(db.String(30), nullable=False)
food = db.Column(db.Text, nullable=False)
- tableno = db.Column(db.Integer, nullable=False)
amount = db.Column(db.Integer, nullable=False)
+ date_ordered = db.Column(db.DateTime, nullable=False, default=datetime.utcnow)
+ tableno = db.Column(db.String(40), db.ForeignKey('customer.tableno'), nullable=False)
def __repr__(self):
- return f"Order('{self.orderid}','{self.status}', '{self.userid}', '{self.food}', '{self.tableno}', '{self.amount}')"
+ return f"Order('{self.orderid}', '{self.status}', '{self.food}', '{self.amount}', '{self.tableno}','{self.date_ordered}')"
class Food(db.Model):
@@ -152,6 +169,67 @@ def menu():
return jsonify({'food_items': items})
+@app.route('/customer_details', methods=['GET', 'POST'])
+def customer_details():
+ if request.method == 'POST':
+ user_data = request.get_json()
+
+ access_token_customer = create_access_token(identity=user_data['email'])
+ refresh_token_customer = create_refresh_token(identity=user_data['email'])
+
+ if Customer.query.filter_by(sessionid=access_token_customer).first():
+ return {"error": "Session already taking place on another window"}
+
+ new_user = Customer(
+ customer_name=user_data['name'],
+ customer_email=user_data['email'],
+ mobileno=user_data['mobile'],
+ no_of_guests=user_data['guests'],
+ sessionid=access_token_customer
+ )
+
+ db.session.add(new_user)
+ db.session.commit()
+
+ return {
+ 'email': user_data['email'],
+ 'customer_access_token': access_token_customer,
+ 'customer_refresh_token': refresh_token_customer
+ }
+ else:
+ user_data = request.get_json()
+ sessid = user_data['sessionid']
+ customer = Customer.query.filter_by(sessionid=sessid).first()
+ food = customer.orders.order_by(desc(customer.orders.date_ordered)).first()
+ print(food)
+
+ return jsonify({'customer_details': food})
+
+
+@app.route('/add_table/', methods=['POST'])
+def add_table(sessionidx):
+ data = request.get_json()
+ find_customer = Customer.query.filter_by(sessionid=sessionidx).first()
+ find_customer.tableno = data
+
+ db.session.commit()
+
+ return 'Done'
+
+
+@app.route('/getpayment', methods=['POST'])
+def cc():
+ user_data = request.get_json()
+ sessid = user_data['sessionid']
+ customer = Customer.query.filter_by(sessionid=sessid).first()
+ order = customer.orders[-1]
+ food = json.loads(order.food)
+ print(type(food))
+ tt = {'id': customer.customer_id, 'name': customer.customer_name, 'food': json.dumps(food), 'tableno': customer.tableno, 'amount': order.amount, 'orderid': order.orderid}
+
+ return jsonify({'customer_details': tt})
+
+
@app.route('/order_delete', methods=['POST'])
def order_delete():
if request.method == 'POST':
@@ -171,11 +249,27 @@ def order_food():
items = []
for item in order_list:
- items.append({'orderid': item.orderid, 'status': item.status, 'userid': item.userid, 'food': item.food, 'tableno': item.tableno, 'amount': item.amount})
+ items.append({'orderid': item.orderid, 'status': item.status, 'food': item.food, 'tableno': item.tableno, 'amount': item.amount, 'datetime': item.date_ordered})
- print(items)
+ print(items)
return jsonify({'order_items': items})
+ else:
+ order_data = request.get_json()
+ sessid = order_data['sessionid']
+ customer = Customer.query.filter_by(sessionid=sessid).first()
+
+ data = Order(
+ status='Food is being prepared',
+ food=order_data['food'],
+ amount=order_data['grandtotal'],
+ tableno=customer.tableno
+ )
+
+ db.session.add(data)
+ db.session.commit()
+
+ return 'Done'
@app.route('/update_status/', methods=['GET', 'POST'])
diff --git a/README.md b/README.md
index 335c48a..33225df 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,32 @@
# DINE-IN
+# Prerequisites: Download nodejs and Python in your desktop.
+//Instructions of git pull to be added
+
+
+After pulling the code in your computer's folder:
+
+
+1.Open command line/terminal
+
+
+2.Go to the project's directory using cd commands
+
+
+3.cd DINE-IN,cd Hotel App
+
+
+4.Once Hotel app's folder is reached:-
+
+
+# For Frontend:
+
+Go to frontend folder using cd frontend and
+# Type the command: npm start
+
+
+# For Backend:
+
+
+Go to server folder using cd server and
+# Type the command: python3 app.py
+You can open 2 separate tabs of command line to run both frontend and backend simultaneously.