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-02-23 14:03:38 -05:00
parent 2494285637
commit 5e9b6e63b2
14 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
{
"files": {
"main.css": "/static/css/main.3078ab9c.css",
"main.js": "/static/js/main.3a673056.js",
"main.css": "/static/css/main.4cb592b3.css",
"main.js": "/static/js/main.b01b945f.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.3078ab9c.css.map": "/static/css/main.3078ab9c.css.map",
"main.3a673056.js.map": "/static/js/main.3a673056.js.map",
"main.4cb592b3.css.map": "/static/css/main.4cb592b3.css.map",
"main.b01b945f.js.map": "/static/js/main.b01b945f.js.map",
"787.c4e7f8f9.chunk.js.map": "/static/js/787.c4e7f8f9.chunk.js.map"
},
"entrypoints": [
"static/css/main.3078ab9c.css",
"static/js/main.3a673056.js"
"static/css/main.4cb592b3.css",
"static/js/main.b01b945f.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.3a673056.js"></script><link href="/static/css/main.3078ab9c.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.b01b945f.js"></script><link href="/static/css/main.4cb592b3.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

1
app/views/static/css/main.3078ab9c.css.map
View File

File diff suppressed because one or more lines are too long

4
app/views/static/css/main.3078ab9c.css → app/views/static/css/main.4cb592b3.css
View File

File diff suppressed because one or more lines are too long

1
app/views/static/css/main.4cb592b3.css.map Normal file
View File

File diff suppressed because one or more lines are too long

3
app/views/static/js/main.3a673056.js
View File

File diff suppressed because one or more lines are too long

3
app/views/static/js/main.b01b945f.js Normal file
View File

File diff suppressed because one or more lines are too long

0
app/views/static/js/main.3a673056.js.LICENSE.txt → app/views/static/js/main.b01b945f.js.LICENSE.txt
View File

2
app/views/static/js/main.3a673056.js.map → app/views/static/js/main.b01b945f.js.map
View File

File diff suppressed because one or more lines are too long

84
client/src/App.css
View File

@@ -932,6 +932,8 @@ input[type="checkbox"] {
/* Center Calendar small modal styling */
.calendar-event-modal {
max-width: 380px !important;
margin-left: auto !important;
margin-right: auto !important;
}
.calendar-event-modal .modal-content {
@@ -1966,6 +1968,10 @@ input[type="checkbox"] {
overflow: hidden;
display: flex;
flex-direction: column;
border: none !important;
padding: 0 !important;
border-radius: 0 !important;
box-sizing: border-box;
}
.fullscreen-mode .app-main-content-list-func-container {
@@ -1973,17 +1979,21 @@ input[type="checkbox"] {
height: 100%;
display: flex;
flex-direction: column;
padding: clamp(10px, 2vw, 30px);
padding: 30px;
box-sizing: border-box;
}
.fullscreen-mode .multi-columns-container {
width: 100%;
height: 100%;
height: calc(100vh - 60px);
max-height: calc(100vh - 60px);
display: flex;
gap: clamp(10px, 1.5vw, 25px);
gap: 20px;
flex: 1;
min-height: 0;
align-items: stretch;
box-sizing: border-box;
overflow: hidden;
}
.fullscreen-mode .column-container {
@@ -1991,9 +2001,11 @@ input[type="checkbox"] {
display: flex;
flex-direction: column;
min-width: 0;
height: 100%;
gap: clamp(8px, 1vw, 16px);
min-height: 0;
height: calc(100vh - 60px) !important;
max-height: calc(100vh - 60px) !important;
gap: 16px;
overflow: hidden;
}
/* Ensure middle column gallery fills remaining space */
@@ -2001,10 +2013,24 @@ input[type="checkbox"] {
justify-content: flex-start;
}
/* Column 1 (appointments) - single card fills full height */
.fullscreen-mode .column-container:nth-child(1) .column-card {
flex: 1;
display: flex;
flex-direction: column;
}
/* Column 3 (activities + menu) - menu fills remaining space */
.fullscreen-mode .column-container:nth-child(3) .column-card:last-child {
flex: 1;
display: flex;
flex-direction: column;
}
.fullscreen-mode .column-card {
background-color: rgba(255, 255, 255, 0.9) !important;
backdrop-filter: blur(8px);
border-radius: clamp(6px, 0.8vw, 12px);
border-radius: 12px;
padding: clamp(10px, 1.5vw, 24px);
flex: 1;
display: flex;
@@ -2016,6 +2042,8 @@ input[type="checkbox"] {
.fullscreen-mode .card {
background-color: rgba(255, 255, 255, 0.9) !important;
backdrop-filter: blur(8px);
border-radius: 12px !important;
border: none !important;
flex: 1;
display: flex;
flex-direction: column;
@@ -2096,8 +2124,8 @@ input[type="checkbox"] {
/* Clock and weather cards - equal sizing */
.fullscreen-mode .row.mb-4 {
display: flex;
gap: clamp(8px, 1vw, 16px);
margin-bottom: clamp(10px, 1.5vw, 24px) !important;
gap: 16px;
margin-bottom: 0 !important;
}
.fullscreen-mode .col-md-6 {
@@ -2106,29 +2134,31 @@ input[type="checkbox"] {
width: auto;
}
/* Clock scaling */
/* Clock scaling - 2/3 of original */
.fullscreen-mode .clock-container {
transform: scale(clamp(0.6, 0.08vw + 0.5, 1.2));
transform: scale(clamp(0.4, 0.053vw + 0.33, 0.8));
transform-origin: center;
}
.fullscreen-mode .clock {
width: clamp(60px, 8vw, 120px);
height: clamp(60px, 8vw, 120px);
width: clamp(40px, 5.3vw, 80px);
height: clamp(40px, 5.3vw, 80px);
}
/* Weather icon scaling */
/* Weather icon scaling - 2/3 of original */
.fullscreen-mode .weather-icon i {
font-size: clamp(32px, 4vw, 64px) !important;
font-size: clamp(21px, 2.7vw, 43px) !important;
}
/* Gallery/Carousel scaling */
/* Gallery/Carousel scaling - let flex handle height */
.fullscreen-mode .carousel {
height: clamp(120px, 15vh, 250px) !important;
flex: 1;
min-height: 0;
}
.fullscreen-mode .carousel-item img {
height: clamp(120px, 15vh, 250px) !important;
height: 100%;
object-fit: cover;
}
/* Attendance note card adjustments */
@@ -2254,16 +2284,18 @@ input[type="checkbox"] {
.fullscreen-mode .attendance-note-wrapper {
flex: 0 0 auto;
margin-bottom: clamp(8px, 1vw, 16px);
margin-bottom: 0;
}
.fullscreen-mode .gallery-wrapper {
flex: 1;
display: flex;
flex-direction: column;
margin-bottom: 0;
margin: 0;
padding: 0;
min-height: 0;
padding-bottom: clamp(8px, 1vw, 16px);
overflow: hidden;
border-radius: 12px;
}
.fullscreen-mode .gallery-wrapper .card {
@@ -2271,6 +2303,7 @@ input[type="checkbox"] {
display: flex;
flex-direction: column;
min-height: 0;
overflow: hidden;
}
.fullscreen-mode .gallery-wrapper .card-body {
@@ -2278,6 +2311,7 @@ input[type="checkbox"] {
display: flex;
flex-direction: column;
min-height: 0;
overflow: hidden;
}
.fullscreen-mode .gallery-wrapper .fullscreen-carousel {
@@ -2289,6 +2323,8 @@ input[type="checkbox"] {
.fullscreen-mode .gallery-wrapper .carousel-inner,
.fullscreen-mode .gallery-wrapper .carousel-item {
height: 100% !important;
border-radius: 12px;
overflow: hidden;
}
.fullscreen-mode .gallery-wrapper .fullscreen-carousel-img {
@@ -2325,24 +2361,24 @@ input[type="checkbox"] {
.fullscreen-mode .fullscreen-note-img {
width: 100%;
object-fit: cover;
border-radius: clamp(4px, 0.5vw, 8px);
border-radius: 12px;
}
.fullscreen-mode .fullscreen-placeholder {
height: clamp(60px, 8vh, 120px);
background-color: rgba(248, 249, 250, 0.8);
border: 2px dashed #dee2e6;
border-radius: clamp(4px, 0.5vw, 8px);
border-radius: 12px;
}
.fullscreen-mode .fullscreen-carousel {
border-radius: clamp(4px, 0.5vw, 8px);
border-radius: 12px;
overflow: hidden;
}
.fullscreen-mode .fullscreen-carousel-img {
object-fit: cover;
border-radius: clamp(4px, 0.5vw, 8px);
border-radius: 12px;
}
/* InfoScreen custom classes for moving inline styles to CSS */

10
client/src/components/center-calendar/CenterCalendar.js
View File

@@ -1307,7 +1307,11 @@ const getReminderTitleLabel = (value) => {
setNewEventEndDateTime(new Date());
setShowCreationModal(true);
}}>
<Plus size={18} className="me-1" />Add Event
<Plus size={18} className="me-1" />
{currentTab === 'activitiesCalendar' && 'Add New Activity'}
{currentTab === 'incidentsCalendar' && 'Add New Attendance Note'}
{currentTab === 'mealPlanCalendar' && 'Add New Meal Plan'}
{currentTab === 'reminderDatesCalendar' && 'Add New Important Date'}
</button>
)}
<Dropdown
@@ -1323,7 +1327,7 @@ const getReminderTitleLabel = (value) => {
<Dropdown.Menu as={customMenu}/>
</Dropdown>
</div>
<Modal show={showCreationModal} onHide={handleClose} size="sm" dialogClassName="calendar-event-modal">
<Modal show={showCreationModal} onHide={handleClose} size="sm" centered dialogClassName="calendar-event-modal">
<Modal.Header closeButton>
<Modal.Title>
{currentTab === 'medicalCalendar' && 'New Medical Appointment'}
@@ -1745,7 +1749,7 @@ const getReminderTitleLabel = (value) => {
</Modal>
{/* Edit Event Modal (non-medical tabs) */}
<Modal show={showEditModal} onHide={closeEditModal} size="sm" dialogClassName="calendar-event-modal">
<Modal show={showEditModal} onHide={closeEditModal} size="sm" centered dialogClassName="calendar-event-modal">
<Modal.Header closeButton>
<Modal.Title>
{currentTab === 'activitiesCalendar' && 'Edit Activity'}

2
client/src/components/dashboard/Dashboard.js
View File

@@ -301,7 +301,7 @@ const Dashboard = () => {
})}
{groupedEvents.size === 0 && (
<div className="text-muted text-center py-3">
No {selectedEventType} events for today
{selectedEventType === 'incident' ? 'No attendance notes available' : `No ${(eventTypes.find(t => t.value === selectedEventType)?.label || selectedEventType).toLowerCase()} available`}
</div>
)}
</div>

2
client/src/components/dashboard/DashboardCustomersList.js
View File

@@ -322,7 +322,6 @@ const DashboardCustomersList = ({ additionalButtons, showBreadcrumb = false, tit
<table className="personnel-info-table">
<thead>
<tr>
<th className="th-checkbox"><input type="checkbox" checked={checkSelectAll()} onClick={() => toggleSelectedAllItems()}></input></th>
<th className="th-index">No.</th>
{
columns.filter(col => col.show).map((column, index) => <th className="sortable-header" key={index}>
@@ -334,7 +333,6 @@ const DashboardCustomersList = ({ additionalButtons, showBreadcrumb = false, tit
<tbody>
{
filteredCustomers.map((customer, index) => <tr key={customer.id}>
<td className="td-checkbox"><input type="checkbox" checked={selectedItems.includes(customer.id)} onClick={()=>toggleItem(customer?.id)}/></td>
<td className="td-index">{index + 1}</td>
{columns.find(col => col.key === 'name')?.show && <td style={{ verticalAlign: 'middle' }}>
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>

2
client/src/components/events/EventsCalendar.js
View File

@@ -545,7 +545,7 @@ const handleSave = () => {
<Dropdown.Menu as={customMenu}/>
</Dropdown>
</div>
<Modal show={showCreationModal} onHide={handleClose} size="sm" dialogClassName="calendar-event-modal">
<Modal show={showCreationModal} onHide={handleClose} size="sm" centered dialogClassName="calendar-event-modal">
<Modal.Header closeButton>
<Modal.Title>New Medical Appointment</Modal.Title>
</Modal.Header>