Remov old stale pages

.circleci/config.yml

@@ -1,80 +0,0 @@
-version: 2.1
-
-jobs:
-  build_assets:
-    docker:
-      - image: node:12-alpine
-    environment:
-      OUTPUT_DIR: ./output_prod/static
-    steps:
-      - checkout
-      - run: npm ci
-      - run: mkdir -p ${OUTPUT_DIR}
-      - run: npm run-script build-prod
-      - run: ls -la ${OUTPUT_DIR}
-      - run: mkdir -p /tmp/workspace/static
-      - run: cp -R ${OUTPUT_DIR}/* /tmp/workspace/static
-      - persist_to_workspace:
-          root: /tmp/workspace
-          paths:
-            - static/*
-
-  build_html:
-    docker:
-      - image: php:7.4-cli
-    environment:
-      APP_ENV: prod
-      APP_URL: https://vakhrushev.me
-      STATIC_DIR: ./output_prod/static
-    steps:
-      - attach_workspace:
-          at: /tmp/workspace
-      - checkout
-      - run: docker/php/provision.sh
-      - run: composer install --no-interaction --no-progress
-      - run: mkdir -p ${STATIC_DIR}
-      - run: cp -R /tmp/workspace/static/* ${STATIC_DIR}
-      - run: |
-          ./vendor/bin/sculpin generate \
-            --env="${APP_ENV}" \
-            --url="${APP_URL}" \
-            --no-interaction \
-            -vv
-      - run: mkdir -p /tmp/workspace/html
-      - run: cp -R ./output_prod/* /tmp/workspace/html
-      - persist_to_workspace:
-          root: /tmp/workspace
-          paths:
-            - html/*
-
-  deploy:
-    docker:
-      - image: php:7.4-cli
-    steps:
-      - checkout
-      - add_ssh_keys
-      - run: apt-get update; apt-get install -yy openssh-client
-      - run: ssh-keyscan "vakhrushev.me" >> ~/.ssh/known_hosts
-      - run: docker/php/provision.sh
-      - attach_workspace:
-          at: /tmp/workspace
-      - run: mkdir -p ./output_prod
-      - run: cp -R /tmp/workspace/html/* ./output_prod
-      - run: ls -la ./output_prod
-      - run: ls -la ./output_prod/static
-      - run: dep deploy production -vv
-
-workflows:
-  version: 2
-  build_and_deploy:
-    jobs:
-      - build_assets:
-          filters:
-            branches:
-              only: master
-      - build_html:
-          requires:
-            - build_assets
-      - deploy:
-          requires:
-            - build_html

.editorconfig

@@ -6,10 +6,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{html,twig,yml,xml}]
+[*.{html,twig,yml,yaml,xml}]
-indent_size = 2
-
-[gulpfile.js]
 indent_size = 2
 
 [package.json]

.env

@@ -1,3 +0,0 @@
-PROJECT=homepage
-PHP_IMAGE=homepage-php
-NODE_IMAGE=homepage-node

.gitignore

@@ -1,5 +1,9 @@
 .idea/
 .vscode/
+.cache/
+.config/
+.home/
+
 output_*
 node_modules/
 var/

Makefile

@@ -1,76 +0,0 @@
-APP_ENV := dev
-APP_OUTPUT_DIR := output_dev
-APP_URL := homepage.site
-APP_NPM_BUILD_CMD := build
-
-ifeq ($(TARGET), prod)
-	APP_ENV := prod
-	APP_OUTPUT_DIR := output_prod
-	APP_URL := https://vakhrushev.me
-	APP_NPM_BUILD_CMD := build-prod
-endif
-
-# Installation
-
-install: build-docker install-php-deps install-js-deps
-
-build-docker:
-	./tools/build-docker
-
-install-php-deps:
-	./tools/composer install --no-interaction
-
-install-js-deps:
-	./tools/npm ci
-
-# Building
-
-clean:
-	rm -rf ./${APP_OUTPUT_DIR}/*
-
-build-assets:
-	./tools/npm run "${APP_NPM_BUILD_CMD}"
-
-build-site:
-	./tools/sculpin generate \
-		--env="${APP_ENV}" \
-		--url="${APP_URL}" \
-		--no-interaction \
-		-vv
-
-build: clean build-assets build-site
-
-build-prod:
-	$(MAKE) build TARGET=prod
-
-# Format
-
-format-pages:
-	./tools/npm run format-md
-
-format-assets:
-	./tools/npm run format-webpack
-	./tools/npm run format-js
-	./tools/npm run format-vue
-	./tools/npm run format-style
-
-format-php:
-	./tools/php-cs-fixer fix
-
-format: format-pages format-assets format-php
-
-watch: clean build-assets
-	./tools/sculpin generate \
-		--env="${APP_ENV}" \
-		--watch \
-		--server \
-		--port=8000 \
-		--no-interaction
-
-# Deploy
-
-deploy: build-prod
-	invoke deploy
-
-rollback:
-	./tools/dep rollback production -vv

README.md

@@ -1,10 +1,10 @@
-Source for [vakhrushev.me](http://vakhrushev.me).
+Source for [vakhrushev.me](https://vakhrushev.me).
 
 Build:
 
-    make build-docker
+    task build-docker
-    make build
+    task build
     
 Deploy:
 
-    make deploy
+    task deploy

Taskfile.yml

@@ -0,0 +1,130 @@
+# https://taskfile.dev
+
+version: '3'
+
+vars:
+  USER_ID:
+    sh: id -u
+  GROUP_ID:
+    sh: id -g
+
+  PROJECT: "homepage"
+  PHP_IMAGE: "{{.PROJECT}}-php"
+  NODE_IMAGE: "{{.PROJECT}}-node"  
+
+  DOCKER_COMMON_OPTS: >-
+    --rm
+    --interactive
+    --tty
+    --user {{.USER_ID}}:{{.GROUP_ID}}
+    --volume /etc/passwd:/etc/passwd:ro
+    --volume /etc/group:/etc/group:ro
+    --volume "./:/srv/app"
+    --workdir "/srv/app"
+    -e XDG_CONFIG_HOME=/srv/app/.config
+    -e XDG_CACHE_HOME=/srv/app/.cache
+    -e HOME=/srv/app/.home
+
+tasks:
+
+  build-docker:
+    cmds:
+      - docker build --file docker/php/Dockerfile --tag "{{.PHP_IMAGE}}" .
+      - docker build --file docker/node/Dockerfile --tag "{{.NODE_IMAGE}}" .
+
+  composer:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" composer {{.CLI_ARGS}}
+
+  npm:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" npm {{.CLI_ARGS}}
+
+  sculpin:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" ./vendor/bin/sculpin {{.CLI_ARGS}}
+
+  shell-node:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.NODE_IMAGE}}" bash
+
+  install-dependencies:
+    cmds:
+      - task: composer
+        vars: { CLI_ARGS: "install" }
+      - task: npm
+        vars: { CLI_ARGS: "install" }
+
+  format-pages:
+    cmds:
+      - task: npm
+        vars: { CLI_ARGS: 'run format-md' }
+
+  format-assets:
+    cmds:
+      - task: npm
+        vars: { CLI_ARGS: 'run format-webpack' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-js' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-vue' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-style' }
+
+  format-php:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" php-cs-fixer fix
+
+  build-dev:
+    vars:
+      APP_OUTPUT_DIR: output_dev
+      NPM_SCRIPT: build
+      APP_ENV: dev
+      APP_URL: homepage.site      
+    cmds:
+      - rm -rf ./{{.APP_OUTPUT_DIR}}/*
+      - task: npm
+        vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
+      - task: sculpin
+        vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
+
+  build-prod:
+    vars:
+      APP_OUTPUT_DIR: output_prod
+      NPM_SCRIPT: build-prod
+      APP_ENV: prod
+      APP_URL: https://vakhrushev.me      
+    cmds:
+      - rm -rf ./{{.APP_OUTPUT_DIR}}/*
+      - task: npm
+        vars: { CLI_ARGS: 'run {{.NPM_SCRIPT}}' }
+      - task: sculpin
+        vars: { CLI_ARGS: 'generate --env="{{.APP_ENV}}" --url="{{.APP_URL}}" --no-interaction -vv' }
+
+  make-post:
+    vars:
+      POST_DATE:
+        sh: date +'%Y-%m-%d'
+    cmd: touch "source/_articles/{{.POST_DATE}}-new-post.md"
+
+  deploy:
+    vars:
+      COMMIT_HASH:
+        sh: git rev-parse --short HEAD
+      TIMESTAMP:
+        sh: date +%s
+      DOCKER_IMAGE: homepage-nginx:{{.COMMIT_HASH}}-{{.TIMESTAMP}}
+    cmds:
+      - task: build-prod
+      - docker build --pull --file docker/Dockerfile.nginx.prod --tag {{.DOCKER_IMAGE}} .
+      - task: deploy-with-ansible
+        vars:
+          DOCKER_IMAGE: '{{.DOCKER_IMAGE}}'
+          
+
+  deploy-with-ansible:
+    internal: true
+    requires: 
+      vars: [DOCKER_IMAGE]
+    dir: '/home/av/projects/private/pet-project-server'
+    cmd: ansible-playbook -i production.yml playbook-app-homepage.yml --extra-vars 'homepage_web_image={{.DOCKER_IMAGE}}'

app/config/sculpin_kernel.yml

@@ -5,16 +5,6 @@ sculpin:
 sculpin_content_types:
   posts:
     enabled: false
-  albums:
-    type: path
-    path: _albums
-    singular_name: album
-    layout: internal
-    permalink: albums/:basename/
-    publish_drafts: false
-    enabled: true
-    taxonomies:
-      - tags
   articles:
     type: path
     path: _articles

bundle/HtmlPrettierBundle/DependencyInjection/HtmlPrettierExtension.php

@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class HtmlPrettierExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

bundle/HtmlPrettierBundle/HtmlPrettier.php

@@ -4,21 +4,14 @@ declare(strict_types=1);
 
 namespace Homepage\HtmlPrettierBundle;
 
-use Generator;
 use Sculpin\Core\Event\SourceSetEvent;
 use Sculpin\Core\Sculpin;
 use Sculpin\Core\Source\SourceInterface;
 use Sculpin\Core\Source\SourceSet;
-
-use function strlen;
-
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class HtmlPrettier implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -47,7 +40,7 @@ class HtmlPrettier implements EventSubscriberInterface
         }
     }
 
-    private function filterSource(SourceSet $sourceSet): Generator
+    private function filterSource(SourceSet $sourceSet): \Generator
     {
         /** @var SourceInterface $source */
         foreach ($sourceSet->allSources() as $source) {
@@ -65,7 +58,7 @@ class HtmlPrettier implements EventSubscriberInterface
 
     private function endsWith($haystack, $needle): bool
     {
-        $length = strlen($needle);
+        $length = \strlen($needle);
 
         return $length === 0 || (substr($haystack, -$length) === $needle);
     }

bundle/SiteMapBundle/DependencyInjection/SiteMapExtension.php

@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class SiteMapExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

bundle/SiteMapBundle/SiteMapGenerator.php

@@ -23,9 +23,6 @@ class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterfac
      */
     private $sources;
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -88,7 +85,7 @@ class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterfac
             return [];
         }
 
-        if ($data['draft']) {
+        if (array_key_exists('draft', $data) && $data['draft']) {
             return [];
         }
 

bundle/TwigExtensionBundle/DependencyInjection/TwigExtensionExtension.php

@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class TwigExtensionExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));

composer.json

@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "php": "~7.4",
+        "php": "^8.0",
         "ext-tidy": "*"
     },
     "require-dev": {

docker/docker-compose.prod.yml

@@ -1,11 +0,0 @@
-version: '2'
-
-services:
-  nginx:
-    image: '${NGINX_IMAGE}'
-#    user: '${CURRENT_UID}:${CURRENT_GID}'
-    restart: unless-stopped
-    ports:
-      - '${WEB_SERVER_PORT}:80'
-    env_file:
-      - .env

docker/node/Dockerfile

@@ -1,3 +1,6 @@
-FROM node:12.22.3-alpine
+FROM node:12
 
-RUN npm install -g npm
+ENV npm_config_fund=false
+ENV npm_config_update_notifier=false
+
+WORKDIR /srv/app

docker/php/Dockerfile

@@ -1,7 +1,29 @@
-FROM php:7.4.21-cli
+FROM php:8.1-cli
 
-COPY ./docker/php/provision.sh /opt/
+ENV COMPOSER_FUND=0
 
-RUN /opt/provision.sh
+RUN apt-get update && apt-get install -y \
+    curl \
+    git \
+    gnupg \
+    gzip \
+    libtidy-dev \
+    rsync \
+    zip \
+;
+
+RUN docker-php-ext-install tidy \
+    && docker-php-ext-enable tidy
+
+# Composer and required tools
+RUN curl -sLO https://getcomposer.org/download/2.8.4/composer.phar \
+    && mv composer.phar /usr/local/bin/composer \
+    && chmod +x /usr/local/bin/composer
+
+
+# PHP-CS-Fixer
+RUN curl -sLO https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.65.0/php-cs-fixer.phar \
+    && mv php-cs-fixer.phar /usr/local/bin/php-cs-fixer \
+    && chmod +x /usr/local/bin/php-cs-fixer
 
 WORKDIR /srv/app

docker/php/provision.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env sh
-
-set -eux
-
-apt-get update && apt-get install -y \
-    curl \
-    git \
-    gnupg \
-    gzip \
-    libtidy-dev \
-    rsync \
-    zip \
-;
-
-docker-php-ext-install tidy \
-    && docker-php-ext-enable tidy
-
-# Project folder
-mkdir -p /srv/app
-
-# Composer and required tools
-curl -sLO https://getcomposer.org/download/2.3.10/composer.phar \
-    && mv composer.phar /usr/local/bin/composer \
-    && chmod +x /usr/local/bin/composer
-
-
-# PHP-CS-Fixer
-curl -sLO https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.9.5/php-cs-fixer.phar \
-    && mv php-cs-fixer.phar /usr/local/bin/php-cs-fixer \
-    && chmod +x /usr/local/bin/php-cs-fixer

source/_albums/white-sea.html.twig

@@ -1,61 +0,0 @@
----
-title: Белое море - 2011, 2013 года
-description: Фотографии с поездок на Белое море в самую короткую ночь в году
----
-{% block content %}
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9222/46045840.28/0_98765_7fc8895f_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9222/46045840.28/0_98765_7fc8895f_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9312/46045840.28/0_98748_e6ab013e_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9312/46045840.28/0_98748_e6ab013e_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9231/46045840.28/0_98749_b4fb46a9_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9231/46045840.28/0_98749_b4fb46a9_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9305/46045840.28/0_9874a_afbf859b_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9305/46045840.28/0_9874a_afbf859b_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9171/46045840.28/0_98747_7d4ca4c9_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9171/46045840.28/0_98747_7d4ca4c9_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9217/46045840.28/0_9874b_e42da6b4_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9217/46045840.28/0_9874b_e42da6b4_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9228/46045840.28/0_9874f_9af8aa8f_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9228/46045840.28/0_9874f_9af8aa8f_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9301/46045840.28/0_9875a_d96bfbd7_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9301/46045840.28/0_9875a_d96bfbd7_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/9324/46045840.28/0_98756_13fee051_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/9324/46045840.28/0_98756_13fee051_XL.jpg"/>
-    </a>
-  </p>
-
-{% endblock %}

source/_albums/winter-fog.html.twig

@@ -1,67 +0,0 @@
----
-title: Зимний туман
-description: Фотографи набережной Седова, сделанные в туманный зимний день
----
-{% block content %}
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/5821/46045840.24/0_6f263_3e1f58f6_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/5821/46045840.24/0_6f263_3e1f58f6_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25c_397758c6_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25c_397758c6_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/5313/46045840.24/0_6f256_e62604eb_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/5313/46045840.24/0_6f256_e62604eb_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/5313/46045840.24/0_6f257_5eaf214c_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/5313/46045840.24/0_6f257_5eaf214c_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f259_3caa7abe_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f259_3caa7abe_XXXL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a class="photo-link" href="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25a_4f1fa9ef_XXXL.jpg">
-      <img class="photo-image" src="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25a_4f1fa9ef_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f25b_8a14fb24_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f25b_8a14fb24_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25d_b4fd58d3_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4419/46045840.24/0_6f25d_b4fd58d3_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f25f_b60733cd_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4614/46045840.24/0_6f25f_b60733cd_XL.jpg"/>
-    </a>
-  </p>
-
-  <p>
-    <a href="https://img-fotki.yandex.ru/get/4418/46045840.24/0_6f255_c458f69c_XXXL.jpg">
-      <img src="https://img-fotki.yandex.ru/get/4418/46045840.24/0_6f255_c458f69c_XL.jpg"/>
-    </a>
-  </p>
-
-{% endblock %}

source/_assets/about/about.vue

@@ -1,78 +0,0 @@
-<template>
-    <section class="app">
-        <p class="fact-index">Факт {{ factIndex }}</p>
-        <p class="note">{{ fact }}</p>
-        <button @click.prevent="next" class="button-next">
-            Узнать чуть лучше
-        </button>
-    </section>
-</template>
-
-<script>
-import _ from 'underscore';
-
-const NOTES = [
-    'Люблю фильм "Три идиота".',
-    'Люблю кататься на велосипеде.',
-    'Люблю читать фантастические книги.',
-    'Люблю шоколад.',
-    'На день рождения ко мне можно прийти без подарка.',
-    'Не люблю пьяных людей.',
-    'Предпочитаю ходить в кино на 2D-сеансы.',
-    'Проехал на велосипеде 200 километров за день.',
-    'Работаю программистом.',
-    'Хотел бы побывать в горах.',
-];
-
-export default {
-    data() {
-        return {
-            notes: NOTES,
-            shown: [],
-            fact: '',
-            factIndex: null,
-        };
-    },
-    mounted() {
-        this.pick();
-    },
-    methods: {
-        next() {
-            this.pick();
-        },
-        pick() {
-            let available = _.difference(this.notes, this.shown);
-            if (_.size(available) === 0) {
-                available = this.notes;
-                this.shown = [];
-            }
-            const fact = _.sample(available);
-            this.shown.push(fact);
-            this.fact = fact;
-            this.factIndex = _.indexOf(NOTES, fact) + 1;
-        },
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-@import '../components/button';
-.app {
-    text-align: center;
-}
-
-.fact-index {
-    margin-top: 3em;
-}
-
-.note {
-    display: block;
-    font-size: 160%;
-    margin: 0 auto 2em;
-    min-height: 3em;
-}
-
-.button-next {
-    @extend %button;
-}
-</style>

source/_assets/about/index.js

@@ -1,7 +0,0 @@
-import Vue from 'vue';
-import About from './about.vue';
-
-new Vue({
-    el: '#app',
-    render: h => h(About),
-});

source/about.html.twig

@@ -1,19 +0,0 @@
----
-layout: internal
-title: Обо мне
-description: Несколько фактов об авторе
----
-
-{% block js %}
-  {{ parent() }}
-  <script async src="{{ hashed_asset('/static/about.js') }}"></script>
-{% endblock %}
-
-{% block css %}
-  {{ parent() }}
-  <link rel="stylesheet" href="{{ hashed_asset('/static/about.css') }}">
-{% endblock %}
-
-{% block content %}
-  <div id="app"></div>
-{% endblock %}

source/albums.html.twig

@@ -1,25 +0,0 @@
----
-layout: internal
-title: Фотоальбомы
-description: Фотоальбомы
-use: [albums]
----
-{% block content %}
-
-  <h1>{{ page.title }}</h1>
-
-  <ul>
-    {% for album in data.albums %}
-      <li>
-        <p>
-          <a href="{{ album.url }}">{{ album.title }}</a>
-          {% if album.description %}
-            <br>
-            {{ album.description }}
-          {% endif %}
-        </p>
-      </li>
-    {% endfor %}
-  </ul>
-
-{% endblock %}

source/index.html.twig

@@ -25,7 +25,6 @@ use: [articles]
       Работаю в <a href="https://playkot.com/" target="_blank">Playkot</a>.
       Пишу на PHP.
       Разбираюсь в back-end, экспериментирую с front-end, интересуюсь функциональным программированием.
-      Иногда <a href="/albums/">фотографирую</a>.
     </p>
 
     <span class="hr-line"></span>
@@ -41,23 +40,8 @@ use: [articles]
         </a>
       </li>
       <li class="social__item">
-        <a class="social__link" href="https://github.com/anwinged" target="_blank" title="Код на Гитхабе">
+        <a class="social__link" href="https://git.vakhrushev.me" target="_blank" title="Код на Гитхабе">
-          <i class="fab fa-github"></i>
+          <i class="fab fa-git-square"></i>
-        </a>
-      </li>
-      <li class="social__item">
-        <a class="social__link" href="https://www.linkedin.com/in/anton-vakhrushev" target="_blank" title="Профиль на Линкедин">
-          <i class="fab fa-linkedin"></i>
-        </a>
-      </li>
-      <li class="social__item">
-        <a class="social__link" href="https://instagram.com/anwinged" target="_blank" title="Фотографии в Инстаграме">
-          <i class="fab fa-instagram"></i>
-        </a>
-      </li>
-      <li class="social__item">
-        <a class="social__link" href="/about/" target="_blank" title="Об авторе">
-          <i class="fas fa-ghost"></i>
         </a>
       </li>
       <li class="social__item">

tasks.py

@@ -1,49 +0,0 @@
-from fabric import Connection
-from invoke import task
-from datetime import datetime
-import subprocess
-import shlex
-
-APP_NAME = "homepage"
-SSH_HOST = "homepage@51.250.85.23"
-DOCKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade"
-
-
-def run(args):
-    return subprocess.run(args, check=True, capture_output=True).stdout
-
-
-@task
-def deploy(c):
-    timestamp = int(datetime.now().timestamp())
-    commit = run(["git", "rev-parse", "--short", "HEAD"]).decode("utf-8").strip()
-    nginx_image_tag = f"{DOCKER_REGISTRY}/homepage-nginx:{commit}-{timestamp}"
-
-    print(f"Build nginx image {nginx_image_tag}")
-
-    run(
-        [
-            "docker",
-            "build",
-            "--file",
-            "docker/Dockerfile.nginx.prod",
-            "--tag",
-            nginx_image_tag,
-            ".",
-        ]
-    )
-
-    print("Push nginx image")
-
-    run(["docker", "push", nginx_image_tag])
-
-    print("Ready to setup remote host")
-
-    with Connection(SSH_HOST) as c:
-        c.put(
-            "./docker/docker-compose.prod.yml",
-            remote="/home/homepage/docker-compose.yml",
-        )
-        c.run("cp .env .env.prod")
-        c.run(f"echo NGINX_IMAGE={shlex.quote(nginx_image_tag)} >> .env.prod")
-        c.run(f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach")

tools/build-docker

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-source .env
-
-docker build \
-    --file docker/php/Dockerfile \
-    --tag "${PHP_IMAGE}" \
-    "$PWD"
-
-docker build \
-    --file docker/node/Dockerfile \
-    --tag "${NODE_IMAGE}" \
-    "$PWD"

tools/composer

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-source .env
-
-mkdir -p var/docker-cache/.composer
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$PWD:/srv/app" \
-    --volume "$HOME:$HOME" \
-    --volume "$PWD/var/docker-cache/.composer:/tmp/.composer" \
-    --env COMPOSER_HOME=/tmp/.composer \
-    "${PHP_IMAGE}" \
-    composer "$@"

tools/dep

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-	  --interactive \
-	  --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$HOME:$HOME" \
-	  --volume "$PWD:/srv/app" \
-	  "${PHP_IMAGE}" \
-	  dep "$@"

tools/mkpost

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-touch "source/_articles/$(date +'%Y-%m-%d')-$1.md"

tools/npm

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-source .env
-
-mkdir -p var/docker-cache/.npm
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume /etc/passwd:/etc/passwd:ro \
-    --volume /etc/group:/etc/group:ro \
-    --volume "$PWD:/srv/app" \
-    --volume "$HOME:$HOME" \
-    --volume "$PWD/var/docker-cache/.npm:/tmp/.npm" \
-    --env npm_config_cache=/tmp/.npm \
-    --workdir /srv/app \
-    "${NODE_IMAGE}" \
-    npm "$@"

tools/php-cs-fixer

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --user "$UID:$(id -g)" \
-    --volume "$PWD:/srv/app" \
-    "${PHP_IMAGE}" \
-    php-cs-fixer "$@"

tools/sculpin

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source .env
-
-docker run \
-    --rm \
-    --interactive \
-    --tty \
-    --init \
-    --user "$UID:$(id -g)" \
-	  --volume="$PWD:/srv/app" \
-	  --expose=8000 \
-	  --publish=8000:8000 \
-	  "${PHP_IMAGE}" \
-	  ./vendor/bin/sculpin "$@"