diff --git a/Dockerfile b/Dockerfile index 1a50c20..76b0ebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Buile Step -FROM node:18.18-alpine AS builder +FROM node:20.9-alpine AS builder WORKDIR /usr/src/app @@ -21,7 +21,7 @@ RUN npm run build RUN npm prune --production # Run Step -FROM node:18.18-alpine AS runner +FROM node:20.9-alpine AS runner WORKDIR /usr/src/app diff --git a/assets/owner.options.js b/assets/owner.options.js index aecae60..7e503fc 100644 --- a/assets/owner.options.js +++ b/assets/owner.options.js @@ -1,7 +1,7 @@ export const OwnerOptions = [ - { key: "chonghak", text: "총학생회", value: "chonghak" }, { key: "dongyeon", text: "동아리연합회", value: "dongyeon" }, { key: "dormUnion", text: "생활관자치회", value: "dormUnion" }, + { key: "chonghak", text: "총학생회", value: "chonghak" }, { key: "saengna", text: "생각나눔", value: "saengna" }, { key: "others", text: "그 외", value: "others" }, ]; diff --git a/components/equipment/equipment.reservation.confirm.modal.jsx b/components/equipment/equipment.reservation.confirm.modal.jsx index 1e6519d..841da17 100644 --- a/components/equipment/equipment.reservation.confirm.modal.jsx +++ b/components/equipment/equipment.reservation.confirm.modal.jsx @@ -18,9 +18,9 @@ const EquipmentReservationConfirmModal = (props) => { {}, {withCredentials: true}) setOpen(false) window.location.reload() - } catch (e) { - alert('예약 승인/거절에 실패했습니다.') - console.log(e) + } catch (err) { + const errMsg = err.response.data.message; + alert(`예약 승인/거절에 실패했습니다.\n${errMsg}`); } } diff --git a/components/equipment/equipment.reservation.table.jsx b/components/equipment/equipment.reservation.table.jsx index 4740e81..ec7f254 100644 --- a/components/equipment/equipment.reservation.table.jsx +++ b/components/equipment/equipment.reservation.table.jsx @@ -4,72 +4,67 @@ import moment from 'moment' import EquipmentReservationConfirmModal from './equipment.reservation.confirm.modal' -const EquipmentReservationTable = (props) => { - const reservations = props.reservations - const start_idx = props.startIdx - +const EquipmentReservationTable = ({ reservations, startIdx }) => { return ( - <> - - - - idx. - 장비 목록 - 사용자 - 예약 제목 - 예약 기간 - 상태 - - - - { - reservations.map((reservation, idx) => - - {start_idx + idx + 1} - - { - reservation.equipments.map(equipment => { - return ( - - ) - }) - } - - {reservation.booker.name} - {reservation.title} - - - {moment(reservation.date, 'YYYYMMDD'). - format('YYYY년 MM월 DD일')} -
- {moment(reservation.start_time, 'HHmm'). - format('HH:mm')} -  ~  - {moment(reservation.end_time, 'HHmm'). - format('HH:mm')} -
-
- {reservation.status} - - } - />, - ) - } -
-
- + + + + idx. + 장비 목록 + 사용자 + 예약 제목 + 예약 기간 + 상태 + + + + { + reservations.map((reservation, idx) => + + {startIdx + idx + 1} + + { + reservation.equipments.map(equipment => { + return ( + + ) + }) + } + + {reservation.booker.name} + {reservation.title} + + + {moment(reservation.date, 'YYYYMMDD'). + format('YYYY년 MM월 DD일')} +
+ {moment(reservation.start_time, 'HHmm'). + format('HH:mm')} +  ~  + {moment(reservation.end_time, 'HHmm'). + format('HH:mm')} +
+
+ {reservation.status} + + } + />, + ) + } +
+
) } diff --git a/components/equipment/equipment.reservation.wait.table.jsx b/components/equipment/equipment.reservation.wait.table.jsx new file mode 100644 index 0000000..90df58b --- /dev/null +++ b/components/equipment/equipment.reservation.wait.table.jsx @@ -0,0 +1,82 @@ +import React from 'react' +import { Label, Table } from 'semantic-ui-react' +import moment from 'moment' +import EquipmentReservationConfirmModal + from './equipment.reservation.confirm.modal' + +const EquipmentReservationWaitTable = ({ reservations, startIdx }) => { + return ( + + + + idx. + 장비 목록 + 사용자 + 예약 제목 + 예약 기간 + 상태 + + + + { + reservations.map((reservation, idx) => { + + const start_datetime = moment( + `${reservation.date} ${reservation.start_time}`, 'YYYYMMDD HHmm') + const end_datetime = moment( + `${reservation.date} ${reservation.end_time}`, 'YYYYMMDD HHmm') + + const isOutdated = moment() > end_datetime; + const isNow = start_datetime <= moment() && moment() <= end_datetime; + + return ( + + {startIdx + idx + 1} + + { + reservation.equipments.map(equipment => { + return ( + + ) + }) + } + + {reservation.booker.name} + {reservation.title} + + + {moment(reservation.date, 'YYYYMMDD'). + format('YYYY년 MM월 DD일')} +
+ {moment(reservation.start_time, 'HHmm'). + format('HH:mm')} +  ~  + {moment(reservation.end_time, 'HHmm'). + format('HH:mm')} +
+
+ {reservation.status} + + } + /> + ) + }) + } +
+
+ ) +} + +export default EquipmentReservationWaitTable \ No newline at end of file diff --git a/components/place/place.reservation.confirm.modal.jsx b/components/place/place.reservation.confirm.modal.jsx index ccbc248..cc36002 100644 --- a/components/place/place.reservation.confirm.modal.jsx +++ b/components/place/place.reservation.confirm.modal.jsx @@ -16,9 +16,9 @@ const PlaceReservationConfirmModal = ({trigger, reservation}) => { {}, {withCredentials: true}) setOpen(false) window.location.reload() - } catch (e) { - alert('예약 승인/거절에 실패했습니다.') - console.log(e) + } catch (err) { + const errMsg = err.response.data.message; + alert(`예약 승인/거절에 실패했습니다.\n${errMsg}`); } } diff --git a/components/place/place.reservation.wait.table.jsx b/components/place/place.reservation.wait.table.jsx index b7a4377..2b10561 100644 --- a/components/place/place.reservation.wait.table.jsx +++ b/components/place/place.reservation.wait.table.jsx @@ -68,12 +68,16 @@ const PlaceReservationWaitTable = ({reservations}) => { { reservations.map((reservation, idx) => { - const reservation_end_datetime = moment( + const start_datetime = moment( + `${reservation.date} ${reservation.start_time}`, 'YYYYMMDD HHmm') + const end_datetime = moment( `${reservation.date} ${reservation.end_time}`, 'YYYYMMDD HHmm') - const isOutdated = moment() > reservation_end_datetime + + const isOutdated = moment() > end_datetime; + const isNow = start_datetime <= moment() && moment() <= end_datetime; return ( - + {idx + 1} {reservation.place.name} {reservation.booker.name} diff --git a/components/reservation/opening_hours.list.jsx b/components/reservation/opening_hours.list.jsx new file mode 100644 index 0000000..75afafd --- /dev/null +++ b/components/reservation/opening_hours.list.jsx @@ -0,0 +1,52 @@ +import { KoreanWeekday } from '@/utils/opening_hours' + +const OpeningHoursList = ({ openingHours }) => { + let isBriefCase; + if (openingHours['Everyday']) { + isBriefCase = false; + } else { + let cnt = 0; + for(const day of Object.keys(openingHours)) { + if(openingHours[day] === '00:00-24:00') { + cnt += 1; + } + } + isBriefCase = (cnt > 5); + } + + return ( +
+ { + Object.keys(openingHours).map(day => { + if(isBriefCase && openingHours[day] === '00:00-24:00') { + return; + } + + return ( +
+
+ {KoreanWeekday[day]}: +
+
+ {openingHours[day]} +
+
+ ) + }, + ) + } + { + isBriefCase ? ( +
+
그외:
+
+ 00:00-24:00 +
+
+ ) : null + } +
+ ) +} + +export default OpeningHoursList diff --git a/components/reservation/reservation.datetime.picker.jsx b/components/reservation/reservation.datetime.picker.jsx new file mode 100644 index 0000000..88d01e1 --- /dev/null +++ b/components/reservation/reservation.datetime.picker.jsx @@ -0,0 +1,82 @@ +import moment from 'moment' +import React from 'react' +import DatePicker from 'react-datepicker' +import 'react-datepicker/dist/react-datepicker.css' +import { roundUpByDuration } from '@/utils/time-date' + +const ReservationDatetimePicker = ({ + date, + startTime, + endTime, + setDate, + setStartTime, + setEndTime, +}) => { + const now = roundUpByDuration(moment(), 30); + const nowNext30Min = moment(now).add(30, 'minute'); + + return ( + <> +
+ + e.preventDefault()} + dateFormat={'yyyy-MM-dd'} + minDate={now.toDate()} + // maxDate={now.add(30, 'day').toDate()} + selected={date.toDate()} + onChange={(date) => { + const targetDate = moment(date).format('YYYY-MM-DD') + const nowDate = now.format('YYYY-MM-DD'); + if (targetDate === nowDate) { + setDate(now); + setStartTime(now); + setEndTime(nowNext30Min); + } else { + setDate(moment(targetDate + 'T00:00')); + setStartTime(moment(targetDate + 'T00:00')); + setEndTime(moment(targetDate + 'T00:30')); + } + }} + /> +
+ +
+ + e.preventDefault()} + dateFormat={'hh:mm aa'} + selected={startTime.toDate()} + minTime={date.toDate()} + maxTime={moment(date.format('YYYY-MM-DD') + 'T23:59').toDate()} + onChange={(startTime) => { + const newStartTime = moment(startTime); + const newStartTimeNext30Min = moment(newStartTime).add(30, 'minute'); + setStartTime(newStartTime); + setEndTime(newStartTimeNext30Min); + }}/> +
+ +
+ + e.preventDefault()} + dateFormat={'hh:mm aa'} + selected={endTime.toDate()} + minTime={ + moment(startTime).add(30, 'minute').toDate() + } + maxTime={ + (endTime.format('HHmm') === '0000') ? + moment(date.format('YYYY-MM-DD') + 'T00:00').toDate() // edge-case + : moment(date.format('YYYY-MM-DD') + 'T23:59').toDate() + } + onChange={(endTime) => {setEndTime(moment(endTime))}}/> +
+ + ) +} + +export default ReservationDatetimePicker; \ No newline at end of file diff --git a/components/reservation/reservation.menubar.jsx b/components/reservation/reservation.menubar.jsx index bec8ea5..bdd48b4 100644 --- a/components/reservation/reservation.menubar.jsx +++ b/components/reservation/reservation.menubar.jsx @@ -6,6 +6,11 @@ export default class ReservationMenubar extends Component { render() { return ( + + + 예약 대기 목록 + + 장소 목록 diff --git a/package-lock.json b/package-lock.json index baf418b..745c17d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "popo-admin-web", - "version": "1.4.1", + "version": "1.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "popo-admin-web", - "version": "1.4.1", + "version": "1.4.2", "dependencies": { - "@nivo/bar": "^0.80.0", - "@nivo/core": "^0.80.0", - "axios": "^1.6.2", - "moment": "^2.29.4", + "@nivo/bar": "^0.84.0", + "@nivo/core": "^0.84.0", + "axios": "^1.6.5", + "moment": "^2.30.1", "next": "^12.3.4", "react": "^17.0.2", "react-datepicker": "^4.25.0", @@ -19,12 +19,12 @@ "react-responsive": "^9.0.2", "semantic-ui-css": "^2.5.0", "semantic-ui-react": "^2.1.5", - "styled-components": "^6.1.1" + "styled-components": "^6.1.8" }, "devDependencies": { - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-config-next": "^13.5.6", - "prettier": "^3.1.0" + "prettier": "^3.1.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -61,9 +61,9 @@ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", + "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.3.0", @@ -128,9 +128,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -409,109 +409,146 @@ } }, "node_modules/@nivo/annotations": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.80.0.tgz", - "integrity": "sha512-bC9z0CLjU07LULTMWsqpjovRtHxP7n8oJjqBQBLmHOGB4IfiLbrryBfu9+aEZH3VN2jXHhdpWUz+HxeZzOzsLg==", - "dependencies": { - "@nivo/colors": "0.80.0", - "@react-spring/web": "9.4.5", - "lodash": "^4.17.21" + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.84.0.tgz", + "integrity": "sha512-g3n+WaZgRza7fZVQZrrxq1cLS+6vmjhWGmQqEynFmKM2f11F7gdkHLhGMYosayjZ0Sb/bMUXvBSkUbyKli7NVw==", + "dependencies": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/prop-types": "^15.7.2", + "lodash": "^4.17.21", + "prop-types": "^15.7.2" }, "peerDependencies": { - "@nivo/core": "0.80.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/axes": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.80.0.tgz", - "integrity": "sha512-AsUyaSHGwQVSEK8QXpsn8X+poZxvakLMYW7crKY1xTGPNw+SU4SSBohPVumm2jMH3fTSLNxLhAjWo71GBJXfdA==", - "dependencies": { - "@nivo/scales": "0.80.0", - "@react-spring/web": "9.4.5", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.84.0.tgz", + "integrity": "sha512-bC9Rx5ixGJiupTRXSnATIVRLPcx0HR8yXGBuO8GTy6K1DDnhaNWfhErnBLYbB9Sq13WQGrS2he6uvLVLd23CtA==", + "dependencies": { + "@nivo/core": "0.84.0", + "@nivo/scales": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-format": "^1.4.1", + "@types/d3-time-format": "^2.3.1", + "@types/prop-types": "^15.7.2", "d3-format": "^1.4.4", - "d3-time-format": "^3.0.0" + "d3-time-format": "^3.0.0", + "prop-types": "^15.7.2" }, "peerDependencies": { - "@nivo/core": "0.80.0", - "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/bar": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.80.0.tgz", - "integrity": "sha512-woE/S12Sp+RKQeOHtp302WXfy5usj73cV/gjP95PzJxMv+Rn01i1Uwys3BILzc9h4+OxYuWTFqLADAySAmi7qQ==", - "dependencies": { - "@nivo/annotations": "0.80.0", - "@nivo/axes": "0.80.0", - "@nivo/colors": "0.80.0", - "@nivo/legends": "0.80.0", - "@nivo/scales": "0.80.0", - "@nivo/tooltip": "0.80.0", - "@react-spring/web": "9.4.5", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.84.0.tgz", + "integrity": "sha512-sOiC980VKS+SOnVSGPlG/nd2ssmz4b6iqIZY/POvwSkB8gvUFz6Bk6lBGXlVNxh1xHaYplVhyl1Tp2NpIWPcAA==", + "dependencies": { + "@nivo/annotations": "0.84.0", + "@nivo/axes": "0.84.0", + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@nivo/legends": "0.84.0", + "@nivo/scales": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-scale": "^3.2.3", + "@types/d3-shape": "^2.0.0", "d3-scale": "^3.2.3", "d3-shape": "^1.3.5", "lodash": "^4.17.21" }, "peerDependencies": { - "@nivo/core": "0.80.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/colors": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.80.0.tgz", - "integrity": "sha512-T695Zr411FU4RPo7WDINOAn8f79DPP10SFJmDdEqELE+cbzYVTpXqLGZ7JMv88ko7EOf9qxLQgcBqY69rp9tHQ==", - "dependencies": { - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.84.0.tgz", + "integrity": "sha512-wNG1uYyDP5Owc1Pdkz0zesdZCrPAywmSssNzQ2Aju7nVs7Ru7iHNBIvOAGgyXTe2gcrIO9VSasXWR+jEYyxN2Q==", + "dependencies": { + "@nivo/core": "0.84.0", + "@types/d3-color": "^2.0.0", + "@types/d3-scale": "^3.2.3", + "@types/d3-scale-chromatic": "^2.0.0", + "@types/prop-types": "^15.7.2", + "d3-color": "^3.1.0", "d3-scale": "^3.2.3", "d3-scale-chromatic": "^2.0.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "prop-types": "^15.7.2" }, "peerDependencies": { - "@nivo/core": "0.80.0", - "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/core": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.80.0.tgz", - "integrity": "sha512-6caih0RavXdWWSfde+rC2pk17WrX9YQlqK26BrxIdXzv3Ydzlh5SkrC7dR2TEvMGBhunzVeLOfiC2DWT1S8CFg==", - "dependencies": { - "@nivo/recompose": "0.80.0", - "@react-spring/web": "9.4.5", - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.84.0.tgz", + "integrity": "sha512-HyQM4x4B7d4X9+xLPKkPxqIxhSDzbJUywGTDWHWx1daeX9VP8O+MqkTBsNsoB+tjxrbKrRJ0+ceS2w89JB+qrA==", + "dependencies": { + "@nivo/recompose": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-shape": "^2.0.0", + "d3-color": "^3.1.0", "d3-format": "^1.4.4", - "d3-interpolate": "^2.0.1", + "d3-interpolate": "^3.0.1", "d3-scale": "^3.2.3", - "d3-scale-chromatic": "^2.0.0", + "d3-scale-chromatic": "^3.0.0", "d3-shape": "^1.3.5", "d3-time-format": "^3.0.0", "lodash": "^4.17.21" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nivo/donate" + }, "peerDependencies": { - "@nivo/tooltip": "0.80.0", "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, + "node_modules/@nivo/core/node_modules/d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "dependencies": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/@nivo/legends": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.80.0.tgz", - "integrity": "sha512-h0IUIPGygpbKIZZZWIxkkxOw4SO0rqPrqDrykjaoQz4CvL4HtLIUS3YRA4akKOVNZfS5agmImjzvIe0s3RvqlQ==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.84.0.tgz", + "integrity": "sha512-o0s1cXoIH6Km9A2zoKB8Ey99Oc1w5nymz0j8s7hR2B0EHo5HgVbYjSs2sZD7NSwLt3QM57Nzxw9VzJ+sqfV30Q==", + "dependencies": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@types/d3-scale": "^3.2.3", + "@types/prop-types": "^15.7.2", + "d3-scale": "^3.2.3", + "prop-types": "^15.7.2" + }, "peerDependencies": { - "@nivo/core": "0.80.0", - "prop-types": ">= 15.5.10 < 16.0.0", "react": ">= 16.14.0 < 19.0.0" } }, "node_modules/@nivo/recompose": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.80.0.tgz", - "integrity": "sha512-iL3g7j3nJGD9+mRDbwNwt/IXDXH6E29mhShY1I7SP91xrfusZV9pSFf4EzyYgruNJk/2iqMuaqn+e+TVFra44A==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.84.0.tgz", + "integrity": "sha512-Odb+r0pEmGt4RV020jwvngF7PxBgxS1e1sy8bWlZKc5qkm6k3eVlZNuYU+zGbDxHMigImvrx5KfUv5iUqtQBZA==", "dependencies": { + "@types/prop-types": "^15.7.2", + "@types/react-lifecycles-compat": "^3.0.1", + "prop-types": "^15.7.2", "react-lifecycles-compat": "^3.0.4" }, "peerDependencies": { @@ -519,25 +556,31 @@ } }, "node_modules/@nivo/scales": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.80.0.tgz", - "integrity": "sha512-4y2pQdCg+f3n4TKXC2tYuq71veZM+xPRQbOTgGYJpuBvMc7pQsXF9T5z7ryeIG9hkpXkrlyjecU6XcAG7tLSNg==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.84.0.tgz", + "integrity": "sha512-Cayo9jFMpoF7Ha7eqOAucHLUG6zZLGpxiAtyZ/vTUCkRZPHmd/YMvrm8E6OyQCTBVf+aRtOKk9tQnMv8E9fWiw==", "dependencies": { + "@types/d3-scale": "^3.2.3", + "@types/d3-time": "^1.1.1", + "@types/d3-time-format": "^3.0.0", "d3-scale": "^3.2.3", "d3-time": "^1.0.11", "d3-time-format": "^3.0.0", "lodash": "^4.17.21" } }, + "node_modules/@nivo/scales/node_modules/@types/d3-time-format": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz", + "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg==" + }, "node_modules/@nivo/tooltip": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.80.0.tgz", - "integrity": "sha512-qGmrreRwnCsYjn/LAuwBtxBn/tvG8y+rwgd4gkANLBAoXd3bzJyvmkSe+QJPhUG64bq57ibDK+lO2pC48a3/fw==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.84.0.tgz", + "integrity": "sha512-x/6Vk4RXKHkG9q5dk4uFYwEfbMoIvJd5ahhVQ6bskuLks5FZoS6bkKoNggjxwmHbIWOVITGUXuykOfC54EWSpw==", "dependencies": { - "@react-spring/web": "9.4.5" - }, - "peerDependencies": { - "@nivo/core": "0.80.0" + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2" } }, "node_modules/@nodelib/fs.scandir": { @@ -605,70 +648,63 @@ } }, "node_modules/@react-spring/animated": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.4.5.tgz", - "integrity": "sha512-KWqrtvJSMx6Fj9nMJkhTwM9r6LIriExDRV6YHZV9HKQsaolUFppgkOXpC+rsL1JEtEvKv6EkLLmSqHTnuYjiIA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz", + "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==", "dependencies": { - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" }, "peerDependencies": { - "react": "^16.8.0 || >=17.0.0 || >=18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/@react-spring/core": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.4.5.tgz", - "integrity": "sha512-83u3FzfQmGMJFwZLAJSwF24/ZJctwUkWtyPD7KYtNagrFeQKUH1I05ZuhmCmqW+2w1KDW1SFWQ43RawqfXKiiQ==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz", + "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==", "dependencies": { - "@react-spring/animated": "~9.4.5", - "@react-spring/rafz": "~9.4.5", - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/animated": "~9.7.3", + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/react-spring/donate" }, "peerDependencies": { - "react": "^16.8.0 || >=17.0.0 || >=18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/@react-spring/rafz": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.4.5.tgz", - "integrity": "sha512-swGsutMwvnoyTRxvqhfJBtGM8Ipx6ks0RkIpNX9F/U7XmyPvBMGd3GgX/mqxZUpdlsuI1zr/jiYw+GXZxAlLcQ==" - }, "node_modules/@react-spring/shared": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.4.5.tgz", - "integrity": "sha512-JhMh3nFKsqyag0KM5IIM8BQANGscTdd0mMv3BXsUiMZrcjQTskyfnv5qxEeGWbJGGar52qr5kHuBHtCjQOzniA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz", + "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==", "dependencies": { - "@react-spring/rafz": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/types": "~9.7.3" }, "peerDependencies": { - "react": "^16.8.0 || >=17.0.0 || >=18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/@react-spring/types": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.4.5.tgz", - "integrity": "sha512-mpRIamoHwql0ogxEUh9yr4TP0xU5CWyZxVQeccGkHHF8kPMErtDXJlxyo0lj+telRF35XNihtPTWoflqtyARmg==" + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz", + "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw==" }, "node_modules/@react-spring/web": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.4.5.tgz", - "integrity": "sha512-NGAkOtKmOzDEctL7MzRlQGv24sRce++0xAY7KlcxmeVkR7LRSGkoXHaIfm9ObzxPMcPHQYQhf3+X9jepIFNHQA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", + "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", "dependencies": { - "@react-spring/animated": "~9.4.5", - "@react-spring/core": "~9.4.5", - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/animated": "~9.7.3", + "@react-spring/core": "~9.7.3", + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" }, "peerDependencies": { - "react": "^16.8.0 || >=17.0.0 || >=18.0.0", - "react-dom": "^16.8.0 || >=17.0.0 || >=18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/@rushstack/eslint-patch": { @@ -698,16 +734,95 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/d3-color": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.6.tgz", + "integrity": "sha512-tbaFGDmJWHqnenvk3QGSvD3RVwr631BjKRD7Sc7VLRgrdX5mk5hTyoeBL6rXZaeoXzmZwIl1D2HPogEdt1rHBg==" + }, + "node_modules/@types/d3-format": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.5.tgz", + "integrity": "sha512-mLxrC1MSWupOSncXN/HOlWUAAIffAEBaI4+PKy2uMPsKe4FNZlk7qrbTjmzJXITQQqBHivaks4Td18azgqnotA==" + }, + "node_modules/@types/d3-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz", + "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA==" + }, + "node_modules/@types/d3-scale": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz", + "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==", + "dependencies": { + "@types/d3-time": "^2" + } + }, + "node_modules/@types/d3-scale-chromatic": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.4.tgz", + "integrity": "sha512-OUgfg6wmoZVhs0/pV8HZhsMw7pYJnS6smfNK2S5ogMaPHfDUaTMu7JA5ssZrRupwf2vWI+haPAuUpsz+M1BOKA==" + }, + "node_modules/@types/d3-scale/node_modules/@types/d3-time": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz", + "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==" + }, + "node_modules/@types/d3-shape": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.7.tgz", + "integrity": "sha512-HedHlfGHdwzKqX9+PiQVXZrdmGlwo7naoefJP7kCNk4Y7qcpQt1tUaoRa6qn0kbTdlaIHGO7111qLtb/6J8uuw==", + "dependencies": { + "@types/d3-path": "^2" + } + }, + "node_modules/@types/d3-time": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz", + "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g==" + }, + "node_modules/@types/d3-time-format": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.4.tgz", + "integrity": "sha512-xdDXbpVO74EvadI3UDxjxTdR6QIxm1FKzEA/+F8tL4GWWUg/hgvBqf6chql64U5A9ZUGWo7pEu4eNlyLwbKdhg==" + }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/prop-types": { + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" + }, + "node_modules/@types/react": { + "version": "18.2.47", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.47.tgz", + "integrity": "sha512-xquNkkOirwyCgoClNk85BjP+aqnIS+ckAJ8i37gAbDs14jfW/J23f2GItAf33oiUPQnqNMALiFeoM9Y5mbjpVQ==", + "dependencies": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-1CM48Y9ztL5S4wjt7DK2izrkgPp/Ql0zCJu/vHzhgl7J+BD4UbSGjHN1M2TlePms472JvOazUtAO1/G3oFZqIQ==", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/scheduler": { + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" + }, "node_modules/@types/stylis": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.4.tgz", - "integrity": "sha512-36ZrGJ8fgtBr6nwNnuJ9jXIj+bn/pF6UoqmrQT7+Y99+tFFeHHsoR54+194dHdyhPjgbeoNz3Qru0oRt0l6ASQ==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==" }, "node_modules/@typescript-eslint/parser": { "version": "5.56.0", @@ -1049,11 +1164,11 @@ } }, "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1226,9 +1341,12 @@ } }, "node_modules/d3-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", - "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-format": { "version": "1.4.5", @@ -1236,11 +1354,14 @@ "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==" }, "node_modules/d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "dependencies": { - "d3-color": "1 - 2" + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" } }, "node_modules/d3-path": { @@ -1269,6 +1390,32 @@ "d3-interpolate": "1 - 2" } }, + "node_modules/d3-scale-chromatic/node_modules/d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "node_modules/d3-scale-chromatic/node_modules/d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "dependencies": { + "d3-color": "1 - 2" + } + }, + "node_modules/d3-scale/node_modules/d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "node_modules/d3-scale/node_modules/d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "dependencies": { + "d3-color": "1 - 2" + } + }, "node_modules/d3-scale/node_modules/d3-time": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", @@ -1597,15 +1744,15 @@ } }, "node_modules/eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2263,9 +2410,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -3245,9 +3392,9 @@ } }, "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "engines": { "node": "*" } @@ -3648,9 +3795,9 @@ } }, "node_modules/prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -4218,19 +4365,19 @@ } }, "node_modules/styled-components": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.1.tgz", - "integrity": "sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==", - "dependencies": { - "@emotion/is-prop-valid": "^1.2.1", - "@emotion/unitless": "^0.8.0", - "@types/stylis": "^4.0.2", - "css-to-react-native": "^3.2.0", - "csstype": "^3.1.2", - "postcss": "^8.4.31", - "shallowequal": "^1.1.0", - "stylis": "^4.3.0", - "tslib": "^2.5.0" + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.8.tgz", + "integrity": "sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==", + "dependencies": { + "@emotion/is-prop-valid": "1.2.1", + "@emotion/unitless": "0.8.0", + "@types/stylis": "4.2.0", + "css-to-react-native": "3.2.0", + "csstype": "3.1.2", + "postcss": "8.4.31", + "shallowequal": "1.1.0", + "stylis": "4.3.1", + "tslib": "2.5.0" }, "engines": { "node": ">= 16" @@ -4245,9 +4392,9 @@ } }, "node_modules/styled-components/node_modules/postcss": { - "version": "8.4.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", - "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -4263,7 +4410,7 @@ } ], "dependencies": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -4291,9 +4438,9 @@ } }, "node_modules/stylis": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz", - "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", @@ -4686,9 +4833,9 @@ "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", + "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" }, "@eslint-community/eslint-utils": { "version": "4.3.0", @@ -4734,9 +4881,9 @@ } }, "@eslint/js": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", - "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true }, "@fluentui/react-component-event-listener": { @@ -4879,102 +5026,153 @@ "optional": true }, "@nivo/annotations": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.80.0.tgz", - "integrity": "sha512-bC9z0CLjU07LULTMWsqpjovRtHxP7n8oJjqBQBLmHOGB4IfiLbrryBfu9+aEZH3VN2jXHhdpWUz+HxeZzOzsLg==", - "requires": { - "@nivo/colors": "0.80.0", - "@react-spring/web": "9.4.5", - "lodash": "^4.17.21" + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.84.0.tgz", + "integrity": "sha512-g3n+WaZgRza7fZVQZrrxq1cLS+6vmjhWGmQqEynFmKM2f11F7gdkHLhGMYosayjZ0Sb/bMUXvBSkUbyKli7NVw==", + "requires": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/prop-types": "^15.7.2", + "lodash": "^4.17.21", + "prop-types": "^15.7.2" } }, "@nivo/axes": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.80.0.tgz", - "integrity": "sha512-AsUyaSHGwQVSEK8QXpsn8X+poZxvakLMYW7crKY1xTGPNw+SU4SSBohPVumm2jMH3fTSLNxLhAjWo71GBJXfdA==", - "requires": { - "@nivo/scales": "0.80.0", - "@react-spring/web": "9.4.5", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.84.0.tgz", + "integrity": "sha512-bC9Rx5ixGJiupTRXSnATIVRLPcx0HR8yXGBuO8GTy6K1DDnhaNWfhErnBLYbB9Sq13WQGrS2he6uvLVLd23CtA==", + "requires": { + "@nivo/core": "0.84.0", + "@nivo/scales": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-format": "^1.4.1", + "@types/d3-time-format": "^2.3.1", + "@types/prop-types": "^15.7.2", "d3-format": "^1.4.4", - "d3-time-format": "^3.0.0" + "d3-time-format": "^3.0.0", + "prop-types": "^15.7.2" } }, "@nivo/bar": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.80.0.tgz", - "integrity": "sha512-woE/S12Sp+RKQeOHtp302WXfy5usj73cV/gjP95PzJxMv+Rn01i1Uwys3BILzc9h4+OxYuWTFqLADAySAmi7qQ==", - "requires": { - "@nivo/annotations": "0.80.0", - "@nivo/axes": "0.80.0", - "@nivo/colors": "0.80.0", - "@nivo/legends": "0.80.0", - "@nivo/scales": "0.80.0", - "@nivo/tooltip": "0.80.0", - "@react-spring/web": "9.4.5", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.84.0.tgz", + "integrity": "sha512-sOiC980VKS+SOnVSGPlG/nd2ssmz4b6iqIZY/POvwSkB8gvUFz6Bk6lBGXlVNxh1xHaYplVhyl1Tp2NpIWPcAA==", + "requires": { + "@nivo/annotations": "0.84.0", + "@nivo/axes": "0.84.0", + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@nivo/legends": "0.84.0", + "@nivo/scales": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-scale": "^3.2.3", + "@types/d3-shape": "^2.0.0", "d3-scale": "^3.2.3", "d3-shape": "^1.3.5", "lodash": "^4.17.21" } }, "@nivo/colors": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.80.0.tgz", - "integrity": "sha512-T695Zr411FU4RPo7WDINOAn8f79DPP10SFJmDdEqELE+cbzYVTpXqLGZ7JMv88ko7EOf9qxLQgcBqY69rp9tHQ==", - "requires": { - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.84.0.tgz", + "integrity": "sha512-wNG1uYyDP5Owc1Pdkz0zesdZCrPAywmSssNzQ2Aju7nVs7Ru7iHNBIvOAGgyXTe2gcrIO9VSasXWR+jEYyxN2Q==", + "requires": { + "@nivo/core": "0.84.0", + "@types/d3-color": "^2.0.0", + "@types/d3-scale": "^3.2.3", + "@types/d3-scale-chromatic": "^2.0.0", + "@types/prop-types": "^15.7.2", + "d3-color": "^3.1.0", "d3-scale": "^3.2.3", "d3-scale-chromatic": "^2.0.0", - "lodash": "^4.17.21" + "lodash": "^4.17.21", + "prop-types": "^15.7.2" } }, "@nivo/core": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.80.0.tgz", - "integrity": "sha512-6caih0RavXdWWSfde+rC2pk17WrX9YQlqK26BrxIdXzv3Ydzlh5SkrC7dR2TEvMGBhunzVeLOfiC2DWT1S8CFg==", - "requires": { - "@nivo/recompose": "0.80.0", - "@react-spring/web": "9.4.5", - "d3-color": "^2.0.0", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.84.0.tgz", + "integrity": "sha512-HyQM4x4B7d4X9+xLPKkPxqIxhSDzbJUywGTDWHWx1daeX9VP8O+MqkTBsNsoB+tjxrbKrRJ0+ceS2w89JB+qrA==", + "requires": { + "@nivo/recompose": "0.84.0", + "@nivo/tooltip": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2", + "@types/d3-shape": "^2.0.0", + "d3-color": "^3.1.0", "d3-format": "^1.4.4", - "d3-interpolate": "^2.0.1", + "d3-interpolate": "^3.0.1", "d3-scale": "^3.2.3", - "d3-scale-chromatic": "^2.0.0", + "d3-scale-chromatic": "^3.0.0", "d3-shape": "^1.3.5", "d3-time-format": "^3.0.0", "lodash": "^4.17.21" + }, + "dependencies": { + "d3-scale-chromatic": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz", + "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==", + "requires": { + "d3-color": "1 - 3", + "d3-interpolate": "1 - 3" + } + } } }, "@nivo/legends": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.80.0.tgz", - "integrity": "sha512-h0IUIPGygpbKIZZZWIxkkxOw4SO0rqPrqDrykjaoQz4CvL4HtLIUS3YRA4akKOVNZfS5agmImjzvIe0s3RvqlQ==", - "requires": {} + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.84.0.tgz", + "integrity": "sha512-o0s1cXoIH6Km9A2zoKB8Ey99Oc1w5nymz0j8s7hR2B0EHo5HgVbYjSs2sZD7NSwLt3QM57Nzxw9VzJ+sqfV30Q==", + "requires": { + "@nivo/colors": "0.84.0", + "@nivo/core": "0.84.0", + "@types/d3-scale": "^3.2.3", + "@types/prop-types": "^15.7.2", + "d3-scale": "^3.2.3", + "prop-types": "^15.7.2" + } }, "@nivo/recompose": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.80.0.tgz", - "integrity": "sha512-iL3g7j3nJGD9+mRDbwNwt/IXDXH6E29mhShY1I7SP91xrfusZV9pSFf4EzyYgruNJk/2iqMuaqn+e+TVFra44A==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/recompose/-/recompose-0.84.0.tgz", + "integrity": "sha512-Odb+r0pEmGt4RV020jwvngF7PxBgxS1e1sy8bWlZKc5qkm6k3eVlZNuYU+zGbDxHMigImvrx5KfUv5iUqtQBZA==", "requires": { + "@types/prop-types": "^15.7.2", + "@types/react-lifecycles-compat": "^3.0.1", + "prop-types": "^15.7.2", "react-lifecycles-compat": "^3.0.4" } }, "@nivo/scales": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.80.0.tgz", - "integrity": "sha512-4y2pQdCg+f3n4TKXC2tYuq71veZM+xPRQbOTgGYJpuBvMc7pQsXF9T5z7ryeIG9hkpXkrlyjecU6XcAG7tLSNg==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.84.0.tgz", + "integrity": "sha512-Cayo9jFMpoF7Ha7eqOAucHLUG6zZLGpxiAtyZ/vTUCkRZPHmd/YMvrm8E6OyQCTBVf+aRtOKk9tQnMv8E9fWiw==", "requires": { + "@types/d3-scale": "^3.2.3", + "@types/d3-time": "^1.1.1", + "@types/d3-time-format": "^3.0.0", "d3-scale": "^3.2.3", "d3-time": "^1.0.11", "d3-time-format": "^3.0.0", "lodash": "^4.17.21" + }, + "dependencies": { + "@types/d3-time-format": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz", + "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg==" + } } }, "@nivo/tooltip": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.80.0.tgz", - "integrity": "sha512-qGmrreRwnCsYjn/LAuwBtxBn/tvG8y+rwgd4gkANLBAoXd3bzJyvmkSe+QJPhUG64bq57ibDK+lO2pC48a3/fw==", + "version": "0.84.0", + "resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.84.0.tgz", + "integrity": "sha512-x/6Vk4RXKHkG9q5dk4uFYwEfbMoIvJd5ahhVQ6bskuLks5FZoS6bkKoNggjxwmHbIWOVITGUXuykOfC54EWSpw==", "requires": { - "@react-spring/web": "9.4.5" + "@nivo/core": "0.84.0", + "@react-spring/web": "9.4.5 || ^9.7.2" } }, "@nodelib/fs.scandir": { @@ -5023,53 +5221,46 @@ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" }, "@react-spring/animated": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.4.5.tgz", - "integrity": "sha512-KWqrtvJSMx6Fj9nMJkhTwM9r6LIriExDRV6YHZV9HKQsaolUFppgkOXpC+rsL1JEtEvKv6EkLLmSqHTnuYjiIA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.3.tgz", + "integrity": "sha512-5CWeNJt9pNgyvuSzQH+uy2pvTg8Y4/OisoscZIR8/ZNLIOI+CatFBhGZpDGTF/OzdNFsAoGk3wiUYTwoJ0YIvw==", "requires": { - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" } }, "@react-spring/core": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.4.5.tgz", - "integrity": "sha512-83u3FzfQmGMJFwZLAJSwF24/ZJctwUkWtyPD7KYtNagrFeQKUH1I05ZuhmCmqW+2w1KDW1SFWQ43RawqfXKiiQ==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.3.tgz", + "integrity": "sha512-IqFdPVf3ZOC1Cx7+M0cXf4odNLxDC+n7IN3MDcVCTIOSBfqEcBebSv+vlY5AhM0zw05PDbjKrNmBpzv/AqpjnQ==", "requires": { - "@react-spring/animated": "~9.4.5", - "@react-spring/rafz": "~9.4.5", - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/animated": "~9.7.3", + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" } }, - "@react-spring/rafz": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.4.5.tgz", - "integrity": "sha512-swGsutMwvnoyTRxvqhfJBtGM8Ipx6ks0RkIpNX9F/U7XmyPvBMGd3GgX/mqxZUpdlsuI1zr/jiYw+GXZxAlLcQ==" - }, "@react-spring/shared": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.4.5.tgz", - "integrity": "sha512-JhMh3nFKsqyag0KM5IIM8BQANGscTdd0mMv3BXsUiMZrcjQTskyfnv5qxEeGWbJGGar52qr5kHuBHtCjQOzniA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.3.tgz", + "integrity": "sha512-NEopD+9S5xYyQ0pGtioacLhL2luflh6HACSSDUZOwLHoxA5eku1UPuqcJqjwSD6luKjjLfiLOspxo43FUHKKSA==", "requires": { - "@react-spring/rafz": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/types": "~9.7.3" } }, "@react-spring/types": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.4.5.tgz", - "integrity": "sha512-mpRIamoHwql0ogxEUh9yr4TP0xU5CWyZxVQeccGkHHF8kPMErtDXJlxyo0lj+telRF35XNihtPTWoflqtyARmg==" + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.3.tgz", + "integrity": "sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw==" }, "@react-spring/web": { - "version": "9.4.5", - "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.4.5.tgz", - "integrity": "sha512-NGAkOtKmOzDEctL7MzRlQGv24sRce++0xAY7KlcxmeVkR7LRSGkoXHaIfm9ObzxPMcPHQYQhf3+X9jepIFNHQA==", + "version": "9.7.3", + "resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.3.tgz", + "integrity": "sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg==", "requires": { - "@react-spring/animated": "~9.4.5", - "@react-spring/core": "~9.4.5", - "@react-spring/shared": "~9.4.5", - "@react-spring/types": "~9.4.5" + "@react-spring/animated": "~9.7.3", + "@react-spring/core": "~9.7.3", + "@react-spring/shared": "~9.7.3", + "@react-spring/types": "~9.7.3" } }, "@rushstack/eslint-patch": { @@ -5095,16 +5286,97 @@ "tslib": "^2.4.0" } }, + "@types/d3-color": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.6.tgz", + "integrity": "sha512-tbaFGDmJWHqnenvk3QGSvD3RVwr631BjKRD7Sc7VLRgrdX5mk5hTyoeBL6rXZaeoXzmZwIl1D2HPogEdt1rHBg==" + }, + "@types/d3-format": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.5.tgz", + "integrity": "sha512-mLxrC1MSWupOSncXN/HOlWUAAIffAEBaI4+PKy2uMPsKe4FNZlk7qrbTjmzJXITQQqBHivaks4Td18azgqnotA==" + }, + "@types/d3-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.4.tgz", + "integrity": "sha512-jjZVLBjEX4q6xneKMmv62UocaFJFOTQSb/1aTzs3m3ICTOFoVaqGBHpNLm/4dVi0/FTltfBKgmOK1ECj3/gGjA==" + }, + "@types/d3-scale": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.5.tgz", + "integrity": "sha512-YOpKj0kIEusRf7ofeJcSZQsvKbnTwpe1DUF+P2qsotqG53kEsjm7EzzliqQxMkAWdkZcHrg5rRhB4JiDOQPX+A==", + "requires": { + "@types/d3-time": "^2" + }, + "dependencies": { + "@types/d3-time": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.4.tgz", + "integrity": "sha512-BTfLsxTeo7yFxI/haOOf1ZwJ6xKgQLT9dCp+EcmQv87Gox6X+oKl4mLKfO6fnWm3P22+A6DknMNEZany8ql2Rw==" + } + } + }, + "@types/d3-scale-chromatic": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.4.tgz", + "integrity": "sha512-OUgfg6wmoZVhs0/pV8HZhsMw7pYJnS6smfNK2S5ogMaPHfDUaTMu7JA5ssZrRupwf2vWI+haPAuUpsz+M1BOKA==" + }, + "@types/d3-shape": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.7.tgz", + "integrity": "sha512-HedHlfGHdwzKqX9+PiQVXZrdmGlwo7naoefJP7kCNk4Y7qcpQt1tUaoRa6qn0kbTdlaIHGO7111qLtb/6J8uuw==", + "requires": { + "@types/d3-path": "^2" + } + }, + "@types/d3-time": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.4.tgz", + "integrity": "sha512-JIvy2HjRInE+TXOmIGN5LCmeO0hkFZx5f9FZ7kiN+D+YTcc8pptsiLiuHsvwxwC7VVKmJ2ExHUgNlAiV7vQM9g==" + }, + "@types/d3-time-format": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.4.tgz", + "integrity": "sha512-xdDXbpVO74EvadI3UDxjxTdR6QIxm1FKzEA/+F8tL4GWWUg/hgvBqf6chql64U5A9ZUGWo7pEu4eNlyLwbKdhg==" + }, "@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "@types/prop-types": { + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" + }, + "@types/react": { + "version": "18.2.47", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.47.tgz", + "integrity": "sha512-xquNkkOirwyCgoClNk85BjP+aqnIS+ckAJ8i37gAbDs14jfW/J23f2GItAf33oiUPQnqNMALiFeoM9Y5mbjpVQ==", + "requires": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" + } + }, + "@types/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-1CM48Y9ztL5S4wjt7DK2izrkgPp/Ql0zCJu/vHzhgl7J+BD4UbSGjHN1M2TlePms472JvOazUtAO1/G3oFZqIQ==", + "requires": { + "@types/react": "*" + } + }, + "@types/scheduler": { + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" + }, "@types/stylis": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.4.tgz", - "integrity": "sha512-36ZrGJ8fgtBr6nwNnuJ9jXIj+bn/pF6UoqmrQT7+Y99+tFFeHHsoR54+194dHdyhPjgbeoNz3Qru0oRt0l6ASQ==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-n4sx2bqL0mW1tvDf/loQ+aMX7GQD3lc3fkCMC55VFNDu/vBOabO+LTIeXKM14xK0ppk5TUGcWRjiSpIlUpghKw==" }, "@typescript-eslint/parser": { "version": "5.56.0", @@ -5338,11 +5610,11 @@ "dev": true }, "axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "requires": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -5477,9 +5749,9 @@ } }, "d3-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", - "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==" }, "d3-format": { "version": "1.4.5", @@ -5487,11 +5759,11 @@ "integrity": "sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==" }, "d3-interpolate": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", - "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "requires": { - "d3-color": "1 - 2" + "d3-color": "1 - 3" } }, "d3-path": { @@ -5511,6 +5783,19 @@ "d3-time-format": "2 - 3" }, "dependencies": { + "d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "requires": { + "d3-color": "1 - 2" + } + }, "d3-time": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", @@ -5528,6 +5813,21 @@ "requires": { "d3-color": "1 - 2", "d3-interpolate": "1 - 2" + }, + "dependencies": { + "d3-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", + "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==" + }, + "d3-interpolate": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", + "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", + "requires": { + "d3-color": "1 - 2" + } + } } }, "d3-shape": { @@ -5790,15 +6090,15 @@ } }, "eslint": { - "version": "8.55.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", - "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.55.0", + "@eslint/js": "8.56.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -6296,9 +6596,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" }, "for-each": { "version": "0.3.3", @@ -7000,9 +7300,9 @@ "dev": true }, "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" }, "ms": { "version": "2.1.2", @@ -7265,9 +7565,9 @@ "dev": true }, "prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true }, "prop-types": { @@ -7668,27 +7968,27 @@ "dev": true }, "styled-components": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.1.tgz", - "integrity": "sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==", - "requires": { - "@emotion/is-prop-valid": "^1.2.1", - "@emotion/unitless": "^0.8.0", - "@types/stylis": "^4.0.2", - "css-to-react-native": "^3.2.0", - "csstype": "^3.1.2", - "postcss": "^8.4.31", - "shallowequal": "^1.1.0", - "stylis": "^4.3.0", - "tslib": "^2.5.0" + "version": "6.1.8", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.8.tgz", + "integrity": "sha512-PQ6Dn+QxlWyEGCKDS71NGsXoVLKfE1c3vApkvDYS5KAK+V8fNWGhbSUEo9Gg2iaID2tjLXegEW3bZDUGpofRWw==", + "requires": { + "@emotion/is-prop-valid": "1.2.1", + "@emotion/unitless": "0.8.0", + "@types/stylis": "4.2.0", + "css-to-react-native": "3.2.0", + "csstype": "3.1.2", + "postcss": "8.4.31", + "shallowequal": "1.1.0", + "stylis": "4.3.1", + "tslib": "2.5.0" }, "dependencies": { "postcss": { - "version": "8.4.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz", - "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { - "nanoid": "^3.3.7", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -7702,9 +8002,9 @@ "requires": {} }, "stylis": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz", - "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz", + "integrity": "sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==" }, "supports-preserve-symlinks-flag": { "version": "1.0.0", diff --git a/package.json b/package.json index 6c2d17e..b0c1759 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "popo-admin-web", - "version": "1.4.1", + "version": "1.4.2", "private": true, "scripts": { "dev": "next dev", @@ -9,10 +9,10 @@ "lint": "next lint" }, "dependencies": { - "@nivo/bar": "^0.80.0", - "@nivo/core": "^0.80.0", - "axios": "^1.6.2", - "moment": "^2.29.4", + "@nivo/bar": "^0.84.0", + "@nivo/core": "^0.84.0", + "axios": "^1.6.5", + "moment": "^2.30.1", "next": "^12.3.4", "react": "^17.0.2", "react-datepicker": "^4.25.0", @@ -20,11 +20,11 @@ "react-responsive": "^9.0.2", "semantic-ui-css": "^2.5.0", "semantic-ui-react": "^2.1.5", - "styled-components": "^6.1.1" + "styled-components": "^6.1.8" }, "devDependencies": { - "eslint": "^8.55.0", + "eslint": "^8.56.0", "eslint-config-next": "^13.5.6", - "prettier": "^3.1.0" + "prettier": "^3.1.1" } } diff --git a/pages/equipment/index.jsx b/pages/equipment/index.jsx index 21d71c4..8ac2ba8 100644 --- a/pages/equipment/index.jsx +++ b/pages/equipment/index.jsx @@ -1,24 +1,47 @@ +import { useMemo, useState } from "react"; import Link from "next/link"; -import { Button } from 'semantic-ui-react' +import { Button, Select } from 'semantic-ui-react' import ReservationLayout from '@/components/reservation/reservation.layout' import EquipmentTable from '@/components/equipment/equipment.table' import { PoPoAxios } from "@/utils/axios.instance"; +import { OwnerOptions } from "@/assets/owner.options"; + +const EquipmentOwnerOptions = [ + { key: 'ALL', value: 'ALL', text: '전체' }, + ...OwnerOptions, +] const EquipmentPage = ({ equipmentList }) => { + const [selectedOwner, setSelectedOwner] = useState('ALL'); + + const filteredEquipmentList = useMemo(() => { + if (selectedOwner === 'ALL') return equipmentList; + return equipmentList.filter(equipment => equipment.equip_owner === selectedOwner); + }, [selectedOwner, equipmentList]); + return (

장비 목록

-
- - - +
+
+ + + +
+
+