Skip to content

Commit

Permalink
Fucking did that breadcrumb think!
Browse files Browse the repository at this point in the history
Finished the homepage (I guess)
Update update udpate?!?!
Housekeeping
  • Loading branch information
Marvin Heilemann committed Jan 8, 2020
1 parent 855b553 commit 497b670
Show file tree
Hide file tree
Showing 50 changed files with 653 additions and 435 deletions.
8 changes: 8 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Environment file for Gatsby's build/develop process.
# Don't forget to insert `siteMetadata` related stuff into
# the `gatsby/utils.js` function as well.
#
# @see: https://www.gatsbyjs.org/docs/environment-variables/#defining-environment-variables

# siteMetdata
SITE_URL=http://localhost:8000
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/_old
/tmp
.env.*
!.env.development
/reports
docker/nginx/certs

# Logs
logs
Expand Down
24 changes: 10 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,24 @@ build:
docker-compose build

destroy:
docker-compose down
docker-compose down --volumes

stop:
docker-compose stop

start:
docker-compose start

restart:
docker exec marvin-nginx /usr/share/nginx-reload.sh

top:
docker-compose top nginx

logs:
docker logs -f marvin-nginx

intimg:
docker run -it --entrypoint bash nginx
restart: restart-nginx
# docker-compose restart marvin-xxxx

intcon:
docker exec -i -t marvin-nginx bash
restart-nginx:
docker exec marvin-nginx /usr/share/nginx-reload.sh

newcert:
webssl --removeOld --addToKeychain

create-env:
cp .env.development .env.production

setup: create-env
34 changes: 34 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@

- [Start](#start)
- [Deploy](#deploy)
- [Docker](#docker)
- [Interactive shell session](#interactive-shell-session)
- [Image](#image)
- [Container](#container)
- [Logs](#logs)
- [Performance (top)](#performance-top)
- [Issues](#issues)

## Start
Expand All @@ -17,6 +23,34 @@ for development.
Since I use [now](https://zeit.co/muuvmuuv/portfolio) for my website, it is
deployed there and fully automated.

## Docker

### Interactive shell session

#### Image

```shell
docker run -it --entrypoint bash nginx
```

#### Container

```shell
docker exec -i -t marvin-nginx bash
```

#### Logs

```shell
docker logs -f marvin-nginx
```

#### Performance (top)

```shell
docker-compose top nginx
```

## Issues

Issues are referenced with `// BUG: #<NUMBER>` and can be seen in
Expand Down
7 changes: 5 additions & 2 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- Async: Inter
- [x] replace package.json with version.txt to reduce size
- [x] add custom slug to all pages
- [ ] test `postcss-easing-gradients` with Scss loaded in `/src`
- [x] test `postcss-easing-gradients` with Scss loaded in `/src`
- [ ] add md table of contents
- [ ] new start page: https://labs.semplice.com/s5-vertical-grid
- [x] test purgecss with classes from Markdown files
Expand All @@ -22,8 +22,11 @@
- [ ] Test
- [ ] Everything pushed to master -> marvin.digital
- [ ] Everything pushed to development -> dev.marvin.digital
- [ ] Everything pushed to by hand -> dev.marvin.digital
- [ ] replace React with [Preact][1] (check if it works now)
- [ ] new image for start: me while coding
- [ ] new image for start: me while writing
- [ ] Add footer with: version, social-media, imprint, changelog, copyright
notice
- [x] test react helmet async
- [x] add "increase version" by script
- [x] add bundle analyzer
Expand Down
1 change: 1 addition & 0 deletions content/writings/Der Morgen, die Nacht/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ title: Der Morgen, die Nacht
description: Ein kleines süßes Gedicht
created: 02-23-2015
modified: 07-12-2019
language: de

header:
image: image.jpg
Expand Down
1 change: 1 addition & 0 deletions content/writings/__demo__/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description: Ein kleines süßes Gedicht
slug: custom slug
created: 09-23-2019
modified: 07-12-2019
language: en

header:
image: image.jpg
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ services:
target: /var/www
volume:
nocopy: true
# - type: bind
# source: ./docker/nginx/certs/
# target: /etc/nginx/ssl/
- type: bind
source: ./docker/nginx/certs/
target: /etc/nginx/ssl/
# - type: bind
# source: ./docker/nginx/components/
# target: /etc/nginx/components/
Expand Down
28 changes: 0 additions & 28 deletions docker/nginx/certs/conf.ini

This file was deleted.

21 changes: 0 additions & 21 deletions docker/nginx/certs/server.crt

This file was deleted.

28 changes: 0 additions & 28 deletions docker/nginx/certs/server.key

This file was deleted.

32 changes: 15 additions & 17 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,7 @@ console.log(`Using environment: ${yellow(activeEnv)}\n`)
module.exports = {
siteMetadata,
plugins: [
{
resolve: 'gatsby-plugin-module-resolver',
options: {
root: './src',
aliases: {
'@app': './',
'@store': './store',
'@components': './components',
'@layouts': './layouts',
'@scripts': './scripts',
'@utils': './utils',
'@hooks': './hooks',
'@images': './images',
},
},
},
`gatsby-plugin-preact`, // file size saving 🍾
`gatsby-plugin-layout`,
`gatsby-plugin-react-helmet`,
{
Expand Down Expand Up @@ -142,8 +127,21 @@ module.exports = {
options: {
useAutoGen: true,
useClassNames: true,
autoGenHomeLabel: `Root`,
exclude: [`/404`],
crumbLabelUpdates: [
{
pathname: '/projects',
crumbLabel: 'Projects',
},
{
pathname: '/photography',
crumbLabel: 'Photography',
},
{
pathname: '/writings',
crumbLabel: 'Writings',
},
],
},
},
{
Expand Down
5 changes: 4 additions & 1 deletion gatsby/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ module.exports.slugify = (text, separator) => {
}

/**
* Return current version, but only minor, major, patches will always be zero.
* Return current version, with major and patches set
* to zero for a easier way of handling reports.
*
* (optional) remove dots
*
* @param {boolean} dots Remove dots from version
*/
Expand Down
1 change: 0 additions & 1 deletion metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module.exports = {
title: `Marvin/Digital`,
author: `muuvmuuv`,
description: `Projects Marvin Heilemann has been working on now and in the past.`,
siteUrl: `https://marvin.digital/`,
keywords: [
'muuvmuuv',
'portfolio',
Expand Down
29 changes: 26 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marvin-digital",
"version": "3.0.0",
"version": "3.1.0",
"private": true,
"description": "Portfolio of Marvin Heilemann (@muuvmuuv)",
"repository": {
Expand Down Expand Up @@ -42,14 +42,15 @@
"dayjs": "^1.8.19",
"gatsby": "^2.18.18",
"gatsby-image": "^2.2.37",
"gatsby-plugin-breadcrumb": "^6.2.3",
"gatsby-plugin-breadcrumb": "^6.3.0",
"gatsby-plugin-canonical-urls": "^2.1.18",
"gatsby-plugin-catch-links": "^2.1.21",
"gatsby-plugin-humans-txt": "^1.1.4",
"gatsby-plugin-layout": "^1.1.18",
"gatsby-plugin-manifest": "^2.2.34",
"gatsby-plugin-module-resolver": "^1.0.3",
"gatsby-plugin-postcss": "^2.1.18",
"gatsby-plugin-preact": "^3.1.24",
"gatsby-plugin-purgecss": "^4.0.1",
"gatsby-plugin-react-helmet": "^3.1.18",
"gatsby-plugin-remove-generator": "^1.0.4",
Expand All @@ -68,6 +69,7 @@
"kleur": "^3.0.3",
"node-sass": "^4.13.0",
"postcss-easing-gradients": "^3.0.1",
"preact": "^10.2.1",
"prismjs": "^1.18.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Backdrop.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Backdrop = ({ img, alt }) => {
fluid={img}
objectFit="cover"
objectPosition="center top"
alt={alt || 'No alternative text'}
alt={alt}
/>
</div>
)
Expand Down
Loading

0 comments on commit 497b670

Please sign in to comment.