Skip to content

Commit 84e22cb

Browse files
author
Luciano Nooijen
committed
Merge branch 'develop' into feature/blog
2 parents 403f173 + 296ba52 commit 84e22cb

30 files changed

+911
-304
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,6 @@ wp-content/plugins/hello.php
7777
/readme.html
7878
/sitemap.xml
7979
/sitemap.xml.gz
80+
81+
# Include specific files
82+
!/static/docs

‎.gitlab-ci.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
image: node:8-alpine
2-
31
cache:
42
paths:
53
- node_modules/
@@ -10,6 +8,14 @@ before_script:
108
- cp .env.example .env
119

1210
build:
11+
image: node:10-alpine
12+
script:
13+
- yarn run lint
14+
- yarn run build
15+
- yarn run export
16+
17+
build-node-8:
18+
image: node:8-alpine
1319
script:
1420
- yarn run lint
1521
- yarn run build

‎CHANGELOG.md‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## 1.1.1 (2018-10-18)
9+
10+
### Fixed:
11+
12+
* Node ENV config
13+
14+
## 1.1.0 (2018-10-17)
15+
16+
### Added:
17+
18+
* Social icons in footer
19+
* Social icon SVG minification
20+
* Sqreen integration
21+
* Contact page
22+
23+
### Changed:
24+
25+
* GitLab CI script
26+
* Updated NextJS
27+
* Converted SVG to outline
28+
* Enhanced typography footer
29+
* Image optimizations
30+
31+
### Fixed:
32+
33+
* Drift and Tag Manager scripts
34+
* Mobile menu issues
35+
36+
## 1.0.1 (2018-10-06)
37+
38+
### Added:
39+
40+
* PM2 ecosystem
41+
* Head scripts
42+
43+
### Fixed:
44+
45+
* ESLint errors
46+
* Responsive issues
47+
48+
## 1.0.0 (2018-10-02)
49+
50+
### Added:
51+
52+
* NextJS configuration
53+
* Layout setup
54+
* Component configuration
55+
* Contact form with backend functionality
56+
* Linting and CI integrations

‎components/Button.jsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@ import styled from 'styled-components';
66
import theme from '../styles/theme';
77

88
const ButtonBase = ({ className, children, ...props }) => {
9-
const { href, useNextLink } = props;
10-
if (useNextLink) {
9+
const { href, usenextlink } = props;
10+
if (usenextlink) {
1111
return (
1212
<Link href={href}>
1313
{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
14-
<a className={`button ${className}`}>{children}</a>
14+
<a className={`button ${className}`} {...props}>
15+
{children}
16+
</a>
1517
</Link>
1618
);
1719
}
1820
return (
19-
<a href={href} className={`button ${className}`}>
21+
<a href={href} className={`button ${className}`} {...props}>
2022
{children}
2123
</a>
2224
);
2325
};
2426

2527
ButtonBase.propTypes = {
2628
href: PropTypes.string.isRequired,
27-
useNextLink: PropTypes.bool,
29+
usenextlink: PropTypes.bool,
2830
};
2931

3032
const Button = styled(ButtonBase)`
@@ -33,7 +35,7 @@ const Button = styled(ButtonBase)`
3335
padding: 0.8rem 3.6rem;
3436
border-color: ${theme.colors.tertiary};
3537
border-style: solid;
36-
border-width: 0.1rem;
38+
border-width: 0.15rem;
3739
border-radius: 10rem;
3840
transition: all 0.2s ease;
3941
&:hover {

‎components/Footer.jsx‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import styled from 'styled-components';
2+
import Link from 'next/link';
23
import { Container, Row, Col } from '../lib/Grid';
34
import Button from './Button';
45
import AllSocials from '../lib/Socials';
@@ -34,6 +35,7 @@ const FooterLinkContainer = styled.h4`
3435
const FooterLink = styled.a`
3536
display: block;
3637
text-decoration: none;
38+
cursor: pointer;
3739
`;
3840

3941
const FooterHeadingContainer = styled.div`
@@ -92,7 +94,10 @@ const Footer = () => (
9294
Ons adres is Verlengde Spiegelmakerstraat 13, 2645LZ
9395
Delfgauw.
9496
</FooterText>
95-
<FooterButton href="https://calendly.com/bytecode">
97+
<FooterButton
98+
href="https://calendly.com/bytecode"
99+
target="_blank"
100+
>
96101
Plan een afspraak
97102
</FooterButton>
98103
</FooterCol>
@@ -110,7 +115,10 @@ const Footer = () => (
110115
vrijgegeven.
111116
</FooterText>
112117
{/* eslint-disable-next-line max-len */}
113-
<FooterButton href="https://github.com/BytecodeBV/Bytecode-Website">
118+
<FooterButton
119+
href="https://github.com/BytecodeBV/Bytecode-Website"
120+
target="_blank"
121+
>
114122
Bekijk broncode
115123
</FooterButton>
116124
</FooterCol>
@@ -119,12 +127,22 @@ const Footer = () => (
119127
<p className="subtitle">Documenten</p>
120128
</FooterHeadingContainer>
121129
<FooterText>
122-
{/* TODO: Add documents
123-
<FooterLink href="#">Algemene Voorwaarden</FooterLink>
124-
<FooterLink href="#">Privacy Policy</FooterLink>
125-
<FooterLink href="#">Cookie Policy</FooterLink>
126-
*/}
127-
<FooterLink href="https://security.bytecode.nl">
130+
<FooterLink
131+
href="/static/docs/algemene-voorwaarden.pdf"
132+
target="_blank"
133+
>
134+
Algemene Voorwaarden
135+
</FooterLink>
136+
<Link href="/legal/privacy-policy">
137+
<FooterLink>Privacy Policy</FooterLink>
138+
</Link>
139+
<Link href="/legal/cookie-policy">
140+
<FooterLink>Cookie Policy</FooterLink>
141+
</Link>
142+
<FooterLink
143+
href="https://security.bytecode.nl"
144+
target="_blank"
145+
>
128146
Security Policy
129147
</FooterLink>
130148
</FooterText>

‎components/IconTextHorizontal.jsx‎

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

‎components/Process.jsx‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
import styled from 'styled-components';
2+
import theme from '../styles/theme';
3+
import TextBlock from './TextBlock';
4+
import { Row, Col } from '../lib/Grid'; // eslint-disable-line
5+
6+
const ContentBlockWrapper = styled.section`
7+
background-color: ${theme.colors.mediumgray};
8+
margin: 5% 0% 5% 5%;
9+
padding: 7.5% 5%;
10+
position: relative;
11+
z-index: 100;
12+
`;
13+
14+
const ProcessStepImage = styled.img`
15+
height: 60rem;
16+
max-height: 30vh;
17+
margin-bottom: 5rem;
18+
@media (max-width: ${theme.breakpoints[2]}px) {
19+
margin-top: 10rem;
20+
}
21+
`;
22+
23+
const Process = () => (
24+
<ContentBlockWrapper>
25+
<Row>
26+
<Col md={4} lg={3}>
27+
<ProcessStepImage
28+
src="/static/img/content/workflow/analyze.svg"
29+
alt="Analyze"
30+
/>
31+
<TextBlock subtitle="Stap 1" headingType="h2" title="Analyze">
32+
Voordat we starten met ontwikkelen, maken we eerst een
33+
gedetailleerde analyse. Dit stelt ons in staat om een helder
34+
en volledig overzicht te krijgen van de huidige situatie.
35+
Hierdoor kunnen wij de pijnpunten in beeld brengen en
36+
analyseren welke punten het meeste prioriteit hebben.
37+
</TextBlock>
38+
</Col>
39+
<Col offset={{ lg: 1 }} md={4} lg={3}>
40+
<ProcessStepImage
41+
src="/static/img/content/workflow/strategize.svg"
42+
alt="Strategize"
43+
/>
44+
<TextBlock
45+
subtitle="Stap 2"
46+
headingType="h2"
47+
title="Strategize"
48+
>
49+
Vervolgens maken wij een duidelijke strategie, waarin we
50+
uiteenzetten welke punten we aan gaan pakken en vooral op
51+
welke manier we dat doen. Bij het ontwikkelen van deze
52+
strategie wegen we de verschillende opties af, zodat we het
53+
best haalbare resultaat met het oog op de toekomst gaan
54+
halen.
55+
</TextBlock>
56+
</Col>
57+
<Col offset={{ lg: 1 }} md={4} lg={3}>
58+
<ProcessStepImage
59+
src="/static/img/content/workflow/realize.svg"
60+
alt="Realize"
61+
/>
62+
<TextBlock subtitle="Stap 3" headingType="h2" title="Realize">
63+
Nadat we alles helemaal hebben geanalyseerd en gepland, is
64+
het tijd om de handen uit de mouwen te steken en het plan te
65+
realiseren. Hierbij werken we volgens de scrum-methode. Op
66+
het moment dat het plan uitgevoerd is, is het tijd om het
67+
resultaat te analyzeren en om te kijken hoe het nóg beter
68+
kan. We blijven dus verbeteren en doorontwikkelen.
69+
</TextBlock>
70+
</Col>
71+
</Row>
72+
</ContentBlockWrapper>
73+
);
74+
75+
export default Process;

‎components/TextBlock.jsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ const getImage = (src, alt) => {
5151
return '';
5252
};
5353

54-
const getButton = (href, button, useNextLink) => {
54+
const getButton = (href, button, usenextlink) => {
5555
if (href && button) {
5656
return (
57-
<StyledButton href={href} useNextLink={useNextLink}>
57+
<StyledButton href={href} usenextlink={usenextlink}>
5858
{button}
5959
</StyledButton>
6060
);
@@ -87,7 +87,7 @@ const TextBlock = props => {
8787
headingType,
8888
href = null,
8989
button = null,
90-
useNextLink,
90+
usenextlink,
9191
children,
9292
} = props;
9393

@@ -97,17 +97,17 @@ const TextBlock = props => {
9797
<Subtitle>{subtitle}</Subtitle>
9898
{getTitle(headingType, title)}
9999
<Paragraph>{children}</Paragraph>
100-
{getButton(href, button, useNextLink)}
100+
{getButton(href, button, usenextlink)}
101101
</div>
102102
);
103103
};
104104

105105
TextBlock.propTypes = {
106-
subtitle: PropTypes.string.isRequired,
106+
subtitle: PropTypes.string,
107107
title: PropTypes.string.isRequired,
108108
href: PropTypes.string,
109109
button: PropTypes.string,
110-
useNextLink: PropTypes.bool,
110+
usenextlink: PropTypes.bool,
111111
};
112112

113113
export default TextBlock;

‎next.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { getRoutes } = require('./server/router');
1+
const getRoutes = () => require('./server/router'); // eslint-disable-line
22

33
module.exports = {
44
pageExtensions: ['jsx', 'js'],

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "bytecode-website",
33
"version": "1.0.0",
44
"description": "Website for Bytecode Digital Agency B.V.",
5-
"main": "server.js",
5+
"main": "server/server.js",
66
"repository": "https://github.com/BytecodeBV",
77
"author": "Luciano Nooijen <luciano@bytecode.nl>",
88
"license": "AGPL-3.0",
@@ -12,7 +12,8 @@
1212
"dev": "nodemon server/server",
1313
"build": "next build",
1414
"export": "next build && next export",
15-
"lint": "eslint --ext .jsx,.js ."
15+
"lint": "eslint --ext .jsx,.js .",
16+
"reinstall": "rm -rf node_modules && yarn"
1617
},
1718
"dependencies": {
1819
"axios": "^0.18.0",
@@ -29,7 +30,7 @@
2930
"react-dom": "^16.4.2",
3031
"react-grid-system": "^4.1.7",
3132
"sqreen": "^1.26.0",
32-
"styled-components": "^3.4.1",
33+
"styled-components": "^4.0.3",
3334
"styled-components-style-utils": "^1.2.0",
3435
"url": "^0.11.0"
3536
},

0 commit comments

Comments
 (0)