From 55cec20914efe4b1ef7aab23ddc38ad9a29a5a72 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 31 Jan 2020 14:42:54 -0800 Subject: [PATCH] Created sider for Chat messages. --- .../chat-window/chat-window.component.jsx | 6 +- .../chat-window/chat-window.container.jsx | 21 +++-- .../jobs-list/jobs-list.component.jsx | 25 +++--- client/src/pages/manage/manage.page.jsx | 82 ++++++++++--------- 4 files changed, 69 insertions(+), 65 deletions(-) diff --git a/client/src/components/chat-window/chat-window.component.jsx b/client/src/components/chat-window/chat-window.component.jsx index e4fd51848..0ec7f9120 100644 --- a/client/src/components/chat-window/chat-window.component.jsx +++ b/client/src/components/chat-window/chat-window.component.jsx @@ -1,5 +1,5 @@ import React from "react"; - -export default function ChatWindowComponent() { - return
Chat Windows and more
; +import { Drawer } from "antd"; +export default function ChatWindowComponent({ ...drawerProps }) { + return Chat Windows and more; } diff --git a/client/src/components/chat-window/chat-window.container.jsx b/client/src/components/chat-window/chat-window.container.jsx index 940e7b416..d3d237a15 100644 --- a/client/src/components/chat-window/chat-window.container.jsx +++ b/client/src/components/chat-window/chat-window.container.jsx @@ -6,7 +6,7 @@ import { createStructuredSelector } from "reselect"; import { selectCurrentUser } from "../../redux/user/user.selectors"; const mapStateToProps = createStructuredSelector({ - currentUser: selectCurrentUser + //currentUser: selectCurrentUser }); const mapDispatchToProps = dispatch => ({ @@ -16,18 +16,17 @@ const mapDispatchToProps = dispatch => ({ export default connect( mapStateToProps, mapDispatchToProps -)(function ChatWindowContainer({ currentUser }) { +)(function ChatWindowContainer() { const [visible, setVisible] = useState(false); return ( -
- {visible ? : null} - +
+ +
); }); diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 17635845d..76d0f7eac 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -28,7 +28,7 @@ export default withRouter(function JobsList({ width: "8%", // onFilter: (value, record) => record.ro_number.includes(value), // filteredValue: state.filteredInfo.text || null, - sorter: (a, b) => alphaSort(a, b), + sorter: (a, b) => alphaSort(a.ro_number, b.ro_number), sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, @@ -74,7 +74,7 @@ export default withRouter(function JobsList({ {record.ownr_ph1} { alert("SMSing will happen here."); }} @@ -91,7 +91,7 @@ export default withRouter(function JobsList({ key: "status", width: "10%", ellipsis: true, - sorter: (a, b) => alphaSort(a, b), + sorter: (a, b) => alphaSort(a.status, b.status), sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order, render: (text, record) => { @@ -122,7 +122,7 @@ export default withRouter(function JobsList({ key: "plate_no", width: "8%", ellipsis: true, - sorter: (a, b) => alphaSort(a, b), + sorter: (a, b) => alphaSort(a.vehicle?.plate_no, b.vehicle?.plate_no), sortOrder: state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order, render: (text, record) => { @@ -139,7 +139,7 @@ export default withRouter(function JobsList({ key: "clm_no", width: "12%", ellipsis: true, - sorter: (a, b) => alphaSort(a, b), + sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sortOrder: state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order, render: (text, record) => { @@ -155,11 +155,9 @@ export default withRouter(function JobsList({ dataIndex: "clm_total", key: "clm_total", width: "8%", - // sorter: (a, b) => { - // return a > b; - // }, - // sortOrder: - // state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order, + sorter: (a, b) => a.clm_total - b.clm_total, + sortOrder: + state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order, render: (text, record) => { return record.clm_total ? ( {record.clm_total} @@ -196,7 +194,6 @@ export default withRouter(function JobsList({ if (record) { if (record.id) { setSelectedJob(record.id); - history.push(`#${record.id}`); return; } } @@ -210,7 +207,7 @@ export default withRouter(function JobsList({ title={() => { return ( { console.log(value); }} @@ -218,10 +215,10 @@ export default withRouter(function JobsList({ /> ); }} - size='small' + size="small" pagination={{ position: "top" }} columns={columns.map(item => ({ ...item }))} - rowKey='id' + rowKey="id" dataSource={jobs} rowSelection={{ selectedRowKeys: [selectedJob] }} onChange={handleTableChange} diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx index 07ebc470c..f30afcf45 100644 --- a/client/src/pages/manage/manage.page.jsx +++ b/client/src/pages/manage/manage.page.jsx @@ -10,7 +10,6 @@ import HeaderContainer from "../../components/header/header.container"; import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; import "./manage.page.styles.scss"; - //const WhiteBoardPage = lazy(() => import("../white-board/white-board.page")); const ManageRootPage = lazy(() => import("../manage-root/manage-root.page.container") @@ -27,7 +26,7 @@ const JobsAvailablePage = lazy(() => import("../jobs-available/jobs-available.page.container") ); -const { Header, Content, Footer } = Layout; +const { Header, Content, Footer, Sider } = Layout; //This page will handle all routing for the entire application. export default function Manage({ match }) { const { t } = useTranslation(); @@ -37,49 +36,58 @@ export default function Manage({ match }) { }, [t]); return ( - +
+ + + + - - - - } - > - + + + + } + > + - + - - - - - - - - + + + + + + + +
-