diff --git a/client/src/components/allocations-employee-label/allocations-employee-label.component.jsx b/client/src/components/allocations-employee-label/allocations-employee-label.component.jsx index e67be1dcc..427c2a2b9 100644 --- a/client/src/components/allocations-employee-label/allocations-employee-label.component.jsx +++ b/client/src/components/allocations-employee-label/allocations-employee-label.component.jsx @@ -1,4 +1,4 @@ -import { Icon } from "antd"; +import Icon from "@ant-design/icons"; import React from "react"; import { MdRemoveCircleOutline } from "react-icons/md"; diff --git a/client/src/components/chat-conversation/chat-conversation.component.jsx b/client/src/components/chat-conversation/chat-conversation.component.jsx index 5d7f095c6..c2e0c3073 100644 --- a/client/src/components/chat-conversation/chat-conversation.component.jsx +++ b/client/src/components/chat-conversation/chat-conversation.component.jsx @@ -1,4 +1,5 @@ -import { Button, Card, Input, Icon } from "antd"; +import { Button, Card, Input } from "antd"; +import Icon from '@ant-design/icons'; import React, { useEffect, useState } from "react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; diff --git a/client/src/components/chat-open-button/chat-open-button.component.jsx b/client/src/components/chat-open-button/chat-open-button.component.jsx index bce620e7b..236be79ed 100644 --- a/client/src/components/chat-open-button/chat-open-button.component.jsx +++ b/client/src/components/chat-open-button/chat-open-button.component.jsx @@ -2,7 +2,7 @@ import React from "react"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { openConversation } from "../../redux/messaging/messaging.actions"; -import { Icon } from "antd"; +import { MessageFilled } from "@ant-design/icons"; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser }); @@ -14,9 +14,8 @@ export default connect( mapDispatchToProps )(function ChatOpenButton({ openConversation, phone }) { return ( - openConversation(phone)} /> ); diff --git a/client/src/components/chat-overlay/chat-overlay.component.jsx b/client/src/components/chat-overlay/chat-overlay.component.jsx index 396a57df6..599a694df 100644 --- a/client/src/components/chat-overlay/chat-overlay.component.jsx +++ b/client/src/components/chat-overlay/chat-overlay.component.jsx @@ -1,4 +1,5 @@ -import { Badge, Card, Icon } from "antd"; +import { Badge, Card } from "antd"; +import { MessageFilled } from "@ant-design/icons"; import React from "react"; import { useTranslation } from "react-i18next"; export default function ChatWindowComponent({ @@ -23,7 +24,7 @@ export default function ChatWindowComponent({ ) : (
- + {t("messaging.labels.messaging")} diff --git a/client/src/components/form-items-formatted/email-form-item.component.jsx b/client/src/components/form-items-formatted/email-form-item.component.jsx index c007b6bb3..f3d211a1a 100644 --- a/client/src/components/form-items-formatted/email-form-item.component.jsx +++ b/client/src/components/form-items-formatted/email-form-item.component.jsx @@ -1,4 +1,5 @@ -import { Icon, Input } from "antd"; +import { Input } from "antd"; +import { MailFilled } from "@ant-design/icons"; import React, { forwardRef } from "react"; function FormItemEmail(props, ref) { return ( @@ -7,10 +8,10 @@ function FormItemEmail(props, ref) { addonAfter={ props.email ? ( - + ) : ( - + ) } /> diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index fe0a4997c..5e19497bf 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -1,4 +1,5 @@ -import { Avatar, Col, Icon, Menu, Row } from "antd"; +import { Avatar, Col, Menu, Row } from "antd"; +import {GlobalOutlined, HomeFilled, TeamOutlined, CalendarFilled, CarFilled} from "@ant-design/icons"; import React from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; @@ -60,7 +61,7 @@ export default ({ - + {t("menus.currentuser.languageselector")} } @@ -87,14 +88,14 @@ export default ({ > - + {t("menus.header.home")} - + {t("menus.header.schedule")} @@ -110,13 +111,13 @@ export default ({ - + {t("menus.header.owners")} - + {t("menus.header.vehicles")} @@ -158,7 +159,7 @@ export default ({ - + {t("menus.currentuser.languageselector")} } diff --git a/client/src/components/invoice-add-line-button/invoice-add-line-button.component.jsx b/client/src/components/invoice-add-line-button/invoice-add-line-button.component.jsx index 80d61182a..319f03302 100644 --- a/client/src/components/invoice-add-line-button/invoice-add-line-button.component.jsx +++ b/client/src/components/invoice-add-line-button/invoice-add-line-button.component.jsx @@ -1,5 +1,6 @@ import React, { useState } from "react"; -import { Button, Popover, Icon, Input, InputNumber, Form } from "antd"; +import { Button, Popover, Input, InputNumber, Form } from "antd"; +import { SelectOutlined } from "@ant-design/icons"; import { useTranslation } from "react-i18next"; export default function InvoiceAddLineButton({ @@ -35,15 +36,16 @@ export default function InvoiceAddLineButton({ initialValue: jobLine.act_price * (discount ? 1 - discount : 1) })()} - DISSC: {discount} - + {} + DISC: {discount} +
); return ( ); diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx index 910a02b1b..4edaccb00 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx @@ -1,5 +1,11 @@ import { useQuery } from "@apollo/react-hooks"; -import { Button, Icon, PageHeader, Tag } from "antd"; +import { + PrinterFilled, + FileImageFilled, + EditFilled, + ShoppingFilled +} from "@ant-design/icons"; +import { Button, PageHeader, Tag } from "antd"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; @@ -33,10 +39,10 @@ export default function JobDetailCards({ selectedJob }) { return
{t("jobs.errors.nojobselected")}
; } if (loading) return ; - if (error) return ; + if (error) return ; return ( -
+
window.history.back()} tags={ - + {data.jobs_by_pk.status ? ( - {data.jobs_by_pk.status} + {data.jobs_by_pk.status} ) : null} } @@ -73,39 +79,43 @@ export default function JobDetailCards({ selectedJob }) { } extra={[ , + key="documents" + to={`/manage/jobs/${data.jobs_by_pk.id}#documents`} + > , - , , - - ]}> + ]} + > { // loading ? ( // @@ -126,7 +136,7 @@ export default function JobDetailCards({ selectedJob }) { // ) } -
+
+ extraLink={`/manage/jobs/${data.id}#notes`} + > {data ? ( ( {item.critical ? ( - - ) : null} - {item.private ? ( - + ) : null} + {item.private ? : null} {item.text} )} diff --git a/client/src/components/jobs-available-new/jobs-available-new.component.jsx b/client/src/components/jobs-available-new/jobs-available-new.component.jsx index e411a125c..7c5d08dba 100644 --- a/client/src/components/jobs-available-new/jobs-available-new.component.jsx +++ b/client/src/components/jobs-available-new/jobs-available-new.component.jsx @@ -1,4 +1,9 @@ -import { Button, Icon, Input, notification, Table } from "antd"; +import { Button, Input, notification, Table } from "antd"; +import { + PlusCircleFilled, + DeleteFilled, + SyncOutlined +} from "@ant-design/icons"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { DateTimeFormatter } from "../../utils/DateFormatter"; @@ -124,7 +129,7 @@ export default function JobsAvailableComponent({ }); }} > - + ) @@ -181,7 +186,7 @@ export default function JobsAvailableComponent({ refetch(); }} > - + ) @@ -184,7 +189,7 @@ export default function JobsAvailableSupplementComponent({ refetch(); }} > - + , diff --git a/client/src/components/jobs-documents/jobs-documents.component.jsx b/client/src/components/jobs-documents/jobs-documents.component.jsx index 1bbd68d12..2ea672ba1 100644 --- a/client/src/components/jobs-documents/jobs-documents.component.jsx +++ b/client/src/components/jobs-documents/jobs-documents.component.jsx @@ -1,4 +1,5 @@ -import { Icon, Modal, notification, Upload } from "antd"; +import { Modal, notification, Upload } from "antd"; +import { InboxOutlined } from "@ant-design/icons"; import axios from "axios"; import React, { useState } from "react"; import { useMutation } from "react-apollo"; @@ -205,7 +206,7 @@ function JobsDocumentsComponent({ shopId, jobId, loading, data, currentUser }) { }; return ( -
+
-

- + onChange={handleChange} + > +

+

-

+

Click or drag file to this area to upload

-

+

Support for a single or bulk upload. Strictly prohibit from uploading company data or other band files

- example + example
); diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 1b1ddb888..da609a63e 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -1,4 +1,5 @@ -import { Button, Icon, Input, Table } from "antd"; +import { Button, Input, Table } from "antd"; +import { SyncOutlined } from "@ant-design/icons"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { Link, withRouter } from "react-router-dom"; @@ -208,7 +209,7 @@ export default withRouter(function JobsList({ return (
{" "} {record.critical ? ( - - ) : null} - {record.private ? ( - + ) : null} + {record.private ? : null} ) }, @@ -48,7 +52,7 @@ export default function JobNotesComponent({ sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at), render: (text, record) => ( - {record.updated_at} + {record.updated_at} ) }, @@ -77,15 +81,17 @@ export default function JobNotesComponent({ message: t("notes.successes.deleted") }); }); - }}> - + }} + > + ) @@ -105,14 +111,15 @@ export default function JobNotesComponent({ onClick={() => { setExistingNote(null); setNoteModalVisible(true); - }}> + }} + > {t("notes.actions.new")} ({ ...item }))} - rowKey='id' + rowKey="id" dataSource={data} /> diff --git a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx index 55ffe1281..5b0e60a72 100644 --- a/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx +++ b/client/src/components/manage-sign-in-button/manage-sign-in-button.component.jsx @@ -1,4 +1,4 @@ -import { Icon } from "antd"; +import { BuildFilled, LoginOutlined } from "@ant-design/icons"; import React from "react"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; @@ -15,12 +15,12 @@ export default connect( )(function ManageSignInButton({ currentUser }) { return currentUser.authorized ? ( - + Manage ) : ( - + Sign In ); diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx index 29cb8252b..d9a4e6a0b 100644 --- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx +++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx @@ -1,4 +1,5 @@ -import { AutoComplete, DatePicker, Icon, Input, List, Radio } from "antd"; +import { AutoComplete, DatePicker, Input, List, Radio } from "antd"; +import { HeartFilled } from "@ant-design/icons"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; export default function PartsOrderModalComponent({ @@ -34,13 +35,14 @@ export default function PartsOrderModalComponent({ onSelect={handleSelect} defaultOpen backfill - optionLabelProp='value' + optionLabelProp="value" dataSource={vendorComplete} - placeholder={t("vendors.labels.search")}> + placeholder={t("vendors.labels.search")} + > {vendorComplete.map(v => (
{v.name}
-
{v.favorite ? : null}
+
{v.favorite ? : null}
 ))} @@ -55,14 +57,15 @@ export default function PartsOrderModalComponent({ {t("parts_orders.labels.inthisorder")} ( //TODO Editable table/adding line remarks to the order. - ]}> + ]} + > { // setSendType(e.target.value)}> + onChange={e => setSendType(e.target.value)} + > {t("parts_orders.labels.email")} {t("parts_orders.labels.print")} diff --git a/client/src/components/profile-sidebar/profile-sidebar.component.jsx b/client/src/components/profile-sidebar/profile-sidebar.component.jsx index b029bfb75..1ae5a5e17 100644 --- a/client/src/components/profile-sidebar/profile-sidebar.component.jsx +++ b/client/src/components/profile-sidebar/profile-sidebar.component.jsx @@ -1,6 +1,7 @@ import React from "react"; import { useTranslation } from "react-i18next"; -import { Layout, Menu, Icon } from "antd"; +import { Layout, Menu } from "antd"; +import { UserOutlined, BankFilled } from "@ant-design/icons"; export default function ProfileSideBar({ sidebarSelection, @@ -21,11 +22,11 @@ export default function ProfileSideBar({ mode="inline" > - + {t("menus.profilesidebar.profile")} - + {t("menus.profilesidebar.shops")} diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx index 61c3ffe3e..9a0f5a5a7 100644 --- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx +++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx @@ -1,7 +1,8 @@ import React from "react"; //import "react-big-calendar/lib/css/react-big-calendar.css"; import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component"; -import { Button, Icon } from "antd"; +import { Button } from "antd"; +import { SyncOutlined } from "@ant-design/icons"; import { useTranslation } from "react-i18next"; import ScheduleAppointmentModalContainer from "../schedule-appointment-modal/schedule-appointment-modal.container"; @@ -19,7 +20,7 @@ export default function ScheduleCalendarComponent({ refetch(); }} > - + diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx index 5de238e63..04c47631e 100644 --- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx +++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx @@ -1,4 +1,12 @@ -import { Form, Icon, Tabs } from "antd"; +import { Form, Tabs } from "antd"; +import { + BarsOutlined, + DollarCircleOutlined, + ToolFilled, + CalendarFilled, + FileImageFilled +} from "@ant-design/icons"; +import Icon from "@ant-design/icons"; import React, { lazy, Suspense, useContext } from "react"; import { useTranslation } from "react-i18next"; import { @@ -140,7 +148,7 @@ export default function JobsDetailPage({ - + {t("menus.jobsdetail.repairdata")} } @@ -152,7 +160,7 @@ export default function JobsDetailPage({ - + {t("menus.jobsdetail.financials")} } @@ -164,7 +172,7 @@ export default function JobsDetailPage({ - + {t("menus.jobsdetail.partssublet")} } @@ -188,7 +196,7 @@ export default function JobsDetailPage({ - + {t("menus.jobsdetail.dates")} } @@ -200,7 +208,7 @@ export default function JobsDetailPage({ - + {t("jobs.labels.documents")} }