From 6b9958018b6cdb65c1685c938848428eb2281ad9 Mon Sep 17 00:00:00 2001 From: Ian Krieger Date: Fri, 1 Sep 2023 09:53:17 -0400 Subject: [PATCH] fix: switch adapters --- package-lock.json | 52 +++++++++++++++------ package.json | 8 ++-- src/auth/views/components/AuthContainer.tsx | 7 ++- src/components/Date/DateRangePicker.tsx | 4 +- 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82fe9fc4..383ed73c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fontsource/mulish": "5.0.8", "@fontsource/poppins": "5.0.8", "@mui/icons-material": "5.14.6", - "@mui/lab": "5.0.0-alpha.141", + "@mui/lab": "5.0.0-alpha.136", "@mui/material": "5.14.6", "@mui/x-date-pickers": "5.0.20", "axios": "1.5.0", @@ -2961,16 +2961,16 @@ } }, "node_modules/@mui/lab": { - "version": "5.0.0-alpha.141", - "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.141.tgz", - "integrity": "sha512-PsW55xX2ieNLldca2hLxL1SYtZgRQv++lj1W/Jyi5Z2MHuFDcdqI7yKGrOzyIWw7ctQrmHa1FTShBiCa2wkEoQ==", + "version": "5.0.0-alpha.136", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.136.tgz", + "integrity": "sha512-ai6LspCkyKRD8rL2HEtaTPBbeYkARNNKvSbjOLVJtro9bIFpZ0noH21Pp7t50Y2eFemuYeC+D5Tto3OvGKrhnQ==", "dependencies": { - "@babel/runtime": "^7.22.10", - "@mui/base": "5.0.0-beta.12", - "@mui/system": "^5.14.6", + "@babel/runtime": "^7.22.5", + "@mui/base": "5.0.0-beta.7", + "@mui/system": "^5.14.0", "@mui/types": "^7.2.4", - "@mui/utils": "^5.14.6", - "clsx": "^2.0.0", + "@mui/utils": "^5.13.7", + "clsx": "^1.2.1", "prop-types": "^15.8.1", "react-is": "^18.2.0" }, @@ -3001,12 +3001,36 @@ } } }, - "node_modules/@mui/lab/node_modules/clsx": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", - "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "node_modules/@mui/lab/node_modules/@mui/base": { + "version": "5.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.7.tgz", + "integrity": "sha512-Pjbwm6gjiS96kOMF7E5fjEJsenc0tZBesrLQ4rrdi3eT/c/yhSWnPbCUkHSz8bnS0l3/VQ8bA+oERSGSV2PK6A==", + "dependencies": { + "@babel/runtime": "^7.22.5", + "@emotion/is-prop-valid": "^1.2.1", + "@mui/types": "^7.2.4", + "@mui/utils": "^5.13.7", + "@popperjs/core": "^2.11.8", + "clsx": "^1.2.1", + "prop-types": "^15.8.1", + "react-is": "^18.2.0" + }, "engines": { - "node": ">=6" + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0 || ^18.0.0", + "react-dom": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@mui/material": { diff --git a/package.json b/package.json index 1a1b4267..5af766de 100644 --- a/package.json +++ b/package.json @@ -68,16 +68,16 @@ "@typescript-eslint/parser": "6.4.1", "@vitejs/plugin-basic-ssl": "1.0.1", "@vitejs/plugin-react": "4.0.4", + "eslint": "8.48.0", + "eslint-config-prettier": "9.0.0", + "eslint-plugin-react": "7.33.2", "husky": "8.0.3", "prettier": "3.0.2", "typescript": "5.2.2", "vite": "4.4.9", "vite-plugin-checker": "0.6.2", "vite-tsconfig-paths": "4.2.0", - "vitest": "0.34.3", - "eslint": "8.48.0", - "eslint-config-prettier": "9.0.0", - "eslint-plugin-react": "7.33.2" + "vitest": "0.34.3" }, "overrides": { "semver": "7.5.4", diff --git a/src/auth/views/components/AuthContainer.tsx b/src/auth/views/components/AuthContainer.tsx index e865e50d..bf621812 100644 --- a/src/auth/views/components/AuthContainer.tsx +++ b/src/auth/views/components/AuthContainer.tsx @@ -14,7 +14,12 @@ export function AuthContainer({ children, belowCard, aboveCard }: Props) { return ( - + {aboveCard} {children} {belowCard} diff --git a/src/components/Date/DateRangePicker.tsx b/src/components/Date/DateRangePicker.tsx index 37a19a0d..cd278c69 100644 --- a/src/components/Date/DateRangePicker.tsx +++ b/src/components/Date/DateRangePicker.tsx @@ -1,7 +1,7 @@ import { Stack, TextField } from "@mui/material"; import { Dispatch } from "react"; -import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns"; import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers"; +import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment"; interface Props { from: Date; @@ -17,7 +17,7 @@ export const DateRangePicker = ({ onToChange, }: Props) => { return ( - +