From 2f703772c9d834aba715a226d5dd8834f45dd0ca Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 30 Sep 2024 14:06:36 +0200 Subject: [PATCH 01/29] Add material ui 5 dependencies --- package.json | 6 + yarn.lock | 319 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 307 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index a0af160..bcb2703 100644 --- a/package.json +++ b/package.json @@ -57,10 +57,16 @@ "dependencies": { "@babel/plugin-proposal-decorators": "^7.19.0", "@craco/craco": "^7.1.0", + "@emotion/react": "^11.13.3", + "@emotion/styled": "^11.13.0", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", "@material-ui/lab": "^4.0.0-alpha.61", "@material-ui/styles": "^4.11.5", + "@mui/icons-material": "^5.16.7", + "@mui/lab": "^5.0.0-alpha.173", + "@mui/material": "^5.16.7", + "@mui/styles": "^5.16.7", "@sentry/electron": "^4.0.2", "classnames": "^2.3.2", "clean-stack": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 163fc16..463731f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -162,7 +162,7 @@ "@babel/types" "7.0.0-beta.35" lodash "^4.2.0" -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.24.7": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== @@ -1121,7 +1121,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.25.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== @@ -1380,11 +1380,118 @@ minimatch "^3.0.4" plist "^3.0.4" +"@emotion/babel-plugin@^11.12.0": + version "11.12.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2" + integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw== + dependencies: + "@babel/helper-module-imports" "^7.16.7" + "@babel/runtime" "^7.18.3" + "@emotion/hash" "^0.9.2" + "@emotion/memoize" "^0.9.0" + "@emotion/serialize" "^1.2.0" + babel-plugin-macros "^3.1.0" + convert-source-map "^1.5.0" + escape-string-regexp "^4.0.0" + find-root "^1.1.0" + source-map "^0.5.7" + stylis "4.2.0" + +"@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0": + version "11.13.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" + integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== + dependencies: + "@emotion/memoize" "^0.9.0" + "@emotion/sheet" "^1.4.0" + "@emotion/utils" "^1.4.0" + "@emotion/weak-memoize" "^0.4.0" + stylis "4.2.0" + "@emotion/hash@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@emotion/hash@^0.9.1", "@emotion/hash@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" + integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== + +"@emotion/is-prop-valid@^1.3.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.3.1.tgz#8d5cf1132f836d7adbe42cf0b49df7816fc88240" + integrity sha512-/ACwoqx7XQi9knQs/G0qKvv5teDMhD7bXYns9N/wM8ah8iNb8jZ2uNO0YOgiq2o2poIvVtJS2YALasQuMSQ7Kw== + dependencies: + "@emotion/memoize" "^0.9.0" + +"@emotion/memoize@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102" + integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== + +"@emotion/react@^11.13.3": + version "11.13.3" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4" + integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg== + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.12.0" + "@emotion/cache" "^11.13.0" + "@emotion/serialize" "^1.3.1" + "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" + "@emotion/utils" "^1.4.0" + "@emotion/weak-memoize" "^0.4.0" + hoist-non-react-statics "^3.3.1" + +"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.2.tgz#e1c1a2e90708d5d85d81ccaee2dfeb3cc0cccf7a" + integrity sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA== + dependencies: + "@emotion/hash" "^0.9.2" + "@emotion/memoize" "^0.9.0" + "@emotion/unitless" "^0.10.0" + "@emotion/utils" "^1.4.1" + csstype "^3.0.2" + +"@emotion/sheet@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c" + integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg== + +"@emotion/styled@^11.13.0": + version "11.13.0" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.13.0.tgz#633fd700db701472c7a5dbef54d6f9834e9fb190" + integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA== + dependencies: + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.12.0" + "@emotion/is-prop-valid" "^1.3.0" + "@emotion/serialize" "^1.3.0" + "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" + "@emotion/utils" "^1.4.0" + +"@emotion/unitless@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" + integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== + +"@emotion/use-insertion-effect-with-fallbacks@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf" + integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw== + +"@emotion/utils@^1.4.0", "@emotion/utils@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.1.tgz#b3adbb43de12ee2149541c4f1337d2eb7774f0ad" + integrity sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA== + +"@emotion/weak-memoize@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6" + integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -1417,6 +1524,33 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2" integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q== +"@floating-ui/core@^1.6.0": + version "1.6.8" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12" + integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA== + dependencies: + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/dom@^1.0.0": + version "1.6.11" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.11.tgz#8631857838d34ee5712339eb7cbdfb8ad34da723" + integrity sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ== + dependencies: + "@floating-ui/core" "^1.6.0" + "@floating-ui/utils" "^0.2.8" + +"@floating-ui/react-dom@^2.0.8": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31" + integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A== + dependencies: + "@floating-ui/dom" "^1.0.0" + +"@floating-ui/utils@^0.2.8": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62" + integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig== + "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0": version "9.3.0" resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" @@ -1838,6 +1972,135 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@mui/base@5.0.0-beta.40": + version "5.0.0-beta.40" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.40.tgz#1f8a782f1fbf3f84a961e954c8176b187de3dae2" + integrity sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ== + dependencies: + "@babel/runtime" "^7.23.9" + "@floating-ui/react-dom" "^2.0.8" + "@mui/types" "^7.2.14" + "@mui/utils" "^5.15.14" + "@popperjs/core" "^2.11.8" + clsx "^2.1.0" + prop-types "^15.8.1" + +"@mui/core-downloads-tracker@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz#182a325a520f7ebd75de051fceabfc0314cfd004" + integrity sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ== + +"@mui/icons-material@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.16.7.tgz#e27f901af792065efc9f3d75d74a66af7529a10a" + integrity sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q== + dependencies: + "@babel/runtime" "^7.23.9" + +"@mui/lab@^5.0.0-alpha.173": + version "5.0.0-alpha.173" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.173.tgz#a0f9696d93a765b48d69a7da5aaca0affa510ae8" + integrity sha512-Gt5zopIWwxDgGy/MXcp6GueD84xFFugFai4hYiXY0zowJpTVnIrTQCQXV004Q7rejJ7aaCntX9hpPJqCrioshA== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/base" "5.0.0-beta.40" + "@mui/system" "^5.16.5" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.5" + clsx "^2.1.0" + prop-types "^15.8.1" + +"@mui/material@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.16.7.tgz#6e814e2eefdaf065a769cecf549c3569e107a50b" + integrity sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/core-downloads-tracker" "^5.16.7" + "@mui/system" "^5.16.7" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + "@popperjs/core" "^2.11.8" + "@types/react-transition-group" "^4.4.10" + clsx "^2.1.0" + csstype "^3.1.3" + prop-types "^15.8.1" + react-is "^18.3.1" + react-transition-group "^4.4.5" + +"@mui/private-theming@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.16.6.tgz#547671e7ae3f86b68d1289a0b90af04dfcc1c8c9" + integrity sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/utils" "^5.16.6" + prop-types "^15.8.1" + +"@mui/styled-engine@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.16.6.tgz#60110c106dd482dfdb7e2aa94fd6490a0a3f8852" + integrity sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g== + dependencies: + "@babel/runtime" "^7.23.9" + "@emotion/cache" "^11.11.0" + csstype "^3.1.3" + prop-types "^15.8.1" + +"@mui/styles@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.16.7.tgz#cf052f0243d283fab837d2505f4901e5207a0575" + integrity sha512-FfXhHP/2MlqH+vLs2tIHMeCChmqSRgkOALVNLKkPrDsvtoq5J8OraOutCn1scpvRjr9mO8ZhW6jKx2t/vUDxtQ== + dependencies: + "@babel/runtime" "^7.23.9" + "@emotion/hash" "^0.9.1" + "@mui/private-theming" "^5.16.6" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + clsx "^2.1.0" + csstype "^3.1.3" + hoist-non-react-statics "^3.3.2" + jss "^10.10.0" + jss-plugin-camel-case "^10.10.0" + jss-plugin-default-unit "^10.10.0" + jss-plugin-global "^10.10.0" + jss-plugin-nested "^10.10.0" + jss-plugin-props-sort "^10.10.0" + jss-plugin-rule-value-function "^10.10.0" + jss-plugin-vendor-prefixer "^10.10.0" + prop-types "^15.8.1" + +"@mui/system@^5.16.5", "@mui/system@^5.16.7": + version "5.16.7" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.16.7.tgz#4583ca5bf3b38942e02c15a1e622ba869ac51393" + integrity sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/private-theming" "^5.16.6" + "@mui/styled-engine" "^5.16.6" + "@mui/types" "^7.2.15" + "@mui/utils" "^5.16.6" + clsx "^2.1.0" + csstype "^3.1.3" + prop-types "^15.8.1" + +"@mui/types@^7.2.14", "@mui/types@^7.2.15": + version "7.2.17" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.17.tgz#329826062d4079de5ea2b97007575cebbba1fdbc" + integrity sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ== + +"@mui/utils@^5.15.14", "@mui/utils@^5.16.5", "@mui/utils@^5.16.6": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" + integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== + dependencies: + "@babel/runtime" "^7.23.9" + "@mui/types" "^7.2.15" + "@types/prop-types" "^15.7.12" + clsx "^2.1.1" + prop-types "^15.8.1" + react-is "^18.3.1" + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" @@ -1884,6 +2147,11 @@ schema-utils "^4.2.0" source-map "^0.7.3" +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@rollup/plugin-babel@^5.2.0": version "5.3.1" resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" @@ -2594,7 +2862,7 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prop-types@*": +"@types/prop-types@*", "@types/prop-types@^15.7.12": version "15.7.13" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451" integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA== @@ -2614,7 +2882,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-transition-group@^4.2.0": +"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.10": version "4.4.11" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== @@ -4373,6 +4641,11 @@ clsx@^1.0.4, clsx@^1.2.1: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== +clsx@^2.1.0, clsx@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" + integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -4572,7 +4845,7 @@ content-type@~1.0.4, content-type@~1.0.5: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== @@ -4953,7 +5226,7 @@ csstype@^2.5.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== -csstype@^3.0.2: +csstype@^3.0.2, csstype@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== @@ -6684,6 +6957,11 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" + integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -7358,7 +7636,7 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -9067,7 +9345,7 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" -jss-plugin-camel-case@^10.5.1: +jss-plugin-camel-case@^10.10.0, jss-plugin-camel-case@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== @@ -9076,7 +9354,7 @@ jss-plugin-camel-case@^10.5.1: hyphenate-style-name "^1.0.3" jss "10.10.0" -jss-plugin-default-unit@^10.5.1: +jss-plugin-default-unit@^10.10.0, jss-plugin-default-unit@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== @@ -9084,7 +9362,7 @@ jss-plugin-default-unit@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-global@^10.5.1: +jss-plugin-global@^10.10.0, jss-plugin-global@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== @@ -9092,7 +9370,7 @@ jss-plugin-global@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-nested@^10.5.1: +jss-plugin-nested@^10.10.0, jss-plugin-nested@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== @@ -9101,7 +9379,7 @@ jss-plugin-nested@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-props-sort@^10.5.1: +jss-plugin-props-sort@^10.10.0, jss-plugin-props-sort@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== @@ -9109,7 +9387,7 @@ jss-plugin-props-sort@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-rule-value-function@^10.5.1: +jss-plugin-rule-value-function@^10.10.0, jss-plugin-rule-value-function@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== @@ -9118,7 +9396,7 @@ jss-plugin-rule-value-function@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-vendor-prefixer@^10.5.1: +jss-plugin-vendor-prefixer@^10.10.0, jss-plugin-vendor-prefixer@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== @@ -9127,7 +9405,7 @@ jss-plugin-vendor-prefixer@^10.5.1: css-vendor "^2.0.8" jss "10.10.0" -jss@10.10.0, jss@^10.5.1: +jss@10.10.0, jss@^10.10.0, jss@^10.5.1: version "10.10.0" resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== @@ -11597,7 +11875,7 @@ react-is@^16.13.1, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^18.0.0: +react-is@^18.0.0, react-is@^18.3.1: version "18.3.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== @@ -11683,7 +11961,7 @@ react-style-proptype@^3.2.2: dependencies: prop-types "^15.5.4" -react-transition-group@^4.4.0: +react-transition-group@^4.4.0, react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== @@ -12690,7 +12968,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.5.6: +source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== @@ -13136,6 +13414,11 @@ stylehacks@^5.1.1: browserslist "^4.21.4" postcss-selector-parser "^6.0.4" +stylis@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" + integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== + sucrase@^3.32.0: version "3.35.0" resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263" From 27df68b5309fcd21cb716551e0378b8a91ef2fc9 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 30 Sep 2024 14:48:46 +0200 Subject: [PATCH 02/29] Remove v4 --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index bcb2703..6475aff 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,6 @@ "@craco/craco": "^7.1.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@material-ui/core": "^4.12.4", - "@material-ui/icons": "^4.11.3", - "@material-ui/lab": "^4.0.0-alpha.61", - "@material-ui/styles": "^4.11.5", "@mui/icons-material": "^5.16.7", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "^5.16.7", From e1f0ae9dca2d38d917491b5ba7470caa4c9063f0 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 30 Sep 2024 14:48:54 +0200 Subject: [PATCH 03/29] Remove v4 --- yarn.lock | 123 ++++++------------------------------------------------ 1 file changed, 13 insertions(+), 110 deletions(-) diff --git a/yarn.lock b/yarn.lock index 463731f..0d71c93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1121,7 +1121,7 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.25.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== @@ -1408,11 +1408,6 @@ "@emotion/weak-memoize" "^0.4.0" stylis "4.2.0" -"@emotion/hash@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" - integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== - "@emotion/hash@^0.9.1", "@emotion/hash@^0.9.2": version "0.9.2" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" @@ -1890,88 +1885,6 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@material-ui/core@^4.12.4": - version "4.12.4" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.4.tgz#4ac17488e8fcaf55eb6a7f5efb2a131e10138a73" - integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.11.5" - "@material-ui/system" "^4.12.2" - "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" - "@types/react-transition-group" "^4.2.0" - clsx "^1.0.4" - hoist-non-react-statics "^3.3.2" - popper.js "1.16.1-lts" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" - react-transition-group "^4.4.0" - -"@material-ui/icons@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1" - integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA== - dependencies: - "@babel/runtime" "^7.4.4" - -"@material-ui/lab@^4.0.0-alpha.61": - version "4.0.0-alpha.61" - resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz#9bf8eb389c0c26c15e40933cc114d4ad85e3d978" - integrity sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.11.3" - clsx "^1.0.4" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" - -"@material-ui/styles@^4.11.5": - version "4.11.5" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.5.tgz#19f84457df3aafd956ac863dbe156b1d88e2bbfb" - integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA== - dependencies: - "@babel/runtime" "^7.4.4" - "@emotion/hash" "^0.8.0" - "@material-ui/types" "5.1.0" - "@material-ui/utils" "^4.11.3" - clsx "^1.0.4" - csstype "^2.5.2" - hoist-non-react-statics "^3.3.2" - jss "^10.5.1" - jss-plugin-camel-case "^10.5.1" - jss-plugin-default-unit "^10.5.1" - jss-plugin-global "^10.5.1" - jss-plugin-nested "^10.5.1" - jss-plugin-props-sort "^10.5.1" - jss-plugin-rule-value-function "^10.5.1" - jss-plugin-vendor-prefixer "^10.5.1" - prop-types "^15.7.2" - -"@material-ui/system@^4.12.2": - version "4.12.2" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.2.tgz#f5c389adf3fce4146edd489bf4082d461d86aa8b" - integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw== - dependencies: - "@babel/runtime" "^7.4.4" - "@material-ui/utils" "^4.11.3" - csstype "^2.5.2" - prop-types "^15.7.2" - -"@material-ui/types@5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" - integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== - -"@material-ui/utils@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.3.tgz#232bd86c4ea81dab714f21edad70b7fdf0253942" - integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg== - dependencies: - "@babel/runtime" "^7.4.4" - prop-types "^15.7.2" - react-is "^16.8.0 || ^17.0.0" - "@mui/base@5.0.0-beta.40": version "5.0.0-beta.40" resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.40.tgz#1f8a782f1fbf3f84a961e954c8176b187de3dae2" @@ -2882,7 +2795,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.10": +"@types/react-transition-group@^4.4.10": version "4.4.11" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== @@ -4636,7 +4549,7 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clsx@^1.0.4, clsx@^1.2.1: +clsx@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== @@ -5221,11 +5134,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.5.2: - version "2.6.21" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== - csstype@^3.0.2, csstype@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" @@ -9345,7 +9253,7 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" -jss-plugin-camel-case@^10.10.0, jss-plugin-camel-case@^10.5.1: +jss-plugin-camel-case@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== @@ -9354,7 +9262,7 @@ jss-plugin-camel-case@^10.10.0, jss-plugin-camel-case@^10.5.1: hyphenate-style-name "^1.0.3" jss "10.10.0" -jss-plugin-default-unit@^10.10.0, jss-plugin-default-unit@^10.5.1: +jss-plugin-default-unit@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== @@ -9362,7 +9270,7 @@ jss-plugin-default-unit@^10.10.0, jss-plugin-default-unit@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-global@^10.10.0, jss-plugin-global@^10.5.1: +jss-plugin-global@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== @@ -9370,7 +9278,7 @@ jss-plugin-global@^10.10.0, jss-plugin-global@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-nested@^10.10.0, jss-plugin-nested@^10.5.1: +jss-plugin-nested@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== @@ -9379,7 +9287,7 @@ jss-plugin-nested@^10.10.0, jss-plugin-nested@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-props-sort@^10.10.0, jss-plugin-props-sort@^10.5.1: +jss-plugin-props-sort@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== @@ -9387,7 +9295,7 @@ jss-plugin-props-sort@^10.10.0, jss-plugin-props-sort@^10.5.1: "@babel/runtime" "^7.3.1" jss "10.10.0" -jss-plugin-rule-value-function@^10.10.0, jss-plugin-rule-value-function@^10.5.1: +jss-plugin-rule-value-function@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== @@ -9396,7 +9304,7 @@ jss-plugin-rule-value-function@^10.10.0, jss-plugin-rule-value-function@^10.5.1: jss "10.10.0" tiny-warning "^1.0.2" -jss-plugin-vendor-prefixer@^10.10.0, jss-plugin-vendor-prefixer@^10.5.1: +jss-plugin-vendor-prefixer@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== @@ -9405,7 +9313,7 @@ jss-plugin-vendor-prefixer@^10.10.0, jss-plugin-vendor-prefixer@^10.5.1: css-vendor "^2.0.8" jss "10.10.0" -jss@10.10.0, jss@^10.10.0, jss@^10.5.1: +jss@10.10.0, jss@^10.10.0: version "10.10.0" resolved "https://registry.yarnpkg.com/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== @@ -10911,11 +10819,6 @@ plist@^3.0.4, plist@^3.0.5: base64-js "^1.5.1" xmlbuilder "^15.1.1" -popper.js@1.16.1-lts: - version "1.16.1-lts" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05" - integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA== - portfinder@^1.0.26: version "1.0.32" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" @@ -11870,7 +11773,7 @@ react-is@^16.13.1, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -"react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1: +react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -11961,7 +11864,7 @@ react-style-proptype@^3.2.2: dependencies: prop-types "^15.5.4" -react-transition-group@^4.4.0, react-transition-group@^4.4.5: +react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== From a9cc609628d3e2e24fde3dc118c60d89aa1867b0 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 30 Sep 2024 14:49:56 +0200 Subject: [PATCH 04/29] Update imports --- src/app/AlignmentCard.js | 40 +++++++++++++-------------- src/app/App.js | 30 ++++++++++---------- src/app/AstralTreeCard.js | 28 +++++++++---------- src/app/CitationModal.js | 18 ++++++------ src/app/Console.js | 2 +- src/app/Input.js | 8 +++--- src/app/Model.js | 8 +++--- src/app/Output.js | 12 ++++---- src/app/PartitionEditor.js | 20 +++++++------- src/app/PartitionFileCard.js | 12 ++++---- src/app/Raxml.js | 14 +++++----- src/app/TreeCard.js | 20 +++++++------- src/app/components/CodeHighlight.js | 2 +- src/app/components/ErrorBoundary.js | 4 +-- src/app/components/ErrorDialog.js | 24 ++++++++-------- src/app/components/LoadingButton.js | 6 ++-- src/app/components/ModifiedDialog.js | 24 ++++++++-------- src/app/components/OptionCheck.js | 6 ++-- src/app/components/OptionSelect.js | 10 +++---- src/app/components/OptionTextField.js | 2 +- src/app/components/SnackbarMessage.js | 20 +++++++------- src/app/index.js | 2 +- src/app/theme/index.js | 2 +- 23 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index 6c4ee55..759c78c 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -1,30 +1,30 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles, withStyles } from '@material-ui/core/styles'; -import IconButton from '@material-ui/core/IconButton'; -import MoreVertIcon from '@material-ui/icons/MoreVert'; -import DeleteForeverIcon from '@material-ui/icons/DeleteForever'; +import { makeStyles, withStyles } from '@mui/styles'; +import IconButton from '@mui/material/IconButton'; +import MoreVertIcon from '@mui/icons-material/MoreVert'; +import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; import classNames from 'classnames'; -import CircularProgress from '@material-ui/core/CircularProgress'; -import Chip from '@material-ui/core/Chip'; -import Switch from '@material-ui/core/Switch'; -import Menu from '@material-ui/core/Menu'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import FormControlLabel from '@material-ui/core/FormControlLabel'; -import InputLabel from '@material-ui/core/InputLabel'; -import Select from '@material-ui/core/Select'; -import Tooltip from '@material-ui/core/Tooltip'; -import Card from '@material-ui/core/Card'; -import CardHeader from '@material-ui/core/CardHeader'; -import CardContent from '@material-ui/core/CardContent'; -import Typography from '@material-ui/core/Typography'; +import CircularProgress from '@mui/material/CircularProgress'; +import Chip from '@mui/material/Chip'; +import Switch from '@mui/material/Switch'; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import FormControl from '@mui/material/FormControl'; +import FormControlLabel from '@mui/material/FormControlLabel'; +import InputLabel from '@mui/material/InputLabel'; +import Select from '@mui/material/Select'; +import Tooltip from '@mui/material/Tooltip'; +import Card from '@mui/material/Card'; +import CardHeader from '@mui/material/CardHeader'; +import CardContent from '@mui/material/CardContent'; +import Typography from '@mui/material/Typography'; import OptionSelect from './components/OptionSelect'; import OptionTextField from './components/OptionTextField'; -import CardActions from '@material-ui/core/CardActions'; +import CardActions from '@mui/material/CardActions'; import LoadingButton from './components/LoadingButton'; -import Box from '@material-ui/core/Box'; +import Box from '@mui/material/Box'; const InputSwitch = withStyles((theme) => ({ switchBase: { diff --git a/src/app/App.js b/src/app/App.js index 4719fc5..08411a0 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -2,21 +2,21 @@ import React from 'react'; import { observer } from 'mobx-react'; import clsx from 'clsx'; import SplitPane from 'react-split-pane'; -import { makeStyles } from '@material-ui/styles'; -import CssBaseline from '@material-ui/core/CssBaseline'; -import IconButton from '@material-ui/core/IconButton'; -import Chip from '@material-ui/core/Chip'; -import CircularProgress from '@material-ui/core/CircularProgress'; -import AppBar from '@material-ui/core/AppBar'; -import Toolbar from '@material-ui/core/Toolbar'; -import Tabs from '@material-ui/core/Tabs'; -import Tab from '@material-ui/core/Tab'; -import IconAdd from '@material-ui/icons/Add'; -import DeleteIcon from '@material-ui/icons/DeleteForever'; -import Box from '@material-ui/core/Box'; -import Snackbar from '@material-ui/core/Snackbar'; -import { Typography } from '@material-ui/core'; -import Modal from '@material-ui/core/Modal'; +import { makeStyles } from '@mui/styles'; +import CssBaseline from '@mui/material/CssBaseline'; +import IconButton from '@mui/material/IconButton'; +import Chip from '@mui/material/Chip'; +import CircularProgress from '@mui/material/CircularProgress'; +import AppBar from '@mui/material/AppBar'; +import Toolbar from '@mui/material/Toolbar'; +import Tabs from '@mui/material/Tabs'; +import Tab from '@mui/material/Tab'; +import IconAdd from '@mui/icons-material/Add'; +import DeleteIcon from '@mui/icons-material/DeleteForever'; +import Box from '@mui/material/Box'; +import Snackbar from '@mui/material/Snackbar'; +import { Typography } from '@mui/material'; +import Modal from '@mui/material/Modal'; import Model from './Model'; import Input from './Input'; diff --git a/src/app/AstralTreeCard.js b/src/app/AstralTreeCard.js index 918500a..b0fc63c 100644 --- a/src/app/AstralTreeCard.js +++ b/src/app/AstralTreeCard.js @@ -1,21 +1,21 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles, withStyles } from '@material-ui/core/styles'; -import IconButton from '@material-ui/core/IconButton'; -import MoreVertIcon from '@material-ui/icons/MoreVert'; -import DeleteForeverIcon from '@material-ui/icons/DeleteForever'; +import { makeStyles } from '@mui/styles'; +import IconButton from '@mui/material/IconButton'; +import MoreVertIcon from '@mui/icons-material/MoreVert'; +import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; import classNames from 'classnames'; -import CircularProgress from '@material-ui/core/CircularProgress'; -import Chip from '@material-ui/core/Chip'; -import Menu from '@material-ui/core/Menu'; -import MenuItem from '@material-ui/core/MenuItem'; -import Tooltip from '@material-ui/core/Tooltip'; -import Card from '@material-ui/core/Card'; -import CardHeader from '@material-ui/core/CardHeader'; -import CardContent from '@material-ui/core/CardContent'; -import CardActions from '@material-ui/core/CardActions'; -import Box from '@material-ui/core/Box'; +import CircularProgress from '@mui/material/CircularProgress'; +import Chip from '@mui/material/Chip'; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import Tooltip from '@mui/material/Tooltip'; +import Card from '@mui/material/Card'; +import CardHeader from '@mui/material/CardHeader'; +import CardContent from '@mui/material/CardContent'; +import CardActions from '@mui/material/CardActions'; +import Box from '@mui/material/Box'; // const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => { diff --git a/src/app/CitationModal.js b/src/app/CitationModal.js index 55c0f4e..c821622 100644 --- a/src/app/CitationModal.js +++ b/src/app/CitationModal.js @@ -1,15 +1,15 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/core/styles'; -import Button from '@material-ui/core/Button'; -import Card from '@material-ui/core/Card'; -import CardContent from '@material-ui/core/CardContent'; -import CardActions from '@material-ui/core/CardActions'; -import Typography from '@material-ui/core/Typography'; -import Box from '@material-ui/core/Box'; -import ToggleButton from '@material-ui/lab/ToggleButton'; -import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'; +import { makeStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; +import Card from '@mui/material/Card'; +import CardContent from '@mui/material/CardContent'; +import CardActions from '@mui/material/CardActions'; +import Typography from '@mui/material/Typography'; +import Box from '@mui/material/Box'; +import ToggleButton from '@mui/lab/ToggleButton'; +import ToggleButtonGroup from '@mui/lab/ToggleButtonGroup'; import CodeHighlight from './components/CodeHighlight'; diff --git a/src/app/Console.js b/src/app/Console.js index 7b4cf4b..e4a5ad5 100644 --- a/src/app/Console.js +++ b/src/app/Console.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; +import { withStyles } from '@mui/styles'; import clsx from 'clsx'; diff --git a/src/app/Input.js b/src/app/Input.js index 4ce484a..b9b9011 100644 --- a/src/app/Input.js +++ b/src/app/Input.js @@ -1,14 +1,14 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/styles'; -import Button from '@material-ui/core/Button'; +import { makeStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; import AlignmentCard, { FinalAlignmentCard } from './AlignmentCard'; import AstralTreeCard from './AstralTreeCard'; import PartitionFileCard from './PartitionFileCard'; -import Box from '@material-ui/core/Box'; +import Box from '@mui/material/Box'; import TreeCard from './TreeCard'; -import { Typography } from '@material-ui/core'; +import { Typography } from '@mui/material'; import Dropzone from 'react-dropzone'; const useStyles = makeStyles(theme => ({ diff --git a/src/app/Model.js b/src/app/Model.js index 6f7a2b5..f0801d3 100644 --- a/src/app/Model.js +++ b/src/app/Model.js @@ -1,12 +1,12 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/styles'; -import Box from '@material-ui/core/Box'; +import { makeStyles } from '@mui/styles'; +import Box from '@mui/material/Box'; import OptionSelect from './components/OptionSelect'; import OptionCheck from './components/OptionCheck'; -import TextField from '@material-ui/core/TextField'; -import Typography from '@material-ui/core/Typography'; +import TextField from '@mui/material/TextField'; +import Typography from '@mui/material/Typography'; const useStyles = makeStyles(theme => ({ Model: { diff --git a/src/app/Output.js b/src/app/Output.js index c76d9ac..7c55fb6 100644 --- a/src/app/Output.js +++ b/src/app/Output.js @@ -1,12 +1,12 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/styles'; -import Box from '@material-ui/core/Box'; -import TextField from '@material-ui/core/TextField'; -import Button from '@material-ui/core/Button'; -import { Link, Typography } from '@material-ui/core'; -import FileIcon from '@material-ui/icons/InsertDriveFileSharp'; +import { makeStyles } from '@mui/styles'; +import Box from '@mui/material/Box'; +import TextField from '@mui/material/TextField'; +import Button from '@mui/material/Button'; +import { Link, Typography } from '@mui/material'; +import FileIcon from '@mui/icons-material/InsertDriveFileSharp'; import { join } from 'path'; const useStyles = makeStyles((theme) => ({ diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index 5b48e34..bc5be67 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -1,18 +1,18 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/core/styles'; -import Button from '@material-ui/core/Button'; -import TextField from '@material-ui/core/TextField'; -import Card from '@material-ui/core/Card'; -import CardContent from '@material-ui/core/CardContent'; -import CardActions from '@material-ui/core/CardActions'; +import { makeStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; +import TextField from '@mui/material/TextField'; +import Card from '@mui/material/Card'; +import CardContent from '@mui/material/CardContent'; +import CardActions from '@mui/material/CardActions'; import OptionTextField from './components/OptionTextField'; import OptionSelect from './components/OptionSelect'; -import Box from '@material-ui/core/Box'; -import Grid from '@material-ui/core/Grid'; -import LinearProgress from '@material-ui/core/LinearProgress'; -import Typography from '@material-ui/core/Typography'; +import Box from '@mui/material/Box'; +import Grid from '@mui/material/Grid'; +import LinearProgress from '@mui/material/LinearProgress'; +import Typography from '@mui/material/Typography'; const useStyles = makeStyles(theme => ({ Partition: { diff --git a/src/app/PartitionFileCard.js b/src/app/PartitionFileCard.js index 4355d60..c542910 100644 --- a/src/app/PartitionFileCard.js +++ b/src/app/PartitionFileCard.js @@ -1,13 +1,13 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/core/styles'; -import DeleteForeverIcon from '@material-ui/icons/DeleteForever'; +import { makeStyles } from '@mui/styles'; +import DeleteForeverIcon from '@mui/icons-material/DeleteForever'; import classNames from 'classnames'; -import Chip from '@material-ui/core/Chip'; -import Card from '@material-ui/core/Card'; -import CardHeader from '@material-ui/core/CardHeader'; -import CardContent from '@material-ui/core/CardContent'; +import Chip from '@mui/material/Chip'; +import Card from '@mui/material/Card'; +import CardHeader from '@mui/material/CardHeader'; +import CardContent from '@mui/material/CardContent'; // const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => { diff --git a/src/app/Raxml.js b/src/app/Raxml.js index f48ca5c..3ceb2fc 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -2,15 +2,15 @@ import React from 'react'; import { clipboard } from 'electron'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import Button from '@material-ui/core/Button'; -import { withStyles } from '@material-ui/core/styles'; +import Button from '@mui/material/Button'; +import { withStyles } from '@mui/styles'; import OptionSelect from './components/OptionSelect'; -import Box from '@material-ui/core/Box'; +import Box from '@mui/material/Box'; import LoadingButton from './components/LoadingButton'; -import Typography from '@material-ui/core/Typography'; -import Tooltip from '@material-ui/core/Tooltip'; -import IconButton from '@material-ui/core/IconButton'; -import FileCopyIcon from '@material-ui/icons/FileCopy'; +import Typography from '@mui/material/Typography'; +import Tooltip from '@mui/material/Tooltip'; +import IconButton from '@mui/material/IconButton'; +import FileCopyIcon from '@mui/icons-material/FileCopy'; const styles = (theme) => ({ Raxml: { diff --git a/src/app/TreeCard.js b/src/app/TreeCard.js index d8f7a55..0d601f7 100644 --- a/src/app/TreeCard.js +++ b/src/app/TreeCard.js @@ -1,17 +1,17 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/core/styles'; -import IconButton from '@material-ui/core/IconButton'; -import MoreVertIcon from '@material-ui/icons/MoreVert'; +import { makeStyles } from '@mui/styles'; +import IconButton from '@mui/material/IconButton'; +import MoreVertIcon from '@mui/icons-material/MoreVert'; import classNames from 'classnames'; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Chip from "@material-ui/core/Chip"; -import Menu from '@material-ui/core/Menu'; -import MenuItem from '@material-ui/core/MenuItem'; -import Card from '@material-ui/core/Card'; -import CardHeader from '@material-ui/core/CardHeader'; -import CardContent from '@material-ui/core/CardContent'; +import CircularProgress from "@mui/material/CircularProgress"; +import Chip from "@mui/material/Chip"; +import Menu from '@mui/material/Menu'; +import MenuItem from '@mui/material/MenuItem'; +import Card from '@mui/material/Card'; +import CardHeader from '@mui/material/CardHeader'; +import CardContent from '@mui/material/CardContent'; const useStyles = makeStyles(theme => ({ TreeCard: { diff --git a/src/app/components/CodeHighlight.js b/src/app/components/CodeHighlight.js index f765066..24db98b 100644 --- a/src/app/components/CodeHighlight.js +++ b/src/app/components/CodeHighlight.js @@ -1,6 +1,6 @@ import React, { useRef, useEffect } from 'react'; import PropTypes from 'prop-types'; -import { makeStyles } from '@material-ui/core/styles'; +import { makeStyles } from '@mui/styles'; import Prism from 'prismjs'; import 'prismjs-bibtex'; import 'prismjs/themes/prism.css'; diff --git a/src/app/components/ErrorBoundary.js b/src/app/components/ErrorBoundary.js index ae46c14..23c125f 100644 --- a/src/app/components/ErrorBoundary.js +++ b/src/app/components/ErrorBoundary.js @@ -1,6 +1,6 @@ import React from 'react'; -import { Box } from '@material-ui/core'; -import Typography from '@material-ui/core/Typography'; +import { Box } from '@mui/material'; +import Typography from '@mui/material/Typography'; import ErrorDialog from './ErrorDialog'; class ErrorBoundary extends React.Component { diff --git a/src/app/components/ErrorDialog.js b/src/app/components/ErrorDialog.js index afcb514..e92955b 100644 --- a/src/app/components/ErrorDialog.js +++ b/src/app/components/ErrorDialog.js @@ -1,17 +1,17 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Box } from '@material-ui/core'; -import Dialog from '@material-ui/core/Dialog'; -import DialogTitle from '@material-ui/core/DialogTitle'; -import DialogContent from '@material-ui/core/DialogContent'; -import DialogActions from '@material-ui/core/DialogActions'; -import DialogContentText from '@material-ui/core/DialogContentText'; -import Accordion from '@material-ui/core/Accordion'; -import AccordionSummary from '@material-ui/core/AccordionSummary'; -import AccordionDetails from '@material-ui/core/AccordionDetails'; -import Typography from '@material-ui/core/Typography'; -import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; -import Button from '@material-ui/core/Button'; +import { Box } from '@mui/material'; +import Dialog from '@mui/material/Dialog'; +import DialogTitle from '@mui/material/DialogTitle'; +import DialogContent from '@mui/material/DialogContent'; +import DialogActions from '@mui/material/DialogActions'; +import DialogContentText from '@mui/material/DialogContentText'; +import Accordion from '@mui/material/Accordion'; +import AccordionSummary from '@mui/material/AccordionSummary'; +import AccordionDetails from '@mui/material/AccordionDetails'; +import Typography from '@mui/material/Typography'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import Button from '@mui/material/Button'; import { ipcRenderer } from 'electron'; import SnackbarMessage from './SnackbarMessage'; import { reportIssueToGitHub, getMailtoLinkToReportError } from '../../common/utils'; diff --git a/src/app/components/LoadingButton.js b/src/app/components/LoadingButton.js index fdbc3c7..0a35647 100644 --- a/src/app/components/LoadingButton.js +++ b/src/app/components/LoadingButton.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { makeStyles } from '@material-ui/core/styles'; -import Button from '@material-ui/core/Button'; -import CircularProgress from '@material-ui/core/CircularProgress'; +import { makeStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; +import CircularProgress from '@mui/material/CircularProgress'; const useStyles = makeStyles(theme => ({ wrapper: { diff --git a/src/app/components/ModifiedDialog.js b/src/app/components/ModifiedDialog.js index a52be30..f7b503a 100644 --- a/src/app/components/ModifiedDialog.js +++ b/src/app/components/ModifiedDialog.js @@ -1,17 +1,17 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Box } from '@material-ui/core'; -import Dialog from '@material-ui/core/Dialog'; -import DialogTitle from '@material-ui/core/DialogTitle'; -import DialogContent from '@material-ui/core/DialogContent'; -import DialogActions from '@material-ui/core/DialogActions'; -import DialogContentText from '@material-ui/core/DialogContentText'; -import Accordion from '@material-ui/core/Accordion'; -import AccordionSummary from '@material-ui/core/AccordionSummary'; -import AccordionDetails from '@material-ui/core/AccordionDetails'; -import Typography from '@material-ui/core/Typography'; -import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; -import Button from '@material-ui/core/Button'; +import { Box } from '@mui/material'; +import Dialog from '@mui/material/Dialog'; +import DialogTitle from '@mui/material/DialogTitle'; +import DialogContent from '@mui/material/DialogContent'; +import DialogActions from '@mui/material/DialogActions'; +import DialogContentText from '@mui/material/DialogContentText'; +import Accordion from '@mui/material/Accordion'; +import AccordionSummary from '@mui/material/AccordionSummary'; +import AccordionDetails from '@mui/material/AccordionDetails'; +import Typography from '@mui/material/Typography'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import Button from '@mui/material/Button'; export default function ModifiedDialog({ show, onClose, messages }) { if (!show) { diff --git a/src/app/components/OptionCheck.js b/src/app/components/OptionCheck.js index a5d0363..b5b4c67 100644 --- a/src/app/components/OptionCheck.js +++ b/src/app/components/OptionCheck.js @@ -1,9 +1,9 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import FormControlLabel from '@material-ui/core/FormControlLabel'; -import Checkbox from '@material-ui/core/Checkbox'; -import { FormControl, FormHelperText } from '@material-ui/core'; +import FormControlLabel from '@mui/material/FormControlLabel'; +import Checkbox from '@mui/material/Checkbox'; +import { FormControl, FormHelperText } from '@mui/material'; const OptionCheck = observer(({ option, className }) => { diff --git a/src/app/components/OptionSelect.js b/src/app/components/OptionSelect.js index 2d0f7a9..f84e8f0 100644 --- a/src/app/components/OptionSelect.js +++ b/src/app/components/OptionSelect.js @@ -1,11 +1,11 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import FormControl from '@material-ui/core/FormControl'; -import FormHelperText from '@material-ui/core/FormHelperText'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import TextField from '@material-ui/core/TextField'; +import FormControl from '@mui/material/FormControl'; +import FormHelperText from '@mui/material/FormHelperText'; +import Select from '@mui/material/Select'; +import MenuItem from '@mui/material/MenuItem'; +import TextField from '@mui/material/TextField'; const OptionSelect = observer(({ option, className }) => { diff --git a/src/app/components/OptionTextField.js b/src/app/components/OptionTextField.js index a529785..75d4557 100644 --- a/src/app/components/OptionTextField.js +++ b/src/app/components/OptionTextField.js @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; -import TextField from '@material-ui/core/TextField'; +import TextField from '@mui/material/TextField'; const OptionTextField = observer(({ option, className }) => { if (option.notAvailable) { diff --git a/src/app/components/SnackbarMessage.js b/src/app/components/SnackbarMessage.js index ef28211..b776d1d 100644 --- a/src/app/components/SnackbarMessage.js +++ b/src/app/components/SnackbarMessage.js @@ -1,16 +1,16 @@ import React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import CheckCircleIcon from '@material-ui/icons/CheckCircle'; -import ErrorIcon from '@material-ui/icons/Error'; -import InfoIcon from '@material-ui/icons/Info'; -import CloseIcon from '@material-ui/icons/Close'; -import { amber } from '@material-ui/core/colors'; -import IconButton from '@material-ui/core/IconButton'; -import SnackbarContent from '@material-ui/core/SnackbarContent'; -import WarningIcon from '@material-ui/icons/Warning'; -import { makeStyles } from '@material-ui/styles'; -import Box from '@material-ui/core/Box'; +import CheckCircleIcon from '@mui/icons-material/CheckCircle'; +import ErrorIcon from '@mui/icons-material/Error'; +import InfoIcon from '@mui/icons-material/Info'; +import CloseIcon from '@mui/icons-material/Close'; +import { amber } from '@mui/material/colors'; +import IconButton from '@mui/material/IconButton'; +import SnackbarContent from '@mui/material/SnackbarContent'; +import WarningIcon from '@mui/icons-material/Warning'; +import { makeStyles } from '@mui/styles'; +import Box from '@mui/material/Box'; const variantIcon = { success: CheckCircleIcon, diff --git a/src/app/index.js b/src/app/index.js index ac88e33..9be7cc3 100644 --- a/src/app/index.js +++ b/src/app/index.js @@ -1,6 +1,6 @@ import React from 'react'; import { observer } from 'mobx-react'; -import { ThemeProvider } from '@material-ui/styles'; +import { ThemeProvider } from '@mui/styles'; import * as Sentry from '@sentry/electron/renderer'; import theme from './theme'; diff --git a/src/app/theme/index.js b/src/app/theme/index.js index 7c1d4cf..2a2762a 100644 --- a/src/app/theme/index.js +++ b/src/app/theme/index.js @@ -1,4 +1,4 @@ -import { createTheme } from '@material-ui/core/styles'; +import { createTheme } from '@mui/material/styles'; const darkTheme = { palette: { From d18043dbaa6e54c0bd63b03883156498eb60d6e3 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 30 Sep 2024 15:01:49 +0200 Subject: [PATCH 05/29] Codemods --- src/app/AlignmentCard.js | 6 +++--- src/app/App.js | 2 +- src/app/AstralTreeCard.js | 4 ++-- src/app/Model.js | 4 ++-- src/app/Output.js | 20 +++++++++++--------- src/app/PartitionEditor.js | 2 +- src/app/Raxml.js | 16 +++------------- src/app/TreeCard.js | 2 +- src/app/components/OptionCheck.js | 2 +- src/app/components/OptionSelect.js | 12 ++++++------ src/app/components/OptionTextField.js | 4 ++-- src/app/components/SnackbarMessage.js | 7 ++++++- src/app/theme/index.js | 10 +++++----- 13 files changed, 44 insertions(+), 47 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index 759c78c..6225f91 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -279,7 +279,7 @@ function AlignmentCard({ className, alignment }) { aria-label="remove-alignment" title="Remove alignment" > - + @@ -288,7 +288,7 @@ function AlignmentCard({ className, alignment }) { aria-owns={anchorEl ? 'alignment-menu' : undefined} aria-haspopup="true" onClick={handleMenuClick} - > + size="large"> @@ -394,7 +394,7 @@ function FinalAlignmentCard({ className, alignment }) { aria-owns={anchorEl ? 'alignment-menu' : undefined} aria-haspopup="true" onClick={handleMenuClick} - > + size="large"> diff --git a/src/app/App.js b/src/app/App.js index 08411a0..d8981f3 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -284,7 +284,7 @@ const App = () => { {TabItems} - + diff --git a/src/app/AstralTreeCard.js b/src/app/AstralTreeCard.js index b0fc63c..b7227b7 100644 --- a/src/app/AstralTreeCard.js +++ b/src/app/AstralTreeCard.js @@ -92,7 +92,7 @@ function AstralTreeCard({ className, astralTree }) { action={
- + @@ -101,7 +101,7 @@ function AstralTreeCard({ className, astralTree }) { aria-owns={anchorEl ? 'astralTree-menu' : undefined} aria-haspopup="true" onClick={handleMenuClick} - > + size="large"> diff --git a/src/app/Model.js b/src/app/Model.js index f0801d3..b4dc3f2 100644 --- a/src/app/Model.js +++ b/src/app/Model.js @@ -79,12 +79,12 @@ const Model = ({ run }) => { {run.haveRandomSeed ? ( run.setRandomSeed(e.target.value)} - /> + onChange={(e) => run.setRandomSeed(e.target.value)} /> ) : null} { const haveResult = resultFilenames.length > 0; return ( -
+ (
{ onClick={run.selectOutputDir} InputProps={{ readOnly: true, - }} - /> + }} /> run.setOutputName(e.target.value)} - error={!run.outputNameOk} - /> + error={!run.outputNameOk} /> - { haveResult ? Result for output id '{run.outputName}' : null } { resultFilenames.map(filename => - run.openFile(join(run.outputDir, filename))}> + run.openFile(join(run.outputDir, filename))} + underline="hover"> {filename} @@ -83,7 +85,7 @@ const Output = ({ run }) => { ) : null } -
+
) ); }; diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index bc5be67..4646e56 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -150,7 +150,7 @@ function PartitionEditor({ alignment }) { /> - + { partition.isDefault ? null : ( diff --git a/src/app/Raxml.js b/src/app/Raxml.js index 3ceb2fc..ff7cf2b 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -73,22 +73,12 @@ class Raxml extends React.Component { {run.modelTestIsRunningOnAlignment ? ( - ) : null} {run.running ? ( - ) : null} @@ -112,7 +102,7 @@ class Raxml extends React.Component { + size="large"> diff --git a/src/app/TreeCard.js b/src/app/TreeCard.js index 0d601f7..86fc0b7 100644 --- a/src/app/TreeCard.js +++ b/src/app/TreeCard.js @@ -110,7 +110,7 @@ function TreeCard({ className, tree }) { aria-owns={anchorEl ? 'tree-menu' : undefined} aria-haspopup="true" onClick={handleMenuClick} - > + size="large"> diff --git a/src/app/components/OptionCheck.js b/src/app/components/OptionCheck.js index b5b4c67..0f6bac7 100644 --- a/src/app/components/OptionCheck.js +++ b/src/app/components/OptionCheck.js @@ -11,7 +11,7 @@ const OptionCheck = observer(({ option, className }) => { return null; } return ( - + { // No options to change to, render as a text field instead. return ( { error={option.error} InputProps={{ readOnly: true, - }} - /> - ) + }} /> + ); } return ( - + option.setValue(e.target.value)} inputProps={{ From 818451022d03754f699222209c6638aaad219f83 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 3 Oct 2024 21:23:05 +0200 Subject: [PATCH 12/29] Update to mui 6 --- package.json | 8 +-- yarn.lock | 192 ++++++++++++++++++++++++++++----------------------- 2 files changed, 110 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index 6475aff..d39a01a 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,10 @@ "@craco/craco": "^7.1.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^5.16.7", - "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "^5.16.7", - "@mui/styles": "^5.16.7", + "@mui/icons-material": "^6.1.2", + "@mui/lab": "^6.0.0-beta.10", + "@mui/material": "^6.1.2", + "@mui/styles": "^6.1.2", "@sentry/electron": "^4.0.2", "classnames": "^2.3.2", "clean-stack": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 0d71c93..3f500d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1121,13 +1121,20 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.25.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2" integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ== dependencies: regenerator-runtime "^0.14.0" +"@babel/runtime@^7.25.0", "@babel/runtime@^7.25.6": + version "7.25.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.7.tgz#7ffb53c37a8f247c8c4d335e89cdf16a2e0d0fb6" + integrity sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/template@^7.24.7", "@babel/template@^7.25.0", "@babel/template@^7.3.3": version "7.25.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" @@ -1397,7 +1404,7 @@ source-map "^0.5.7" stylis "4.2.0" -"@emotion/cache@^11.11.0", "@emotion/cache@^11.13.0": +"@emotion/cache@^11.13.0", "@emotion/cache@^11.13.1": version "11.13.1" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== @@ -1408,7 +1415,7 @@ "@emotion/weak-memoize" "^0.4.0" stylis "4.2.0" -"@emotion/hash@^0.9.1", "@emotion/hash@^0.9.2": +"@emotion/hash@^0.9.2": version "0.9.2" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== @@ -1534,7 +1541,7 @@ "@floating-ui/core" "^1.6.0" "@floating-ui/utils" "^0.2.8" -"@floating-ui/react-dom@^2.0.8": +"@floating-ui/react-dom@^2.1.1": version "2.1.2" resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.1.2.tgz#a1349bbf6a0e5cb5ded55d023766f20a4d439a31" integrity sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A== @@ -1885,92 +1892,93 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@mui/base@5.0.0-beta.40": - version "5.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.40.tgz#1f8a782f1fbf3f84a961e954c8176b187de3dae2" - integrity sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ== +"@mui/base@5.0.0-beta.58": + version "5.0.0-beta.58" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.58.tgz#66ae4e1aaef8cfd9ae81bd55a70ce76b02eb5d3e" + integrity sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A== dependencies: - "@babel/runtime" "^7.23.9" - "@floating-ui/react-dom" "^2.0.8" - "@mui/types" "^7.2.14" - "@mui/utils" "^5.15.14" + "@babel/runtime" "^7.25.0" + "@floating-ui/react-dom" "^2.1.1" + "@mui/types" "^7.2.15" + "@mui/utils" "6.0.0-rc.0" "@popperjs/core" "^2.11.8" - clsx "^2.1.0" + clsx "^2.1.1" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^5.16.7": - version "5.16.7" - resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz#182a325a520f7ebd75de051fceabfc0314cfd004" - integrity sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ== +"@mui/core-downloads-tracker@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.2.tgz#a15eb14d433100f734e56929f842c2ccc7cab691" + integrity sha512-1oE4U38/TtzLWRYWEm/m70dUbpcvBx0QvDVg6NtpOmSNQC1Mbx0X/rNvYDdZnn8DIsAiVQ+SZ3am6doSswUQ4g== -"@mui/icons-material@^5.16.7": - version "5.16.7" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.16.7.tgz#e27f901af792065efc9f3d75d74a66af7529a10a" - integrity sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q== +"@mui/icons-material@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.1.2.tgz#3e4537c312687afbdd2fd289d5412731d5da3d11" + integrity sha512-7NNcjW5JoT9jHagrVbARA1o41vQY2xezDamtke+mEKKZmsJyejfRBOacSrPDfjZQ//lyhIjNKyzAwisxYJR47w== dependencies: - "@babel/runtime" "^7.23.9" + "@babel/runtime" "^7.25.6" -"@mui/lab@^5.0.0-alpha.173": - version "5.0.0-alpha.173" - resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.173.tgz#a0f9696d93a765b48d69a7da5aaca0affa510ae8" - integrity sha512-Gt5zopIWwxDgGy/MXcp6GueD84xFFugFai4hYiXY0zowJpTVnIrTQCQXV004Q7rejJ7aaCntX9hpPJqCrioshA== +"@mui/lab@^6.0.0-beta.10": + version "6.0.0-beta.10" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-6.0.0-beta.10.tgz#cf6dce21e8491aa00facc0d6b1cd357bfb2ed58e" + integrity sha512-eqCBz5SZS8Un9To3UcjH01AxkOOgvme/g0ZstFC8Nz1Kg5/EJMA0ByhKS5AvUMzUKrv0FXMdbuPqbBvF3bVrXg== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/base" "5.0.0-beta.40" - "@mui/system" "^5.16.5" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.5" - clsx "^2.1.0" + "@babel/runtime" "^7.25.6" + "@mui/base" "5.0.0-beta.58" + "@mui/system" "^6.1.1" + "@mui/types" "^7.2.17" + "@mui/utils" "^6.1.1" + clsx "^2.1.1" prop-types "^15.8.1" -"@mui/material@^5.16.7": - version "5.16.7" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.16.7.tgz#6e814e2eefdaf065a769cecf549c3569e107a50b" - integrity sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg== - dependencies: - "@babel/runtime" "^7.23.9" - "@mui/core-downloads-tracker" "^5.16.7" - "@mui/system" "^5.16.7" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.6" +"@mui/material@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.1.2.tgz#9f47bfa6adcf3b8245799cbf4c027e3cb949bcc6" + integrity sha512-5TtHeAVX9D5d2LYfB1GAUn29BcVETVsrQ76Dwb2SpAfQGW3JVy4deJCAd0RrIkI3eEUrsl0E4xuBdreszxdTTg== + dependencies: + "@babel/runtime" "^7.25.6" + "@mui/core-downloads-tracker" "^6.1.2" + "@mui/system" "^6.1.2" + "@mui/types" "^7.2.17" + "@mui/utils" "^6.1.2" "@popperjs/core" "^2.11.8" - "@types/react-transition-group" "^4.4.10" - clsx "^2.1.0" + "@types/react-transition-group" "^4.4.11" + clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" react-is "^18.3.1" react-transition-group "^4.4.5" -"@mui/private-theming@^5.16.6": - version "5.16.6" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.16.6.tgz#547671e7ae3f86b68d1289a0b90af04dfcc1c8c9" - integrity sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw== +"@mui/private-theming@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.1.2.tgz#1e093c7194dd9f8a511179e0e5c5b10798a4bfae" + integrity sha512-S8WcjZdNdi++8UhrrY8Lton5h/suRiQexvdTfdcPAlbajlvgM+kx+uJstuVIEyTb3gMkxzIZep87knZ0tqcR0g== dependencies: - "@babel/runtime" "^7.23.9" - "@mui/utils" "^5.16.6" + "@babel/runtime" "^7.25.6" + "@mui/utils" "^6.1.2" prop-types "^15.8.1" -"@mui/styled-engine@^5.16.6": - version "5.16.6" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.16.6.tgz#60110c106dd482dfdb7e2aa94fd6490a0a3f8852" - integrity sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g== +"@mui/styled-engine@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.1.2.tgz#bef156ac2e47a67d49982ddb5fa4211974740a26" + integrity sha512-uKOfWkR23X39xj7th2nyTcCHqInTAXtUnqD3T5qRVdJcOPvu1rlgTleTwJC/FJvWZJBU6ieuTWDhbcx5SNViHQ== dependencies: - "@babel/runtime" "^7.23.9" - "@emotion/cache" "^11.11.0" + "@babel/runtime" "^7.25.6" + "@emotion/cache" "^11.13.1" + "@emotion/sheet" "^1.4.0" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/styles@^5.16.7": - version "5.16.7" - resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.16.7.tgz#cf052f0243d283fab837d2505f4901e5207a0575" - integrity sha512-FfXhHP/2MlqH+vLs2tIHMeCChmqSRgkOALVNLKkPrDsvtoq5J8OraOutCn1scpvRjr9mO8ZhW6jKx2t/vUDxtQ== +"@mui/styles@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.1.2.tgz#24bc654cdb0aae369348453ee8d25e3a9c1ace56" + integrity sha512-fsQkTCyyBnjsmy7CM0LG95PJZAhTsmoC/iNk4ihVYmdubMQEeGXzeAWL8E6QBChCnANmjZwm2h5ENyLnCUUuzg== dependencies: - "@babel/runtime" "^7.23.9" - "@emotion/hash" "^0.9.1" - "@mui/private-theming" "^5.16.6" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.6" - clsx "^2.1.0" + "@babel/runtime" "^7.25.6" + "@emotion/hash" "^0.9.2" + "@mui/private-theming" "^6.1.2" + "@mui/types" "^7.2.17" + "@mui/utils" "^6.1.2" + clsx "^2.1.1" csstype "^3.1.3" hoist-non-react-statics "^3.3.2" jss "^10.10.0" @@ -1983,37 +1991,49 @@ jss-plugin-vendor-prefixer "^10.10.0" prop-types "^15.8.1" -"@mui/system@^5.16.5", "@mui/system@^5.16.7": - version "5.16.7" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.16.7.tgz#4583ca5bf3b38942e02c15a1e622ba869ac51393" - integrity sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA== - dependencies: - "@babel/runtime" "^7.23.9" - "@mui/private-theming" "^5.16.6" - "@mui/styled-engine" "^5.16.6" - "@mui/types" "^7.2.15" - "@mui/utils" "^5.16.6" - clsx "^2.1.0" +"@mui/system@^6.1.1", "@mui/system@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.1.2.tgz#28840b04c6fc70780620759d67de2c20bdc7d1c7" + integrity sha512-mzW7F1ZMIYS1aLON48Nrk9c65OrVEVQ+R4lUcTWs1lCSul0VGK23eo4dmY0NX5PS7Oe4xz3P5B9tQZZ7SYgxcg== + dependencies: + "@babel/runtime" "^7.25.6" + "@mui/private-theming" "^6.1.2" + "@mui/styled-engine" "^6.1.2" + "@mui/types" "^7.2.17" + "@mui/utils" "^6.1.2" + clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.14", "@mui/types@^7.2.15": +"@mui/types@^7.2.15", "@mui/types@^7.2.17": version "7.2.17" resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.17.tgz#329826062d4079de5ea2b97007575cebbba1fdbc" integrity sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ== -"@mui/utils@^5.15.14", "@mui/utils@^5.16.5", "@mui/utils@^5.16.6": - version "5.16.6" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" - integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== +"@mui/utils@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.0.0-rc.0.tgz#208c12c919b5cd1731f9d14784c05c35294a893e" + integrity sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A== dependencies: - "@babel/runtime" "^7.23.9" + "@babel/runtime" "^7.25.0" "@mui/types" "^7.2.15" "@types/prop-types" "^15.7.12" clsx "^2.1.1" prop-types "^15.8.1" react-is "^18.3.1" +"@mui/utils@^6.1.1", "@mui/utils@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.1.2.tgz#3717cd9373324a92e48c34f74385350104be652c" + integrity sha512-6+B1YZ8cCBWD1fc3RjqpclF9UA0MLUiuXhyCO+XowD/Z2ku5IlxeEhHHlgglyBWFGMu4kib4YU3CDsG5/zVjJQ== + dependencies: + "@babel/runtime" "^7.25.6" + "@mui/types" "^7.2.17" + "@types/prop-types" "^15.7.13" + clsx "^2.1.1" + prop-types "^15.8.1" + react-is "^18.3.1" + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" @@ -2775,7 +2795,7 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prop-types@*", "@types/prop-types@^15.7.12": +"@types/prop-types@*", "@types/prop-types@^15.7.12", "@types/prop-types@^15.7.13": version "15.7.13" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451" integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA== @@ -2795,7 +2815,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-transition-group@^4.4.10": +"@types/react-transition-group@^4.4.11": version "4.4.11" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== @@ -4554,7 +4574,7 @@ clsx@^1.2.1: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -clsx@^2.1.0, clsx@^2.1.1: +clsx@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== From 72a00eac8e3fbc9a2870e5010fe240fd682a772b Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 3 Oct 2024 21:53:01 +0200 Subject: [PATCH 13/29] Use Grid2 --- src/app/PartitionEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index 4646e56..af6fd0e 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -10,7 +10,7 @@ import CardActions from '@mui/material/CardActions'; import OptionTextField from './components/OptionTextField'; import OptionSelect from './components/OptionSelect'; import Box from '@mui/material/Box'; -import Grid from '@mui/material/Grid'; +import Grid from '@mui/material/Grid2'; import LinearProgress from '@mui/material/LinearProgress'; import Typography from '@mui/material/Typography'; From 0b4cc1455c2c884672f3e46d9a60094c759e3d5a Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Thu, 3 Oct 2024 22:56:15 +0200 Subject: [PATCH 14/29] Grid2 codemod --- src/app/PartitionEditor.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index af6fd0e..a2e9b04 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -90,7 +90,7 @@ function PartitionEditor({ alignment }) { const { partToAdd } = partition; return ( - + ( Partition editor @@ -101,25 +101,25 @@ function PartitionEditor({ alignment }) { - + - + - + - + - + - + - + @@ -152,15 +152,15 @@ function PartitionEditor({ alignment }) { { partition.isDefault ? null : ( - + )} - + - + ) ); } From 7bfffa5d9a0eeb544a9ad3550f99a0ee44fb0419 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:00:56 +0100 Subject: [PATCH 15/29] Update mui --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index d39a01a..8dbb888 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,10 @@ "@craco/craco": "^7.1.0", "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^6.1.2", - "@mui/lab": "^6.0.0-beta.10", - "@mui/material": "^6.1.2", - "@mui/styles": "^6.1.2", + "@mui/icons-material": "^6.4.4", + "@mui/lab": "^6.0.0-beta.27", + "@mui/material": "^6.4.4", + "@mui/styles": "^6.4.4", "@sentry/electron": "^4.0.2", "classnames": "^2.3.2", "clean-stack": "3.0.1", From a1db0c55eb28c4a3e6dec7d7ef8f94b905b7a47c Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:01:30 +0100 Subject: [PATCH 16/29] Replace custom LoadingButton --- src/app/AlignmentCard.js | 9 ++++--- src/app/Raxml.js | 7 ++--- src/app/components/LoadingButton.js | 40 ----------------------------- 3 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 src/app/components/LoadingButton.js diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index ca9666e..4d5f8cc 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -20,8 +20,8 @@ import Typography from '@mui/material/Typography'; import OptionSelect from './components/OptionSelect'; import OptionTextField from './components/OptionTextField'; import CardActions from '@mui/material/CardActions'; -import LoadingButton from './components/LoadingButton'; import Box from '@mui/material/Box'; +import Button from '@mui/material/Button'; const InputSwitch = withStyles((theme) => ({ switchBase: { @@ -146,14 +146,15 @@ function _ModelTestButton({ alignment }) { return null; } return ( - Run ModelTest - + ); } _ModelTestButton.propTypes = { diff --git a/src/app/Raxml.js b/src/app/Raxml.js index b03bcd5..b852603 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -6,7 +6,6 @@ import Button from '@mui/material/Button'; import { withStyles } from '@mui/styles'; import OptionSelect from './components/OptionSelect'; import Box from '@mui/material/Box'; -import LoadingButton from './components/LoadingButton'; import Typography from '@mui/material/Typography'; import Tooltip from '@mui/material/Tooltip'; import IconButton from '@mui/material/IconButton'; @@ -82,13 +81,15 @@ class Raxml extends React.Component { Cancel ) : null} - Run - + diff --git a/src/app/components/LoadingButton.js b/src/app/components/LoadingButton.js deleted file mode 100644 index 231572d..0000000 --- a/src/app/components/LoadingButton.js +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Button from '@mui/material/Button'; -import CircularProgress from '@mui/material/CircularProgress'; -import { Box } from '@mui/material'; - -function LoadingButton(props) { - const { loading, ...buttonProps } = props; - const disabled = (loading || buttonProps.disabled); - - return ( - - - {loading && } - - ); -} - -LoadingButton.propTypes = { - className: PropTypes.string, - children: PropTypes.node, - loading: PropTypes.bool, - noDisabled: PropTypes.bool, -}; - -export default LoadingButton; From 49bc722bb2574526f7585265151132c1296f3fa9 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:01:38 +0100 Subject: [PATCH 17/29] Update mui --- yarn.lock | 241 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 126 insertions(+), 115 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3f500d3..12f5956 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1128,10 +1128,10 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/runtime@^7.25.0", "@babel/runtime@^7.25.6": - version "7.25.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.7.tgz#7ffb53c37a8f247c8c4d335e89cdf16a2e0d0fb6" - integrity sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w== +"@babel/runtime@^7.26.0": + version "7.26.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.9.tgz#aa4c6facc65b9cb3f87d75125ffd47781b475433" + integrity sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg== dependencies: regenerator-runtime "^0.14.0" @@ -1404,7 +1404,7 @@ source-map "^0.5.7" stylis "4.2.0" -"@emotion/cache@^11.13.0", "@emotion/cache@^11.13.1": +"@emotion/cache@^11.13.0": version "11.13.1" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== @@ -1415,6 +1415,17 @@ "@emotion/weak-memoize" "^0.4.0" stylis "4.2.0" +"@emotion/cache@^11.13.5": + version "11.14.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76" + integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA== + dependencies: + "@emotion/memoize" "^0.9.0" + "@emotion/sheet" "^1.4.0" + "@emotion/utils" "^1.4.2" + "@emotion/weak-memoize" "^0.4.0" + stylis "4.2.0" + "@emotion/hash@^0.9.2": version "0.9.2" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" @@ -1457,6 +1468,17 @@ "@emotion/utils" "^1.4.1" csstype "^3.0.2" +"@emotion/serialize@^1.3.3": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.3.tgz#d291531005f17d704d0463a032fe679f376509e8" + integrity sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA== + dependencies: + "@emotion/hash" "^0.9.2" + "@emotion/memoize" "^0.9.0" + "@emotion/unitless" "^0.10.0" + "@emotion/utils" "^1.4.2" + csstype "^3.0.2" + "@emotion/sheet@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c" @@ -1489,6 +1511,11 @@ resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.1.tgz#b3adbb43de12ee2149541c4f1337d2eb7774f0ad" integrity sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA== +"@emotion/utils@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.2.tgz#6df6c45881fcb1c412d6688a311a98b7f59c1b52" + integrity sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA== + "@emotion/weak-memoize@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6" @@ -1892,92 +1919,93 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@mui/base@5.0.0-beta.58": - version "5.0.0-beta.58" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.58.tgz#66ae4e1aaef8cfd9ae81bd55a70ce76b02eb5d3e" - integrity sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A== +"@mui/base@5.0.0-beta.69": + version "5.0.0-beta.69" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.69.tgz#fc3635818c6a9fb954b1ee00870109e7e266149d" + integrity sha512-r2YyGUXpZxj8rLAlbjp1x2BnMERTZ/dMqd9cClKj2OJ7ALAuiv/9X5E9eHfRc9o/dGRuLSMq/WTjREktJVjxVA== dependencies: - "@babel/runtime" "^7.25.0" + "@babel/runtime" "^7.26.0" "@floating-ui/react-dom" "^2.1.1" - "@mui/types" "^7.2.15" - "@mui/utils" "6.0.0-rc.0" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.1" "@popperjs/core" "^2.11.8" clsx "^2.1.1" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.2.tgz#a15eb14d433100f734e56929f842c2ccc7cab691" - integrity sha512-1oE4U38/TtzLWRYWEm/m70dUbpcvBx0QvDVg6NtpOmSNQC1Mbx0X/rNvYDdZnn8DIsAiVQ+SZ3am6doSswUQ4g== +"@mui/core-downloads-tracker@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.4.tgz#7ea43a1185e9cb1dbec77b9fc543b3d8a338d1f0" + integrity sha512-r+J0EditrekkTtO2CnCBCOGpNaDYwJqz8lH4rj6o/anDcskZFJodBlG8aCJkS8DL/CF/9EHS+Gz53EbmYEnQbw== -"@mui/icons-material@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.1.2.tgz#3e4537c312687afbdd2fd289d5412731d5da3d11" - integrity sha512-7NNcjW5JoT9jHagrVbARA1o41vQY2xezDamtke+mEKKZmsJyejfRBOacSrPDfjZQ//lyhIjNKyzAwisxYJR47w== +"@mui/icons-material@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.4.4.tgz#cbc2c9e9c9bbb66f4062085dc69c0b886cd7f888" + integrity sha512-uF1chGaoFmYdRUomK6f8kgJfWosk9A3HXWiVD0vQm+2mE7f25eTQ1E8RRO11LXpnUBqu8Rbv/uGlpnjT/u1Ksg== dependencies: - "@babel/runtime" "^7.25.6" + "@babel/runtime" "^7.26.0" -"@mui/lab@^6.0.0-beta.10": - version "6.0.0-beta.10" - resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-6.0.0-beta.10.tgz#cf6dce21e8491aa00facc0d6b1cd357bfb2ed58e" - integrity sha512-eqCBz5SZS8Un9To3UcjH01AxkOOgvme/g0ZstFC8Nz1Kg5/EJMA0ByhKS5AvUMzUKrv0FXMdbuPqbBvF3bVrXg== +"@mui/lab@^6.0.0-beta.27": + version "6.0.0-beta.27" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-6.0.0-beta.27.tgz#7bf2dec1792e68d0372128578dea4b4b04165c6f" + integrity sha512-weLxPsCs2wJKgWKf46shXHE+x7qlf5VxMK3P+4HsWasMakV/uTmxsoT7PG3QCvakGQ2TdpZtQLE2umJKC0mvKQ== dependencies: - "@babel/runtime" "^7.25.6" - "@mui/base" "5.0.0-beta.58" - "@mui/system" "^6.1.1" - "@mui/types" "^7.2.17" - "@mui/utils" "^6.1.1" + "@babel/runtime" "^7.26.0" + "@mui/base" "5.0.0-beta.69" + "@mui/system" "^6.4.3" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.3" clsx "^2.1.1" prop-types "^15.8.1" -"@mui/material@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.1.2.tgz#9f47bfa6adcf3b8245799cbf4c027e3cb949bcc6" - integrity sha512-5TtHeAVX9D5d2LYfB1GAUn29BcVETVsrQ76Dwb2SpAfQGW3JVy4deJCAd0RrIkI3eEUrsl0E4xuBdreszxdTTg== - dependencies: - "@babel/runtime" "^7.25.6" - "@mui/core-downloads-tracker" "^6.1.2" - "@mui/system" "^6.1.2" - "@mui/types" "^7.2.17" - "@mui/utils" "^6.1.2" +"@mui/material@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.4.4.tgz#fd2879cae5f3ed8a13b6257dbc051e0bbeefa8ee" + integrity sha512-ISVPrIsPQsxnwvS40C4u03AuNSPigFeS2+n1qpuEZ94hDsdMi19dQM2JcC9CHEhXecSIQjP1RTyY0mPiSpSrFQ== + dependencies: + "@babel/runtime" "^7.26.0" + "@mui/core-downloads-tracker" "^6.4.4" + "@mui/system" "^6.4.3" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.3" "@popperjs/core" "^2.11.8" - "@types/react-transition-group" "^4.4.11" + "@types/react-transition-group" "^4.4.12" clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" - react-is "^18.3.1" + react-is "^19.0.0" react-transition-group "^4.4.5" -"@mui/private-theming@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.1.2.tgz#1e093c7194dd9f8a511179e0e5c5b10798a4bfae" - integrity sha512-S8WcjZdNdi++8UhrrY8Lton5h/suRiQexvdTfdcPAlbajlvgM+kx+uJstuVIEyTb3gMkxzIZep87knZ0tqcR0g== +"@mui/private-theming@^6.4.3": + version "6.4.3" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.4.3.tgz#40d7d95316e9e52d465f0c96da23f9fb8f6a989f" + integrity sha512-7x9HaNwDCeoERc4BoEWLieuzKzXu5ZrhRnEM6AUcRXUScQLvF1NFkTlP59+IJfTbEMgcGg1wWHApyoqcksrBpQ== dependencies: - "@babel/runtime" "^7.25.6" - "@mui/utils" "^6.1.2" + "@babel/runtime" "^7.26.0" + "@mui/utils" "^6.4.3" prop-types "^15.8.1" -"@mui/styled-engine@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.1.2.tgz#bef156ac2e47a67d49982ddb5fa4211974740a26" - integrity sha512-uKOfWkR23X39xj7th2nyTcCHqInTAXtUnqD3T5qRVdJcOPvu1rlgTleTwJC/FJvWZJBU6ieuTWDhbcx5SNViHQ== +"@mui/styled-engine@^6.4.3": + version "6.4.3" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.4.3.tgz#fbd7a6b925dfaeaa84ffbf8ed9be78a0ff0b3d6e" + integrity sha512-OC402VfK+ra2+f12Gef8maY7Y9n7B6CZcoQ9u7mIkh/7PKwW/xH81xwX+yW+Ak1zBT3HYcVjh2X82k5cKMFGoQ== dependencies: - "@babel/runtime" "^7.25.6" - "@emotion/cache" "^11.13.1" + "@babel/runtime" "^7.26.0" + "@emotion/cache" "^11.13.5" + "@emotion/serialize" "^1.3.3" "@emotion/sheet" "^1.4.0" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/styles@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.1.2.tgz#24bc654cdb0aae369348453ee8d25e3a9c1ace56" - integrity sha512-fsQkTCyyBnjsmy7CM0LG95PJZAhTsmoC/iNk4ihVYmdubMQEeGXzeAWL8E6QBChCnANmjZwm2h5ENyLnCUUuzg== +"@mui/styles@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-6.4.4.tgz#6de0f208c7f677c9ff7bc2b6ae20cf1d64fe1fff" + integrity sha512-QjB9jhjVTPR7+icGQQzjTUPAu/LodnwcRV3HNDqO5sr1HJhZOqd8V8TF/8ArXWwVIm0yw6E/MTvnvhJB82LUPQ== dependencies: - "@babel/runtime" "^7.25.6" + "@babel/runtime" "^7.26.0" "@emotion/hash" "^0.9.2" - "@mui/private-theming" "^6.1.2" - "@mui/types" "^7.2.17" - "@mui/utils" "^6.1.2" + "@mui/private-theming" "^6.4.3" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.3" clsx "^2.1.1" csstype "^3.1.3" hoist-non-react-statics "^3.3.2" @@ -1991,48 +2019,36 @@ jss-plugin-vendor-prefixer "^10.10.0" prop-types "^15.8.1" -"@mui/system@^6.1.1", "@mui/system@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.1.2.tgz#28840b04c6fc70780620759d67de2c20bdc7d1c7" - integrity sha512-mzW7F1ZMIYS1aLON48Nrk9c65OrVEVQ+R4lUcTWs1lCSul0VGK23eo4dmY0NX5PS7Oe4xz3P5B9tQZZ7SYgxcg== - dependencies: - "@babel/runtime" "^7.25.6" - "@mui/private-theming" "^6.1.2" - "@mui/styled-engine" "^6.1.2" - "@mui/types" "^7.2.17" - "@mui/utils" "^6.1.2" +"@mui/system@^6.4.3": + version "6.4.3" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.4.3.tgz#f1e093850c8cc23c6605297c8a4134bea6fe290b" + integrity sha512-Q0iDwnH3+xoxQ0pqVbt8hFdzhq1g2XzzR4Y5pVcICTNtoCLJmpJS3vI4y/OIM1FHFmpfmiEC2IRIq7YcZ8nsmg== + dependencies: + "@babel/runtime" "^7.26.0" + "@mui/private-theming" "^6.4.3" + "@mui/styled-engine" "^6.4.3" + "@mui/types" "^7.2.21" + "@mui/utils" "^6.4.3" clsx "^2.1.1" csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.15", "@mui/types@^7.2.17": - version "7.2.17" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.17.tgz#329826062d4079de5ea2b97007575cebbba1fdbc" - integrity sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ== +"@mui/types@^7.2.21": + version "7.2.21" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.21.tgz#63f50874eda8e4a021a69aaa8ba9597369befda2" + integrity sha512-6HstngiUxNqLU+/DPqlUJDIPbzUBxIVHb1MmXP0eTWDIROiCR2viugXpEif0PPe2mLqqakPzzRClWAnK+8UJww== -"@mui/utils@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.0.0-rc.0.tgz#208c12c919b5cd1731f9d14784c05c35294a893e" - integrity sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A== +"@mui/utils@^6.4.1", "@mui/utils@^6.4.3": + version "6.4.3" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.4.3.tgz#e08bc3a5ae1552a48dd13ddc7c65e3eebdb4cd58" + integrity sha512-jxHRHh3BqVXE9ABxDm+Tc3wlBooYz/4XPa0+4AI+iF38rV1/+btJmSUgG4shDtSWVs/I97aDn5jBCt6SF2Uq2A== dependencies: - "@babel/runtime" "^7.25.0" - "@mui/types" "^7.2.15" - "@types/prop-types" "^15.7.12" + "@babel/runtime" "^7.26.0" + "@mui/types" "^7.2.21" + "@types/prop-types" "^15.7.14" clsx "^2.1.1" prop-types "^15.8.1" - react-is "^18.3.1" - -"@mui/utils@^6.1.1", "@mui/utils@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.1.2.tgz#3717cd9373324a92e48c34f74385350104be652c" - integrity sha512-6+B1YZ8cCBWD1fc3RjqpclF9UA0MLUiuXhyCO+XowD/Z2ku5IlxeEhHHlgglyBWFGMu4kib4YU3CDsG5/zVjJQ== - dependencies: - "@babel/runtime" "^7.25.6" - "@mui/types" "^7.2.17" - "@types/prop-types" "^15.7.13" - clsx "^2.1.1" - prop-types "^15.8.1" - react-is "^18.3.1" + react-is "^19.0.0" "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -2795,10 +2811,10 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f" integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA== -"@types/prop-types@*", "@types/prop-types@^15.7.12", "@types/prop-types@^15.7.13": - version "15.7.13" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.13.tgz#2af91918ee12d9d32914feb13f5326658461b451" - integrity sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA== +"@types/prop-types@^15.7.14": + version "15.7.14" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.14.tgz#1433419d73b2a7ebfc6918dcefd2ec0d5cd698f2" + integrity sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ== "@types/q@^1.5.1": version "1.5.8" @@ -2815,20 +2831,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-transition-group@^4.4.11": - version "4.4.11" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.11.tgz#d963253a611d757de01ebb241143b1017d5d63d5" - integrity sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA== - dependencies: - "@types/react" "*" - -"@types/react@*": - version "18.3.9" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.9.tgz#2cdf5f425ec8a133d67e9e3673909738b783db20" - integrity sha512-+BpAVyTpJkNWWSSnaLBk6ePpHLOGJKnEQNbINNovPWzvEUyAe3e+/d494QdEh71RekM/qV7lw6jzf1HGrJyAtQ== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" +"@types/react-transition-group@^4.4.12": + version "4.4.12" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044" + integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w== "@types/resolve@1.17.1": version "1.17.1" @@ -11798,11 +11804,16 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^18.0.0, react-is@^18.3.1: +react-is@^18.0.0: version "18.3.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== +react-is@^19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.0.0.tgz#d6669fd389ff022a9684f708cf6fa4962d1fea7a" + integrity sha512-H91OHcwjZsbq3ClIDHMzBShc1rotbfACdWENsmEf0IFvZ3FgGPtdHMcsv45bQ1hAbgdfiA8SnxTKfDS+x/8m2g== + react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" From 557dbe38a15af30d92b16b0b4f2cca8ff4b4e0cf Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:01:46 +0100 Subject: [PATCH 18/29] Remove unused code --- src/app/PartitionEditor.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/app/PartitionEditor.js b/src/app/PartitionEditor.js index a2e9b04..482542d 100644 --- a/src/app/PartitionEditor.js +++ b/src/app/PartitionEditor.js @@ -58,30 +58,11 @@ const useStyles = makeStyles(theme => ({ function PartitionEditor({ alignment }) { const classes = useStyles(); - // const [partitionText, setPartitionText] = React.useState(alignment.partitionText); - // const [partitionText, setPartitionText] = React.useState( - // alignment.partitionFileContent - // ); - - // function handleChange(event) { - // setPartitionText(event.target.value); - // } function handleAdd(event) { alignment.partition.addPart(); } - // function onClickCancel(event) { - // alignment.setShowPartition(false); - // } - - // function onClickSave(event) { - // alignment.setPartitionText(partitionText); - // alignment.setShowPartition(false); - // } - - // const hasChange = partitionText !== alignment.partitionText; - if (!alignment.showPartition) { return null; } @@ -184,7 +165,6 @@ const useStylesOnCard = makeStyles(theme => ({ }, form: {}, textField: { - // height: 80, width: 250, padding: 0, marginTop: 10, From 84a5ae9cda2a48173757b64283d723dbf22e088d Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:17:17 +0100 Subject: [PATCH 19/29] Deprecations codemod --- src/app/Output.js | 6 ++++-- src/app/PartitionEditor.js | 8 +++++--- src/app/components/OptionSelect.js | 10 ++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/app/Output.js b/src/app/Output.js index dc6f1f4..2e92401 100644 --- a/src/app/Output.js +++ b/src/app/Output.js @@ -54,8 +54,10 @@ const Output = ({ run }) => { className={classes.formItem} value={run.outputDir} onClick={run.selectOutputDir} - InputProps={{ - readOnly: true, + slotProps={{ + input: { + readOnly: true, + } }} /> diff --git a/src/app/components/OptionSelect.js b/src/app/components/OptionSelect.js index 3bf9148..83381c3 100644 --- a/src/app/components/OptionSelect.js +++ b/src/app/components/OptionSelect.js @@ -15,7 +15,7 @@ const OptionSelect = observer(({ option, className }) => { if (option.options.length === 1) { // No options to change to, render as a text field instead. return ( - { value={option.value} placeholder={option.placeholder} error={option.error} - InputProps={{ - readOnly: true, - }} /> + slotProps={{ + input: { + readOnly: true, + } + }} />) ); } From 8af6fa7be3d342f927462cc0920d0b4b726a770c Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:47:29 +0100 Subject: [PATCH 20/29] Replace SnackbarMessage with Alert --- src/app/App.js | 34 ++++++---- src/app/components/ErrorDialog.js | 9 ++- src/app/components/SnackbarMessage.js | 98 --------------------------- 3 files changed, 27 insertions(+), 114 deletions(-) delete mode 100644 src/app/components/SnackbarMessage.js diff --git a/src/app/App.js b/src/app/App.js index d8981f3..642ea38 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -15,6 +15,7 @@ import IconAdd from '@mui/icons-material/Add'; import DeleteIcon from '@mui/icons-material/DeleteForever'; import Box from '@mui/material/Box'; import Snackbar from '@mui/material/Snackbar'; +import Alert from '@mui/material/Alert'; import { Typography } from '@mui/material'; import Modal from '@mui/material/Modal'; @@ -27,7 +28,6 @@ import store from './store'; import PartitionEditor from './PartitionEditor'; import CitationModal from './CitationModal'; -import SnackbarMessage from './components/SnackbarMessage'; import ErrorBoundary from './components/ErrorBoundary'; import ErrorDialog from './components/ErrorDialog'; import ModifiedDialog from './components/ModifiedDialog'; @@ -240,11 +240,13 @@ const App = () => { open={run.showModifiedSnack} onClose={run.clearShowModified} > - + severity="info" + sx={{ width: '100%' }} + > + {message} + ); } @@ -260,11 +262,13 @@ const App = () => { open={store.showAppSnack} onClose={store.clearAppSnack} > - + severity="info" + sx={{ width: '100%' }} + > + {message} + ); } @@ -369,7 +373,7 @@ const App = () => { className={`${classes.verticalHeading} ${classes.consoleHeading}`} > Console - {(run.stdout === '' && run.stderr === '') ? null : ( + {run.stdout === '' && run.stderr === '' ? null : ( { autoHideDuration={6000} onClose={run.clearFinished} > - + { run.exitCode === 0 ? 'Calculation finished!' : `Calculation cancelled!` } - /> + {fileModifiedSnack(run)} {appSnack(store)} diff --git a/src/app/components/ErrorDialog.js b/src/app/components/ErrorDialog.js index e92955b..3f449bd 100644 --- a/src/app/components/ErrorDialog.js +++ b/src/app/components/ErrorDialog.js @@ -12,8 +12,8 @@ import AccordionDetails from '@mui/material/AccordionDetails'; import Typography from '@mui/material/Typography'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import Button from '@mui/material/Button'; +import Alert from '@mui/material/Alert'; import { ipcRenderer } from 'electron'; -import SnackbarMessage from './SnackbarMessage'; import { reportIssueToGitHub, getMailtoLinkToReportError } from '../../common/utils'; import * as ipc from '../../constants/ipc'; @@ -77,7 +77,12 @@ export default function ErrorDialog({ error, onClose, needReload, title }) { Please help us solve the issue by reporting it. ) : ( - + + Thanks for reporting the issue! + ); const GenericErrorDialog = ( diff --git a/src/app/components/SnackbarMessage.js b/src/app/components/SnackbarMessage.js deleted file mode 100644 index 1e43cd2..0000000 --- a/src/app/components/SnackbarMessage.js +++ /dev/null @@ -1,98 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import clsx from 'clsx'; -import CheckCircleIcon from '@mui/icons-material/CheckCircle'; -import ErrorIcon from '@mui/icons-material/Error'; -import InfoIcon from '@mui/icons-material/Info'; -import CloseIcon from '@mui/icons-material/Close'; -import { amber } from '@mui/material/colors'; -import IconButton from '@mui/material/IconButton'; -import SnackbarContent from '@mui/material/SnackbarContent'; -import WarningIcon from '@mui/icons-material/Warning'; -import { makeStyles } from '@mui/styles'; -import Box from '@mui/material/Box'; - -const variantIcon = { - success: CheckCircleIcon, - warning: WarningIcon, - error: ErrorIcon, - info: InfoIcon, -}; - -const useStyles = makeStyles((theme) => ({ - success: { - backgroundColor: theme.palette.output.main, - }, - error: { - // backgroundColor: theme.palette.error.main, - backgroundColor: '#f2401b', - }, - info: { - backgroundColor: theme.palette.input.main, - }, - warning: { - backgroundColor: amber[700], - }, - icon: { - fontSize: 20, - }, - iconVariant: { - opacity: 0.9, - marginRight: theme.spacing(1), - }, - message: { - display: 'flex', - alignItems: 'center', - color: theme.palette.primary.contrastText, - }, -})); - -function SnackbarMessage(props) { - const classes = useStyles(); - const { className, message, error, onClose, variant, ...other } = props; - const Icon = variantIcon[variant]; - - const Message = error ? ( -
- - {error.name}: {error.message} - -
Details:
- {JSON.stringify(error)} -
- ) : message; - - return ( - - - { Message } - - } - action={onClose ? [ - - - , - ] : null } - {...other} - /> - ); -} - -SnackbarMessage.propTypes = { - className: PropTypes.string, - message: PropTypes.string, - error: PropTypes.object, - onClose: PropTypes.func, - variant: PropTypes.oneOf(['error', 'info', 'success', 'warning']).isRequired, -}; - -export default SnackbarMessage; From 69ec6b145b457cb583c2f02e2ff03b6cbda914cc Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Sun, 16 Feb 2025 23:47:43 +0100 Subject: [PATCH 21/29] Remove adaptV4Theme --- src/app/theme/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/theme/index.js b/src/app/theme/index.js index 1ce4834..cdd164d 100644 --- a/src/app/theme/index.js +++ b/src/app/theme/index.js @@ -1,4 +1,4 @@ -import { createTheme, adaptV4Theme } from '@mui/material/styles'; +import { createTheme } from '@mui/material/styles'; const darkTheme = { palette: { @@ -208,6 +208,6 @@ const lightTheme = { }; export default { - light: createTheme(adaptV4Theme(lightTheme)), - dark: createTheme(adaptV4Theme(darkTheme)) + light: createTheme(lightTheme), + dark: createTheme(darkTheme) }; From 0e5bba41096a332624beca2e2d062c8616d013c0 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 10:44:35 +0100 Subject: [PATCH 22/29] Switch back to contained main button for Run actions --- src/app/AlignmentCard.js | 3 ++- src/app/Raxml.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/AlignmentCard.js b/src/app/AlignmentCard.js index 4d5f8cc..7235cf3 100644 --- a/src/app/AlignmentCard.js +++ b/src/app/AlignmentCard.js @@ -147,7 +147,8 @@ function _ModelTestButton({ alignment }) { } return ( ) : null} @@ -98,7 +102,8 @@ class Raxml extends React.Component { + size="large" + > From 3351120123339e15d0d3b4f4feca8882bcad3213 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 11:19:27 +0100 Subject: [PATCH 24/29] Update thme to style Runbutton as it was --- src/app/Raxml.js | 1 + src/app/theme/index.js | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/app/Raxml.js b/src/app/Raxml.js index a548426..cb23515 100644 --- a/src/app/Raxml.js +++ b/src/app/Raxml.js @@ -87,6 +87,7 @@ class Raxml extends React.Component { ) : null}
); diff --git a/src/app/components/OptionCheck.js b/src/app/components/OptionCheck.js index 0f6bac7..eea1ebf 100644 --- a/src/app/components/OptionCheck.js +++ b/src/app/components/OptionCheck.js @@ -3,7 +3,7 @@ import { observer } from 'mobx-react'; import PropTypes from 'prop-types'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; -import { FormControl, FormHelperText } from '@mui/material'; +import { FormControl } from '@mui/material'; const OptionCheck = observer(({ option, className }) => { From 2b74935f46f99bb0a2626ece374597d90b341a52 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 11:51:12 +0100 Subject: [PATCH 26/29] Restyle Link text color --- src/app/theme/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/theme/index.js b/src/app/theme/index.js index e9484dc..ddff174 100644 --- a/src/app/theme/index.js +++ b/src/app/theme/index.js @@ -5,11 +5,11 @@ const darkTheme = { mode: 'dark', primary: { background: 'hsl(29, 5%, 5%)', - main: 'hsl(0, 0.00%, 100.00%)', - contrastText: '#000', + main: 'hsl(0, 0%, 100%)', + contrastText: '#ddd', }, secondary: { - main: 'hsl(0, 0.00%, 76.50%)', + main: 'hsl(0, 0%, 76%)', contrastText: '#333', }, model: { @@ -107,12 +107,12 @@ const lightTheme = { mode: 'light', primary: { background: 'hsl(29, 99%, 99%)', - border: 'hsl(0, 0.00%, 0.00%)', - main: 'hsl(0, 0.00%, 0.00%)', + border: 'hsl(0, 0%, 0%)', + main: 'hsl(0, 0%, 0%)', contrastText: '#333', }, secondary: { - main: 'hsl(0, 0.00%, 76.50%)', + main: 'hsl(0, 0%, 76%)', contrastText: '#333', }, model: { From d90ba6a721e5b537ba71d2865e49601cb7b5ee18 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 12:03:36 +0100 Subject: [PATCH 27/29] Update emotion --- package.json | 4 +-- yarn.lock | 81 ++++++++++++++++++---------------------------------- 2 files changed, 29 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 8dbb888..0df6c50 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "dependencies": { "@babel/plugin-proposal-decorators": "^7.19.0", "@craco/craco": "^7.1.0", - "@emotion/react": "^11.13.3", - "@emotion/styled": "^11.13.0", + "@emotion/react": "^11.14.0", + "@emotion/styled": "^11.14.0", "@mui/icons-material": "^6.4.4", "@mui/lab": "^6.0.0-beta.27", "@mui/material": "^6.4.4", diff --git a/yarn.lock b/yarn.lock index 12f5956..6eb8c20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1387,16 +1387,16 @@ minimatch "^3.0.4" plist "^3.0.4" -"@emotion/babel-plugin@^11.12.0": - version "11.12.0" - resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz#7b43debb250c313101b3f885eba634f1d723fcc2" - integrity sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw== +"@emotion/babel-plugin@^11.13.5": + version "11.13.5" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0" + integrity sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ== dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/runtime" "^7.18.3" "@emotion/hash" "^0.9.2" "@emotion/memoize" "^0.9.0" - "@emotion/serialize" "^1.2.0" + "@emotion/serialize" "^1.3.3" babel-plugin-macros "^3.1.0" convert-source-map "^1.5.0" escape-string-regexp "^4.0.0" @@ -1404,18 +1404,7 @@ source-map "^0.5.7" stylis "4.2.0" -"@emotion/cache@^11.13.0": - version "11.13.1" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.13.1.tgz#fecfc54d51810beebf05bf2a161271a1a91895d7" - integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw== - dependencies: - "@emotion/memoize" "^0.9.0" - "@emotion/sheet" "^1.4.0" - "@emotion/utils" "^1.4.0" - "@emotion/weak-memoize" "^0.4.0" - stylis "4.2.0" - -"@emotion/cache@^11.13.5": +"@emotion/cache@^11.13.5", "@emotion/cache@^11.14.0": version "11.14.0" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76" integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA== @@ -1443,31 +1432,20 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102" integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== -"@emotion/react@^11.13.3": - version "11.13.3" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.13.3.tgz#a69d0de2a23f5b48e0acf210416638010e4bd2e4" - integrity sha512-lIsdU6JNrmYfJ5EbUCf4xW1ovy5wKQ2CkPRM4xogziOxH1nXxBSjpC9YqbFAP7circxMfYp+6x676BqWcEiixg== +"@emotion/react@^11.14.0": + version "11.14.0" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.14.0.tgz#cfaae35ebc67dd9ef4ea2e9acc6cd29e157dd05d" + integrity sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.12.0" - "@emotion/cache" "^11.13.0" - "@emotion/serialize" "^1.3.1" - "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" - "@emotion/utils" "^1.4.0" + "@emotion/babel-plugin" "^11.13.5" + "@emotion/cache" "^11.14.0" + "@emotion/serialize" "^1.3.3" + "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0" + "@emotion/utils" "^1.4.2" "@emotion/weak-memoize" "^0.4.0" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0", "@emotion/serialize@^1.3.1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.2.tgz#e1c1a2e90708d5d85d81ccaee2dfeb3cc0cccf7a" - integrity sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA== - dependencies: - "@emotion/hash" "^0.9.2" - "@emotion/memoize" "^0.9.0" - "@emotion/unitless" "^0.10.0" - "@emotion/utils" "^1.4.1" - csstype "^3.0.2" - "@emotion/serialize@^1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.3.tgz#d291531005f17d704d0463a032fe679f376509e8" @@ -1484,32 +1462,27 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c" integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg== -"@emotion/styled@^11.13.0": - version "11.13.0" - resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.13.0.tgz#633fd700db701472c7a5dbef54d6f9834e9fb190" - integrity sha512-tkzkY7nQhW/zC4hztlwucpT8QEZ6eUzpXDRhww/Eej4tFfO0FxQYWRyg/c5CCXa4d/f174kqeXYjuQRnhzf6dA== +"@emotion/styled@^11.14.0": + version "11.14.0" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.14.0.tgz#f47ca7219b1a295186d7661583376fcea95f0ff3" + integrity sha512-XxfOnXFffatap2IyCeJyNov3kiDQWoR08gPUQxvbL7fxKryGBKUZUkG6Hz48DZwVrJSVh9sJboyV1Ds4OW6SgA== dependencies: "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.12.0" + "@emotion/babel-plugin" "^11.13.5" "@emotion/is-prop-valid" "^1.3.0" - "@emotion/serialize" "^1.3.0" - "@emotion/use-insertion-effect-with-fallbacks" "^1.1.0" - "@emotion/utils" "^1.4.0" + "@emotion/serialize" "^1.3.3" + "@emotion/use-insertion-effect-with-fallbacks" "^1.2.0" + "@emotion/utils" "^1.4.2" "@emotion/unitless@^0.10.0": version "0.10.0" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== -"@emotion/use-insertion-effect-with-fallbacks@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz#1a818a0b2c481efba0cf34e5ab1e0cb2dcb9dfaf" - integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw== - -"@emotion/utils@^1.4.0", "@emotion/utils@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.1.tgz#b3adbb43de12ee2149541c4f1337d2eb7774f0ad" - integrity sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA== +"@emotion/use-insertion-effect-with-fallbacks@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.2.0.tgz#8a8cb77b590e09affb960f4ff1e9a89e532738bf" + integrity sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg== "@emotion/utils@^1.4.2": version "1.4.2" From 1712a52962d0a2e3e4da330cd76ecd78c1efa160 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 12:11:04 +0100 Subject: [PATCH 28/29] Update citation modal --- src/app/App.js | 1 - src/app/CitationModal.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/App.js b/src/app/App.js index 642ea38..1802149 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -185,7 +185,6 @@ const useStyles = makeStyles(theme => ({ }, }, Modal: { - top: `50%`, margin: 'auto', display: 'flex', alignItems: 'center', diff --git a/src/app/CitationModal.js b/src/app/CitationModal.js index c821622..ace413c 100644 --- a/src/app/CitationModal.js +++ b/src/app/CitationModal.js @@ -8,8 +8,8 @@ import CardContent from '@mui/material/CardContent'; import CardActions from '@mui/material/CardActions'; import Typography from '@mui/material/Typography'; import Box from '@mui/material/Box'; -import ToggleButton from '@mui/lab/ToggleButton'; -import ToggleButtonGroup from '@mui/lab/ToggleButtonGroup'; +import ToggleButton from '@mui/material/ToggleButton'; +import ToggleButtonGroup from '@mui/material/ToggleButtonGroup'; import CodeHighlight from './components/CodeHighlight'; From b109f17a7e95ec7040f830e6ac1e6b0c50ba2587 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Mon, 17 Feb 2025 12:23:34 +0100 Subject: [PATCH 29/29] Buttons audit --- src/app/CitationModal.js | 1 + src/app/PartitionEditor.js | 1 + src/app/components/ErrorDialog.js | 27 ++++++++++++++++++++------- src/app/components/ModifiedDialog.js | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/app/CitationModal.js b/src/app/CitationModal.js index ace413c..d320dbe 100644 --- a/src/app/CitationModal.js +++ b/src/app/CitationModal.js @@ -77,6 +77,7 @@ function CitationModal({ citation }) { ); - const Actions = reported ? CloseAction : ( + const Actions = reported ? ( + CloseAction + ) : ( - - - + ); diff --git a/src/app/components/ModifiedDialog.js b/src/app/components/ModifiedDialog.js index f7b503a..18c1114 100644 --- a/src/app/components/ModifiedDialog.js +++ b/src/app/components/ModifiedDialog.js @@ -45,7 +45,7 @@ export default function ModifiedDialog({ show, onClose, messages }) { -