diff --git a/front/package-lock.json b/front/package-lock.json index 24f701e54..5475bfb9d 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -11,22 +11,32 @@ "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", + "@fullcalendar/daygrid": "^6.1.9", + "@fullcalendar/interaction": "^6.1.9", + "@fullcalendar/react": "^6.1.9", + "@fullcalendar/timegrid": "^6.1.9", "@mui/icons-material": "^5.14.15", - - - "@mui/x-charts": "^6.18.1", - "@mui/material": "^5.14.17", "@mui/styles": "^5.14.17", - + "@mui/x-charts": "^6.18.1", + "@mui/x-date-pickers": "^5.0.12", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "@types/react-big-calendar": "^1.8.4", "bootstrap": "^5.3.2", + "chart.js": "^4.4.0", + "date-fns": "^2.30.0", + "fullcalendar": "^6.1.9", "react": "^18.2.0", + "react-big-calendar": "^1.8.2", "react-bootstrap": "^2.8.0", "react-bootstrap-calendar": "^0.0.3", + "react-chartjs-2": "^5.2.0", + "react-colorful": "^5.6.1", + "react-datepicker": "^4.21.0", "react-dom": "^18.2.0", + "react-modal": "^3.16.1", "react-notifications-menu": "^1.0.6", "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", @@ -2206,6 +2216,75 @@ "postcss-selector-parser": "^6.0.10" } }, + "node_modules/@date-io/core": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.17.0.tgz", + "integrity": "sha512-+EQE8xZhRM/hsY0CDTVyayMDDY5ihc4MqXCrPxooKw19yAzUIC6uUqsZeaOFNL9YKTNxYKrJP5DFgE8o5xRCOw==" + }, + "node_modules/@date-io/date-fns": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.17.0.tgz", + "integrity": "sha512-L0hWZ/mTpy3Gx/xXJ5tq5CzHo0L7ry6KEO9/w/JWiFWFLZgiNVo3ex92gOl3zmzjHqY/3Ev+5sehAr8UnGLEng==", + "dependencies": { + "@date-io/core": "^2.17.0" + }, + "peerDependencies": { + "date-fns": "^2.0.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + } + } + }, + "node_modules/@date-io/dayjs": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/dayjs/-/dayjs-2.17.0.tgz", + "integrity": "sha512-Iq1wjY5XzBh0lheFA0it6Dsyv94e8mTiNR8vuTai+KopxDkreL3YjwTmZHxkgB7/vd0RMIACStzVgWvPATnDCA==", + "dependencies": { + "@date-io/core": "^2.17.0" + }, + "peerDependencies": { + "dayjs": "^1.8.17" + }, + "peerDependenciesMeta": { + "dayjs": { + "optional": true + } + } + }, + "node_modules/@date-io/luxon": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/luxon/-/luxon-2.17.0.tgz", + "integrity": "sha512-l712Vdm/uTddD2XWt9TlQloZUiTiRQtY5TCOG45MQ/8u0tu8M17BD6QYHar/3OrnkGybALAMPzCy1r5D7+0HBg==", + "dependencies": { + "@date-io/core": "^2.17.0" + }, + "peerDependencies": { + "luxon": "^1.21.3 || ^2.x || ^3.x" + }, + "peerDependenciesMeta": { + "luxon": { + "optional": true + } + } + }, + "node_modules/@date-io/moment": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/moment/-/moment-2.17.0.tgz", + "integrity": "sha512-e4nb4CDZU4k0WRVhz1Wvl7d+hFsedObSauDHKtZwU9kt7gdYEAzKgnrSCTHsEaXrDumdrkCYTeZ0Tmyk7uV4tw==", + "dependencies": { + "@date-io/core": "^2.17.0" + }, + "peerDependencies": { + "moment": "^2.24.0" + }, + "peerDependenciesMeta": { + "moment": { + "optional": true + } + } + }, "node_modules/@emotion/babel-plugin": { "version": "11.11.0", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", @@ -2466,6 +2545,70 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.6.tgz", "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" }, + "node_modules/@fullcalendar/core": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.9.tgz", + "integrity": "sha512-eeG+z9BWerdsU9Ac6j16rpYpPnE0wxtnEHiHrh/u/ADbGTR3hCOjCD9PxQOfhOTHbWOVs7JQunGcksSPu5WZBQ==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.9.tgz", + "integrity": "sha512-o/6joH/7lmVHXAkbaa/tUbzWYnGp/LgfdiFyYPkqQbjKEeivNZWF1WhHqFbhx0zbFONSHtrvkjY2bjr+Ef2quQ==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.9.tgz", + "integrity": "sha512-I3FGnv0kKZpIwujg3HllbKrciNjTqeTYy3oJG226oAn7lV6wnrrDYMmuGmA0jPJAGN46HKrQqKN7ItxQRDec4Q==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, + "node_modules/@fullcalendar/list": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.9.tgz", + "integrity": "sha512-OCKdC1Gz26cJ5QsXdQyXVyzVu23ypT2xzyAR+Wc8jEytcJLWXw2a914m/MVax8n8EHuaIYY2exhsy/eaSU0XNA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, + "node_modules/@fullcalendar/multimonth": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/multimonth/-/multimonth-6.1.9.tgz", + "integrity": "sha512-YpH1NL6RzdM1wO2nFJ3pNMo9xhd6i2WuE+e7SnGi7q1lO+ZZ77h5Fja5JKcpuIQUFHpi+m6vTzihIV8DT44NnQ==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.9" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, + "node_modules/@fullcalendar/react": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/react/-/react-6.1.9.tgz", + "integrity": "sha512-ioxu0V++pYz2u/N1LL1V8DkMyiKGRun0gMAll2tQz3Kzi3r9pTwncGKRb1zO8h0e+TrInU08ywk/l5lBwp7eog==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.9", + "react": "^16.7.0 || ^17 || ^18", + "react-dom": "^16.7.0 || ^17 || ^18" + } + }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@fullcalendar/timegrid/-/timegrid-6.1.9.tgz", + "integrity": "sha512-le7UV05wVE1Trdr054kgJXTwa+A1pEI8nlCBnPWdcyrL+dTLoPvQ4AWEVCnV7So+4zRYaCqnqGXfCJsj0RQa0g==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.9" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.9" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.10", "license": "Apache-2.0", @@ -3243,6 +3386,11 @@ "version": "1.4.14", "license": "MIT" }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", "license": "MIT" @@ -3608,6 +3756,72 @@ } } }, + "node_modules/@mui/x-date-pickers": { + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.12.tgz", + "integrity": "sha512-HpiPE4nkqlklilKAxUQpf3tecJEDaTIBRRVTGk9GMgpkwli7Cv+5OGn6aSxG5ckMZdiQ/NT1L9kOcm0Bi9Gqjw==", + "dependencies": { + "@babel/runtime": "^7.18.9", + "@date-io/core": "^2.15.0", + "@date-io/date-fns": "^2.15.0", + "@date-io/dayjs": "^2.15.0", + "@date-io/luxon": "^2.15.0", + "@date-io/moment": "^2.15.0", + "@mui/utils": "^5.10.3", + "@types/react-transition-group": "^4.4.5", + "clsx": "^1.2.1", + "prop-types": "^15.7.2", + "react-transition-group": "^4.4.5", + "rifm": "^0.12.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui" + }, + "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", + "@mui/material": "^5.4.1", + "@mui/system": "^5.4.1", + "date-fns": "^2.25.0", + "dayjs": "^1.10.7", + "luxon": "^1.28.0 || ^2.0.0 || ^3.0.0", + "moment": "^2.29.1", + "react": "^17.0.2 || ^18.0.0", + "react-dom": "^17.0.2 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + }, + "date-fns": { + "optional": true + }, + "dayjs": { + "optional": true + }, + "luxon": { + "optional": true + }, + "moment": { + "optional": true + } + } + }, + "node_modules/@mui/x-date-pickers/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "license": "MIT", @@ -4297,6 +4511,11 @@ "@types/node": "*" } }, + "node_modules/@types/date-arithmetic": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@types/date-arithmetic/-/date-arithmetic-4.1.4.tgz", + "integrity": "sha512-p9eZ2X9B80iKiTW4ukVj8B4K6q9/+xFtQ5MGYA5HWToY9nL4EkhV9+6ftT2VHpVMEZb5Tv00Iel516bVdO+yRw==" + }, "node_modules/@types/eslint": { "version": "8.44.1", "license": "MIT", @@ -4461,6 +4680,16 @@ "csstype": "^3.0.2" } }, + "node_modules/@types/react-big-calendar": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/@types/react-big-calendar/-/react-big-calendar-1.8.4.tgz", + "integrity": "sha512-hmobr37m9b4qw3jvGNQQL4u6KzmKeDJUUmMF4X5Y3FY4azKqVASSe1Rmo5a2iUNKhSfNKtwpWNMYdER9tn2rgg==", + "dependencies": { + "@types/date-arithmetic": "*", + "@types/prop-types": "*", + "@types/react": "*" + } + }, "node_modules/@types/react-dom": { "version": "18.2.7", "license": "MIT", @@ -5896,6 +6125,17 @@ "node": ">=10" } }, + "node_modules/chart.js": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.0.tgz", + "integrity": "sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=7" + } + }, "node_modules/check-types": { "version": "11.2.2", "license": "MIT" @@ -6788,6 +7028,31 @@ "node": ">=10" } }, + "node_modules/date-arithmetic": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-arithmetic/-/date-arithmetic-4.1.0.tgz", + "integrity": "sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg==" + }, + "node_modules/date-fns": { + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "dependencies": { + "@babel/runtime": "^7.21.0" + }, + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } + }, + "node_modules/dayjs": { + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + }, "node_modules/debug": { "version": "4.3.4", "license": "MIT", @@ -7938,6 +8203,11 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" + }, "node_modules/exit": { "version": "0.1.2", "engines": { @@ -8401,6 +8671,19 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/fullcalendar": { + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/fullcalendar/-/fullcalendar-6.1.9.tgz", + "integrity": "sha512-b3y22EqOtV1cGjOlPE6krs1CwQA/8p5lsylllp35tqDLOK7kLIXDQotpXgsDBY4qAKTgdiSauqzdkdvyrbjAgQ==", + "dependencies": { + "@fullcalendar/core": "~6.1.9", + "@fullcalendar/daygrid": "~6.1.9", + "@fullcalendar/interaction": "~6.1.9", + "@fullcalendar/list": "~6.1.9", + "@fullcalendar/multimonth": "~6.1.9", + "@fullcalendar/timegrid": "~6.1.9" + } + }, "node_modules/function-bind": { "version": "1.1.1", "license": "MIT" @@ -8554,6 +8837,11 @@ "which": "bin/which" } }, + "node_modules/globalize": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/globalize/-/globalize-0.1.1.tgz", + "integrity": "sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==" + }, "node_modules/globals": { "version": "11.12.0", "license": "MIT", @@ -11574,6 +11862,11 @@ "version": "4.17.21", "license": "MIT" }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "license": "MIT" @@ -11618,6 +11911,14 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", + "engines": { + "node": ">=12" + } + }, "node_modules/lz-string": { "version": "1.5.0", "license": "MIT", @@ -11680,6 +11981,11 @@ "node": ">= 4.0.0" } }, + "node_modules/memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" + }, "node_modules/merge-descriptors": { "version": "1.0.1", "license": "MIT" @@ -11866,6 +12172,25 @@ "node": "*" } }, + "node_modules/moment-timezone": { + "version": "0.5.43", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz", + "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, + "node_modules/moment-timezone/node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.2", "license": "MIT" @@ -13588,6 +13913,15 @@ "version": "4.2.0", "license": "MIT" }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "license": "MIT", @@ -13833,6 +14167,49 @@ "node": ">=14" } }, + "node_modules/react-big-calendar": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.8.2.tgz", + "integrity": "sha512-L6OcmTGT198eD6VmaK/T6IE6SPYSV2lup//V25huCy3KLgONmEPQbX8/m3XnHYKqCEIoIyU8mzIsSmd8eXQVbw==", + "dependencies": { + "@babel/runtime": "^7.20.7", + "clsx": "^1.2.1", + "date-arithmetic": "^4.1.0", + "dayjs": "^1.11.7", + "dom-helpers": "^5.2.1", + "globalize": "^0.1.1", + "invariant": "^2.2.4", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "luxon": "^3.2.1", + "memoize-one": "^6.0.0", + "moment": "^2.29.4", + "moment-timezone": "^0.5.40", + "prop-types": "^15.8.1", + "react-overlays": "^5.2.1", + "uncontrollable": "^7.2.1" + }, + "peerDependencies": { + "react": "^16.14.0 || ^17 || ^18", + "react-dom": "^16.14.0 || ^17 || ^18" + } + }, + "node_modules/react-big-calendar/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/react-big-calendar/node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "engines": { + "node": "*" + } + }, "node_modules/react-bootstrap": { "version": "2.8.0", "license": "MIT", @@ -13873,6 +14250,41 @@ "react": "~0.11.2" } }, + "node_modules/react-chartjs-2": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-5.2.0.tgz", + "integrity": "sha512-98iN5aguJyVSxp5U3CblRLH67J8gkfyGNbiK3c+l1QI/G4irHMPQw44aEPmjVag+YKTyQ260NcF82GTQ3bdscA==", + "peerDependencies": { + "chart.js": "^4.1.1", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/react-colorful": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz", + "integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==", + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/react-datepicker": { + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.21.0.tgz", + "integrity": "sha512-z0DtuRrKMz9i7dcTusW29VacbM9pn08g1yw0cG+Y5GpodJDxSWv7zUMxl3IwKN9Ap/AMphiepvmT5P+iNCgEiA==", + "dependencies": { + "@popperjs/core": "^2.11.8", + "classnames": "^2.2.6", + "date-fns": "^2.30.0", + "prop-types": "^15.7.2", + "react-onclickoutside": "^6.13.0", + "react-popper": "^2.3.0" + }, + "peerDependencies": { + "react": "^16.9.0 || ^17 || ^18", + "react-dom": "^16.9.0 || ^17 || ^18" + } + }, "node_modules/react-dev-utils": { "version": "12.0.1", "license": "MIT", @@ -13928,6 +14340,11 @@ "version": "6.0.11", "license": "MIT" }, + "node_modules/react-fast-compare": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", + "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" + }, "node_modules/react-is": { "version": "17.0.2", "license": "MIT" @@ -13936,6 +14353,24 @@ "version": "3.0.4", "license": "MIT" }, + "node_modules/react-modal": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", + "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==", + "dependencies": { + "exenv": "^1.2.0", + "prop-types": "^15.7.2", + "react-lifecycles-compat": "^3.0.0", + "warning": "^4.0.3" + }, + "engines": { + "node": ">=8" + }, + "peerDependencies": { + "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", + "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" + } + }, "node_modules/react-notifications-menu": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/react-notifications-menu/-/react-notifications-menu-1.0.6.tgz", @@ -13955,6 +14390,52 @@ "react-dom": "^15.0.0 || ^16.0.0" } }, + "node_modules/react-onclickoutside": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", + "funding": { + "type": "individual", + "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" + }, + "peerDependencies": { + "react": "^15.5.x || ^16.x || ^17.x || ^18.x", + "react-dom": "^15.5.x || ^16.x || ^17.x || ^18.x" + } + }, + "node_modules/react-overlays": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.2.1.tgz", + "integrity": "sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==", + "dependencies": { + "@babel/runtime": "^7.13.8", + "@popperjs/core": "^2.11.6", + "@restart/hooks": "^0.4.7", + "@types/warning": "^3.0.0", + "dom-helpers": "^5.2.0", + "prop-types": "^15.7.2", + "uncontrollable": "^7.2.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "react": ">=16.3.0", + "react-dom": ">=16.3.0" + } + }, + "node_modules/react-popper": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", + "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==", + "dependencies": { + "react-fast-compare": "^3.0.1", + "warning": "^4.0.2" + }, + "peerDependencies": { + "@popperjs/core": "^2.0.0", + "react": "^16.8.0 || ^17 || ^18", + "react-dom": "^16.8.0 || ^17 || ^18" + } + }, "node_modules/react-refresh": { "version": "0.11.0", "license": "MIT", @@ -14344,6 +14825,14 @@ "node": ">=0.10.0" } }, + "node_modules/rifm": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/rifm/-/rifm-0.12.1.tgz", + "integrity": "sha512-OGA1Bitg/dSJtI/c4dh90svzaUPt228kzFsUkJbtA2c964IqEAwWXeL9ZJi86xWv3j5SMqRvGULl7bA6cK0Bvg==", + "peerDependencies": { + "react": ">=16.8" + } + }, "node_modules/rimraf": { "version": "3.0.2", "license": "ISC", diff --git a/front/package.json b/front/package.json index c87d01431..262dc1e57 100644 --- a/front/package.json +++ b/front/package.json @@ -6,21 +6,32 @@ "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", + "@fullcalendar/daygrid": "^6.1.9", + "@fullcalendar/interaction": "^6.1.9", + "@fullcalendar/react": "^6.1.9", + "@fullcalendar/timegrid": "^6.1.9", "@mui/icons-material": "^5.14.15", - - "@mui/x-charts": "^6.18.1", - "@mui/material": "^5.14.17", "@mui/styles": "^5.14.17", - + "@mui/x-charts": "^6.18.1", + "@mui/x-date-pickers": "^5.0.12", "@testing-library/jest-dom": "^5.17.0", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "@types/react-big-calendar": "^1.8.4", "bootstrap": "^5.3.2", + "chart.js": "^4.4.0", + "date-fns": "^2.30.0", + "fullcalendar": "^6.1.9", "react": "^18.2.0", + "react-big-calendar": "^1.8.2", "react-bootstrap": "^2.8.0", "react-bootstrap-calendar": "^0.0.3", + "react-chartjs-2": "^5.2.0", + "react-colorful": "^5.6.1", + "react-datepicker": "^4.21.0", "react-dom": "^18.2.0", + "react-modal": "^3.16.1", "react-notifications-menu": "^1.0.6", "react-router-dom": "^6.15.0", "react-scripts": "5.0.1", diff --git a/front/public/assets/bootstrap/css/bootstrap.min.css b/front/public/assets/bootstrap/css/bootstrap.min.css index 66fdf4c48..8a7defa7a 100644 --- a/front/public/assets/bootstrap/css/bootstrap.min.css +++ b/front/public/assets/bootstrap/css/bootstrap.min.css @@ -13089,3 +13089,5 @@ footer.sticky-footer .copyright { body.sidebar-toggled footer.sticky-footer { width: 100%; } + + diff --git a/front/public/assets/css/styles.min.css b/front/public/assets/css/styles.min.css index f2fd04c5b..90a0cd986 100644 --- a/front/public/assets/css/styles.min.css +++ b/front/public/assets/css/styles.min.css @@ -76,3 +76,26 @@ width: 60%; justify-content: end; } + +@media screen { + #printSection { + display: none; + } +} + +@media print { + body * { + visibility: hidden; + } + + #printSection, + #printSection * { + visibility: visible; + } + + #printSection { + position: absolute; + left: 0; + top: 0; + } +} diff --git a/front/public/index.html b/front/public/index.html index 94603b0da..8f08b8201 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -3,7 +3,7 @@ - + - + +
diff --git a/front/src/App.js b/front/src/App.js index ef673b1ab..99f184210 100644 --- a/front/src/App.js +++ b/front/src/App.js @@ -1,46 +1,21 @@ -import LogIn_Page from './LogIn_Page'; +import LoginPage from "./LoginPage"; function App() { -<<<<<<< HEAD - useEffect(() => { - fetch("/api") - .then((res) => res.json()) - .then((data) => { - setData(data); - }) - },[]) - -======= ->>>>>>> main - return ( - /* BODY CONTAINER */ -
+ /* BODY CONTAINER */ +
+ {/* MAIN CONTENT */} - - - {/* MAIN CONTENT */} - - - - + -<<<<<<< HEAD - -
-
-======= - ->>>>>>> main - - {/* END MAIN CONTENT */} -
+ {/* END MAIN CONTENT */} - /* END BODY CONTAINER */ + + /* END BODY CONTAINER */ ); } diff --git a/front/src/Bills/Bills_Payments.js b/front/src/Bills/BillsPayments.js similarity index 97% rename from front/src/Bills/Bills_Payments.js rename to front/src/Bills/BillsPayments.js index 2165659f1..d70658747 100644 --- a/front/src/Bills/Bills_Payments.js +++ b/front/src/Bills/BillsPayments.js @@ -2,28 +2,30 @@ import Footer from "../Footer"; import Header from "../Header"; import Navbar from "../Navbar"; -var Bill_Payment = () => { - function print_body() { - document.getElementById("btnPrint").onclick = function () { - printElement(document.getElementById("print_body")); - }; - } +var BillPayment = () => { + // document.getElementById("btnPrint").onclick = function () { + // printElement(document.getElementById("print_body")); + // }; - function printElement(elem) { - var domClone = elem.cloneNode(true); + function btnPrint() { + printElement(document.getElementById("printBody")) + + } - var $printSection = document.getElementById("printSection"); + function printElement(elem) { + var domClone = elem.cloneNode(true); + var $printSection = document.getElementById("printSection"); - if (!$printSection) { - var $printSection = document.createElement("div"); - $printSection.id = "printSection"; - document.body.appendChild($printSection); - } + if (!$printSection) { + var $printSection = document.createElement("div"); + $printSection.id = "printSection"; + document.body.appendChild($printSection); + } - $printSection.innerHTML = ""; - $printSection.appendChild(domClone); - window.print(); - } + $printSection.innerHTML = ""; + $printSection.appendChild(domClone); + window.print(); + } return (
@@ -67,11 +69,8 @@ var Bill_Payment = () => { { marginRight: "-2px", marginLeft: "12px", }} - href="/List_of_Pricings"> + href="/ListofPricings"> List of Pricings
@@ -264,7 +263,7 @@ var Bill_Payment = () => {
@@ -486,7 +485,7 @@ var Bill_Payment = () => { id="btnPrint" type="button" className="btn btn-outline-secondary m-4" - onclick={print_body}> + onClick={btnPrint}> Print Receipt
@@ -1048,8 +1047,7 @@ var Bill_Payment = () => {
@@ -1068,4 +1066,4 @@ var Bill_Payment = () => { ); }; -export default Bill_Payment; +export default BillPayment; diff --git a/front/src/Bills/List_of_Pricings.js b/front/src/Bills/ListofPricings.js similarity index 99% rename from front/src/Bills/List_of_Pricings.js rename to front/src/Bills/ListofPricings.js index ea2a4c646..2ccfa2e28 100644 --- a/front/src/Bills/List_of_Pricings.js +++ b/front/src/Bills/ListofPricings.js @@ -5,7 +5,7 @@ import { Button, Table } from "react-bootstrap"; import "bootstrap/dist/css/bootstrap.min.css"; import { Link, useNavigate } from "react-router-dom"; import sample_cust from "../Cust_pages/Cust_list"; -var List_of_Pricings = () => { +var ListofPricings = () => { const history = useNavigate(); // const handleEdit = (id, Name, Address, Email, Contact) => { @@ -406,4 +406,4 @@ var List_of_Pricings = () => { ); }; -export default List_of_Pricings; +export default ListofPricings; diff --git a/front/src/Cust_pages/Create_Customer.js b/front/src/Cust_pages/CreateCustomer.js similarity index 98% rename from front/src/Cust_pages/Create_Customer.js rename to front/src/Cust_pages/CreateCustomer.js index b23282506..27ed93d78 100644 --- a/front/src/Cust_pages/Create_Customer.js +++ b/front/src/Cust_pages/CreateCustomer.js @@ -7,7 +7,7 @@ import { Link, useNavigate } from "react-router-dom"; import sample_cust from "./Cust_list"; import { Tab, Tabs } from "react-bootstrap"; -var Create_customer = () => { +var CreateCustomer = () => { const [activeStep, setActiveStep] = useState(0); const handleTabClick = (step) => { @@ -161,4 +161,4 @@ var Create_customer = () => { ); }; -export default Create_customer; +export default CreateCustomer; diff --git a/front/src/Cust_pages/Edit_Cust.js b/front/src/Cust_pages/EditCust.js similarity index 98% rename from front/src/Cust_pages/Edit_Cust.js rename to front/src/Cust_pages/EditCust.js index 2b3f2966b..088eb0096 100644 --- a/front/src/Cust_pages/Edit_Cust.js +++ b/front/src/Cust_pages/EditCust.js @@ -7,7 +7,7 @@ import { Link, useNavigate } from "react-router-dom"; import sample_cust from "./Cust_list"; import { Tab, Tabs } from "react-bootstrap"; -var Create_customer = () => { +var EditCustomer = () => { const [activeStep, setActiveStep] = useState(0); const handleTabClick = (step) => { @@ -154,4 +154,4 @@ var Create_customer = () => { ); }; -export default Create_customer; +export default EditCustomer; diff --git a/front/src/Dashboard/DCashier.js b/front/src/Dashboard/DCashier.js new file mode 100644 index 000000000..49fc7f8d2 --- /dev/null +++ b/front/src/Dashboard/DCashier.js @@ -0,0 +1,219 @@ +import Header from "../Header"; +import Navbar from "../Navbar"; +import React, { useState } from "react"; +import FullCalendar from "@fullcalendar/react"; +import dayGridPlugin from "@fullcalendar/daygrid"; +import interactionPlugin from "@fullcalendar/interaction"; +import "bootstrap/dist/css/bootstrap.min.css"; // Import Bootstrap CSS +import { Modal, Button } from "react-bootstrap"; + +class DCashier extends React.Component { + + state = { + modalIsOpen: false, + eventInfo: { title: "", start: "" }, + }; + + handleEventClick = (arg) => { + this.setState({ + eventInfo: { + title: arg.event.title, + start: arg.event.start.toISOString(), // Convert date to string + }, + showModal: true, + }); + }; + + closeModal = () => { + this.setState({ showModal: false }); + }; +render(){ + return ( +
+
+ +
+
+
+
+
+

Dashboard

+
+ +
+
+
+
+
+

Quotations

+
+
+
+
+
+ Total +
+
+ 8 +
+
+
+
+ Accepted +
+
+ 8 +
+
+
+
+ To invoice +
+
+ 8 +
+
+
+
+ Not Completed +
+
+ 8 +
+
+
+ Completed +
+
+ 8 +
+
+
+
+
+
+
+ +
+
+
+

Purchased History

+
+
+ + + + + + + + + + + + + + + + + + + + + +
IdNameBrandUnitQuantityTotal Amount
1213BatteryAcer123-jad12$908
+
+
+
+
+
+
+ +
+
+
+
+
Delivered Items
+

Text

+
+
+
+
+
+
+
Purchased Item
+

Text

+
+
+
+
+
+
+
With warranty
+

Text

+
+
+
+
+
+
+
Without warranty
+

Text

+
+
+
+
+
+
+
From OCCC
+

Text

+
+
+
+
+ +
+
+
+
+
+ + + + + {this.state.eventInfo.title} + + +

Start Date: {this.state.eventInfo.start}

+ {/* Add other event information or content here */} + + + + + +
+
+
+
+
+
+
+
+
+
+
+ ); + } +}; + +export default DCashier; diff --git a/front/src/Dashboard/DPurchasingOfficer.js b/front/src/Dashboard/DPurchasingOfficer.js new file mode 100644 index 000000000..6a94de22f --- /dev/null +++ b/front/src/Dashboard/DPurchasingOfficer.js @@ -0,0 +1,189 @@ +import Header from "../Header"; +import Navbar from "../Navbar"; +import * as React from "react"; +import { Line } from "react-chartjs-2"; +import { + Chart as chartjs, + LineElement, + CategoryScale, + LinearScale, + PointElement, +} from "chart.js"; + +chartjs.register(LineElement, CategoryScale, LinearScale, PointElement); +var DPurchasingOfficer = () => { + const data = { + labels: [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ], + datasets: [ + { + labels: "Mae Mae", + data: [2, 1, 3, 1, 2, 1, 2, 1, 2, 1, 2, 1], + backgroundColor: "orange", + borderColor: "orange", + PointBorderColor: "blue", + fill: true, + tension: 0.5, + }, + ], + }; + + const options = { + plugins: {}, + scales: { + y: {}, + }, + }; + + + return ( +
+
+ +
+
+
+
+
+

Dashboard

+
+
+
+
+
+
+
+
+ Purchased Items +
+
+ 2 + +
+
+
+
+
+
+
+
+
+
+
+
+ Item Requests +
+
+ 3 + +
+
+
+
+
+
+
+
+
+
+
+
+ Delivered +
+
+
+
+ 0 + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancelled +
+
+ 0 + +
+
+
+
+
+
+
+ {/* Start: Chart */} +
+
+
+
+
Monthly Purchased
+ +
+
+
+ +
+
+
+
+
+
+
+ {/* End: Chart */} +
+
+
+
+
+
+
Monthly Requests
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+ ); +}; + +export default DPurchasingOfficer; diff --git a/front/src/Dashboard/DTechnician.js b/front/src/Dashboard/DTechnician.js new file mode 100644 index 000000000..6e3ad353d --- /dev/null +++ b/front/src/Dashboard/DTechnician.js @@ -0,0 +1,219 @@ +import Header from "../Header"; +import Navbar from "../Navbar"; +import * as React from "react"; +import { Badge } from "react-bootstrap"; +import { Line } from "react-chartjs-2"; +import { + Chart as chartjs, + LineElement, + CategoryScale, + LinearScale, + PointElement, +} from 'chart.js'; + +chartjs.register ( + LineElement, + CategoryScale, + LinearScale, + PointElement, +) +var DTechnician = () => { + + const data = { + labels: ['Jan','Feb','Mar', 'Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'], + datasets: [{ + labels: 'Mae Mae', + data: [2,1,3,1,2,1,2,1,2,1,2,1], + backgroundColor: 'orange', + borderColor: 'orange', + PointBorderColor: 'blue', + fill: true, + tension: 0.5 + }] + } + + const options = { + plugins: { + }, + scales: { + y:{ + + } + } + + } + + return ( +
+
+ +
+
+
+
+
+

Dashboard

+
+
+
+
+
+
+
+
+ Total Service Done +
+
+ 2 + +
+
+
+
+
+
+
+
+
+
+
+
+ Reseolved Repairs +
+
+ 3 + +
+
+
+
+
+
+
+
+
+
+
+
+ Un-repairable +
+
+
+
+ 0 + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancelled +
+
+ 0 + +
+
+
+
+
+
+
+ {/* Start: Chart */} +
+
+
+
+
Metrics
+ +
+
+ +
+
+
+
+
+
+
+ {/* End: Chart */} +
+
+
+
+
Order History
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Order IDCustomerRepair DateAmountStatus
12123 + Airi Satou + P09/14/2023$90Completed
+
+
+
+
+
+
+
+
+ ); +}; + +export default DTechnician; diff --git a/front/src/Dashboard/D_Cashier.js b/front/src/Dashboard/D_Cashier.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/front/src/Dashboard/D_PurchasingOfficer.js b/front/src/Dashboard/D_PurchasingOfficer.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/front/src/Dashboard/D_Technician.js b/front/src/Dashboard/D_Technician.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/front/src/Dashboard/Dashboard.js b/front/src/Dashboard/Dashboard.js index 3dcda4bb4..de3c2ad8c 100644 --- a/front/src/Dashboard/Dashboard.js +++ b/front/src/Dashboard/Dashboard.js @@ -6,390 +6,382 @@ const Dashboard = () => { return (
+ +
+
- -
- -
- -
-
-
-
-
-
-
- Earnings (monthly) +
+
+

Dashboard

+
+
+
+
+
+
+
+
+ Earnings (monthly) +
+
+ $40,000 +
-
- $40,000 +
+
-
- -
-
-
-
-
-
-
-
- Earnings (annual) +
+
+
+
+
+
+ Earnings (annual) +
+
+ $215,000 +
-
- $215,000 +
+
-
- -
-
-
-
-
-
-
-
- Tasks -
-
-
-
- 50% -
+
+
+
+
+
+
+ Tasks
-
-
-
- 50% +
+
+
+ 50% +
+
+
+
+
+ 50% +
-
-
- +
+ +
-
-
-
-
-
-
-
- Pending Requests +
+
+
+
+
+
+ Pending Requests +
+
+ 18 +
-
- 18 +
+
-
- -
-
- {/* Start: Chart */} -
-
-
-
-
Earnings Overview
-
- -
-

dropdown header:

- -  Action - - -  Another action - -
- -  Something else here - + {/* Start: Chart */} +
+
+
+
+
Earnings Overview
+ -
-
-
- +
+
+
-
-
-
-
-
Revenue Sources
-
- -
-

dropdown header:

- -  Action - - -  Another action - -
- -  Something else here - +
+
+
+
Revenue Sources
+ -
-
-
- -
-
- - -  Direct - - - -  Social - - - -  Refferal - +
+
+
+
+ + +  Direct + + + +  Social + + + +  Refferal + +
-
- {/* End: Chart */} -
-
-
-
-
Projects
-
-
-

- Server migration20% -

-
-
- 20% -
+ {/* End: Chart */} +
+
+
+
+
Projects
-

- Sales tracking40% -

-
-
- 40% +
+

+ Server migration20% +

+
+
+ 20% +
-
-

- Customer Database60% -

-
-
- 60% +

+ Sales tracking40% +

+
+
+ 40% +
-
-

- Payout Details80% -

-
-
- 80% +

+ Customer Database60% +

+
+
+ 60% +
-
-

- Account setupComplete! -

-
-
- 100% +

+ Payout Details80% +

+
+
+ 80% +
+
+

+ Account setupComplete! +

+
+
+ 100% +
-
-
-
-
Todo List
-
-
    -
  • -
    -
    -
    - Lunch meeting -
    - 10:30 AM -
    -
    -
    - -
    • -
  • -
    -
    -
    - Lunch meeting -
    - 11:30 AM -
    -
    -
    - -
    -
    -
    • -
  • -
    -
    -
    - Lunch meeting -
    - 12:30 AM +
    • +
  • +
    +
    +
    + Lunch meeting +
    + 11:30 AM +
    +
    +
    + +
    +
    -
    -
    - -
    • +
  • +
    +
    +
    + Lunch meeting +
    + 12:30 AM +
    +
    +
    + +
    -
- - + + +
-
-
-
-
-
-
-

Primary

-

#4e73df

+
+
+
+
+
+

Primary

+

#4e73df

+
-
-
-
-
-

Success

-

#1cc88a

+
+
+
+

Success

+

#1cc88a

+
-
-
-
-
-

Info

-

#36b9cc

+
+
+
+

Info

+

#36b9cc

+
-
-
-
-
-

Warning

-

#f6c23e

+
+
+
+

Warning

+

#f6c23e

+
-
-
-
-
-

Danger

-

#e74a3b

+
+
+
+

Danger

+

#e74a3b

+
-
-
-
-
-

Secondary

-

#858796

+
+
+
+

Secondary

+

#858796

+
@@ -398,9 +390,7 @@ const Dashboard = () => {
-
- - +
); }; diff --git a/front/src/Header.js b/front/src/Header.js index ece9a9fa4..8f882827d 100644 --- a/front/src/Header.js +++ b/front/src/Header.js @@ -88,8 +88,8 @@ const Header = () => {
console.log("Clicked") }, @@ -149,7 +149,7 @@ const Header = () => { My profile - + diff --git a/front/src/JobOrder_pages/Deliveries.js b/front/src/JobOrder_pages/Deliveries.js index e39d8d89e..2314eb539 100644 --- a/front/src/JobOrder_pages/Deliveries.js +++ b/front/src/JobOrder_pages/Deliveries.js @@ -1,600 +1,77 @@ -import Navbar from "../Navbar"; -import Header from "../Header"; -import "bootstrap/dist/css/bootstrap.min.css"; import React, { useState } from "react"; +import FullCalendar from "@fullcalendar/react"; +import dayGridPlugin from "@fullcalendar/daygrid"; +import interactionPlugin from "@fullcalendar/interaction"; +import "bootstrap/dist/css/bootstrap.min.css"; // Import Bootstrap CSS +import { Modal, Button } from "react-bootstrap"; import Header from "../Header"; +import Navbar from "../Navbar"; +////Simple M +class Deliveries extends React.Component { + state = { + modalIsOpen: false, + eventInfo: { title: "", start: "" }, + }; -var Deliveries = () => { - - - const [typeinput,setInput] = useState(); - - function getType(event){ - let k = event.target.value; - k === "po"? - setInput("Purchase Order ID") : - setInput("Order ID") - } - - const [items,setItems] = useState([]); - const [numitems,setNumItems] = useState(0); - const addItem = () => { - setNumItems(numitems+1); - var i = numitems+1; - const newItem = <> -
-
- -
-
- -
-
- - setItems([...items,newItem]); - } - - const deleteItem = (event) =>{ - setNumItems(numitems-1); - document.getElementById(event.target).remove(); - } - - return ( -
-
- -
-
-
-
-
-
-
-

- Jobs > - - View Deliveries - -

-
-
-
-
-
-
-
-
- - -
-
-
-
- {/* Start: Form Select - 12 Months without Month Numbers */} - - {/* End: Form Select - 12 Months without Month Numbers */} -
-
-
-
- {/* Start: Bootstrap Calendar */} -
-
- {/* Calendar */} -
-
- -

- December 2019 -

-
-

- No events for this day. -

-
    -
  1. Sun
    2. -
  2. Mon
    3. -
  3. Tue
    4. -
  4. Wed
    5. -
  5. Thu
    6. -
  6. Fri
    7. -
  7. Sat
    8. -
-
    -
  1. -
    1
    - - -
    2. -
  2. -
    2
    -
    3. -
  3. -
    3
    -
    4. -
  4. -
    4
    -
    5. -
  5. -
    5
    -
    6. -
  6. -
    6
    -
    7. -
  7. -
    7
    -
    8. -
  8. -
    8
    -
    9. -
  9. -
    9
    -
    10. -
  10. -
    10
    -
    11. -
  11. -
    11
    -
    12. -
  12. -
    12
    -
    13. -
  13. -
    13
    - - -
    14. -
  14. -
    14
    -
    15. -
  15. -
    15
    -
    16. -
  16. -
    16
    -
    17. -
  17. -
    17
    -
    18. -
  18. -
    18
    -
    19. -
  19. -
    19
    -
    20. -
  20. -
    20
    -
    21. -
  21. -
    21
    - - -
    22. -
  22. -
    22
    - - -
    23. -
  23. -
    23
    -
    24. -
  24. -
    24
    -
    25. -
  25. -
    25
    -
    26. -
  26. -
    26
    -
    27. -
  27. -
    27
    -
    28. -
  28. -
    28
    -
    29. -
  29. -
    29
    -
    30. -
  30. -
    30
    -
    31. -
  31. -
    31
    -
    32. -
  32. -
    1
    -
    33. -
  33. -
    2
    -
    34. -
  34. -
    3
    -
    35. -
  35. -
    4
    -
    36. -
-
-
-
- {/* End: Bootstrap Calendar */} - + handleEventClick = (arg) => { + this.setState({ + eventInfo: { + title: arg.event.title, + start: arg.event.start.toISOString(), // Convert date to string + }, + showModal: true, + }); + }; - {/* ADD DELIVERY */} -