Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/upgrade mui #9

Merged
merged 6 commits into from
Apr 25, 2022
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
1 change: 0 additions & 1 deletion .github/workflows/push_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,3 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

2 changes: 1 addition & 1 deletion frontend/components/Footer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import Image from 'next/image'
import { Typography, Grid } from '@material-ui/core'
import { Typography, Grid } from '@mui/material'
import Link from '../components/Link'
import useStyles from '../styles/components/Footer'

Expand Down
4 changes: 2 additions & 2 deletions frontend/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
ListItem,
Grid,
Link as MuiLink
} from '@material-ui/core'
import { YouTube, Twitter, GitHub } from '@material-ui/icons'
} from '@mui/material'
import { YouTube, Twitter, GitHub } from '@mui/icons-material'
import Link from './Link'
import useStyles from '../styles/components/Header'

Expand Down
4 changes: 2 additions & 2 deletions frontend/components/Link.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'
import clsx from 'clsx'
import { useRouter } from 'next/router'
import NextLink from 'next/link'
import MuiLink from '@material-ui/core/Link'
import { styled } from '@material-ui/core/styles'
import MuiLink from '@mui/material/Link'
import { styled } from '@mui/styles'

// Add support for the sx prop for consistency with the other branches.
const Anchor = styled('a')({})
Expand Down
10 changes: 7 additions & 3 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
"lint": "next lint"
},
"dependencies": {
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.6.2",
"@mui/lab": "^5.0.0-alpha.79",
"@mui/material": "^5.6.3",
"@mui/styles": "^5.6.2",
"@mui/x-data-grid": "^5.10.0",
"axios": "^0.26.1",
"clsx": "^1.1.1",
"next": "^12.1.5",
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useEffect } from 'react'
import PropTypes from 'prop-types'
import Head from 'next/head'
import { useRouter } from 'next/router'
import { ThemeProvider } from '@material-ui/core/styles'
import CssBaseline from '@material-ui/core/CssBaseline'
import { ThemeProvider } from '@mui/styles'
import CssBaseline from '@mui/material/CssBaseline'
import { AuthProvider } from '../contexts/AuthContext'
import light from '../themes/light'
import Header from '../components/Header'
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/_document.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import Document, { Html, Head, Main, NextScript } from 'next/document'
import { ServerStyleSheets } from '@material-ui/core/styles'
import { ServerStyleSheets } from '@mui/styles'

export default class MyDocument extends Document {
render() {
Expand Down
3 changes: 2 additions & 1 deletion frontend/pages/about.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Container, Grid, Typography } from '@material-ui/core'
import { Container, Grid, Typography } from '@mui/material'

export default function About() {

return (
<Container>
<Grid container spacing={2}>
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/contact.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container, Grid, Typography } from '@material-ui/core'
import { Container, Grid, Typography } from '@mui/material'

export default function Contact() {
return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
CardActionArea,
CardMedia,
Typography
} from '@material-ui/core'
} from '@mui/material'
import Link from '../components/Link'
import useStyles from '../styles/pages/index'

Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
Typography,
Container,
Snackbar
} from '@material-ui/core'
} from '@mui/material'
import Alert from '@material-ui/lab/Alert'
import LockOutlinedIcon from '@material-ui/icons/LockOutlined'
import LockOutlinedIcon from '@mui/icons-material/LockOutlined'
import Link from '../components/Link'
import useStyles from '../styles/pages/login'
import { AuthContext } from '../contexts/AuthContext'
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/tutorials.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Container, Grid, Typography } from '@material-ui/core'
import { Container, Grid, Typography } from '@mui/material'

export default function Tutorials() {
return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
TextField,
MenuItem,
Button
} from '@material-ui/core'
} from '@mui/material'
import { parseCookies } from 'nookies'
import useStyles from '../styles/pages/upload'

Expand Down
2 changes: 1 addition & 1 deletion frontend/styles/components/Footer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles } from '@material-ui/core/styles'
import { makeStyles } from '@mui/styles'

const useStyles = makeStyles(theme => ({
root: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/styles/components/Header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles } from '@material-ui/core/styles'
import { makeStyles } from '@mui/styles'

const useStyles = makeStyles(theme => ({
list: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/styles/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles } from '@material-ui/core/styles'
import { makeStyles } from '@mui/styles'

const useStyles = makeStyles(theme => ({
root: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/styles/pages/login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles } from '@material-ui/core/styles'
import { makeStyles } from '@mui/styles'

const useStyles = makeStyles(theme => ({
container: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/styles/pages/upload.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { makeStyles } from '@material-ui/core/styles'
import { makeStyles } from '@mui/styles'

const useStyles = makeStyles(theme => ({
gridContainer: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/themes/light.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createTheme } from '@material-ui/core/styles'
import { createTheme } from '@mui/material/styles';

const light = createTheme({
palette: {
Expand Down
Loading