diff --git a/.prettierrc b/.prettierrc index 33d2cfa..15bc4fe 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,4 @@ { "arrowParens": "avoid", - "semi": false + "semi": true } diff --git a/gatsby-browser.js b/gatsby-browser.js index b1e5c31..564fabb 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -1,7 +1 @@ -/** - * Implement Gatsby's Browser APIs in this file. - * - * See: https://www.gatsbyjs.org/docs/browser-apis/ - */ - -// You can delete this file if you're not using it +import "@kichiyaki/roboto"; diff --git a/gatsby-config.js b/gatsby-config.js index 95ec4bb..9928fb8 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -1,6 +1,6 @@ -const baseUrl = "tribalwarshelp.com" -const siteUrl = "https://" + baseUrl -const apiUrl = "https://api." + baseUrl +const baseUrl = "tribalwarshelp.com"; +const siteUrl = "https://" + baseUrl; +const apiUrl = "https://api." + baseUrl; module.exports = { siteMetadata: { @@ -37,7 +37,12 @@ module.exports = { icon: `src/images/icon.svg`, // This path is relative to the root of the site. }, }, - `gatsby-theme-material-ui`, + { + resolve: `gatsby-theme-material-ui`, + options: { + webFontsConfig: null, + }, + }, `gatsby-plugin-sitemap`, { resolve: "gatsby-plugin-robots-txt", @@ -66,4 +71,4 @@ module.exports = { }, }, ], -} +}; diff --git a/package.json b/package.json index b739533..22afd81 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "version": "0.1.0", "author": "Dawid Wysokiński ", "dependencies": { + "@kichiyaki/roboto": "^1.0.0", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@material-ui/styles": "^4.10.0", diff --git a/src/components/Link.js b/src/components/Link.js index b7de4e8..7f0873c 100644 --- a/src/components/Link.js +++ b/src/components/Link.js @@ -1,12 +1,12 @@ -import React from "react" -import { Link as GatsbyLink } from "gatsby" -import { Link as MUILink } from "@material-ui/core" +import React from "react"; +import { Link as GatsbyLink } from "gatsby"; +import { Link as MUILink } from "@material-ui/core"; function Link({ href, to, ...rest }) { if (to) { - return + return ; } - return + return ; } -export default Link +export default Link; diff --git a/src/components/SEO.js b/src/components/SEO.js index 80f0ae8..4092ac7 100644 --- a/src/components/SEO.js +++ b/src/components/SEO.js @@ -5,11 +5,11 @@ * See: https://www.gatsbyjs.org/docs/use-static-query/ */ -import React from "react" -import PropTypes from "prop-types" -import { Helmet } from "react-helmet" -import { useStaticQuery, graphql } from "gatsby" -import seoBG from "@images/seo-bg.png" +import React from "react"; +import PropTypes from "prop-types"; +import { Helmet } from "react-helmet"; +import { useStaticQuery, graphql } from "gatsby"; +import seoBG from "@images/seo-bg.png"; function SEO({ description, lang, meta, title, pathname }) { const { site } = useStaticQuery( @@ -24,9 +24,9 @@ function SEO({ description, lang, meta, title, pathname }) { } } ` - ) + ); - const metaDescription = description || site.siteMetadata.description + const metaDescription = description || site.siteMetadata.description; return ( - ) + ); } SEO.defaultProps = { lang: `en`, meta: [], description: ``, -} +}; SEO.propTypes = { description: PropTypes.string, lang: PropTypes.string, meta: PropTypes.arrayOf(PropTypes.object), title: PropTypes.string.isRequired, -} +}; -export default SEO +export default SEO; diff --git a/src/gatsby-theme-material-ui-top-layout/theme.js b/src/gatsby-theme-material-ui-top-layout/theme.js index 38787b6..d38e48c 100644 --- a/src/gatsby-theme-material-ui-top-layout/theme.js +++ b/src/gatsby-theme-material-ui-top-layout/theme.js @@ -1,9 +1,9 @@ -import { createMuiTheme, responsiveFontSizes } from "@material-ui/core/styles" +import { createMuiTheme, responsiveFontSizes } from "@material-ui/core/styles"; const theme = createMuiTheme({ palette: { type: "dark", }, -}) +}); -export default responsiveFontSizes(theme) +export default responsiveFontSizes(theme); diff --git a/src/pages/404.js b/src/pages/404.js index 94ca90f..070624e 100644 --- a/src/pages/404.js +++ b/src/pages/404.js @@ -1,8 +1,8 @@ -import React from "react" +import React from "react"; -import { Typography, Box, Container } from "@material-ui/core" -import { Link } from "gatsby-theme-material-ui" -import SEO from "../components/SEO" +import { Typography, Box, Container } from "@material-ui/core"; +import { Link } from "gatsby-theme-material-ui"; +import SEO from "../components/SEO"; const NotFoundPage = ({ location }) => ( ( -) +); -export default NotFoundPage +export default NotFoundPage; diff --git a/src/pages/index.js b/src/pages/index.js index ca33c63..8b10c60 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -1,10 +1,10 @@ -import React from "react" -import { useStaticQuery, graphql } from "gatsby" +import React from "react"; +import { useStaticQuery, graphql } from "gatsby"; -import { makeStyles } from "@material-ui/core/styles" -import { Typography, Button, Box, Container } from "@material-ui/core" -import SEO from "../components/SEO" -import Link from "../components/Link" +import { makeStyles } from "@material-ui/core/styles"; +import { Typography, Button, Box, Container } from "@material-ui/core"; +import SEO from "../components/SEO"; +import Link from "../components/Link"; const LinkButton = ({ children, href, to }) => { return ( @@ -13,8 +13,8 @@ const LinkButton = ({ children, href, to }) => { {children} - ) -} + ); +}; const useStyles = makeStyles(theme => ({ nav: { @@ -31,10 +31,10 @@ const useStyles = makeStyles(theme => ({ flexDirection: "column", }, }, -})) +})); const IndexPage = ({ location }) => { - const classes = useStyles() + const classes = useStyles(); const { site: { siteMetadata }, @@ -52,7 +52,7 @@ const IndexPage = ({ location }) => { } } ` - ) + ); return ( { - ) -} + ); +}; -export default IndexPage +export default IndexPage; diff --git a/src/pages/supported-versions.js b/src/pages/supported-versions.js index b978df5..3d0a7f5 100644 --- a/src/pages/supported-versions.js +++ b/src/pages/supported-versions.js @@ -1,5 +1,5 @@ -import React from "react" -import { useStaticQuery, graphql } from "gatsby" +import React from "react"; +import { useStaticQuery, graphql } from "gatsby"; import { Box, @@ -8,13 +8,13 @@ import { Grid, Container, Typography, -} from "@material-ui/core" -import Link from "../components/Link" -import SEO from "../components/SEO" +} from "@material-ui/core"; +import Link from "../components/Link"; +import SEO from "../components/SEO"; const buildURLToVersionPage = (baseUrl, code) => { - return `https://${code}.${baseUrl}` -} + return `https://${code}.${baseUrl}`; +}; function SupportedVersionsPage({ location }) { const { @@ -40,7 +40,7 @@ function SupportedVersionsPage({ location }) { } } } - `) + `); return ( - ) + ); } -export default SupportedVersionsPage +export default SupportedVersionsPage; diff --git a/yarn.lock b/yarn.lock index 6f63b86..a81f632 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,6 +1485,11 @@ core-js "^3.4.1" regenerator-runtime "^0.13.3" +"@kichiyaki/roboto@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@kichiyaki/roboto/-/roboto-1.0.0.tgz#6f5dfb40e2423940588946c952490b123ca8088b" + integrity sha512-4pfkzXOqtSWZvvkA6jI30h+y2vDOvhEavYo4O32C98jPk2zqIiFwd4SwiiFe9xzjQsPURqO89rUTZlChU255bQ== + "@material-ui/core@^4.11.0": version "4.11.0" resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.0.tgz#b69b26e4553c9e53f2bfaf1053e216a0af9be15a"