diff --git a/.drone.yml b/.drone.yml index 597009df..c7db7ce7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ image_pull_secrets: steps: - name: build site # https://hub.docker.com/r/library/docker - image: docker.struchkov.dev/quartz:latest + image: docker.struchkov.dev/quartz:develop commands: - cp -r ./* /usr/src/app/content - cp ./.quartz/quartz.config.ts /usr/src/app/ @@ -21,6 +21,7 @@ steps: - cd /usr/src/app/ - npx quartz build - mv /usr/src/app/public /drone/src + - ./zip_image ./public - name: publish to server image: private.docker.struchkov.dev/mkdocs:latest environment: @@ -49,6 +50,6 @@ steps: # drone sign --save upagge/digital-garden --- kind: signature -hmac: f341c13b25a38e50db57caf4dd127155de52d70b720bb07ab137dc477ba3d420 +hmac: 8f637e2e49344e5c18aaf67e634957cac41fc8dddf47b4a8ce3aa6096fe1b7a9 ... diff --git a/.quartz/quartz.layout.ts b/.quartz/quartz.layout.ts index 48bfd6d9..a70b7fa4 100644 --- a/.quartz/quartz.layout.ts +++ b/.quartz/quartz.layout.ts @@ -5,10 +5,20 @@ import * as Component from "./quartz/components" export const sharedPageComponents: SharedLayout = { head: Component.Head(), header: [], - afterBody: [], + afterBody: [ + Component.Remark({ + options: { + host: 'https://comments.struchkov.dev', + siteId: 'gardenru', + locale: 'ru', + } + }), + ], footer: Component.Footer({ links: { - "B.log": "https://struchkov.dev" + "About Me": "https://mark.struchkov.dev/cv/", + "B.log": "https://struchkov.dev", + "CV": "https://mark.struchkov.dev/cv/?utm_source=gardenru&utm_medium=organic&utm_campaign=static", }, }), } diff --git a/.quartz/zip_image.sh b/.quartz/zip_image.sh new file mode 100644 index 00000000..a1dec22c --- /dev/null +++ b/.quartz/zip_image.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +find ./images/ -type f -not -path "./images/comp/*" ! -name "*-no-comp.*" $option -iname "*.png" -exec sh -c ' + png_file="${1/\/images\//\/images\/comp\/}" + png_dir="$(dirname "$png_file")" + mkdir -p "$png_dir" + cp "$1" "${png_file}" + optipng -o7 "${png_file}" + advpng -z4 "${png_file}" + pngcrush -rem gAMA -rem alla -rem cHRM -rem iCCP -rem sRGB -rem time -ow "${png_file}" +' _ {} \; + +find ./images/ -type f-not -path "./images/comp/*" ! -name "*-no-comp.*" $option -iregex '.*\.\(jpg\|jpeg\)' -exec sh -c ' + jpg_file="${1/\/images\//\/images\/comp\/}" + jpg_dir="$(dirname "$jpg_file")" + mkdir -p "$jpg_dir" + cp "$1" "${jpg_file}" + jpegoptim --all-progressive "${jpg_file}" +' _ {} \; + +find ./images/comp -type f -iregex '.*\.\(jpg\|jpeg\|png\)' -not -iregex '.*no-comp\.\(jpg\|jpeg\|png\)' $option -exec sh -c ' + webp_file="${1/\/images\/comp\//\/images\/webp\/}" + webp_dir="$(dirname "$webp_file")" + mkdir -p "$webp_dir" + cwebp -mt -af -progress -m 6 -q 75 -pass 10 "$1" -o "${webp_file%.*}.webp" +' _ {} \; \ No newline at end of file diff --git a/index.md b/index.md index fec39b36..9c8f8914 100644 --- a/index.md +++ b/index.md @@ -11,7 +11,7 @@ title: Struchkov's Digital Garden Основная идея цифрового сада — это процесс, а не результат. Здесь можно увидеть черновики мыслей, промежуточные этапы работы над проектами и идеи, которые ещё только ждут своего часа. Всё связано между собой гипер-ссылками, создавая сеть знаний, которую можно изучать и расширять. -![digital-garden](meta/files/digital-garden.png) +![digital-garden](meta/files/images/digital-garden.png) ## Zero Links - [Разработка](meta/zero/00%20Разработка.md) diff --git a/meta/files/digital-garden.png b/meta/files/images/digital-garden.png similarity index 100% rename from meta/files/digital-garden.png rename to meta/files/images/digital-garden.png