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-12 17:46:38 -05:00
parent 6431ecabf6
commit 87254cc59e
6 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/App.css
View File

@@ -1209,6 +1209,17 @@ input[type="checkbox"] {
transform: translate(-50%, -50%);
}
.clock-sm {
width: 50px !important;
height: 50px !important;
border-width: 2px !important;
}
.clock-sm .center-dot {
width: 5px;
height: 5px;
}
.weather-icon {
display: flex;
justify-content: center;

23
client/src/components/admin-view/AdminView.js
View File

@@ -1,8 +1,6 @@
import React, { useState, useEffect } from 'react';
import { Breadcrumb, BreadcrumbItem, Card, Row, Col } from 'react-bootstrap';
import { AuthService, CustomerService, TransRoutesService } from '../../services';
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';
import moment from 'moment';
import { CUSTOMER_TYPE, PERSONAL_ROUTE_STATUS, CUSTOMER_JOIN_REASON, CUSTOMER_JOIN_REASON_TEXT, CUSTOMER_DISCHARGE_REASON, CUSTOMER_DISCHARGE_REASON_TEXT } from '../../shared';
import {
@@ -33,7 +31,6 @@ ChartJS.register(
const AdminView = () => {
const [isLoading, setIsLoading] = useState(true);
const [reportDate, setReportDate] = useState(new Date());
const [customers, setCustomers] = useState([]);
const [selectedWeek, setSelectedWeek] = useState('this-week');
const [selectedMonth, setSelectedMonth] = useState('this-month');
@@ -659,8 +656,8 @@ const AdminView = () => {
{/* First Section - No border */}
<div className="mb-4 admin-view-container">
<Row>
{/* Left Side - 9 columns */}
<Col md={9}>
{/* Main Content - Full Width */}
<Col md={12}>
{/* First Row - Stats Card */}
<Row className="mb-4">
<Col md={12}>
@@ -830,22 +827,6 @@ const AdminView = () => {
</Row>
</Col>
{/* Right Side - 3 columns */}
<Col md={3}>
<Card className="admin-view-reports-card">
<Card.Body>
<div className="admin-view-chart-header">
<h6 className="admin-view-chart-title">Reports</h6>
<DatePicker
selected={reportDate}
onChange={(date) => setReportDate(date)}
dateFormat="MM/dd/yyyy"
className="form-control form-select-sm ms-2"
/>
</div>
</Card.Body>
</Card>
</Col>
</Row>
</div>

16
client/src/components/customers/UpdateCustomer.js
View File

@@ -161,7 +161,7 @@ const UpdateCustomer = () => {
}
const redirectToView = () => {
navigate(`/customers/${urlParams.id}`);
navigate(`/customers/${urlParams.id}?tab=${activeTab}`);
}
// Phone number formatting function
@@ -1273,7 +1273,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1358,7 +1358,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1495,7 +1495,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1525,7 +1525,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1579,7 +1579,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1684,7 +1684,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>
@@ -1716,7 +1716,7 @@ const UpdateCustomer = () => {
<div className="list row mb-5">
<div className="col-md-12 col-sm-12 col-xs-12">
<button className="btn btn-default btn-sm float-right" onClick={() => redirectTo()}> Cancel </button>
<button className="btn btn-default btn-sm float-right" onClick={() => redirectToView()}> Cancel </button>
{/* <button className="btn btn-danger btn-sm me-2 mb-2" onClick={() => triggerShowDeleteModal()}> Delete </button> */}
<button className="btn btn-primary btn-sm float-right" onClick={() => saveCustomer()}> Save </button>
</div>

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

@@ -23,7 +23,7 @@ const Dashboard = () => {
const eventTypes = [
{ value: 'medical', label: 'Medical Appointments' },
{ value: 'activity', label: 'Activities' },
{ value: 'incident', label: 'Important Notes And Incidents' },
{ value: 'incident', label: 'Attendance' },
{ value: 'meal_plan', label: 'Meal Plan' },
{ value: 'reminder', label: 'Important Dates' }
];

20
client/src/components/info-screen/InfoScreen.js
View File

@@ -675,22 +675,22 @@ const InfoScreen = () => {
{/* Time Card */}
<div>
<div className="card h-100" style={{borderRadius: '8px', minWidth: '200px'}}>
<div className="card-body text-center">
<div className="mb-3">
<div className="card-body text-center" style={{ padding: '10px 16px' }}>
<div className="mb-1">
<div className="text-black" style={{ fontSize: '12px' }}>
{moment(currentTime).format('dddd')}
</div>
<div className="text-black">
{moment(currentTime).format('MMM Do, YYYY')}
</div>
<h5 className="text-primary mt-2" style={{ fontSize: '20px', fontWeight: '600' }}>
<h5 className="text-primary mt-1 mb-0" style={{ fontSize: '20px', fontWeight: '600' }}>
{moment(currentTime).format('HH:mm')}
</h5>
</div>
{/* CSS Clock */}
<div className="clock-container">
<div className="clock">
<div className="clock-container" style={{ marginTop: '6px' }}>
<div className="clock clock-sm">
<div className="clock-face">
<div className="hand hour-hand" style={{
transform: `rotate(${(moment(currentTime).hour() % 12) * 30 + moment(currentTime).minute() * 0.5}deg)`
@@ -712,22 +712,22 @@ const InfoScreen = () => {
{/* Weather Card */}
<div>
<div className="card h-100" style={{borderRadius: '8px', minWidth: '200px'}}>
<div className="card-body text-center">
<div className="mb-3">
<div className="card-body text-center" style={{ padding: '10px 16px' }}>
<div className="mb-1">
<div className="text-black" style={{ fontSize: '12px' }}>
New York, NY
</div>
<div className="text-black">
Partly Cloudy
</div>
<h5 className="text-primary mt-2" style={{ fontSize: '20px', fontWeight: '600' }}>
<h5 className="text-primary mt-1 mb-0" style={{ fontSize: '20px', fontWeight: '600' }}>
22°C
</h5>
</div>
{/* Weather Icon */}
<div className="weather-icon">
<i className="fas fa-cloud-sun" style={{ fontSize: '48px', color: '#ffc107' }}></i>
<div className="weather-icon" style={{ marginTop: '6px' }}>
<i className="fas fa-cloud-sun" style={{ fontSize: '28px', color: '#ffc107' }}></i>
</div>
</div>
</div>

6
client/src/components/trans-routes/PersonnelInfoTable.js
View File

@@ -943,7 +943,7 @@ const PersonnelInfoTable = ({transRoutes, showCompletedInfo,
</div>
<Modal show={show} onHide={() => closeModal()}>
<Modal.Header closeButton>
<Modal.Title>Special Edit Participant</Modal.Title>
<Modal.Title>Special Edit Customer</Modal.Title>
</Modal.Header>
<Modal.Body>
<>
@@ -984,7 +984,7 @@ const PersonnelInfoTable = ({transRoutes, showCompletedInfo,
<div className="app-main-content-fields-section">
<div className="me-4">
<div className="field-label">Special Set User Route Status
<div className="field-label">Special Set Customer Route Status
</div>
<select value={customerStatusInRoute} onChange={(e)=>{setCustomerStatusInRoute(e.currentTarget.value)}}>
<option value=""></option>
@@ -996,7 +996,7 @@ const PersonnelInfoTable = ({transRoutes, showCompletedInfo,
</select>
</div>
<div className="me-4">
<div className="field-label"> Special Set User Pickup Status
<div className="field-label"> Special Set Customer Pickup Status
</div>
<select value={customerPickupStatusInRoute} onChange={(e)=>{setCustomerPickupStatusInRoute(e.currentTarget.value)}}>
<option value=""></option>