Skip to content

Commit 93332d0

Browse files
richardvanthofrichardvanthof
committed
Merge branch 'develop' of git.bytedev.io:bytecode/bytecode-website into develop
2 parents b663f14 + 2308aa6 commit 93332d0

144 files changed

Lines changed: 9284 additions & 3043 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.babelrc‎

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

‎.env.example‎

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

‎.eslintrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
"strict": 1,
1818
"operator-linebreak": 0,
1919
"eol-last": 1,
20+
"global-require": 0,
2021
"no-else-return": 1,
2122
"object-curly-newline": 0,
23+
"import/no-dynamic-require": 0,
2224
"max-len": [
2325
1,
2426
80,

‎.gitignore‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Temp
2+
gatsby-gen/
3+
next/
4+
.cache/
5+
public
6+
17
# OS specific
28
.DS_Store
39
.DS_Store?
@@ -10,7 +16,6 @@ Thumbs.db
1016
# General
1117
build/
1218
dist/
13-
docs/
1419
.next/
1520
.out/
1621
out/
@@ -23,7 +28,6 @@ out
2328
.env
2429
.npm
2530
coverage
26-
docs/
2731
.cache/
2832

2933
# Code editors
@@ -78,5 +82,3 @@ wp-content/plugins/hello.php
7882
/sitemap.xml
7983
/sitemap.xml.gz
8084

81-
# Include specific files
82-
!/static/docs

‎.gitlab-ci.yml‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,52 @@
1+
image: node:10-alpine
2+
stages:
3+
- build
4+
- test
5+
- deploy
6+
- analyze
17
cache:
28
paths:
39
- node_modules/
410

5-
before_script:
6-
- apk add python make g++
7-
- npm i -g yarn
8-
- npm i # To fix Yarn error
9-
- cp .env.example .env
10-
1111
build:
12-
image: node:10-alpine
12+
stage: build
13+
before_script:
14+
- npm i -g yarn
15+
- yarn
1316
script:
14-
- yarn run lint
15-
- yarn run build
16-
- yarn run export
17+
- yarn run build --prefix-paths bytecode-website
18+
- mv public build
19+
artifacts:
20+
paths:
21+
- build/
1722

18-
build-node-8:
19-
image: node:8-alpine
23+
lint:
24+
stage: test
25+
before_script:
26+
- npm i -g yarn
27+
- yarn
2028
script:
2129
- yarn run lint
22-
- yarn run build
23-
- yarn run export
30+
31+
pages:
32+
image: alpine:3.9
33+
stage: deploy
34+
dependencies:
35+
- build
36+
script:
37+
- rm -rf public
38+
- mv build public
39+
artifacts:
40+
paths:
41+
- public
42+
only:
43+
- master
44+
- develop
45+
- release/*
46+
47+
include:
48+
- template: Code-Quality.gitlab-ci.yml
49+
code_quality:
50+
stage: analyze
51+
dependencies: []
52+

‎.travis.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,13 @@ node_js:
44
- "stable"
55
- "node"
66
- "lts/*"
7-
- "9"
8-
- "8"
9-
10-
notifications:
11-
email:
12-
receipients:
13-
- info@bytecode.nl
14-
15-
# before_install:
7+
- "10"
168

179
install:
1810
- yarn
1911

20-
# before_script:
21-
2212
script:
13+
- yarn run lint
2314
- yarn run export
2415

2516
cache:

‎.vscode/launch.json‎

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

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ 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.0.0 (tbd)
9+
10+
Complete switch from NextJS to GatsbyJS
11+
12+
### Added:
13+
14+
* GitLab pages setup
15+
* GatsbyJS configuration
16+
* PWA functionalities, manifes, caching and offline mode
17+
18+
### Changed:
19+
20+
* Changed NextJS to GatsbyJS
21+
* Humans.txt
22+
823
## 1.3.1 (2019-03-29)
924

1025
### Added:

‎LICENSE‎

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

‎README.md‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Bytecode Website
22

3-
Website for Bytecode Digital Agency B.V. built with NextJS (server-side rendered React) and Styled Components.
3+
Website for Bytecode Digital Agency B.V. built with GatsbyJS.
44

55
## Dependencies
66

77
To run this develop environment, you need the follow dependencies:
88

9-
* NodeJS 8+ (10 recommended)
9+
* NodeJS 10 LTS
1010
* Yarn (install using `npm i -g yarn`)
1111

1212
To install all dependencies after cloning the Git repo, run `yarn`. Otherwise the project will not run.
@@ -30,32 +30,18 @@ This website can both be exported to static HTML or run as a live server itself.
3030
To use this project as a server for production, run
3131

3232
```sh
33-
yarn run build
33+
yarn run build && yarn run serve
3434
```
3535

36-
to build the pages and then run
37-
38-
```sh
39-
yarn run start
40-
```
41-
42-
to start the server.
43-
4436
#### Export
4537

4638
If you want to export the project to static HTML/CSS/JS, run `yarn run export`.
4739

48-
### Routes
49-
50-
All `GET`-routes are defined in `server/routes.js`.
51-
52-
The `POST`-route is `/post`.
53-
5440
## License and restrictions
5541

5642
This project is AGPL-3.0 licenced with certain restrictions for commercial use. These restrictions are as follows:
5743

58-
1. The files in the icon folder are proprietary, unless stated otherwise on the top of the file
44+
1. The files in the content, static, src/pages and src/image folders are proprietary, unless stated otherwise on the top of the file
5945
2. The styles/theme.js file must be completely modified so that a modified version of this website will not include the same look and feel and markup, as Bytecode branding and markup is proprietary
6046
3. Any written content, with the sole purpose of displaying text or custom content for meta tags, must be removed or completely modified, as website contents are proprietary
6147
4. Images cannot be reused unless they are used under Creative Commons license
@@ -67,3 +53,4 @@ In short, this means that this project can be used under the AGPL-3.0 license, a
6753
Exceptions can be made for these restrictions, but are only valid with written consent from the owners of Bytecode. If you like Bytecode to make an exception, please send an email to [info@bytecode.nl](mailto:info@bytecode.nl).
6854

6955
Bytecode in this context means either Bytecode Holding B.V. or Bytecode Digital Agency B.V. as registered at the Handelsregister/KvK/Chamber of Commerce in The Netherlands.
56+

0 commit comments

Comments
 (0)