Skip to content

Commit a722db1

Browse files
richardvanthofrichardvanthof
committed
Merge branch 'develop' of git.bytecode.nl:bytecode/bytecode-website into feature/landing-page
2 parents ddf4bcf + 6930ef4 commit a722db1

25 files changed

+6889
-778
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
root: true,
23
parser: '@typescript-eslint/parser',
34
extends: [
45
'plugin:@typescript-eslint/recommended',

‎.gitlab-ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
image: node:12-alpine
22
stages:
3-
- build
43
- test
5-
- release
6-
- deploy
74
cache:
85
key: ${CI_COMMIT_REF_SLUG}
96
paths:
107
- node_modules/
118

12-
build_node:
13-
stage: build
9+
.node_base: &node_base
10+
stage: test
1411
before_script:
15-
- yarn install --production --frozen-lockfile
12+
- apk add make nasm autoconf automake libtool dpkg pkgconfig libpng libpng-dev g++
13+
- yarn install --frozen-lockfile
14+
15+
build:
16+
<<: *node_base
17+
stage: test
1618
script:
1719
- yarn run build
18-
- mv public build
1920

2021
lint:
21-
stage: test
22-
before_script:
23-
- yarn install --frozen-lockfile
22+
<<: *node_base
2423
script:
2524
- yarn run lint
2625

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 2.7.1 (2021-06-29)
9+
10+
### Fixed:
11+
12+
* Amount of hours in golang vacancy
13+
14+
## 2.7.0 (2021-06-08)
15+
16+
## Added:
17+
18+
* Vacancy page for Golang developer
19+
20+
## Changed:
21+
22+
* Updated numbers on cases pages
23+
* Updated MDX dependency to non-deprecated package
24+
25+
## Removed:
26+
27+
* Julian from team page
28+
829
## 2.6.2 (2021-01-27)
930

1031
### Changed:

‎gatsby-config.js‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@ module.exports = {
88
},
99
plugins: [
1010
{
11-
resolve: `gatsby-mdx`,
11+
resolve: `gatsby-plugin-mdx`,
1212
extensions: ['.mdx'],
1313
},
14-
`gatsby-plugin-react-helmet`,
15-
// {
16-
// resolve: `gatsby-source-filesystem`,
17-
// options: {
18-
// name: `images`,
19-
// path: `${__dirname}/src/images`,
20-
// },
21-
// },
2214
`gatsby-transformer-sharp`,
2315
{
2416
resolve: `gatsby-plugin-sharp`,

‎gatsby-node.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ exports.createPages = async ({ actions, graphql }) => {
4242
reading_time
4343
article_intro
4444
}
45-
code {
46-
body
47-
}
45+
body
46+
rawBody
4847
fields {
4948
slug
5049
}

‎package.json‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "bytecode-website",
33
"private": false,
44
"description": "The Bytecode Digital Agency website, released as free software",
5-
"version": "v2.6.2",
5+
"version": "v2.7.1",
66
"author": "Luciano Nooijen <[email protected]>",
77
"keywords": [
88
"bytecode"
@@ -21,21 +21,25 @@
2121
"reinstall": "rm -rf node_modules && yarn"
2222
},
2323
"dependencies": {
24+
"@babel/core": " ^7.0.0-0",
2425
"@mdx-js/mdx": "^1.6.22",
2526
"@mdx-js/react": "^1.6.22",
27+
"@react-icons/all-files": "^4.1.0",
2628
"@types/jest": "^26.0.19",
2729
"@types/node": "^14.14.12",
2830
"@types/react": "^17.0.0",
2931
"@types/react-router-dom": "^5.1.6",
32+
"@types/react-stickynode": "^3.0.1",
3033
"@types/uuid": "^8.3.0",
3134
"axios": "^0.21.0",
3235
"babel-preset-gatsby": "^0.8.0",
3336
"change-case": "^4.1.2",
37+
"core-js": "^3.0.0",
3438
"gatsby": "^2.29.1",
3539
"gatsby-image": "^2.2.18",
36-
"gatsby-mdx": "^0.6.3",
3740
"gatsby-plugin-babel": "^1.0.0",
3841
"gatsby-plugin-manifest": "^2.2.16",
42+
"gatsby-plugin-mdx": "^2.6.0",
3943
"gatsby-plugin-offline": "^3.0.5",
4044
"gatsby-plugin-react-helmet": "^3.1.7",
4145
"gatsby-plugin-robots-txt": "^1.5.0",
@@ -50,6 +54,9 @@
5054
"react-dom": "^17.0.1",
5155
"react-grid-system": "^7.1.1",
5256
"react-helmet": "^6.1.0",
57+
"react-is": "16.8.0",
58+
"react-stickynode": "^3.0.5",
59+
"sharp": "^0.28.3",
5360
"styled-components": "^5.2.1",
5461
"styled-components-style-utils": "^1.2.1",
5562
"to-style": "^1.3.3",
@@ -58,19 +65,23 @@
5865
},
5966
"devDependencies": {
6067
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
68+
"@babel/preset-env": "^7.14.4",
69+
"@types/mdx-js__react": "^1.5.3",
6170
"@types/react-dom": "^17.0.0",
6271
"@types/react-helmet": "^6.1.0",
6372
"@types/styled-components": "^5.1.5",
64-
"@typescript-eslint/eslint-plugin": "^4.9.1",
65-
"@typescript-eslint/parser": "^4.9.1",
66-
"eslint": "^7.15.0",
73+
"@typescript-eslint/eslint-plugin": "^4.26.1",
74+
"@typescript-eslint/parser": "^4.26.1",
75+
"babel-plugin-styled-components": "^1.5.0",
76+
"eslint": "^7.28.0",
6777
"eslint-config-airbnb": "^18.2.1",
6878
"eslint-config-prettier": "^7.0.0",
6979
"eslint-plugin-import": "^2.22.1",
7080
"eslint-plugin-jest": "^24.1.3",
7181
"eslint-plugin-jsx-a11y": "^6.4.1",
7282
"eslint-plugin-prettier": "^3.2.0",
7383
"eslint-plugin-react": "^7.21.5",
84+
"eslint-plugin-react-hooks": "^4",
7485
"eslint-plugin-security": "^1.4.0",
7586
"jest": "^26.6.3",
7687
"prettier": "^2.2.1",

‎src/containers/IconText/IconText.components.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import styled from 'styled-components';
2+
3+
export const IconStyle = styled.span`
4+
margin: 0 0.5rem;
5+
vertical-align: middle;
6+
font-size: 15px;
7+
`;
8+
9+
export const IconTextContainer = styled.div`
10+
display: inline-block;
11+
margin-right: 1.33rem;
12+
margin-bottom: 1.33rem;
13+
`;

‎src/containers/IconText/IconText.tsx‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import React from 'react';
2+
import { FaRegClock } from '@react-icons/all-files/fa/FaRegClock';
3+
import { FaMapMarkerAlt } from '@react-icons/all-files/fa/FaMapMarkerAlt';
4+
import { IconTextProps, IconProps } from './IconText.types';
5+
import { IconTextContainer, IconStyle } from './IconText.components';
6+
7+
// Creates the Icon
8+
const Icon: React.FC<IconProps> = ({ iconName, iconColor }) => {
9+
let icon = null;
10+
if (iconName === 'FaMapMarkerAlt') {
11+
icon = <FaMapMarkerAlt />;
12+
}
13+
if (iconName === 'FaRegClock') {
14+
icon = <FaRegClock />;
15+
}
16+
return <IconStyle style={{ color: iconColor }}>{icon}</IconStyle>;
17+
};
18+
19+
// Creates the Icon with Text
20+
const IconText: React.FC<IconTextProps> = ({ iconName, iconColor, text }) => {
21+
return (
22+
<IconTextContainer>
23+
<Icon iconName={iconName} iconColor={iconColor} />
24+
<span style={{ fontSize: '15px' }}>{text}</span>
25+
</IconTextContainer>
26+
);
27+
};
28+
29+
export default IconText;

‎src/containers/IconText/IconText.types.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export interface IconTextProps {
2+
iconName: string;
3+
iconColor: string;
4+
text: string;
5+
}
6+
7+
export interface IconProps {
8+
iconName: string;
9+
iconColor: string;
10+
}

‎src/containers/NewsletterSubscribe/NewsletterSubscribe.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ const NewsletterSubscribe: React.FC<NewsletterSubscribeProps> = ({
3535
const [name, setName] = useState('');
3636
const [email, setEmail] = useState('');
3737

38-
const stateChanger = (
39-
setter: React.Dispatch<React.SetStateAction<string>>
40-
) => (e: React.ChangeEvent<HTMLInputElement>) => setter(e.target.value);
38+
const stateChanger =
39+
(setter: React.Dispatch<React.SetStateAction<string>>) =>
40+
(e: React.ChangeEvent<HTMLInputElement>) =>
41+
setter(e.target.value);
4142
const canSubmit = name !== '' && email !== '';
4243

4344
return (

0 commit comments

Comments
 (0)