Skip to content

Commit

Permalink
Updated logo
Browse files Browse the repository at this point in the history
Removed prismjs plugin in order to allow using MDX react-prism-renderer
Added plugin to parse single files
Added source plugin to parse package-json
Added SEO related stuf
Updated About Me page with easter eggs
Removed container stuf from MDX components
Some theme changes (WIP)
Remove old unused stuf
Replaced .env with .env.build for local now builds
Updated docker nginx version
Fix nginx builder debian version
  • Loading branch information
Marvin Heilemann committed Feb 2, 2020
1 parent 47668be commit 51afb49
Show file tree
Hide file tree
Showing 81 changed files with 1,418 additions and 1,172 deletions.
2 changes: 2 additions & 0 deletions .env.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#
# https://www.gatsbyjs.org/docs/environment-variables/#defining-environment-variables
# https://zeit.co/docs/v2/build-step?query=env.build#providing-environment-variables
#
# Important: update secrets via https://zeit.co/docs/now-cli#commands/secrets

# External API's
RIOT_API_KEY=""
Expand Down
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v3.12.0](https://github.com/muuvmuuv/portfolio/compare/v3.11.0...v3.12.0)
#### [v3.14.0](https://github.com/muuvmuuv/portfolio/compare/v3.11.0...v3.14.0)

> 28 January 2020
> 2 February 2020
- Huuge update [`c134958`](https://github.com/muuvmuuv/portfolio/commit/c134958c1bdccaa9d6e88ffaa832b6710682f913)
- Recreated all icons to have a strict size [`47668be`](https://github.com/muuvmuuv/portfolio/commit/47668beafa509fc82460880ea4cb4253ae8ca304)
- Fix "window is not defined" in component [`e7389a7`](https://github.com/muuvmuuv/portfolio/commit/e7389a74ba0112213a74cbe8928dfa10aac0b939)

#### [v3.11.0](https://github.com/muuvmuuv/portfolio/compare/v3.8.2...v3.11.0)
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include .env
include .env.build

timestamp := $(shell date +%Y%m%d)

Expand Down Expand Up @@ -35,9 +35,9 @@ newcert:
# Setup

create-env:
if test -f .env; \
if test -f .env.build; \
then echo Environment file already exist, exiting...; exit 0; \
else cp .env.tmpl .env; echo Created environment file; \
else cp .env.tmpl .env.build; echo Created environment file; \
fi

create-dirs:
Expand Down
13 changes: 7 additions & 6 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@
- [x] update mobile navigation
- [x] add scroll to top
- [x] check description, keywords and title on all pages
- [ ] add md table of contents
- [ ] add md table of contents (for whatever reason, this is not working...)
- [x] use [auto-changelog](https://github.com/CookPete/auto-changelog) for the changelog
page
- [ ] image opening on big vertical images is broken, add max height and width + scrolling
with mouse move
- [ ] optimize image container to be bigger than the rest of the content (-margin?)
- [ ] new image for start: me while coding
- [ ] new image for start: me while writing
- [ ] skip this messy shit with elements wrapped in container tags
- [x] skip this messy shit with elements wrapped in container tags
- [ ] create page transitions: https://github.com/react-spring/react-spring/issues/894
- [x] writings no image => small hero
- [x] put scss theme stuff in own mixin for compat.
Expand Down Expand Up @@ -78,23 +79,23 @@
- [x] Upload all writings
- [x] Grammatical corrections
- [x] ~~Find images on Unsplash~~
- [ ] Update current projects
- [x] Update current projects
- [x] More text
- [x] Update images
- [ ] Upload some photos (best off's)
- [ ] Setup SimpleAnalytics or something similar
- [ ] show GitHub OSS with GitHub API on a separate page
- [ ] display `</Coding>` stuff somewhere or let it imported by browser XML export
- [ ] upload all content to GraphCMS
- [ ] upload all content to GraphCMS (?)
- [x] check pages with Firefox Axe
- [ ] setup danger and make sure
- [ ] version is increased before commit/push
- [ ] no push if no audit for current version
- [ ] note about linting
- [ ] note about linting or run linter before commit
- [ ] check all pages with screen reader
- [ ] check all pages with reduced motion
- [ ] check all pages with reduced transparency
- [ ] remove source maps in production builds
- [x] remove source maps in production builds (not possible but ok)
- [x] add new theme switch design, current does not work properly with `mix-blend-mode`
- [x] PWA: add service worker for offline usage (`gatsby-plugin-offline`)
- [x] ~~add tests?!~~
Expand Down
Binary file modified assets/logo.sketch
Binary file not shown.
96 changes: 38 additions & 58 deletions content/projects/__demo__/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,26 @@ tags: [website, re-design]

## Text block

<div class="container container--small hello">
<p>this is already HTML</p>
</div>

Sleep in the bathroom sink allways wantings ⛱ food. Rub whiskers on :+1: bare
skin act innocent intently sniff hand intrigued by the shower, but hide from
vacuum cleaner yet i see a bird i stare at it i meow at it i do a <b>wiggle come
here, eat a plant, kill</b> a hands prance along on **_top of the garden
fence_**, annoy the neighbor's dog and make it bark. Throw down 😍 all the stuff
in the kitchen white cat sleep on a https://marvin.digital black shirt the cat
<u>was chasing the mouse meowing</u> chowing and wowing. I’m so hungry i’m so
hungry but ew not for that try to hold own back foot <s>to clean it but foot
reflexively</s> kicks you in face, go into a rage and bite own foot, hard decide
to want nothing to do with my owner
Sleep in the bathroom sink allways wantings ⛱ food. Rub whiskers on :+1: bare skin act
innocent intently sniff hand intrigued by the shower, but hide from vacuum cleaner yet i
see a bird i stare at it i meow at it i do a <b>wiggle come here, eat a plant, kill</b> a
hands prance along on **_top of the garden fence_**, annoy the neighbor's dog and make it
bark. Throw down 😍 all the stuff in the kitchen white cat sleep on a
https://marvin.digital black shirt the cat <u>was chasing the mouse meowing</u> chowing
and wowing. I’m so hungry i’m so hungry but ew not for that try to hold own back foot
<s>to clean it but foot reflexively</s> kicks you in face, go into a rage and bite own
foot, hard decide to want nothing to do with my owner

---

today. Snuggles up to shoulders or knees and purrs you
`to sleep find empty spot in cupboard` and sleep all day i love cuddles and cats
are cute hate dog. **Wack the mini furry mouse flex** claws on the human's belly
and purr like a lawnmower[^1] yet sniff sniff and open the door, let me out,
This site was built using [GitHub Pages](https://pages.github.com/). let me out,
_let me-out, let me-aow, let meaow,_ meaow!. Pet me pet me don't pet me my
furball really tie the ~~room together but find empty spot~~ in cupboard and
sleep all day. Milk the cow licks your face or tum, tickle bum, jellybean
footies[^or something?] cudasrly toes. Curl into a furry donut.
`to sleep find empty spot in cupboard` and sleep all day i love cuddles and cats are cute
hate dog. **Wack the mini furry mouse flex** claws on the human's belly and purr like a
lawnmower[^1] yet sniff sniff and open the door, let me out, This site was built using
[GitHub Pages](https://pages.github.com/). let me out, _let me-out, let me-aow, let
meaow,_ meaow!. Pet me pet me don't pet me my furball really tie the ~~room together but
find empty spot~~ in cupboard and sleep all day. Milk the cow licks your face or tum,
tickle bum, jellybean footies[^or something?] cudasrly toes. Curl into a furry donut.

## Lists

Expand Down Expand Up @@ -100,17 +94,15 @@ _Some normal text because the parser has problems here._

## Form

<div class="container container--small">
<form>
<fieldset>
<label for="fc-checkbox">This is a label</label>
<div class="form-control">
<input type="checkbox" name="checkbox" id="fc-checkbox" />
<span for="fc-checkbox">This is a checkbox</span>
</div>
</fieldset>
</form>
</div>
<form>
<fieldset>
<label for="fc-checkbox">This is a label</label>
<div class="form-control">
<input type="checkbox" name="checkbox" id="fc-checkbox" />
<span for="fc-checkbox">This is a checkbox</span>
</div>
</fieldset>
</form>

## Tables

Expand All @@ -123,7 +115,7 @@ _Some normal text because the parser has problems here._

## Code blocks

```jsx{numberLines: true}
```jsx
import { Component } from 'react'

class Test extends Component {
Expand Down Expand Up @@ -156,32 +148,20 @@ Some basic preformated text block
is
```

```bash{outputLines: 3-7}
~/Documents/M8FINDER/API master !1 *1
marvinheilemann@marvin❯ py src/app.py
Traceback (most recent call last):
File "src/app.py", line 1, in <module>
from flask import Flask
ModuleNotFoundError: No module named 'flask'
```

## Quotes

> Sleep in the bathroom sink allways wanting food. Rub whiskers on bare skin act
> innocent intently sniff hand intrigued by the shower, but hide from vacuum
> cleaner yet i see a bird i stare at it i meow at it i do a <b>wiggle come
> here, eat a plant, kill</b>
<div class="container container--small">
<blockquote>
<p>
Sleep in the bathroom sink allways wanting food. Rub whiskers on bare skin act innocent intently sniff hand intrigued by the shower.
</p>
<footer>
Marvin Heilemann
</footer>
</blockquote>
</div>
> Sleep in the bathroom sink allways wanting food. Rub whiskers on bare skin act innocent
> intently sniff hand intrigued by the shower, but hide from vacuum cleaner yet i see a
> bird i stare at it i meow at it i do a <b>wiggle come here, eat a plant, kill</b>
<blockquote>
<p>
Sleep in the bathroom sink allways wanting food. Rub whiskers on bare skin act innocent intently sniff hand intrigued by the shower.
</p>
<footer>
Marvin Heilemann
</footer>
</blockquote>

## Images

Expand Down
2 changes: 1 addition & 1 deletion content/projects/add-mip/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ I have re-created the complete website in Wordpress and also added an API for th
performance dashboard.

![Shows the home page](home.jpg) ![Shows the performance page](performance.jpg)
![Shows the blog page](blog.jpg) ![Shows a single blog post](single.jpg)
![Shows the blog page](blog.jpg) ![Shows a single blog post](single.png)
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
build:
context: ./docker/nginx
args:
- version=1.17.4
- version=1.17.8
ports:
- "80:80"
- "443:443"
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG modules_dir="/usr/lib/nginx/modules"
# Install brotli from source
# ----------------------------

FROM debian:latest AS builder
FROM debian:10.2 AS builder

ARG version
ARG build_dir
Expand Down
6 changes: 2 additions & 4 deletions gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
const { isProd, isDev } = require('./utils/environment')
const { getLocale, getLanguage } = require('./src/utils/locale')

// const wrapPageElement = require('./gatsby/wrapPageElement')
const wrapRootElement = require('./gatsby/wrapRootElement')
const printCorporateMessage = require('./gatsby/browser/corporateMessage')
const setDefaultTime = require('./gatsby/browser/defaultTime')

require('./src/styles/app.scss')

// module.exports.wrapPageElement = wrapPageElement
module.exports.wrapRootElement = wrapRootElement
// module.exports.wrapPageElement = require('./gatsby/wrapPageElement')
module.exports.wrapRootElement = require('./gatsby/wrapRootElement')

module.exports.onClientEntry = () => {
setDefaultTime()
Expand Down
44 changes: 7 additions & 37 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* eslint-disable import/first */
require('dotenv').config({
path: `.env`,
path: `.env.build`,
})

const { yellow, blue, bold } = require('kleur')
Expand Down Expand Up @@ -35,7 +35,7 @@ module.exports = {
},
`gatsby-plugin-sass`,
`gatsby-plugin-postcss`,
'gatsby-transformer-json',
`gatsby-transformer-json`,
{
resolve: `gatsby-plugin-sharp`,
options: {
Expand Down Expand Up @@ -86,11 +86,7 @@ module.exports = {
resolve: `gatsby-source-files`,
options: {
name: `package`,
files: [
`${__dirname}/CHANGELOG.md`,
`${__dirname}/package.json`,
`${__dirname}/TODO.md`,
],
files: [`${__dirname}/CHANGELOG.md`, `${__dirname}/TODO.md`],
},
},
{
Expand Down Expand Up @@ -150,28 +146,10 @@ module.exports = {
rel: 'nofollow',
},
},
`remark-checkbox-spanner`,
{
// TODO: try to replace this in the future with MDX custom components/shortcodes
resolve: `remark-custom-classes`,
options: {
root: {
image: 'container',
heading: 'container container--small',
blockquote: 'container container--small',
thematicBreak: 'container container--small',
list: 'container container--small',
table: 'container container--small',
footnoteDefinition: 'container container--small',
paragraph: 'container container--small',
},
remark: {
images: 'container',
prismjs: 'container container--small',
},
},
},
'gatsby-remark-check-links',
`remark-checkbox-spanner`,
// TODO: remove plugin `remark-custom-classes`
// `remark-prismjs`,
],
},
},
Expand Down Expand Up @@ -216,15 +194,7 @@ module.exports = {
resolve: `gatsby-plugin-offline`,
options: {
appendScript: require.resolve(`./src/sw.js`),
precachePages: [
`/about/`,
`/imprint/`,
`/credits/`,
`/changelog/`,
`/projects/*`,
`/photography/*`,
`/writings/*`,
],
precachePages: [`/about/`, `/imprint/`, `/credits/`, `/changelog/`],
},
},
{
Expand Down
11 changes: 6 additions & 5 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
* @see https://www.gatsbyjs.org/docs/node-apis/
*/

const onCreateWebpackConfig = require('./gatsby/node/onCreateWebpackConfig')
const onCreateNode = require('./gatsby/node/onCreateNode')
const createPages = require('./gatsby/node/createPages')

module.exports = { onCreateWebpackConfig, onCreateNode, createPages }
module.exports.onCreateWebpackConfig = require('./gatsby/node/onCreateWebpackConfig')
module.exports.onCreateNode = require('./gatsby/node/onCreateNode')
module.exports.createPages = require('./gatsby/node/createPages')
module.exports.sourceNodes = require('./gatsby/node/sourceNodes')
// module.exports.createResolvers = require('./gatsby/node/createResolvers')
// module.exports.createSchemaCustomization = require('./gatsby/node/createSchemaCustomization')
4 changes: 2 additions & 2 deletions gatsby-ssr.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
* @see https://www.gatsbyjs.org/docs/ssr-apis/
*/

// exports.wrapRootElement = require('./gatsby/wrapRootElement')
// exports.wrapPageElement = require('./gatsby/wrapPageElement')
// module.exports.wrapPageElement = require('./gatsby/wrapPageElement')
module.exports.wrapRootElement = require('./gatsby/wrapRootElement')
18 changes: 0 additions & 18 deletions gatsby/config/commonRemark.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,4 @@ module.exports = [
emojiConversion: 'shortnameToUnicode',
},
},
{
resolve: `gatsby-remark-prismjs`,
options: {
noInlineHighlight: true,
prompt: {
user: 'root',
host: 'localhost',
global: false,
},
// BUG: https://github.com/gatsbyjs/gatsby/issues/17997
// BUG: https://github.com/gatsbyjs/gatsby/issues/20642
// plugins: [
// require.resolve(
// 'prismjs/plugins/show-invisibles/prism-show-invisibles'
// ),
// ],
},
},
]
Loading

0 comments on commit 51afb49

Please sign in to comment.