yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-06 14:20:31 -05:00
parent 49b839b275
commit 858e08a50b
10 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
app/.DS_Store vendored
View File

Binary file not shown.

6
app/views/asset-manifest.json
View File

@@ -1,16 +1,16 @@
{
"files": {
"main.css": "/static/css/main.46cc12be.css",
"main.js": "/static/js/main.79e0cd13.js",
"main.js": "/static/js/main.59349b38.js",
"static/js/787.c4e7f8f9.chunk.js": "/static/js/787.c4e7f8f9.chunk.js",
"static/media/landing.png": "/static/media/landing.d4c6072db7a67dff6a78.png",
"index.html": "/index.html",
"main.46cc12be.css.map": "/static/css/main.46cc12be.css.map",
"main.79e0cd13.js.map": "/static/js/main.79e0cd13.js.map",
"main.59349b38.js.map": "/static/js/main.59349b38.js.map",
"787.c4e7f8f9.chunk.js.map": "/static/js/787.c4e7f8f9.chunk.js.map"
},
"entrypoints": [
"static/css/main.46cc12be.css",
"static/js/main.79e0cd13.js"
"static/js/main.59349b38.js"
]
}

2
app/views/index.html
View File

@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.10/lodash.min.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"><link rel="manifest" href="/manifest.json"/><title>Worldshine Transportation</title><script defer="defer" src="/static/js/main.79e0cd13.js"></script><link href="/static/css/main.46cc12be.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.10/lodash.min.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"><link rel="manifest" href="/manifest.json"/><title>Worldshine Transportation</title><script defer="defer" src="/static/js/main.59349b38.js"></script><link href="/static/css/main.46cc12be.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

6
app/views/static/js/main.79e0cd13.js → app/views/static/js/main.59349b38.js
View File

File diff suppressed because one or more lines are too long

0
app/views/static/js/main.79e0cd13.js.LICENSE.txt → app/views/static/js/main.59349b38.js.LICENSE.txt
View File

2
app/views/static/js/main.79e0cd13.js.map → app/views/static/js/main.59349b38.js.map
View File

File diff suppressed because one or more lines are too long

BIN
client/.DS_Store vendored
View File

Binary file not shown.

10
client/src/components/seating/CircularTable.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
const CircularTable = ({tableNumber, guests = [], inCenterCustomerIds = [], onSeatClick}) => {
const CircularTable = ({tableNumber, guests = [], inCenterCustomerIds = [], onSeatClick, labels = []}) => {
const getPositions = () => {
const positions = [];
const seatCount = 8;
@@ -41,13 +41,17 @@ const CircularTable = ({tableNumber, guests = [], inCenterCustomerIds = [], onSe
const guest = guests[index];
const isInCenter = isCustomerInCenter(guest?.customerId);
const hasCustomer = guest?.customerId && guest?.customerName;
const latestLabelColor = guest?.label?.id
? labels.find((item) => item?.id === guest?.label?.id)?.label_color
: undefined;
const seatLabelColor = latestLabelColor || guest?.label?.label_color;
// Determine seat style:
// - Apply label color if it exists
// - Gray out if customer is assigned but not in-center (and no label color)
const seatStyle = {
...(guest?.label?.label_color ? { background: guest.label.label_color } : {}),
...(!isInCenter && hasCustomer && !guest?.label?.label_color ? { background: '#cccccc', opacity: 0.6 } : {}),
...(seatLabelColor ? { background: seatLabelColor } : {}),
...(!isInCenter && hasCustomer && !seatLabelColor ? { background: '#cccccc', opacity: 0.6 } : {}),
...(!isInCenter && hasCustomer ? { opacity: 0.6 } : {})
};

4
client/src/components/seating/Seating.js
View File

@@ -892,7 +892,7 @@ const Seating = () => {
tablesByVisualRow().map((rowItem, rowIndex) => {
return (<div className="seating-row-container" id={`seating-row-fullscreen-${rowIndex}`} key={`seating-row-fullscreen-${rowIndex}`}>
{
rowItem?.tables?.map((item, itemIndex) => <CircularTable className="me-4" key={`seating-table-fullscreen-${rowIndex}-${itemIndex}`} id={`seating-table-fullscreen-${rowIndex}-${itemIndex}`} tableNumber={item?.id} guests={item?.seats} inCenterCustomerIds={inCenterCustomerIds} onSeatClick={handleSeatClick} />)
rowItem?.tables?.map((item, itemIndex) => <CircularTable className="me-4" key={`seating-table-fullscreen-${rowIndex}-${itemIndex}`} id={`seating-table-fullscreen-${rowIndex}-${itemIndex}`} tableNumber={item?.id} guests={item?.seats} inCenterCustomerIds={inCenterCustomerIds} onSeatClick={handleSeatClick} labels={currentLabels} />)
}
</div>)
})
@@ -952,7 +952,7 @@ const Seating = () => {
tablesByVisualRow().map((rowItem, rowIndex) => {
return (<div className="seating-row-container" id={`seating-row-${rowIndex}`} key={`seating-row-${rowIndex}`}>
{
rowItem?.tables?.map((item, itemIndex) => <CircularTable className="me-4" key={`seating-table-${rowIndex}-${itemIndex}`} id={`seating-table-${rowIndex}-${itemIndex}`} tableNumber={item?.id} guests={item?.seats} inCenterCustomerIds={inCenterCustomerIds} onSeatClick={handleSeatClick} />)
rowItem?.tables?.map((item, itemIndex) => <CircularTable className="me-4" key={`seating-table-${rowIndex}-${itemIndex}`} id={`seating-table-${rowIndex}-${itemIndex}`} tableNumber={item?.id} guests={item?.seats} inCenterCustomerIds={inCenterCustomerIds} onSeatClick={handleSeatClick} labels={currentLabels} />)
}
</div>)
})