Skip to content

Commit 640e119

Browse files
committed
Move mui theme into separate file and update mui imports for v5
1 parent a840297 commit 640e119

File tree

4 files changed

+33
-35
lines changed

4 files changed

+33
-35
lines changed

src/pages/contact.tsx

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,16 @@
11
import Head from 'next/head';
22
import React, { Component } from 'react';
33

4-
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
5-
import TextField from '@material-ui/core/TextField';
6-
import twConfig from '@base/tailwind.config';
4+
import { ThemeProvider } from '@mui/material/styles';
5+
import TextField from '@mui/material/TextField';
76

87
import { Navbar } from '@ui/Navbar';
98
import { Footer } from '@ui/Footer';
109
import { Button } from '@ui/Button';
1110
import { Spinner } from '@ui/Spinner';
11+
import { muiTheme } from '@styles/theme';
1212
import API from '@api';
1313

14-
const theme = createTheme({
15-
palette: {
16-
primary: {
17-
main: '#1987bd',
18-
},
19-
secondary: {
20-
main: '#9e1cf3',
21-
},
22-
type: 'dark',
23-
},
24-
typography: {
25-
fontFamily: twConfig.theme.fontFamily.sans.join(','),
26-
},
27-
});
28-
2914
type Props = {};
3015
type States = {
3116
invalidFields: {
@@ -295,7 +280,7 @@ export default class Contact extends Component<Props, States> {
295280
id="contactForm"
296281
className="w-11/12 md:w-9/12 lg:w-7/12 xl:w-6/12 2xl:w-5/12 mx-auto px-3 md:px-10 flex-grow"
297282
>
298-
<ThemeProvider theme={theme}>
283+
<ThemeProvider theme={muiTheme}>
299284
<div className="flex justify-center py-1">
300285
<TextField
301286
id="contactName"

src/styles/theme.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { createTheme } from '@mui/material/styles';
2+
3+
import twConfig from '@base/tailwind.config';
4+
5+
export const muiTheme = createTheme({
6+
palette: {
7+
primary: {
8+
main: '#1987bd',
9+
},
10+
secondary: {
11+
main: '#9e1cf3',
12+
},
13+
mode: 'dark',
14+
},
15+
typography: {
16+
fontFamily: twConfig.theme.extend.fontFamily.sans.join(','),
17+
},
18+
});

src/ui/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import React, {
55
Fragment,
66
} from 'react';
77

8-
import ButtonBase from '@material-ui/core/ButtonBase';
8+
import ButtonBase from '@mui/material/ButtonBase';
99

1010
export type ButtonProps = DetailedHTMLProps<
1111
ButtonHTMLAttributes<HTMLButtonElement>,

src/ui/Navbar.tsx

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import Link from 'next/link';
22
import React, { useState } from 'react';
33

4-
import { Drawer, IconButton } from '@material-ui/core';
5-
import {
6-
createTheme,
7-
ThemeProvider,
8-
makeStyles,
9-
} from '@material-ui/core/styles';
10-
import { Menu } from '@material-ui/icons';
4+
import Drawer from '@mui/material/Drawer';
5+
import IconButton from '@mui/material/IconButton';
6+
import { ThemeProvider } from '@mui/material/styles';
7+
import { makeStyles } from '@mui/styles';
8+
import Menu from '@mui/icons-material/Menu';
9+
10+
import { muiTheme } from '@styles/theme';
1111

1212
export interface NavbarProps {
1313
className?: string;
@@ -18,13 +18,7 @@ interface PageData {
1818
location: string;
1919
}
2020

21-
const theme = createTheme({
22-
palette: {
23-
type: 'dark',
24-
},
25-
});
26-
27-
const styles = makeStyles((_) => ({
21+
const styles = makeStyles((_: any) => ({
2822
drawerPaper: {
2923
backgroundColor: '#0c0c0c',
3024
},
@@ -69,7 +63,7 @@ export const Navbar: React.FC<NavbarProps> = ({ className = '' }) => {
6963
</div>
7064

7165
<div className="block md:hidden">
72-
<ThemeProvider theme={theme}>
66+
<ThemeProvider theme={muiTheme}>
7367
<IconButton
7468
aria-label="Open navigation"
7569
className="relative left-3"
@@ -87,6 +81,7 @@ export const Navbar: React.FC<NavbarProps> = ({ className = '' }) => {
8781
setDrawer(false);
8882
}}
8983
classes={{
84+
//@ts-ignore
9085
paper: styles().drawerPaper,
9186
}}
9287
>

0 commit comments

Comments
 (0)