diff --git a/client/package.json b/client/package.json index 8310ddbeb..bd23011dc 100644 --- a/client/package.json +++ b/client/package.json @@ -31,7 +31,6 @@ "react-redux": "^7.1.3", "react-router-dom": "^5.1.2", "react-scripts": "3.3.1", - "react-trello": "^2.2.3", "redux": "^4.0.5", "redux-logger": "^3.0.6", "redux-persist": "^6.0.0", diff --git a/client/src/components/white-board-card/white-board-card.component.jsx b/client/src/components/white-board-card/white-board-card.component.jsx deleted file mode 100644 index 393878f8f..000000000 --- a/client/src/components/white-board-card/white-board-card.component.jsx +++ /dev/null @@ -1,117 +0,0 @@ -import React from "react"; -import { Link } from "react-router-dom"; -import { Menu, Dropdown, Card, Icon, Avatar, Row, Col } from "antd"; -import { useTranslation } from "react-i18next"; -import styled from "styled-components"; -import Moment from "react-moment"; -import CarImage from "../../assets/car.svg"; - -//The following styled div is required because of a smooth-dnd style used by react-trello to prevent wrapping of columns. -const WrappedSpan = styled.span` - white-space: normal; -`; - -export default function WhiteBoardCard({ metadata }) { - // const { - // onClick, - // className, - // name, - // cardStyle, - // body, - // dueOn, - // cardColor, - // subTitle, - // tagStyle, - // escalationText, - // tags, - // showDeleteButton, - // onDelete - // } = this.props; - const { t } = useTranslation(); - - const menu = ( - - - - {t("jobs.actions.viewJobImages")} - - - - {t("jobs.actions.printCenter")} - - - - {t("jobs.actions.notes")} - - - - {t("jobs.actions.postInvoices")} - - - - {t("jobs.actions.receiveParts")} - - - - {t("jobs.actions.partStatus")} - - - ); - - - return ( -
- - - , - , - - - - ]}> - - - - - - - - {metadata.vehicle?.v_model_yr || t("general.labels.na")}{" "} - {metadata.vehicle?.v_make_desc || t("general.labels.na")}{" "} - {metadata.vehicle?.v_model_desc || t("general.labels.na")} - - - {metadata.vehicle?.v_vin ? ( - - - VIN: {metadata.vehicle?.v_vin || t("general.labels.na")} - - - ) : null} - - - - - {t("general.labels.in")}: - {metadata.actual_in} - - - {t("general.labels.out")}: - {metadata.scheduled_completion} - - - -
- ); -} diff --git a/client/src/components/white-board-kanban/white-board-kanban.component.jsx b/client/src/components/white-board-kanban/white-board-kanban.component.jsx deleted file mode 100644 index f249819e4..000000000 --- a/client/src/components/white-board-kanban/white-board-kanban.component.jsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from "react"; -import Board from "react-trello"; -import WhiteBoardCard from "../white-board-card/white-board-card.component"; - -export default function WhiteBoardKanBan({ data, eventBus }) { - const setEventBus = handle => { - eventBus = handle; - }; - - return ( - - alert(`Card with id:${cardId} clicked. Has metadata.id: ${metadata.id}`) - } - /> - ); -} diff --git a/client/src/components/white-board-kanban/white-board-kanban.container.jsx b/client/src/components/white-board-kanban/white-board-kanban.container.jsx deleted file mode 100644 index ac444f7df..000000000 --- a/client/src/components/white-board-kanban/white-board-kanban.container.jsx +++ /dev/null @@ -1,46 +0,0 @@ -import React from "react"; -import { useSubscription } from "@apollo/react-hooks"; -import { SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries"; -import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component"; -import Alert from "../../components/alert/alert.component"; -import WhiteBoardKanBan from "./white-board-kanban.component"; - -export default function WhiteBoardKanBanContainer() { - const { loading, error, data } = useSubscription( - SUBSCRIPTION_JOBS_IN_PRODUCTION, - { - fetchPolicy: "network-only" - } - ); - - if (loading) return ; - if (error) return ; - let eventBus; - - let i = data.job_status.reduce((acc, value) => { - //Create a lane object for each row. - let newLane = { - id: value.name, - title: value.name, - label: "0", - cards: value.jobs.reduce((acc, value) => { - acc.push({ - id: value.id, - title: value.ro_number, - description: value.est_number, - label: value.id, - metadata: value - }); - return acc; - }, []) - }; - acc.push(newLane); - return acc; - }, []); - - let laneData = { - lanes: i - }; - - return ; -} diff --git a/client/src/components/white-board-left-sider/white-board-left-sider.component.jsx b/client/src/components/white-board-left-sider/white-board-left-sider.component.jsx deleted file mode 100644 index a46ea91b8..000000000 --- a/client/src/components/white-board-left-sider/white-board-left-sider.component.jsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from "react"; -import { Menu, Icon } from "antd"; -export default function WhiteBoardLeftSiderComponent({visible}) { - return ( - - - - nav 1 - - - - nav 2 - - - - nav 3 - - - - nav 4 - - - ); -} diff --git a/client/src/components/white-board-left-sider/white-board-left-sider.container.jsx b/client/src/components/white-board-left-sider/white-board-left-sider.container.jsx deleted file mode 100644 index b23aad9b2..000000000 --- a/client/src/components/white-board-left-sider/white-board-left-sider.container.jsx +++ /dev/null @@ -1,7 +0,0 @@ -import React from "react"; - -import WhiteBoardLeftSiderComponent from "./white-board-left-sider.component"; - -export default function WhiteBoardPageContainer() { - return ; -} diff --git a/client/src/pages/white-board/white-board.page.jsx b/client/src/pages/white-board/white-board.page.jsx deleted file mode 100644 index 0da18f3b8..000000000 --- a/client/src/pages/white-board/white-board.page.jsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from "react"; - -import WhiteBoardLeftSiderContainer from "../../components/white-board-left-sider/white-board-left-sider.container"; -import WhiteBoardKanBanContainer from "../../components/white-board-kanban/white-board-kanban.container"; -import { Layout } from "antd"; - -export default function WhiteBoardPage({ whiteBoardLeftSiderVisible }) { - const { Sider, Content } = Layout; - return ( - - { - //console.log(broken); - }} - onCollapse={(collapsed, type) => { - //console.log(collapsed, type); - }} - > - - - - - - - - ); -} diff --git a/client/yarn.lock b/client/yarn.lock index b48b372f0..ed969110b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2632,11 +2632,6 @@ autoprefixer@^9.6.1: postcss "^7.0.26" postcss-value-parser "^4.0.2" -autosize@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9" - integrity sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA== - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -3401,7 +3396,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@2.x, "classnames@>= 2.0", classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@~2.2.6: +classnames@2.x, classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@~2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== @@ -6178,13 +6173,6 @@ immer@1.10.0: resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg== -immutability-helper@^2.8.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.9.1.tgz#71c423ba387e67b6c6ceba0650572f2a2a6727df" - integrity sha512-r/RmRG8xO06s/k+PIaif2r5rGc3j4Yhc01jSBfwPCXDLYZwp/yxralI37Df1mwmuzcCsen/E/ITKcTEvc1PQmQ== - dependencies: - invariant "^2.2.0" - immutable@^3.7.4: version "3.8.2" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" @@ -6320,7 +6308,7 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" -invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4: +invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -7350,11 +7338,6 @@ jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: array-includes "^3.0.3" object.assign "^4.1.0" -just-curry-it@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.1.0.tgz#ab59daed308a58b847ada166edd0a2d40766fbc5" - integrity sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg== - killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -9772,7 +9755,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -10471,10 +10454,6 @@ react-chartjs-2@^2.9.0: lodash "^4.17.4" prop-types "^15.5.8" -react-click-outside@tj/react-click-outside: - version "1.1.1" - resolved "https://codeload.github.com/tj/react-click-outside/tar.gz/a833ddc5be47490307f9fcc6ed09d8c353108510" - react-dev-utils@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.1.0.tgz#ccf82135f6dc2fc91969bc729ce57a69d8e86025" @@ -10505,7 +10484,7 @@ react-dev-utils@^10.1.0: strip-ansi "6.0.0" text-table "0.2.0" -"react-dom@>= 16.3", react-dom@^16.12.0: +react-dom@^16.12.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz#0da4b714b8d13c2038c9396b54a92baea633fe11" integrity sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw== @@ -10555,7 +10534,7 @@ react-lazy-load@^3.0.13: lodash.throttle "^4.0.0" prop-types "^15.5.8" -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== @@ -10585,30 +10564,6 @@ react-overlays@^2.0.0-0: uncontrollable "^7.0.0" warning "^4.0.3" -react-popopo@^2.1.9: - version "2.1.9" - resolved "https://registry.yarnpkg.com/react-popopo/-/react-popopo-2.1.9.tgz#d93f70a8fb68227907d00c0cea4d8f5d321053ea" - integrity sha512-zXOpcLSpaLZmBxhdtenJzQPLjY81XknVS/tXH4Kv5BBrnYIUPHvVdGmS7+o9s7DjCzzdK7AdVwtG+FVSO0cZ8g== - dependencies: - classnames ">= 2.0" - prop-types "^15.7.2" - react ">= 16.3" - react-dom ">= 16.3" - styled-components ">= 4.0" - -react-redux@^5.0.7: - version "5.1.2" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57" - integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q== - dependencies: - "@babel/runtime" "^7.1.2" - hoist-non-react-statics "^3.3.0" - invariant "^2.2.4" - loose-envify "^1.1.0" - prop-types "^15.6.1" - react-is "^16.6.0" - react-lifecycles-compat "^3.0.0" - react-redux@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.3.tgz#717a3d7bbe3a1b2d535c94885ce04cdc5a33fc79" @@ -10731,26 +10686,7 @@ react-test-renderer@^16.0.0-0: react-is "^16.8.6" scheduler "^0.18.0" -react-trello@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/react-trello/-/react-trello-2.2.3.tgz#a8018c3b4812902b6030dc1ef3b8123c270ace5c" - integrity sha512-eB2BT3EJl7A30/+GcgKFnvhydSjMgzmvjPpx7MHgc5gmUuK2sbEzpNXtx9p7/eQC5dd10T7pnQa2muURp6ESCg== - dependencies: - autosize "^4.0.2" - classnames "^2.2.6" - immutability-helper "^2.8.1" - lodash "^4.17.11" - prop-types "^15.7.2" - react-click-outside tj/react-click-outside - react-popopo "^2.1.9" - react-redux "^5.0.7" - redux "^4.0.0" - redux-actions "^2.6.1" - redux-logger "^3.0.6" - smooth-dnd "https://github.com/rcdexta/smooth-dnd" - uuid "^3.3.2" - -"react@>= 16.3", react@^16.12.0: +react@^16.12.0: version "16.12.0" resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83" integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA== @@ -10870,22 +10806,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -reduce-reducers@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c" - integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw== - -redux-actions@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e" - integrity sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw== - dependencies: - invariant "^2.2.4" - just-curry-it "^3.1.0" - loose-envify "^1.4.0" - reduce-reducers "^0.4.3" - to-camel-case "^1.0.0" - redux-logger@^3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" @@ -10905,7 +10825,7 @@ redux-saga@^1.1.3: dependencies: "@redux-saga/core" "^1.1.3" -redux@^4.0.0, redux@^4.0.4, redux@^4.0.5: +redux@^4.0.4, redux@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== @@ -11276,6 +11196,8 @@ rxjs@^6.5.3: version "6.5.4" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + dependencies: + tslib "^1.9.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" @@ -11604,10 +11526,6 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -"smooth-dnd@https://github.com/rcdexta/smooth-dnd": - version "0.6.3" - resolved "https://github.com/rcdexta/smooth-dnd#f13924c67bf6ffe4613d97bb1ee83f11d364eb1e" - snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -12056,7 +11974,7 @@ style-loader@1.1.3: loader-utils "^1.2.3" schema-utils "^2.6.4" -"styled-components@>= 4.0", styled-components@^5.0.1: +styled-components@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.0.1.tgz#57782a6471031abefb2db5820a1876ae853bc619" integrity sha512-E0xKTRIjTs4DyvC1MHu/EcCXIj6+ENCP8hP01koyoADF++WdBUOrSGwU1scJRw7/YaYOhDvvoad6VlMG+0j53A== @@ -12310,23 +12228,11 @@ to-arraybuffer@^1.0.0: resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= -to-camel-case@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46" - integrity sha1-GlYFSy+daWKYzmamCJcyK29CPkY= - dependencies: - to-space-case "^1.0.0" - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-no-case@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a" - integrity sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo= - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -12359,13 +12265,6 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-space-case@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17" - integrity sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc= - dependencies: - to-no-case "^1.0.0" - toggle-selection@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"