-
Menu
-
-
-
-
- {items.map((item) => (
-
-
-
- ))}
+ <>
+
+
+
+
Menu
+
+
+
+ {items.map((item) => (
+
openModal(item)} role="button">
+
+
+ ))}
+
+
-
-
+
)}
);
diff --git a/server/controllers/menu.js b/server/controllers/menu.js
index 88da795..d1ab591 100644
--- a/server/controllers/menu.js
+++ b/server/controllers/menu.js
@@ -13,7 +13,7 @@ function getMenus(message) {
"Menus not found for restaurantId: " + restaurantId,
});
} else {
- resolve(restaurant.restaurantMenu.menuList);
+ resolve({ action: "GETMENUS", menuList: restaurant.restaurantMenu.menuList});
}
})
.catch((err) => {
@@ -39,7 +39,7 @@ function getMenu(message) {
const menuItem = restaurant.restaurantMenu.menuList.find(
(menuItem) => menuItem.menuId == menuId
);
- resolve(menuItem);
+ resolve({ action: "GETMENU", menuItem: menuItem });
}
})
.catch((err) => {
@@ -94,8 +94,8 @@ function createMenu(message) {
.save()
.then(() => {
resolve({
- //menuList: newMenuItem,
- menuList: getMenus(),
+ action: "CREATEMENU",
+ menuItem: newMenuItem,
});
})
.catch((err) => {
@@ -152,10 +152,7 @@ function updateMenu(message) {
restaurant
.save()
.then(() => {
- getMenus()
- .then((menu) => {
- resolve({menuList: menu});
- })
+ resolve({ action: "UPDATEMENU", menuItem: menuItem });
})
.catch((err) => {
reject({
@@ -202,7 +199,7 @@ function deleteMenu(message) {
restaurant
.save()
.then(() => {
- resolve({menuList: getMenus()});
+ resolve({ action: "DELETEMENU", menuItem: menuItem });
})
.catch((err) => {
reject({
diff --git a/server/server.js b/server/server.js
index dd3afa0..62d614f 100644
--- a/server/server.js
+++ b/server/server.js
@@ -42,12 +42,6 @@ class Server {
this.clients = []; // array of connected ClientWebSockets
this.disconnected = []; // array of disconnected ClientWebSockets
this.master = []; // array of ClientWebSocket
-
- this.orderLog = []; // array of all processed orders with items [client, orderItem, startTime, finishTime]
- this.waitingOrders = []; // queue with items [hash, client, orderItem, startTime]
- this.workingOrders = []; // array with items [hash, client, orderItem, startTime]
- this.finishedOrders = []; // array with items[hash, client, orderItem, startTime, finishTime];
-
}
/*********************************
@@ -133,53 +127,10 @@ class Server {
});
break;
- case 'REQUESTORDERS':
- console.log('Received order queue request');
- this.fulfillRequestOrder(client);
- break;
-
case "ORDER":
console.log(`Server received ORDER request`);
- let orders = payload.order;
- const batch = {
- client: client.id,
- orders: []
- }
- orders.forEach((order) => {
- console.log('order:', order);
- batch.orders.push({hash: order[1], item: order[0]});
- });
- this.queueOrder(client, batch);
- break;
-
- case 'WORKONITEM':
- console.log(`Server received WORKONITEM request`);
- // Remove item from waitingOrders
- this.waitingOrders = this.waitingOrders.filter(order => order.hash !== payload.item.hash);
- // Add item to workingOrders
- this.workingOrders.push(payload.item);
- console.log('waitingOrders:', this.waitingOrders);
- console.log('workingOrders:', this.workingOrders);
- // Broadcast changes
- this.clients.forEach((client) => {
- this.fulfillRequestOrder(client);
- })
- /* this.master.forEach((master) => {
- this.fulfillRequestOrder(master);
- })*/
- this.updateKitchens();
- break;
-
- case 'FINISHITEM':
- console.log(`Server received FINISHITEM`);
- // Remove item from workingOrders
- this.workingOrders = this.workingOrders.filter(order => order.hash !== payload.item.hash);
- // Add item to finishedItems
- this.finishedOrders.push(payload.item);
- this.clients.forEach((client) => {
- this.fulfillRequestOrder(client);
- })
- this.updateKitchens();
+ let orders = payload.cart;
+ this.sendOrderToKitchen(client, orders);
break;
// Restaurant
@@ -200,53 +151,39 @@ class Server {
case "DELETERESTAURANT":
console.log("Received request DELETERESTAURANT");
- // flying a little too close to the sun here no?
- //deleteRestaurant(payload);
+ deleteRestaurant(payload);
break;
// Menu
case "GETMENUS":
console.log("Received request GETMENUS");
- this.sendMenu(client);
- //this.sendMenu(client);
+ getMenus(payload);
break;
case "GETMENU":
console.log("Received request GETMENU");
- getMenu(payload)
- .then((menu) => {
- const actionObject = {
- action: 'GETMENU',
- menuList: menu,
- }
- this.sendMenu(client, menu);
- });
+ getMenu(payload);
break;
case "CREATEMENU":
console.log("Received request CREATEMENU");
- createMenu(payload)
- .then((updatedMenu) => {
- //console.log('updated menu:', updateMenu);
- console.log('updated menu:', updatedMenu);
- this.pushMenuUpdate(updatedMenu);
- });
+ createMenu(payload);
break;
case "DELETEMENU":
console.log("Received request DELETEMENU");
- deleteMenu(payload)
- .then((updatedMenu) => {
- this.pushMenuUpdate(updatedMenu);
- })
+
+ // // testing fixing by Rixin Li
+ // console.log("testing delete working?");
+ // // checking payload
+ // console.log(payload);
+
+ deleteMenu(payload);
break;
case "EDITMENU":
console.log("Received request EDITMENU");
- updateMenu(payload)
- .then((updatedMenu) => {
- this.pushMenuUpdate(updatedMenu);
- });
+ updateMenu(payload);
break;
// Table
@@ -383,16 +320,12 @@ class Server {
* @param {Bool} isMaster Signals if system is master or slave
*/
sendInit(client, id, isMaster) {
+ var actionObject;
getMenus().then((menu) => {
var actionObject = {
action: "INIT",
ID: id,
menu: menu,
- allOrders: {
- waitingOrders: this.waitingOrders,
- workingOrders: this.workingOrders,
- finishedOrders: this.finishedOrders,
- }
};
client.send(JSON.stringify(actionObject));
});
@@ -423,10 +356,13 @@ class Server {
* Wrapper function for sendMenu
* Pushes a menu update to all clients
*/
- pushMenuUpdate(menu) {
- this.clients.forEach((client) => {
- this.sendMenu(client, menu);
- })
+ pushMenuUpdate() {
+ getMenus().then((menu) => {
+ this.clients.forEach((client) => {
+ client.send(JSON.stringify(menu));
+ });
+ });
+
return;
}
@@ -435,92 +371,12 @@ class Server {
* @param {ClientWebSocket} client
* @returns
*/
- sendMenu(client, menu) {
- /*if(!menu){
- getMenus().then((menu) => {
- const actionObject = {
- action: 'MENU',
- menuList: menu,
- }
- client.send(JSON.stringify(actionObject));
- });
- }else{
- const actionObject = {
- action: "MENU",
- menuList: menu,
- }
- client.send(JSON.stringify(actionObject));
- }*/
+ sendMenu(client) {
getMenus().then((menu) => {
- const actionObject = {
- action: 'MENU',
- menuList: menu,
- }
- client.send(JSON.stringify(actionObject));
- })
-
- return;
- }
-
- /**
- * Queues the order and sends to the kitchen
- */
- queueOrder(client, batch){
- console.log('Queue order received order', batch, 'for client', client.id);
- const now = new Date();
- const hours = now.getHours().toString().padStart(2, '0');
- const minutes = now.getMinutes().toString().padStart(2, '0');
- const seconds = now.getSeconds().toString().padStart(2, '0');
- const day = now.getDate().toString().padStart(2, '0');
- const month = (now.getMonth() + 1).toString().padStart(2, '0'); // Months are zero-based
- const year = now.getFullYear();
- const formattedDateTime = `${hours}:${minutes}:${seconds} ${day}/${month}/${year}`;
- /*order.forEach((orderItem) => {
- console.log('orderItem:', orderItem);
- //this.waitingOrders.push([orderItem[0][1], client.id, order[0][0], formattedDateTime]);
- })*/
-
- // Push items to waitingOrders
- batch.orders.forEach((order) => {
- order.orderer = batch.client;
- order.orderTime = formattedDateTime;
- console.log('order:', order);
- this.waitingOrders.push(order);
- });
-
- console.log('waitingOrders:', this.waitingOrders);
-
- this.updateKitchens();
- }
-
- /**
- * Sends current WaitingOrders to kitchen
- */
- updateKitchens(){
- const actionObject = {
- action: 'ORDERPLACED',
- allOrders: {
- waitingOrders: this.waitingOrders,
- workingOrders: this.workingOrders,
- finishedOrders: this.finishedOrders,
- }
- }
-
- this.master.forEach((master) => {
- master.send(JSON.stringify(actionObject));
+ client.send(JSON.stringify(menu));
});
- }
- fulfillRequestOrder(client) {
- const actionObject = {
- action: 'ALLORDERS',
- allOrders: {
- waitingOrders: this.waitingOrders,
- workingOrders: this.workingOrders,
- finishedOrders: this.finishedOrders,
- }
- }
- client.send(JSON.stringify(actionObject));
+ return;
}
}
- )} */}
-
+ /> */}
@@ -172,7 +174,7 @@ const LpNavBar = ({cartItems, cartSize, renderCartSize, removeFromCart, WebSocke