Skip to content

Commit 25f1b3b

Browse files
CodeDeadCodeDead
committed
feat: upgraded to mui v7
1 parent 810b79a commit 25f1b3b

7 files changed

Lines changed: 97 additions & 124 deletions

File tree

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@emotion/react": "^11.14.0",
1616
"@emotion/styled": "^11.14.0",
1717
"@fontsource/roboto": "^5.2.5",
18-
"@mui/icons-material": "^6.4.9",
19-
"@mui/material": "^6.4.9",
18+
"@mui/icons-material": "^7.0.1",
19+
"@mui/material": "^7.0.1",
2020
"@mui/x-data-grid": "^7.28.2",
2121
"@tauri-apps/api": "^2.4.0",
2222
"@tauri-apps/plugin-dialog": "^2.2.0",

‎src/components/GridList/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Grid from '@mui/material/Grid2';
2+
import Grid from '@mui/material/Grid';
33

44
const GridList = ({
55
spacing, children, xs, md, lg,

‎src/components/Layout/index.jsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const Layout = () => {
4343
});
4444

4545
/**
46-
* Check for updates
47-
*/
46+
* Check for updates
47+
*/
4848
const checkForUpdates = () => {
4949
if (loading) {
5050
return;
@@ -69,8 +69,9 @@ const Layout = () => {
6969
};
7070

7171
/**
72-
* Update the number of threads
73-
*/
72+
* Update the number of threads
73+
* @returns {Promise<void>}
74+
*/
7475
const updateThreads = async () => {
7576
if (!localStorage.threads) {
7677
getNumberOfThreads()
@@ -84,15 +85,15 @@ const Layout = () => {
8485
};
8586

8687
/**
87-
* Close the dialog that displays a message that no updates are available
88-
*/
88+
* Close the dialog that displays a message that no updates are available
89+
*/
8990
const closeNoUpdate = () => {
9091
d1(setCheckedForUpdates(false));
9192
};
9293

9394
/**
94-
* Close the alert dialog
95-
*/
95+
* Close the alert dialog
96+
*/
9697
const closeAlertDialog = () => {
9798
d1(setError(null));
9899
};

‎src/routes/Home/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useContext, useEffect, useState } from 'react';
22
import Card from '@mui/material/Card';
33
import CardContent from '@mui/material/CardContent';
4-
import Grid from '@mui/material/Grid2';
4+
import Grid from '@mui/material/Grid';
55
import TextField from '@mui/material/TextField';
66
import Container from '@mui/material/Container';
77
import Paper from '@mui/material/Paper';

‎src/routes/Settings/index.jsx‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,26 @@ import FormLabel from '@mui/material/FormLabel';
1515
import RadioGroup from '@mui/material/RadioGroup';
1616
import Button from '@mui/material/Button';
1717
import Radio from '@mui/material/Radio';
18-
import blue from '@mui/material/colors/blue';
19-
import purple from '@mui/material/colors/purple';
20-
import deepPurple from '@mui/material/colors/deepPurple';
21-
import lightBlue from '@mui/material/colors/lightBlue';
22-
import red from '@mui/material/colors/red';
23-
import green from '@mui/material/colors/green';
24-
import lightGreen from '@mui/material/colors/lightGreen';
25-
import grey from '@mui/material/colors/grey';
26-
import orange from '@mui/material/colors/orange';
27-
import deepOrange from '@mui/material/colors/deepOrange';
28-
import amber from '@mui/material/colors/amber';
29-
import brown from '@mui/material/colors/brown';
30-
import pink from '@mui/material/colors/pink';
31-
import indigo from '@mui/material/colors/indigo';
32-
import cyan from '@mui/material/colors/cyan';
33-
import teal from '@mui/material/colors/teal';
34-
import lime from '@mui/material/colors/lime';
35-
import yellow from '@mui/material/colors/yellow';
18+
import {
19+
blue,
20+
lightBlue,
21+
red,
22+
green,
23+
lightGreen,
24+
purple,
25+
deepPurple,
26+
grey,
27+
orange,
28+
deepOrange,
29+
amber,
30+
brown,
31+
pink,
32+
indigo,
33+
cyan,
34+
teal,
35+
lime,
36+
yellow,
37+
} from '@mui/material/colors';
3638
import TextField from '@mui/material/TextField';
3739
import packageJson from '../../../package.json';
3840
import Updater from '../../utils/Updater';

‎src/utils/ThemeSelector/index.js‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
import blue from '@mui/material/colors/blue';
2-
import lightBlue from '@mui/material/colors/lightBlue';
3-
import red from '@mui/material/colors/red';
4-
import green from '@mui/material/colors/green';
5-
import lightGreen from '@mui/material/colors/lightGreen';
6-
import purple from '@mui/material/colors/purple';
7-
import deepPurple from '@mui/material/colors/deepPurple';
8-
import grey from '@mui/material/colors/grey';
9-
import orange from '@mui/material/colors/orange';
10-
import deepOrange from '@mui/material/colors/deepOrange';
11-
import amber from '@mui/material/colors/amber';
12-
import brown from '@mui/material/colors/brown';
13-
import pink from '@mui/material/colors/pink';
14-
import indigo from '@mui/material/colors/indigo';
15-
import cyan from '@mui/material/colors/cyan';
16-
import teal from '@mui/material/colors/teal';
17-
import lime from '@mui/material/colors/lime';
18-
import yellow from '@mui/material/colors/yellow';
1+
import {
2+
blue,
3+
lightBlue,
4+
red,
5+
green,
6+
lightGreen,
7+
purple,
8+
deepPurple,
9+
grey,
10+
orange,
11+
deepOrange,
12+
amber,
13+
brown,
14+
pink,
15+
indigo,
16+
cyan,
17+
teal,
18+
lime,
19+
yellow,
20+
} from '@mui/material/colors';
1921

2022
/**
2123
* Select the theme, depending on the theme index

‎yarn.lock‎

Lines changed: 44 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ __metadata:
176176
languageName: node
177177
linkType: hard
178178

179-
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.25.7, @babel/runtime@npm:^7.26.0, @babel/runtime@npm:^7.26.10, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
179+
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.25.7, @babel/runtime@npm:^7.26.10, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
180180
version: 7.27.0
181181
resolution: "@babel/runtime@npm:7.27.0"
182182
dependencies:
@@ -681,38 +681,38 @@ __metadata:
681681
languageName: node
682682
linkType: hard
683683

684-
"@mui/core-downloads-tracker@npm:^6.4.9":
685-
version: 6.4.9
686-
resolution: "@mui/core-downloads-tracker@npm:6.4.9"
687-
checksum: 10c0/c7c3cee1d4871db484cb6629d6fd3fa9435628494e7b6295e9e0224cbe3ad35168f664ae827d3e43b51c83897f1829eb91ebf584b8d60903154bfca2855ebc44
684+
"@mui/core-downloads-tracker@npm:^7.0.1":
685+
version: 7.0.1
686+
resolution: "@mui/core-downloads-tracker@npm:7.0.1"
687+
checksum: 10c0/8291211a5aefd9348c9fddd4b12340087f2d661bfbdcf6797b09b2e58ae9a4a37ae80de7124613b870ea3a8ea5661b6a35849214eeb2d5f238cdba10d381d056
688688
languageName: node
689689
linkType: hard
690690

691-
"@mui/icons-material@npm:^6.4.9":
692-
version: 6.4.9
693-
resolution: "@mui/icons-material@npm:6.4.9"
691+
"@mui/icons-material@npm:^7.0.1":
692+
version: 7.0.1
693+
resolution: "@mui/icons-material@npm:7.0.1"
694694
dependencies:
695-
"@babel/runtime": "npm:^7.26.0"
695+
"@babel/runtime": "npm:^7.26.10"
696696
peerDependencies:
697-
"@mui/material": ^6.4.9
697+
"@mui/material": ^7.0.1
698698
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
699699
react: ^17.0.0 || ^18.0.0 || ^19.0.0
700700
peerDependenciesMeta:
701701
"@types/react":
702702
optional: true
703-
checksum: 10c0/1504c71b86c88086f03d0c4d5cede848d79715185601e6656242c94de52a463f614c3fa20ee8854505135129858798d1bd8d1abf032b8548bd0be703d81dfb1c
703+
checksum: 10c0/375ba909363cc248154937bcc8522ba98566311bf20d4c0c3114ed4bd31430354b0d5779523b3f7cf78bb15ba7544d137a7ccbde63cf75ec957ae30e73083693
704704
languageName: node
705705
linkType: hard
706706

707-
"@mui/material@npm:^6.4.9":
708-
version: 6.4.9
709-
resolution: "@mui/material@npm:6.4.9"
707+
"@mui/material@npm:^7.0.1":
708+
version: 7.0.1
709+
resolution: "@mui/material@npm:7.0.1"
710710
dependencies:
711-
"@babel/runtime": "npm:^7.26.0"
712-
"@mui/core-downloads-tracker": "npm:^6.4.9"
713-
"@mui/system": "npm:^6.4.9"
714-
"@mui/types": "npm:~7.2.24"
715-
"@mui/utils": "npm:^6.4.8"
711+
"@babel/runtime": "npm:^7.26.10"
712+
"@mui/core-downloads-tracker": "npm:^7.0.1"
713+
"@mui/system": "npm:^7.0.1"
714+
"@mui/types": "npm:^7.4.0"
715+
"@mui/utils": "npm:^7.0.1"
716716
"@popperjs/core": "npm:^2.11.8"
717717
"@types/react-transition-group": "npm:^4.4.12"
718718
clsx: "npm:^2.1.1"
@@ -723,7 +723,7 @@ __metadata:
723723
peerDependencies:
724724
"@emotion/react": ^11.5.0
725725
"@emotion/styled": ^11.3.0
726-
"@mui/material-pigment-css": ^6.4.9
726+
"@mui/material-pigment-css": ^7.0.1
727727
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
728728
react: ^17.0.0 || ^18.0.0 || ^19.0.0
729729
react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -736,32 +736,32 @@ __metadata:
736736
optional: true
737737
"@types/react":
738738
optional: true
739-
checksum: 10c0/cbdb85059a137fc3b3aaeb1bc3e9ccd4a957ae0c1be85b71282acea8d7290c6e006b24185a4b774705ed7b2605850fddc8d2ba7027f0aa9dc37fedb2abf5ecee
739+
checksum: 10c0/95203b299dc5481f8fe903f7604dea641067db431c0606bffa5fafa8a4e9e0a0203a8d5ef9af3e314186c779c08654d6e0c1b85c70d8320397f2ce7a05ee633d
740740
languageName: node
741741
linkType: hard
742742

743-
"@mui/private-theming@npm:^6.4.8":
744-
version: 6.4.8
745-
resolution: "@mui/private-theming@npm:6.4.8"
743+
"@mui/private-theming@npm:^7.0.1":
744+
version: 7.0.1
745+
resolution: "@mui/private-theming@npm:7.0.1"
746746
dependencies:
747-
"@babel/runtime": "npm:^7.26.0"
748-
"@mui/utils": "npm:^6.4.8"
747+
"@babel/runtime": "npm:^7.26.10"
748+
"@mui/utils": "npm:^7.0.1"
749749
prop-types: "npm:^15.8.1"
750750
peerDependencies:
751751
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
752752
react: ^17.0.0 || ^18.0.0 || ^19.0.0
753753
peerDependenciesMeta:
754754
"@types/react":
755755
optional: true
756-
checksum: 10c0/5acc9ad80d70757d31e6f95e833833826c1885ef90b6ae5de5cfe2883c4b276427efb5b0ba0bba0eb37fe80e5a7ae91c2d193807f32812c30be4d53d6ee9eb18
756+
checksum: 10c0/15f0037925d9dd59b0bdc4bf6031407e31ef008ebe0e437f424eeed3f433bafd585676b995739f0362c9d403c0cbe2f99478d5eeadd60bfa8b1d968a6be7185d
757757
languageName: node
758758
linkType: hard
759759

760-
"@mui/styled-engine@npm:^6.4.9":
761-
version: 6.4.9
762-
resolution: "@mui/styled-engine@npm:6.4.9"
760+
"@mui/styled-engine@npm:^7.0.1":
761+
version: 7.0.1
762+
resolution: "@mui/styled-engine@npm:7.0.1"
763763
dependencies:
764-
"@babel/runtime": "npm:^7.26.0"
764+
"@babel/runtime": "npm:^7.26.10"
765765
"@emotion/cache": "npm:^11.13.5"
766766
"@emotion/serialize": "npm:^1.3.3"
767767
"@emotion/sheet": "npm:^1.4.0"
@@ -776,19 +776,19 @@ __metadata:
776776
optional: true
777777
"@emotion/styled":
778778
optional: true
779-
checksum: 10c0/eabe9e168b4f83201eed57eee656dbc9bf8d91f9b47e047273b922ee1b7f87510c108c2334f0375a93f7490cc5651fe7e9a5b923542123aebab643c6ea5ebd2e
779+
checksum: 10c0/cdef1c15ea645198440cd87a53c1a0155f444688387ed816b98890e42bd22a9204242cae8fb1b56124fe05c163d9e38fa482901804dee0bef6f88da1cddd8579
780780
languageName: node
781781
linkType: hard
782782

783-
"@mui/system@npm:^6.4.9":
784-
version: 6.4.9
785-
resolution: "@mui/system@npm:6.4.9"
783+
"@mui/system@npm:^7.0.1":
784+
version: 7.0.1
785+
resolution: "@mui/system@npm:7.0.1"
786786
dependencies:
787-
"@babel/runtime": "npm:^7.26.0"
788-
"@mui/private-theming": "npm:^6.4.8"
789-
"@mui/styled-engine": "npm:^6.4.9"
790-
"@mui/types": "npm:~7.2.24"
791-
"@mui/utils": "npm:^6.4.8"
787+
"@babel/runtime": "npm:^7.26.10"
788+
"@mui/private-theming": "npm:^7.0.1"
789+
"@mui/styled-engine": "npm:^7.0.1"
790+
"@mui/types": "npm:^7.4.0"
791+
"@mui/utils": "npm:^7.0.1"
792792
clsx: "npm:^2.1.1"
793793
csstype: "npm:^3.1.3"
794794
prop-types: "npm:^15.8.1"
@@ -804,7 +804,7 @@ __metadata:
804804
optional: true
805805
"@types/react":
806806
optional: true
807-
checksum: 10c0/b8b19de8605e6224805c0267e7d328767fa15630b95770c1e08a9ee5c8b2db50e94a9aea8438ec1aaf67dd0d50f08b0a93c71b4ce3529c6d7ba28b80a06c7c18
807+
checksum: 10c0/58de50dceef8a85aa24cda596836c034068b6f3e960c47520b9401a3f6f5bdf013e6ad7adb1a31cc57707ae304d524813ed53d4d12c1193ec8ca6b31d90f8dcf
808808
languageName: node
809809
linkType: hard
810810

@@ -822,19 +822,7 @@ __metadata:
822822
languageName: node
823823
linkType: hard
824824

825-
"@mui/types@npm:~7.2.24":
826-
version: 7.2.24
827-
resolution: "@mui/types@npm:7.2.24"
828-
peerDependencies:
829-
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
830-
peerDependenciesMeta:
831-
"@types/react":
832-
optional: true
833-
checksum: 10c0/7756339cae70e9b684c4311924e4e3882f908552b69c434b4d13faf2f5908ce72fe889a31890257c5ad42a085207be7c1661981dfc683293e90ac6dfac3759d0
834-
languageName: node
835-
linkType: hard
836-
837-
"@mui/utils@npm:^5.16.6 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta":
825+
"@mui/utils@npm:^5.16.6 || ^6.0.0 || ^7.0.0 || ^7.0.0-beta, @mui/utils@npm:^7.0.1":
838826
version: 7.0.1
839827
resolution: "@mui/utils@npm:7.0.1"
840828
dependencies:
@@ -854,26 +842,6 @@ __metadata:
854842
languageName: node
855843
linkType: hard
856844

857-
"@mui/utils@npm:^6.4.8":
858-
version: 6.4.8
859-
resolution: "@mui/utils@npm:6.4.8"
860-
dependencies:
861-
"@babel/runtime": "npm:^7.26.0"
862-
"@mui/types": "npm:~7.2.24"
863-
"@types/prop-types": "npm:^15.7.14"
864-
clsx: "npm:^2.1.1"
865-
prop-types: "npm:^15.8.1"
866-
react-is: "npm:^19.0.0"
867-
peerDependencies:
868-
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
869-
react: ^17.0.0 || ^18.0.0 || ^19.0.0
870-
peerDependenciesMeta:
871-
"@types/react":
872-
optional: true
873-
checksum: 10c0/df2392c3a2bb5a9549eec9b897ec418d40d41f74f8317ccc0e86c6973358d0ede46e10927581415c9d265067739be3a5b7ce3ec8027375bf526cdaa2a8560862
874-
languageName: node
875-
linkType: hard
876-
877845
"@mui/x-data-grid@npm:^7.28.2":
878846
version: 7.28.2
879847
resolution: "@mui/x-data-grid@npm:7.28.2"
@@ -1596,8 +1564,8 @@ __metadata:
15961564
"@emotion/react": "npm:^11.14.0"
15971565
"@emotion/styled": "npm:^11.14.0"
15981566
"@fontsource/roboto": "npm:^5.2.5"
1599-
"@mui/icons-material": "npm:^6.4.9"
1600-
"@mui/material": "npm:^6.4.9"
1567+
"@mui/icons-material": "npm:^7.0.1"
1568+
"@mui/material": "npm:^7.0.1"
16011569
"@mui/x-data-grid": "npm:^7.28.2"
16021570
"@tauri-apps/api": "npm:^2.4.0"
16031571
"@tauri-apps/cli": "npm:^2.4.0"

0 commit comments

Comments
 (0)