Skip to content

feature/gatsby-upgrade #6

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 9, 2021
Merged

feature/gatsby-upgrade #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const path = require('path');

module.exports = {
polyfill: false,
/* Your site config here */
siteMetadata: {
title: 'CodeDead',
description: 'Solving problems using code',
Expand Down Expand Up @@ -61,9 +60,10 @@ module.exports = {
'gatsby-plugin-react-helmet',
'gatsby-transformer-remark',
'gatsby-theme-material-ui',
'gatsby-transformer-sharp',
'gatsby-plugin-sharp',
'gatsby-plugin-sitemap',
'gatsby-plugin-robots-txt',
'gatsby-plugin-image',
'gatsby-plugin-sharp',
'gatsby-transformer-sharp',
],
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"gatsby": "^3.0.3",
"gatsby-image": "^3.0.0",
"gatsby-plugin-google-gtag": "^3.0.0",
"gatsby-plugin-image": "^1.0.0",
"gatsby-plugin-robots-txt": "^1.5.5",
"gatsby-plugin-sharp": "^3.0.0",
"gatsby-plugin-sitemap": "^3.0.0",
Expand Down
44 changes: 22 additions & 22 deletions src/pages/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Grid from '@material-ui/core/Grid';
import {
graphql, useStaticQuery, navigate, Link,
} from 'gatsby';
import Img from 'gatsby-image';
import { GatsbyImage } from 'gatsby-plugin-image';
import Typography from '@material-ui/core/Typography';
import Button from '@material-ui/core/Button';
import Divider from '@material-ui/core/Divider';
Expand Down Expand Up @@ -36,23 +36,17 @@ const Home = () => {
},
deadhash: file(relativePath: { eq: "DeadHash/DeadHash.png" }) {
childImageSharp {
fluid(maxHeight: 250) {
...GatsbyImageSharpFluid
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
memplus: file(relativePath: { eq: "MemPlus/memplus.png" }) {
childImageSharp {
fluid(maxHeight: 250) {
...GatsbyImageSharpFluid
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
pkfinder: file(relativePath: { eq: "PK Finder/pkfinder.png" }) {
childImageSharp {
fluid(maxHeight: 250) {
...GatsbyImageSharpFluid
}
gatsbyImageData(layout: FULL_WIDTH)
}
}
}`);
Expand Down Expand Up @@ -89,10 +83,12 @@ const Home = () => {
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Link to="/software/memplus">
<Img fluid={{
...data.memplus.childImageSharp.fluid,
aspectRatio: 21 / 9,
}}
<GatsbyImage
image={{
...data.memplus.childImageSharp.gatsbyImageData,
aspectRatio: 21 / 9,
}}
alt="MemPlus"
/>
</Link>
</Grid>
Expand Down Expand Up @@ -121,10 +117,12 @@ const Home = () => {
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Link to="/software/deadhash">
<Img fluid={{
...data.deadhash.childImageSharp.fluid,
aspectRatio: 21 / 9,
}}
<GatsbyImage
image={{
...data.deadhash.childImageSharp.gatsbyImageData,
aspectRatio: 21 / 9,
}}
alt="DeadHash"
/>
</Link>
</Grid>
Expand Down Expand Up @@ -153,10 +151,12 @@ const Home = () => {
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Link to="/software/pk-finder">
<Img fluid={{
...data.pkfinder.childImageSharp.fluid,
aspectRatio: 21 / 9,
}}
<GatsbyImage
image={{
...data.pkfinder.childImageSharp.gatsbyImageData,
aspectRatio: 21 / 9,
}}
alt="PK Finder"
/>
</Link>
</Grid>
Expand Down
23 changes: 10 additions & 13 deletions src/pages/software/advanced-passgen/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext, useEffect } from 'react';
import { Container } from '@material-ui/core';
import { graphql, useStaticQuery } from 'gatsby';
import Img from 'gatsby-image/index';
import { GatsbyImage } from 'gatsby-plugin-image';
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
Expand All @@ -23,23 +23,17 @@ const AdvancedPassGenPage = () => {
query {
advancedpassgen: file(relativePath: { eq: "Advanced PassGen/ap.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
advancedpassgensettings: file(relativePath: { eq: "Advanced PassGen/ap_theme_settings.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
advancedpassgensettingsadvanced: file(relativePath: { eq: "Advanced PassGen/ap_advanced_settings.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
}
}`);
Expand Down Expand Up @@ -80,7 +74,7 @@ const AdvancedPassGenPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.advancedpassgen.childImageSharp.fixed} />
<GatsbyImage image={data.advancedpassgen.childImageSharp.gatsbyImageData} alt="Advanced PassGen" />
</Grid>
</Grid>
</CardContent>
Expand All @@ -92,7 +86,7 @@ const AdvancedPassGenPage = () => {
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.advancedpassgensettings.childImageSharp.fixed} />
<GatsbyImage image={data.advancedpassgensettings.childImageSharp.gatsbyImageData} alt="Advanced PassGen settings" />
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Typography variant="h6">
Expand Down Expand Up @@ -124,7 +118,10 @@ const AdvancedPassGenPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.advancedpassgensettingsadvanced.childImageSharp.fixed} />
<GatsbyImage
image={data.advancedpassgensettingsadvanced.childImageSharp.gatsbyImageData}
alt="Advanced PassGen advanced settings"
/>
</Grid>
</Grid>
</CardContent>
Expand Down
29 changes: 16 additions & 13 deletions src/pages/software/advanced-portchecker/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Container } from '@material-ui/core';
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import Img from 'gatsby-image';
import { GatsbyImage } from 'gatsby-plugin-image';
import Button from '@material-ui/core/Button';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
Expand All @@ -23,23 +23,17 @@ const AdvancedPortCheckerPage = () => {
query {
main: file(relativePath: { eq: "Advanced PortChecker/ap.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
settings: file(relativePath: { eq: "Advanced PortChecker/ap_general_settings.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
about: file(relativePath: { eq: "Advanced PortChecker/ap_about.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
}
}`);
Expand Down Expand Up @@ -79,7 +73,10 @@ const AdvancedPortCheckerPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.main.childImageSharp.fixed} />
<GatsbyImage
image={data.main.childImageSharp.gatsbyImageData}
alt="Advanced PortChecker main window"
/>
</Grid>
</Grid>
</CardContent>
Expand All @@ -91,7 +88,10 @@ const AdvancedPortCheckerPage = () => {
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.settings.childImageSharp.fixed} />
<GatsbyImage
image={data.settings.childImageSharp.gatsbyImageData}
alt="Advanced PortChecker settings"
/>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Typography variant="h6">
Expand Down Expand Up @@ -124,7 +124,10 @@ const AdvancedPortCheckerPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.about.childImageSharp.fixed} />
<GatsbyImage
image={data.about.childImageSharp.gatsbyImageData}
alt="Advanced PortChecker about"
/>
</Grid>
</Grid>
</CardContent>
Expand Down
29 changes: 16 additions & 13 deletions src/pages/software/aniview/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Container } from '@material-ui/core';
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import Img from 'gatsby-image';
import { GatsbyImage } from 'gatsby-plugin-image';
import Button from '@material-ui/core/Button';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
Expand All @@ -23,23 +23,17 @@ const AniViewPage = () => {
query {
main: file(relativePath: { eq: "AniView/aniview.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
settings: file(relativePath: { eq: "AniView/settings.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
image: file(relativePath: { eq: "AniView/av_settings_image.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
}
}`);
Expand Down Expand Up @@ -80,7 +74,10 @@ const AniViewPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.main.childImageSharp.fixed} />
<GatsbyImage
image={data.main.childImageSharp.gatsbyImageData}
alt="AniView main window"
/>
</Grid>
</Grid>
</CardContent>
Expand All @@ -92,7 +89,10 @@ const AniViewPage = () => {
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.settings.childImageSharp.fixed} />
<GatsbyImage
image={data.settings.childImageSharp.gatsbyImageData}
alt="AniView settings"
/>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Typography variant="h6">
Expand Down Expand Up @@ -125,7 +125,10 @@ const AniViewPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.image.childImageSharp.fixed} />
<GatsbyImage
image={data.image.childImageSharp.gatsbyImageData}
alt="AniView image"
/>
</Grid>
</Grid>
</CardContent>
Expand Down
29 changes: 16 additions & 13 deletions src/pages/software/deadhash/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import Divider from '@material-ui/core/Divider';
import { Container } from '@material-ui/core';
import Img from 'gatsby-image';
import { GatsbyImage } from 'gatsby-plugin-image';
import { graphql, useStaticQuery } from 'gatsby';
import Button from '@material-ui/core/Button';
import Card from '@material-ui/core/Card';
Expand All @@ -23,23 +23,17 @@ const DeadHashPage = () => {
query {
deadhash: file(relativePath: { eq: "DeadHash/DeadHash.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
deadhashresult: file(relativePath: { eq: "DeadHash/deadhash_result.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
},
deadhashtext: file(relativePath: { eq: "DeadHash/deadhash_text.png" }) {
childImageSharp {
fixed {
...GatsbyImageSharpFixed
}
gatsbyImageData(layout: FULL_WIDTH)
}
}
}`);
Expand Down Expand Up @@ -81,7 +75,10 @@ const DeadHashPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.deadhash.childImageSharp.fixed} />
<GatsbyImage
image={data.deadhash.childImageSharp.gatsbyImageData}
alt="DeadHash main window"
/>
</Grid>
</Grid>
</CardContent>
Expand All @@ -93,7 +90,10 @@ const DeadHashPage = () => {
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.deadhashresult.childImageSharp.fixed} />
<GatsbyImage
image={data.deadhashresult.childImageSharp.gatsbyImageData}
alt="DeadHash result"
/>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Typography variant="h6">
Expand Down Expand Up @@ -128,7 +128,10 @@ const DeadHashPage = () => {
</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Img fixed={data.deadhashtext.childImageSharp.fixed} />
<GatsbyImage
image={data.deadhashtext.childImageSharp.gatsbyImageData}
alt="DeadHash text"
/>
</Grid>
</Grid>
</CardContent>
Expand Down
Loading