Skip to content

Commit cbc7176

Browse files
authored
Merge pull request #25 from CodeDead/feature/upgrades
feat: MUI upgrade, Yarn upgrade, refactoring, dependency upgrades
2 parents 57d1f53 + 34fcdc6 commit cbc7176

40 files changed

Lines changed: 2456 additions & 2462 deletions

File tree

.yarn/releases/yarn-4.3.1.cjs

Lines changed: 0 additions & 894 deletions
This file was deleted.

.yarn/releases/yarn-4.5.0.cjs

Lines changed: 925 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-4.3.1.cjs
3+
yarnPath: .yarn/releases/yarn-4.5.0.cjs

package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
"test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\" && exit 1"
1616
},
1717
"dependencies": {
18-
"@emotion/react": "^11.11.4",
19-
"@emotion/styled": "^11.11.5",
20-
"@mui/icons-material": "^5.16.1",
21-
"@mui/material": "^5.16.1",
22-
"axios": "^1.7.2",
18+
"@emotion/react": "^11.13.3",
19+
"@emotion/styled": "^11.13.0",
20+
"@fontsource/roboto": "^5.1.0",
21+
"@mui/icons-material": "^6.1.1",
22+
"@mui/material": "^6.1.1",
23+
"axios": "^1.7.7",
2324
"gatsby": "^5.13.7",
2425
"gatsby-plugin-catch-links": "^5.13.1",
2526
"gatsby-plugin-google-gtag": "^5.13.1",
@@ -28,7 +29,7 @@
2829
"gatsby-plugin-robots-txt": "^1.8.0",
2930
"gatsby-plugin-sharp": "^5.13.1",
3031
"gatsby-plugin-sitemap": "^6.13.1",
31-
"gatsby-remark-images": "^7.13.1",
32+
"gatsby-remark-images": "^7.13.2",
3233
"gatsby-source-filesystem": "^5.13.1",
3334
"gatsby-theme-material-ui": "^5.3.0",
3435
"gatsby-transformer-remark": "^6.13.1",
@@ -38,11 +39,11 @@
3839
"react-helmet": "^6.1.0"
3940
},
4041
"devDependencies": {
41-
"eslint": "^9.6.0",
42+
"eslint": "^9.11.1",
4243
"eslint-config-airbnb": "^19.0.4",
43-
"eslint-plugin-import": "^2.29.1",
44-
"eslint-plugin-jsx-a11y": "^6.9.0",
45-
"eslint-plugin-react": "^7.34.3",
44+
"eslint-plugin-import": "^2.30.0",
45+
"eslint-plugin-jsx-a11y": "^6.10.0",
46+
"eslint-plugin-react": "^7.37.0",
4647
"eslint-plugin-react-hooks": "^4.6.2"
4748
},
4849
"repository": {
@@ -52,5 +53,5 @@
5253
"bugs": {
5354
"url": "https://github.com/CodeDead/codedead.com/issues"
5455
},
55-
"packageManager": "yarn@4.3.1"
56+
"packageManager": "yarn@4.5.0"
5657
}

src/components/Application/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ const Application = ({
2323
};
2424

2525
return (
26-
<Card style={{ height: '100%' }}>
26+
<Card sx={{ height: '100%' }}>
2727
<CardActionArea
2828
onClick={goToUrl}
29-
style={{ height: '100%' }}
29+
sx={{ height: '100%' }}
3030
>
3131
<CardMedia
3232
title={name}
@@ -37,7 +37,7 @@ const Application = ({
3737
title={name}
3838
/>
3939
<CardContent>
40-
<Typography color="textSecondary" paragraph>
40+
<Typography color="textSecondary" component="p">
4141
{description}
4242
</Typography>
4343
</CardContent>

src/components/BlogList/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React from 'react';
2-
import Grid from '@mui/material/Grid';
2+
import Grid from '@mui/material/Grid2';
33
import BlogPost from '../BlogPost';
44

5-
const BlogList = ({ blogPosts, style }) => (
6-
<Grid container spacing={2} style={style}>
5+
const BlogList = ({ blogPosts}) => (
6+
<Grid container spacing={2}>
77
{blogPosts && blogPosts.map((item) => {
88
const post = item.node.frontmatter;
99
return (
10-
<Grid item xs={12} md={12} lg={12} key={post.path}>
10+
<Grid size={12} key={post.path}>
1111
<BlogPost
1212
title={post.title}
1313
abstract={post.abstract}

src/components/BlogPost/index.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import Typography from '@mui/material/Typography';
99
const BlogPost = ({
1010
title, path, abstract, date,
1111
}) => (
12-
<Card
13-
elevation={2}
14-
>
12+
<Card elevation={2}>
1513
<CardActionArea onClick={() => navigate(path)}>
1614
<CardHeader title={title} subheader={<i>{date}</i>} />
1715
<CardContent>

src/components/Layout/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const Layout = ({ children }) => {
5151
* Go to the GDPR site
5252
*/
5353
const gotoGdpr = () => {
54-
navigate('http://ec.europa.eu/ipg/basics/legal/cookies/index_en.htm');
54+
navigate('https://commission.europa.eu/resources-partners/europa-web-guide_en');
5555
};
5656

5757
return (
@@ -62,8 +62,8 @@ const Layout = ({ children }) => {
6262
{hasAcceptedCookieNotice ? null : (
6363
<Alert
6464
severity="warning"
65-
style={{
66-
position: 'sticky', bottom: 0, marginTop: 10, zIndex: 1000,
65+
sx={{
66+
position: 'sticky', bottom: 0, mt: 5, zIndex: 1000,
6767
}}
6868
>
6969
<Typography>
@@ -75,7 +75,7 @@ const Layout = ({ children }) => {
7575
variant="contained"
7676
color="secondary"
7777
onClick={gotoGdpr}
78-
style={{ marginRight: 5 }}
78+
sx={{ mr: 1 }}
7979
>
8080
Decline
8181
</Button>

src/components/PageHeader/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const PageHeader = ({ title, subTitle, backButton }) => {
2424
: null}
2525
{title}
2626
</Typography>
27-
<Typography variant="h5" align="center" color="textSecondary" paragraph>
27+
<Typography variant="h5" align="center" color="textSecondary" component="p">
2828
{subTitle}
2929
</Typography>
3030
</Container>

src/components/SEO/index.jsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { Helmet } from 'react-helmet';
33
import { useStaticQuery, graphql } from 'gatsby';
44

55
const SEO = ({
6-
description, lang, meta, title,
6+
description = '',
7+
lang = 'en',
8+
meta = [],
9+
title,
710
}) => {
811
const { site } = useStaticQuery(
912
graphql`
@@ -67,10 +70,4 @@ const SEO = ({
6770
);
6871
};
6972

70-
SEO.defaultProps = {
71-
lang: 'en',
72-
meta: [],
73-
description: '',
74-
};
75-
7673
export default SEO;

0 commit comments

Comments
 (0)