Skip to content

Commit c400216

Browse files
authored
Merge pull request #97 from raduwen/build/bumpup-material-ui
build: bumpup material-ui
2 parents 241751c + f2c7275 commit c400216

File tree

8 files changed

+367
-124
lines changed

8 files changed

+367
-124
lines changed

package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
"lint": "next lint"
1313
},
1414
"dependencies": {
15-
"@material-ui/core": "^4.12.3",
15+
"@emotion/react": "^11.4.1",
16+
"@emotion/styled": "^11.3.0",
17+
"@mui/icons-material": "^5.0.3",
18+
"@mui/material": "^5.0.3",
19+
"@mui/styles": "^5.0.1",
1620
"firebase": "^9.1.2",
1721
"next": "^11.1.2",
1822
"react": "^17.0.2",

src/components/IFrameWidget/editor.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
TextField,
77
Button,
88
Typography,
9-
} from '@material-ui/core';
9+
} from '@mui/material';
1010
import type { IFrameWidgetProps } from './types';
1111

1212
type Props = {

src/components/TextWidget/editor.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Typography,
66
FormControlLabel,
77
Checkbox,
8-
} from '@material-ui/core';
8+
} from '@mui/material';
99
import styled from 'styled-components';
1010
import { Property } from 'csstype';
1111
import { ref, set } from '@firebase/database';

src/components/TimeWidget/editor.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Typography,
77
FormControlLabel,
88
Checkbox,
9-
} from '@material-ui/core';
9+
} from '@mui/material';
1010
import { ref, set } from '@firebase/database';
1111
import { db } from '@/lib/firebase';
1212
import type { TimeWidgetProps } from './types';

src/components/admin/SignInForm/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
22
import { useRouter } from 'next/router';
33
import styled from 'styled-components';
44
import { signInWithEmailAndPassword } from '@firebase/auth';
5-
import { TextField, Button } from '@material-ui/core';
5+
import { TextField, Button } from '@mui/material';
66
import { auth } from '@/lib/firebase';
77

88
const FormGroup = styled.div`

src/pages/_app.tsx

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
import '@/global.css';
2+
import { createTheme, ThemeProvider } from '@mui/material/styles';
3+
4+
const theme = createTheme();
25

36
function MyApp({ Component, pageProps }) {
4-
return <Component {...pageProps} />
7+
return (
8+
<ThemeProvider theme={theme}>
9+
<Component {...pageProps} />
10+
</ThemeProvider>
11+
);
512
}
613

714
export default MyApp

src/pages/admin/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { useEffect, useState } from 'react';
22
import {
3-
makeStyles,
43
CssBaseline,
54
Container,
65
Box,
76
AppBar,
87
Toolbar,
98
Typography,
10-
Button
11-
} from '@material-ui/core';
9+
Button,
10+
} from '@mui/material';
11+
import { makeStyles } from '@mui/styles'
1212
import { User } from '@firebase/auth';
1313
import { ref, onValue, DataSnapshot } from '@firebase/database';
1414

0 commit comments

Comments
 (0)