Merge pull request #4 from Kichiyaki/develop

merge develop into master
This commit is contained in:
Dawid Wysokiński 2021-05-14 12:46:51 +02:00 committed by GitHub
commit b6a73484f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 31 additions and 29 deletions

View File

@ -1,11 +1,11 @@
import React from 'react';
import classnames from 'classnames';
import * as routes from '@config/routes';
import { Route } from '@config/routing';
import useSmoothScroll from '@libs/useSmoothScroll';
import logo from '@images/logo.svg';
import { HEADER_ID } from '@features/HomePage/components/Header';
import { SECTION_ID as PORTFOLIO_SECTION_ID } from '@features/HomePage/components/Portfolio/Portfolio';
import { SECTION_ID as CONTACT_SECTION_ID } from '@features/HomePage/components/Contact';
import { HEADER_ID } from '@features/IndexPage/components/Header';
import { SECTION_ID as PORTFOLIO_SECTION_ID } from '@features/IndexPage/components/Portfolio/Portfolio';
import { SECTION_ID as CONTACT_SECTION_ID } from '@features/IndexPage/components/Contact';
import { makeStyles } from '@material-ui/core/styles';
import { AppBar, Toolbar, Container, Link } from '@material-ui/core';
@ -25,7 +25,7 @@ function Navbar({ className, ...rest }) {
<Container>
<Toolbar className={classes.toolbar} disableGutters>
<div className={classes.titleContainer}>
<GatsbyLink title="Strona główna" color="inherit" to={routes.HOME}>
<GatsbyLink title="Strona główna" color="inherit" to={Route.IndexPage}>
<img className={classes.logo} src={logo} alt="logo" />
</GatsbyLink>
</div>

View File

@ -1 +0,0 @@
export const HOME = '/';

3
src/config/routing.js Normal file
View File

@ -0,0 +1,3 @@
export const Route = {
IndexPage: '/',
}

View File

@ -16,7 +16,7 @@ const useStyles = makeStyles(theme => ({
},
}));
const HomePage = ({ location }) => {
const IndexPage = ({ location }) => {
const classes = useStyles();
return (
<Layout className={classes.layout} navbarProps={{ position: 'absolute' }}>
@ -32,4 +32,4 @@ const HomePage = ({ location }) => {
);
};
export default HomePage;
export default IndexPage;

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

@ -43,36 +43,36 @@ function Technologies() {
Technologies / tools I use
</Typography>
<div className={classes.grid}>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/html5.png')}
name="HTML"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology fixed={findIcon('technologies/css.png')} name="CSS" />
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology fixed={findIcon('technologies/scss.png')} name="SCSS" />
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/js.png')}
name="JavaScript"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/typescript.png')}
name="TypeScript"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/react.png')}
@ -80,46 +80,46 @@ function Technologies() {
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/gatsby.png')}
name="Gatsby"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/nextjs.png')}
name="Next.JS"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology fixed={findIcon('technologies/jest.png')} name="Jest" />
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/express.png')}
name="Express"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/nest.png')}
name="Nest.JS"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/strapi.png')}
name="Strapi"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/ghost.png')}
@ -127,42 +127,42 @@ function Technologies() {
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/graphql.png')}
name="GraphQL"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/golang.png')}
name="Golang"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/gqlgen.png')}
name="gqlgen"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/golang.png')}
name="Gin"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/postgresql.png')}
name="PostgreSQL"
/>
</div>
<div className={classes.hide}></div>
<div className={classes.hide} />
<div>
<Technology
fixed={findIcon('technologies/docker.png')}

View File

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

View File

@ -1,7 +1,7 @@
import React from 'react';
import HomePage from '@features/HomePage/HomePage';
import IndexPage from '@features/IndexPage/IndexPage';
const IndexPage = props => <HomePage {...props} />;
const IndexPage = props => <IndexPage {...props} />;
export default IndexPage;