Skip to content

Commit e199f16

Browse files
author
Luciano Nooijen
committed
Restructured components to components/containers
Signed-off-by: Luciano Nooijen <luciano@bytecode.nl>
1 parent aa6e0f8 commit e199f16

File tree

24 files changed

+62
-62
lines changed

24 files changed

+62
-62
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import styled from 'styled-components';
4-
import theme from '../styles/theme';
4+
import theme from '../../styles/theme';
55

66
const AuthorBlock = styled.div`
77
display: flex;
@@ -34,7 +34,7 @@ const AuthorBlockPhoto = styled.img`
3434

3535
const Author = props => {
3636
const { img, name, title } = props;
37-
const image = require(`../images/img/authors/${img}`);
37+
const image = require(`../../images/img/authors/${img}`);
3838
return (
3939
<AuthorBlock>
4040
<AuthorBlockPhoto src={image} />

src/components/ContactForm.jsx renamed to src/containers/ContactForm/ContactForm.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import styled from 'styled-components';
66
import axios from 'axios';
77
import { Field, Formik } from 'formik';
88
import * as Yup from 'yup';
9-
import theme from '../styles/theme';
10-
import TextBlock from './TextBlock';
11-
import Button from './Button';
9+
import theme from '../../styles/theme';
10+
import TextBlock from '../TextBlock/TextBlock';
11+
import Button from '../../components/Button';
1212

1313
const ContactFormContainer = styled.div`
1414
padding: 1em 0;

src/components/ContentBlocks.jsx renamed to src/containers/ContentBlocks/ContentBlocks.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import styled from 'styled-components';
33
import PropTypes from 'prop-types';
4-
import theme from '../styles/theme';
4+
import theme from '../../styles/theme';
55

66
const container = theme.containerWidth;
77
const { mediaQueryMin } = theme;

src/components/ContentPageHeader.jsx renamed to src/containers/ContentPageHeader/ContentPageHeader.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import React from 'react';
44
import PropTypes from 'prop-types';
55
import styled from 'styled-components';
6-
import TextBlock from './TextBlock';
7-
import theme from '../styles/theme';
6+
import TextBlock from '../TextBlock/TextBlock';
7+
import theme from '../../styles/theme';
88

99
const { mediaQueryMin, colors, containerWidth } = theme;
1010

src/components/NavbarComponents.jsx renamed to src/containers/Navbar/Navbar.components.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import styled from 'styled-components';
33
import PropTypes from 'prop-types';
44
import { transparentize } from 'polished'; // TODO: Remove dependency
55
import { Link } from 'gatsby';
6-
import { Container } from '../lib/Grid';
7-
import theme from '../styles/theme';
6+
import { Container } from '../../lib/Grid';
7+
import theme from '../../styles/theme';
88

99
const { mediaQueryMin } = theme;
1010

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Link } from 'gatsby';
3-
import NavbarComponents from './NavbarComponents';
3+
import NavbarComponents from './Navbar.components';
44

55
const {
66
NavbarContainer,
@@ -14,10 +14,10 @@ const {
1414
BlackOverlay,
1515
} = NavbarComponents;
1616

17-
const logo = require('../images/img/logo.svg');
18-
const logoMin = require('../images/img/logo-min.svg');
19-
const hamburger = require('../images/img/hamburger-menu.svg');
20-
const closeMenu = require('../images/img/close-menu.svg');
17+
const logo = require('../../images/img/logo.svg');
18+
const logoMin = require('../../images/img/logo-min.svg');
19+
const hamburger = require('../../images/img/hamburger-menu.svg');
20+
const closeMenu = require('../../images/img/close-menu.svg');
2121

2222
class Navbar extends React.Component {
2323
constructor() {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react';
22
import styled from 'styled-components';
3-
import theme from '../styles/theme';
4-
import TextBlock from './TextBlock';
5-
import { Container, Row, Col } from '../lib/Grid';
3+
import theme from '../../styles/theme';
4+
import TextBlock from '../TextBlock/TextBlock';
5+
import { Container, Row, Col } from '../../lib/Grid';
66

7-
const step1 = require('../images/img/content/workflow/analyze.svg');
8-
const step2 = require('../images/img/content/workflow/strategize.svg');
9-
const step3 = require('../images/img/content/workflow/realize.svg');
7+
const step1 = require('../../images/img/content/workflow/analyze.svg');
8+
const step2 = require('../../images/img/content/workflow/strategize.svg');
9+
const step3 = require('../../images/img/content/workflow/realize.svg');
1010

1111
const { mediaQueryMin } = theme;
1212

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
22
import styled from 'styled-components';
33
import PropTypes from 'prop-types';
4-
import theme from '../styles/theme';
5-
import TextBlock from './TextBlock';
4+
import theme from '../../styles/theme';
5+
import TextBlock from '../TextBlock/TextBlock';
66

77
const { mediaQueryMin } = theme;
88

@@ -51,7 +51,7 @@ const ServiceIcon = styled.div`
5151
`;
5252

5353
const Service = ({ children, iconName, title, fullWidth }) => {
54-
const iconSrc = require(`../images/icons/services/${iconName}.svg`);
54+
const iconSrc = require(`../../images/icons/services/${iconName}.svg`);
5555
return (
5656
<ServiceWrapper fullWidth={fullWidth}>
5757
<ServiceIcon>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
22
import styled from 'styled-components';
33
import PropTypes from 'prop-types';
4-
import theme from '../styles/theme';
5-
import AllSocials from '../lib/Socials';
6-
import { Col } from '../lib/Grid';
4+
import theme from '../../styles/theme';
5+
import AllSocials from '../../lib/Socials';
6+
import { Col } from '../../lib/Grid';
77

88
const { mediaQueryMin } = theme;
99

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import styled from 'styled-components';
33
import PropTypes from 'prop-types';
4-
import Button from './Button';
4+
import Button from '../../components/Button';
55

66
const SubtitleBase = ({ className, children }) => (
77
<div className={`subtitle ${className}`}>{children}</div>

0 commit comments

Comments
 (0)