Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
"lint": "next lint"
},
"dependencies": {
"@material-ui/core": "^4.12.3",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.3",
"@mui/material": "^5.0.3",
"@mui/styles": "^5.0.1",
"firebase": "^9.1.2",
"next": "^11.1.2",
"react": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/components/IFrameWidget/editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
TextField,
Button,
Typography,
} from '@material-ui/core';
} from '@mui/material';
import type { IFrameWidgetProps } from './types';

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/TextWidget/editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Typography,
FormControlLabel,
Checkbox,
} from '@material-ui/core';
} from '@mui/material';
import styled from 'styled-components';
import { Property } from 'csstype';
import { ref, set } from '@firebase/database';
Expand Down
2 changes: 1 addition & 1 deletion src/components/TimeWidget/editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Typography,
FormControlLabel,
Checkbox,
} from '@material-ui/core';
} from '@mui/material';
import { ref, set } from '@firebase/database';
import { db } from '@/lib/firebase';
import type { TimeWidgetProps } from './types';
Expand Down
2 changes: 1 addition & 1 deletion src/components/admin/SignInForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
import { useRouter } from 'next/router';
import styled from 'styled-components';
import { signInWithEmailAndPassword } from '@firebase/auth';
import { TextField, Button } from '@material-ui/core';
import { TextField, Button } from '@mui/material';
import { auth } from '@/lib/firebase';

const FormGroup = styled.div`
Expand Down
9 changes: 8 additions & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import '@/global.css';
import { createTheme, ThemeProvider } from '@mui/material/styles';

const theme = createTheme();

function MyApp({ Component, pageProps }) {
return <Component {...pageProps} />
return (
<ThemeProvider theme={theme}>
<Component {...pageProps} />
</ThemeProvider>
);
}

export default MyApp
6 changes: 3 additions & 3 deletions src/pages/admin/index.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useEffect, useState } from 'react';
import {
makeStyles,
CssBaseline,
Container,
Box,
AppBar,
Toolbar,
Typography,
Button
} from '@material-ui/core';
Button,
} from '@mui/material';
import { makeStyles } from '@mui/styles'
import { User } from '@firebase/auth';
import { ref, onValue, DataSnapshot } from '@firebase/database';

Expand Down
Loading