diff --git a/.eleventy.js b/.eleventy.js index 98c2f18..e195d6c 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -5,8 +5,9 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPlugin(syntaxHighlight) //eleventyConfig.addPassthroughCopy("css") - eleventyConfig.addPassthroughCopy("src/**/*.png") - eleventyConfig.addPassthroughCopy("src/**/*.jpg") + //eleventyConfig.addPassthroughCopy("src/_assets/*.png") + //eleventyConfig.addPassthroughCopy("src/_assets/*.jpg") + eleventyConfig.addPassthroughCopy("src/pwa.webmanifest") eleventyConfig.addPassthroughCopy("src/css/*.css") eleventyConfig.addPassthroughCopy("src/libs/**/*.js") eleventyConfig.addPassthroughCopy({ "src/_assets/": "assets" }) diff --git a/compress_images.sh b/compress_images.sh index 859b92a..78e8d1c 100755 --- a/compress_images.sh +++ b/compress_images.sh @@ -1,8 +1,9 @@ #!/bin/bash +set -euo pipefail # Call this from the repo folder -for image in src/_assets/images/original/*.jpg; do +for image in src/_assets/images/original/*.{jpg,png}; do #echo "Converting $image ..." filename=$(basename -- "$image") @@ -13,9 +14,9 @@ for image in src/_assets/images/original/*.jpg; do # filename = "workflows" imagefilename="${filename%.*}" - # extension = "jpg" + # extension = "jpg" or "png" imageextension="${filename##*.}" echo "${imagefolder}${imagefilename}_mobile.${imageextension}" - convert "$image" -resize 1500 -strip -quality 85 "${imagefolder}${imagefilename}_mobile.${imageextension}" + convert "$image" -resize 1500 -strip -quality 85 "${imagefolder}${imagefilename}_mobile.jpg" done \ No newline at end of file diff --git a/package.json b/package.json index c7cba30..0823f7e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "optimize": "./compress_images.sh", "dev": "npx @11ty/eleventy --serve", "build": "npx @11ty/eleventy", - "deploy": "scp -r build/ server:/tmp/ && ssh server 'sudo cp -r /tmp/build/* ~/www/luca-junge.de/'" + "deploy": "rsync -av build/* server:/tmp/build/ && ssh server 'sudo cp -r /tmp/build/* ~/www/luca-junge.de/'" }, "keywords": [], "author": "Luca Junge", diff --git a/src/_assets/images/hero_image2_mobile.jpg b/src/_assets/images/hero_image2_mobile.jpg new file mode 100644 index 0000000..24064d1 Binary files /dev/null and b/src/_assets/images/hero_image2_mobile.jpg differ diff --git a/src/_assets/images/logo.png b/src/_assets/images/logo.png new file mode 100644 index 0000000..97ce992 Binary files /dev/null and b/src/_assets/images/logo.png differ diff --git a/src/_assets/images/logo.svg b/src/_assets/images/logo.svg new file mode 100644 index 0000000..075b23a --- /dev/null +++ b/src/_assets/images/logo.svg @@ -0,0 +1,67 @@ + + + + + + + + + LJ + + diff --git a/src/_assets/images/museum2_mobile.jpg b/src/_assets/images/museum2_mobile.jpg new file mode 100644 index 0000000..62c8d82 Binary files /dev/null and b/src/_assets/images/museum2_mobile.jpg differ diff --git a/src/_assets/images/original/hero_image2.png b/src/_assets/images/original/hero_image2.png new file mode 100644 index 0000000..c891b67 Binary files /dev/null and b/src/_assets/images/original/hero_image2.png differ diff --git a/src/_assets/images/original/museum2.png b/src/_assets/images/original/museum2.png new file mode 100644 index 0000000..888b40d Binary files /dev/null and b/src/_assets/images/original/museum2.png differ diff --git a/src/_includes/base.njk b/src/_includes/base.njk index a6cb835..69408a0 100644 --- a/src/_includes/base.njk +++ b/src/_includes/base.njk @@ -6,6 +6,7 @@ + {{ title }} diff --git a/src/_includes/partials/header.njk b/src/_includes/partials/header.njk index e25e795..87215e1 100644 --- a/src/_includes/partials/header.njk +++ b/src/_includes/partials/header.njk @@ -7,7 +7,7 @@
  • - Portfolio + Portfolio
  • Workflows @@ -18,13 +18,18 @@
  • Kontakt
    • +
  • + + Installieren + +
    • @@ -35,8 +40,44 @@ \ No newline at end of file diff --git a/src/css/header.css b/src/css/header.css index 6046619..47ecaa4 100644 --- a/src/css/header.css +++ b/src/css/header.css @@ -6,7 +6,7 @@ -webkit-backdrop-filter: blur(4px); backdrop-filter: blur(4px); margin-bottom: -70px; - outline: 1px solid rgba(0, 0, 0, 0.5); + outline: 1px solid rgba(0, 0, 0, 0.6); } #navigation a { @@ -62,6 +62,13 @@ display: none; } +#navigation #install-button { + display: none; + background: linear-gradient(to right, #ad5389, #3c1053); + border-radius: 4px; + cursor: pointer; +} + /* Breakpoints */ @media (max-width: 512px) { @@ -85,8 +92,20 @@ display: none; }*/ + /* This should always be the same header image as the hero element */ #navigation.open { - background-color: rgba(59, 66, 82, 1); + padding: 0px; + /*background-color: rgba(59, 66, 82, 1);*/ + background: linear-gradient(rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.75)), + url("/assets/images/hero_image2_mobile.jpg"); + background-position: top left; + background-size: cover; + object-fit: cover; + } + + #navigation.open nav ul { + padding: 12px; + backdrop-filter: blur(4px); } #navigation.open ul { diff --git a/src/css/hero.css b/src/css/hero.css index b29e208..b61c7c9 100644 --- a/src/css/hero.css +++ b/src/css/hero.css @@ -5,7 +5,9 @@ padding-top: calc(128px + 70px); padding-bottom: 128px; background: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), - url("/assets/images/hero-image_mobile.jpg"); + url("/assets/images/hero_image2_mobile.jpg"); background-size: cover; object-fit: cover; + background-position: top left; + } diff --git a/src/index/index.njk b/src/index/index.njk index b4c4f01..d086d9d 100644 --- a/src/index/index.njk +++ b/src/index/index.njk @@ -19,7 +19,7 @@ permalink: /index.html -
    +

    Interactive Applications & Games

    diff --git a/src/pwa.webmanifest b/src/pwa.webmanifest new file mode 100644 index 0000000..9a29a43 --- /dev/null +++ b/src/pwa.webmanifest @@ -0,0 +1,21 @@ +{ + "name": "Luca Junge PWA", + "short_name": "Luca Junge PWA", + "description": "The website of Luca Junge as a Progressive Web App", + "icons": [ + { + "src": "/assets/images/logo.png", + "sizes": "32x32", + "type": "image/png" + }, + { + "src": "/assets/images/logo.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "start_url": "/", + "display": "standalone", + "theme_color": "#4C0026", + "background_color": "#4C0026" +} \ No newline at end of file