admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Package updates and removed autosave on job on enter.

Browse Source
This commit is contained in:
Patrick Fic
2020-08-20 10:45:54 -07:00
parent df0f98f377
commit af0b08e7f1
6 changed files with 428 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/package.json
View File

@@ -6,10 +6,10 @@
"dependencies": {
"@lourenci/react-kanban": "^2.0.0",
"@stripe/react-stripe-js": "^1.1.2",
"@stripe/stripe-js": "^1.8.0",
"@tanem/react-nprogress": "^3.0.37",
"@stripe/stripe-js": "^1.9.0",
"@tanem/react-nprogress": "^3.0.39",
"@tinymce/tinymce-react": "^3.6.0",
"antd": "^4.5.2",
"antd": "^4.5.4",
"apollo-boost": "^0.4.9",
"apollo-link-context": "^1.0.20",
"apollo-link-error": "^1.1.13",
@@ -20,15 +20,15 @@
"dinero.js": "^1.8.1",
"dotenv": "^8.2.0",
"fingerprintjs2": "^2.1.2",
"firebase": "^7.17.1",
"firebase": "^7.18.0",
"graphql": "^15.3.0",
"i18next": "^19.6.3",
"i18next-browser-languagedetector": "^5.0.1",
"i18next": "^19.7.0",
"i18next-browser-languagedetector": "^6.0.1",
"inline-css": "^2.6.3",
"logrocket": "^1.0.10",
"logrocket": "^1.0.11",
"moment-business-days": "^1.2.0",
"node-sass": "^4.14.1",
"phone": "^2.4.14",
"phone": "^2.4.15",
"prop-types": "^15.7.2",
"query-string": "^6.13.1",
"react": "^16.13.1",
@@ -42,16 +42,16 @@
"react-grid-gallery": "^0.5.5",
"react-grid-layout": "^1.0.0",
"react-i18next": "^11.7.0",
"react-icons": "^3.10.0",
"react-icons": "^3.11.0",
"react-image-file-resizer": "^0.3.1",
"react-moment": "^0.9.7",
"react-number-format": "^4.4.1",
"react-redux": "^7.2.1",
"react-resizable": "^1.10.1",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-scripts": "3.4.3",
"react-trello": "^2.2.8",
"react-virtualized": "^9.21.2",
"react-virtualized": "^9.22.2",
"recharts": "^1.8.5",
"redux": "^4.0.5",
"redux-persist": "^6.0.0",
@@ -59,7 +59,7 @@
"redux-state-sync": "^3.1.2",
"reselect": "^4.0.0",
"styled-components": "^5.1.1",
"subscriptions-transport-ws": "^0.9.17"
"subscriptions-transport-ws": "^0.9.18"
},
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -86,7 +86,7 @@
"devDependencies": {
"@apollo/react-testing": "^4.0.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-adapter-react-16": "^1.15.3",
"redux-logger": "^3.0.6",
"source-map-explorer": "^2.4.2"
}

12
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -25,12 +25,12 @@ const mapDispatchToProps = (dispatch) => ({
export function JobsDetailHeader({
job,
refetch,
setPrintCenterContext,
bodyshop,
updateJobStatus,
setScheduleContext,
form,
}) {
const { t } = useTranslation();
@@ -80,8 +80,7 @@ export function JobsDetailHeader({
<Button
type="primary"
className="imex-flex-row__margin"
key="submit"
htmlType="submit"
onClick={() => form.submit()}
>
{t("general.actions.save")}
</Button>
@@ -108,12 +107,7 @@ export function JobsDetailHeader({
</Tag>,
<Tag title={t("jobs.fields.repairtotal")} key="total" color="green">
<CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
</Tag>,
<Tag
title={t("jobs.fields.customerowing")}
key="custowing"
color="green"
>
<span style={{ margin: "0rem .5rem" }}>/</span>
<CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
</Tag>,
]}

1
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -142,6 +142,7 @@ export function JobsDetailPage({
<FormFieldsChanged form={form} />
<JobsDetailHeader
form={form}
job={job}
refetch={refetch}
handleSubmit={handleSubmit}

669
client/yarn.lock
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@@ -26,20 +26,20 @@
"dotenv": "8.2.0",
"express": "^4.16.4",
"express-sslify": "^1.2.0",
"firebase-admin": "^9.0.0",
"firebase-admin": "^9.1.0",
"graphql-request": "^2.0.0",
"handlebars": "^4.7.6",
"lodash": "^4.17.19",
"lodash": "^4.17.20",
"moment": "^2.27.0",
"node-fetch": "^2.6.0",
"node-mailjet": "^3.3.1",
"phone": "^2.4.14",
"stripe": "^8.82.0",
"twilio": "^3.48.1",
"phone": "^2.4.15",
"stripe": "^8.88.0",
"twilio": "^3.49.0",
"xmlbuilder": "^15.1.1"
},
"devDependencies": {
"concurrently": "^5.2.0",
"concurrently": "^5.3.0",
"eslint": "^6.6.0",
"eslint-plugin-promise": "^4.2.1",
"source-map-explorer": "^2.4.2"

142
yarn.lock
View File

@@ -18,55 +18,55 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
"@firebase/app-types@0.6.0":
version "0.6.0"
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.6.0.tgz#8dcc3e793c6983e9d54f7eb623a7618c05f2d94c"
integrity sha512-ld6rzjXk/SUauHiQZJkeuSJpxIZ5wdnWuF5fWBFQNPaxsaJ9kyYg9GqEvwZ1z2e6JP5cU9gwRBlfW1WkGtGDYA==
"@firebase/auth-interop-types@0.1.4":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.4.tgz#e81589f58508630a5bffa604d7c949a0d01ea97b"
integrity sha512-CLKNS84KGAv5lRnHTQZFWoR11Ti7gIPFirDDXWek/fSU+TdYdnxJFR5XSD4OuGyzUYQ3Dq7aVj5teiRdyBl9hA==
"@firebase/component@0.1.10":
version "0.1.10"
resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.10.tgz#9df3a6555568602ca7b262a3bff2125024f61649"
integrity sha512-Iy1+f8wp6mROz19oxWUd31NxMlGxtW1IInGHITnVa6eZtXOg0lxcbgYeLp9W3PKzvvNfshHU0obDkcMY97zRAw==
dependencies:
"@firebase/util" "0.2.45"
tslib "1.11.1"
"@firebase/database-types@0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.5.0.tgz#603a0865c3180a9ffb6f5fa065d156387385a74d"
integrity sha512-6/W3frFznYOALtw2nrWVPK2ytgdl89CzTqVBHCCGf22wT6uKU63iDBo+Nw+7olFGpD15O0zwYalFIcMZ27tkew==
dependencies:
"@firebase/app-types" "0.6.0"
"@firebase/database@^0.6.0":
"@firebase/app-types@0.6.1":
version "0.6.1"
resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.1.tgz#76ee8003aa1fff7ff5deb317959bbb0e35e56765"
integrity sha512-7XqUbj3nK2vEdFjGOXBfKISmpLrM0caIwwfDPxhn6i7X/g6AIH+D1limH+Jit4QeKMh/IJZDNqO7P+Fz+e8q1Q==
resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.6.1.tgz#dcbd23030a71c0c74fc95d4a3f75ba81653850e9"
integrity sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg==
"@firebase/auth-interop-types@0.1.5":
version "0.1.5"
resolved "https://registry.yarnpkg.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz#9fc9bd7c879f16b8d1bb08373a0f48c3a8b74557"
integrity sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==
"@firebase/component@0.1.18":
version "0.1.18"
resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.1.18.tgz#28e69e54b79953376283464cb0543bde4c104140"
integrity sha512-c8gd1k/e0sbBTR0xkLIYUN8nVkA0zWxcXGIvdfYtGEsNw6n7kh5HkcxKXOPB8S7bcPpqZkGgBIfvd94IyG2gaQ==
dependencies:
"@firebase/auth-interop-types" "0.1.4"
"@firebase/component" "0.1.10"
"@firebase/database-types" "0.5.0"
"@firebase/logger" "0.2.2"
"@firebase/util" "0.2.45"
"@firebase/util" "0.3.1"
tslib "^1.11.1"
"@firebase/database-types@0.5.2", "@firebase/database-types@^0.5.2":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.5.2.tgz#23bec8477f84f519727f165c687761e29958b63c"
integrity sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g==
dependencies:
"@firebase/app-types" "0.6.1"
"@firebase/database@^0.6.10":
version "0.6.11"
resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.6.11.tgz#74a09d5f4769eb97c00bc2f7621f54efbccea6f2"
integrity sha512-QOHhB7+CdjVhEXG9CyX0roA9ARJcEuwbozz0Bix+ULuZqjQ58KUFHMH1apW6EEiUP22d/mYD7dNXsUGshjL9PA==
dependencies:
"@firebase/auth-interop-types" "0.1.5"
"@firebase/component" "0.1.18"
"@firebase/database-types" "0.5.2"
"@firebase/logger" "0.2.6"
"@firebase/util" "0.3.1"
faye-websocket "0.11.3"
tslib "1.11.1"
tslib "^1.11.1"
"@firebase/logger@0.2.2":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.2.2.tgz#aea3ef8cbb131c9d3daaf8022f120f194a40509f"
integrity sha512-MbEy17Ha1w/DlLtvxG89ScQ+0+yoElGKJ1nUCQHHLjeMNsRwd2wnUPOVCsZvtBzQp8Z0GaFmD4a2iG2v91lEbA==
"@firebase/logger@0.2.6":
version "0.2.6"
resolved "https://registry.yarnpkg.com/@firebase/logger/-/logger-0.2.6.tgz#3aa2ca4fe10327cabf7808bd3994e88db26d7989"
integrity sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==
"@firebase/util@0.2.45":
version "0.2.45"
resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.2.45.tgz#d52f28da8a4d7a4fa97d36202a86d5f654fbed6d"
integrity sha512-k3IqXaIgwlPg7m5lXmMUtkqA/p+LMFkFQIqBuDtdT0iyWB6kQDokyjw2Sgd3GoTybs6tWqUKFZupZpV6r73UHw==
"@firebase/util@0.3.1":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@firebase/util/-/util-0.3.1.tgz#8c95152a00121bd31fb7c1fc6520ca208976e384"
integrity sha512-zjVd9rfL08dRRdZILFn1RZTHb1euCcnD9N/9P56gdBcm2bvT5XsCC4G6t5toQBpE/H/jYe5h6MZMqfLu3EQLXw==
dependencies:
tslib "1.11.1"
tslib "^1.11.1"
"@google-cloud/common@^3.0.0":
version "3.3.2"
@@ -663,10 +663,10 @@ concat-stream@^2.0.0:
readable-stream "^3.0.2"
typedarray "^0.0.6"
concurrently@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.2.0.tgz#ead55121d08a0fc817085584c123cedec2e08975"
integrity sha512-XxcDbQ4/43d6CxR7+iV8IZXhur4KbmEJk1CetVMUqCy34z9l0DkszbY+/9wvmSnToTej0SYomc2WSRH+L0zVJw==
concurrently@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-5.3.0.tgz#7500de6410d043c912b2da27de3202cb489b1e7b"
integrity sha512-8MhqOB6PWlBfA2vJ8a0bSFKATOdWlHiQlk11IfmQBPaHVP8oP2gsh2MObE6UR3hqDHqvaIvLTyceNW6obVuFHQ==
dependencies:
chalk "^2.4.2"
date-fns "^2.0.1"
@@ -1241,12 +1241,13 @@ find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
firebase-admin@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.0.0.tgz#d68551a33e9c14252453743cd6ef9e5ad3251816"
integrity sha512-LP4xD+JxfEZ+e1kBIKT2kbDa9UFChwgL4488NexvTjhynNcJsKCGmawl2FMvZ2UPwXKgWBpLXJ07cYp6gk5lcw==
firebase-admin@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.1.0.tgz#c8b7f8da32cc52d5f15b0be47fd88979c5e86618"
integrity sha512-tGGREJpoRM/mbV/5bs/q9SQRZkVhxMMq1HIJEzSEh3mtz5hC9VtaCkuLt6chuAsqHMBoc1pvnrGTOC5nOme9VQ==
dependencies:
"@firebase/database" "^0.6.0"
"@firebase/database" "^0.6.10"
"@firebase/database-types" "^0.5.2"
"@types/node" "^10.10.0"
dicer "^0.3.0"
jsonwebtoken "^8.5.1"
@@ -1876,6 +1877,11 @@ lodash@^4.17.19:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
lodash@^4.17.20:
version "4.17.20"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
long@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
@@ -2233,10 +2239,10 @@ path-to-regexp@0.1.7:
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
phone@^2.4.14:
version "2.4.14"
resolved "https://registry.yarnpkg.com/phone/-/phone-2.4.14.tgz#2ef9e7531073ca53cfd43adadeefa6129d61f05e"
integrity sha512-t2ZmC0cQ+md5i4nZKiKBIqElz80cfQbMGuNHhfDXNjNKW3sMqXhYu5fJ5To59niTf48BtQOrc6mJ8zYkB4rDDw==
phone@^2.4.15:
version "2.4.15"
resolved "https://registry.yarnpkg.com/phone/-/phone-2.4.15.tgz#4ab158ac011c8107e873d7b1d12abcc88fda6bf3"
integrity sha512-C1/0wWjwSOxoqYcwMtnb8KhxaFUhBIg0srDa9WZ5mBeCMkmUhC9jJIrWzUQnJdaM5bagLp9wmNHzKPVjLCF0kg==
pify@^3.0.0:
version "3.0.0"
@@ -2805,10 +2811,10 @@ strip-json-comments@^3.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
stripe@^8.82.0:
version "8.82.0"
resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.82.0.tgz#dbda4143aaf9a470405bb6e91f27fd7b6399c61b"
integrity sha512-Sce37IF3S1+RT/bYTXn1ZhPkVmKYwrTiLDF7V5EzxgLreGNUNBObvIHHKDbf4+AYTv2DDBMAzuqwX29z8wGmxA==
stripe@^8.88.0:
version "8.88.0"
resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.88.0.tgz#ba7e9eec21bbf5459491366081d04a811b55f0de"
integrity sha512-aeixfX6Gem5UiRdoH9wphQ344abxgAQrLg2sAY/0IddZ5mprZKS568Pb3WX0qy2E5OJGute+jEAn2Za7DKLQtw==
dependencies:
"@types/node" ">=8.1.0"
qs "^6.6.0"
@@ -2945,20 +2951,20 @@ tree-kill@^1.2.2:
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
tslib@1.11.1:
version "1.11.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
tslib@^1.11.1:
version "1.13.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
tslib@^1.9.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
twilio@^3.48.1:
version "3.48.1"
resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.48.1.tgz#98d864bf1c39da19e6b75397e324bc6a25aa7c7e"
integrity sha512-gUfkLPt4llVXWuUeZ5V3O0zyWvG0yt49CFUoAUoOlqsoILoVjcwGe5xfDhk87J6Iotc1CX4tMeBupdHmd2Cn1g==
twilio@^3.49.0:
version "3.49.0"
resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.49.0.tgz#4c2caa9fb9f293c4535fb8e87c4bbe4ee928f11c"
integrity sha512-XuWny4sqj92ch3dQhC6WhGcPSODOOFd3fgkYocSi5j59Rq1DwAxGL4b9MgM5to4CbrGlm4Qr4gaxffiQsRfyEQ==
dependencies:
"@types/express" "^4.17.7"
axios "^0.19.2"