diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 5b6cd2d..9cc97bd 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -1,4 +1,4 @@ -name: 🚀 Build and deploy website on push +# name: 🚀 Build and deploy website on push on: push: branches: @@ -10,31 +10,19 @@ jobs: steps: - name: 🚚 Get latest code uses: actions/checkout@v2 - - name: 📦 Use cache - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }} - restore-keys: | - ${{ runner.os }}-gems- - - name: 🔧 Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 16 - - name: 🛠️ Setup Ruby - uses: ruby/setup-ruby@v1 + - name: 🛠️ Setup Zola + uses: taiki-e/install-action@v2 with: - ruby-version: '3.0' - bundler-cache: true # runs 'bundle install' and caches installed gems automatically + tool: zola@0.19.1 - name: 🏗️ Build website with Jekyll - run: JEKYLL_ENV=production bundle exec jekyll build + run: zola build - name: 📂 Sync files uses: SamKirkland/FTP-Deploy-Action@4.3.0 with: server: ${{ secrets.FTP_WEB_SERVER }} username: ${{ secrets.FTP_USER_NAME }} password: ${{ secrets.FTP_PASSWORD }} - local-dir: ./_site/ + local-dir: ./public/ server-dir: /www/weryskok.ru/ exclude: | **/.git* diff --git a/.gitignore b/.gitignore index fa56d71..2cab1c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,2 @@ -# Ignore metadata generated by Jekyll -_site/ -.sass-cache/ -.jekyll-cache/ -.jekyll-metadata - -# Ignore folders generated by Bundler -.bundle/ -vendor/ \ No newline at end of file +# Ignore folder generated by Zola +public/ \ No newline at end of file diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 4bbf973..0000000 --- a/.prettierrc +++ /dev/null @@ -1,3 +0,0 @@ -tabWidth: 4 -semi: true -singleQuote: true diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 3785bc0..0000000 --- a/Gemfile +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - -gem "jekyll" -gem "webrick" - -group :jekyll_plugins do - gem 'jekyll-sitemap' - gem 'jekyll-feed' - gem 'jekyll-seo-tag' - gem 'jekyll-minifier' - end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 49fc9e1..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,93 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - colorator (1.1.0) - concurrent-ruby (1.1.10) - cssminify2 (2.0.1) - em-websocket (0.5.3) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0) - eventmachine (1.2.7) - execjs (2.8.1) - ffi (1.15.5) - forwardable-extended (2.6.0) - htmlcompressor (0.4.0) - http_parser.rb (0.8.0) - i18n (1.10.0) - concurrent-ruby (~> 1.0) - jekyll (4.2.2) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) - jekyll-watch (~> 2.0) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.0) - liquid (~> 4.0) - mercenary (~> 0.4.0) - pathutil (~> 0.9) - rouge (~> 3.0) - safe_yaml (~> 1.0) - terminal-table (~> 2.0) - jekyll-feed (0.16.0) - jekyll (>= 3.7, < 5.0) - jekyll-minifier (0.1.10) - cssminify2 (~> 2.0) - htmlcompressor (~> 0.4) - jekyll (>= 3.5) - json-minify (~> 0.0.3) - uglifier (~> 4.1) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) - jekyll-seo-tag (2.8.0) - jekyll (>= 3.8, < 5.0) - jekyll-sitemap (1.4.0) - jekyll (>= 3.7, < 5.0) - jekyll-watch (2.2.1) - listen (~> 3.0) - json (2.6.2) - json-minify (0.0.3) - json (> 0) - kramdown (2.4.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.4.0) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (4.0.7) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) - ffi (~> 1.0) - rexml (3.2.5) - rouge (3.28.0) - safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unicode-display_width (1.8.0) - webrick (1.7.0) - -PLATFORMS - x86_64-linux - -DEPENDENCIES - jekyll - jekyll-feed - jekyll-minifier - jekyll-seo-tag - jekyll-sitemap - webrick - -BUNDLED WITH - 2.3.14 diff --git a/README.MD b/README.MD index 572f76d..761b15a 100644 --- a/README.MD +++ b/README.MD @@ -2,16 +2,13 @@ This repo contains source code for [weryskok.ru](https://weryskok.ru). ## What tools are used? -* [Jekyll](https://jekyllrb.com/) as static site generator +* [Zola](https://www.getzola.org/) as static site generator * [Darkly Bootstrap](https://bootswatch.com/darkly/) for components to build this site ## How to build this site? -1. Install ``nodejs``, ``ruby`` and ``rubygems``. -1. ``gem install bundler``. -1. Add gems dir to path. -1. ``git clone https://github.com/WerySkok/weryskok.ru.git && cd weryskok.ru`` -1. ``bundle install`` -1. ``JEKYLL_ENV=production bundle exec jekyll build`` +1. [Install Zola](https://www.getzola.org/documentation/getting-started/installation/). +2. ``git clone https://github.com/WerySkok/weryskok.ru.git && cd weryskok.ru`` +3. ``zola build`` ## Why not GitHub Pages? Am lazy. diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 0b476ee..0000000 --- a/_config.yml +++ /dev/null @@ -1,12 +0,0 @@ -plugins: - - jekyll-feed - - jekyll-sitemap - - jekyll-seo-tag - - jekyll-minifier -exclude: - - README.MD - - LICENSE - -jekyll-minifier: - uglifier_args: - harmony: true \ No newline at end of file diff --git a/_includes/header-en.html b/_includes/header-en.html deleted file mode 100644 index 99ab9a8..0000000 --- a/_includes/header-en.html +++ /dev/null @@ -1,32 +0,0 @@ - \ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html deleted file mode 100644 index 1262d5d..0000000 --- a/_layouts/default.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - {{ page.title }} - - - - - - - - - - - - - - - {% feed_meta %} {% seo %} - - - - {% include header.html %} -
{{ content }}
- {% include footer.html %} - - - diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..a993d7e --- /dev/null +++ b/config.toml @@ -0,0 +1,21 @@ +# The URL the site will be built for +base_url = "https://weryskok.ru" + +# Whether to automatically compile all Sass files in the sass directory +compile_sass = false + +# Whether to build a search index to be used later on by a JavaScript library +build_search_index = false + +default_language = "ru" + +[markdown] +# Whether to do syntax highlighting +# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola +highlight_code = false + +[languages.en] + +[extra] +# Put all your custom variables here +navigation = [{ name = "Блог", link = "https://blog.weryskok.ru" }] diff --git a/en/index.html b/content/_index.en.md similarity index 99% rename from en/index.html rename to content/_index.en.md index 543b6c6..7a758a3 100644 --- a/en/index.html +++ b/content/_index.en.md @@ -1,7 +1,6 @@ ---- -layout: default-en -title: Main ---- ++++ +title = "Main" ++++
diff --git a/index.html b/content/_index.md similarity index 99% rename from index.html rename to content/_index.md index 563477a..87f965e 100644 --- a/index.html +++ b/content/_index.md @@ -1,8 +1,6 @@ ---- -layout: default -title: Главная ---- - ++++ +title = "Главная" ++++
@@ -565,4 +563,4 @@

Вики-сайты

-
+
\ No newline at end of file diff --git a/content/lol.en.md b/content/lol.en.md new file mode 100644 index 0000000..91411f7 --- /dev/null +++ b/content/lol.en.md @@ -0,0 +1,4 @@ ++++ +title = "lol" ++++ +lol \ No newline at end of file diff --git a/content/my-pc.en.md b/content/my-pc.en.md new file mode 100644 index 0000000..19f744e --- /dev/null +++ b/content/my-pc.en.md @@ -0,0 +1,160 @@ ++++ +title = "My PCs" ++++ +## My computers +### Laptop +Right now I am using HP OMEN +16-c0001urlaptop. I didn't try to replace any parts yet but I am planning to +increase RAM capacity in the future. + +Laptop configuration is: + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CPU + AMD Ryzen 7 5800H +
RAM + Two DDR4-3200 8 GB sticks (16 GB + in total) +
GPU +
    +
  • Integrated AMD Radeon Graphics
    • +
  • + Discrete NVIDIA GeForce RTX 3070 Laptop GPU with 8 GB + GDDR6 +
    • +
+
StorageM.2 NVMe SSD for 1 TB
Operating system + Windows 11 and Arch Linux + (sadly, there are issues with discrete GPU) +
Monitors +
    +
  • + Laptop's 16.1" display with 144 Hz refresh rate and + 1920x1080 (16:9) resoluton. +
    • +
  • + External ViewSonic VX2452MH monitor with + 1920x1080 (16:9) resoluton. +
    • +
+
+ +### Компьютер +Well, it just so happens that my computer is a purchased unit from 2013. It was +assembled by USN company as part of IGROMIR series (and yes, in 2013 I was at +IGROMIR and after the big crowds and queues I refused to go there again). +According to this +article, the exact model is the USN IGROMIR V1, although the claimed SSD +unit was not there. The main thing is that this computer is still doing its job +well today. + +Of course, the computer in such a long time was updated, first I added a +terabyte HDD from the old computer, Then I ordered an SSD from AliExpress, and +in 2020 I decided to replace the RAM and video card. In 2022, I replaced two 1TB +drives with one 2TB drive because the first two were nearing the end of their +life. (yet the new one oftenly restarts itself for some reason) + +Now it is rarely used since laptop's appearance. + +The current configuration is: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MotherboardGIGABYTE GA-B75-D3V
CPU + Intel Core i7-3770 +
RAM + 2 Patriot PSD38G16002 DDR3 8 GB sticks + (16 GB in total) +
Видеокарта + GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G + (GV-N165SWF2OC-4GD) +
Storage +
    +
  • KingDian S370 for 128 GB
    • +
  • + Western Digital Blue WD20EZBX for 2 TB +
    • + +
  • + Seagate Barracuda ST1000DM003 for 1 TB + +
    • +     + +
  • + Western Digital AV-GP WD10EVDS for 1 TB + +
    • +     +
+
Operating Systems + Arch Linux and Windows 10 +
Monitors +
    +
  • + ViewSonic VX2452MH with 1920x1080 + (16:9) resolution. +
    • +
  • + BenQ E910 with 1280x1024 (5:4) resolution. +
    • +
+
\ No newline at end of file diff --git a/content/my-pc.md b/content/my-pc.md new file mode 100644 index 0000000..b59c9ec --- /dev/null +++ b/content/my-pc.md @@ -0,0 +1,168 @@ ++++ +title = "Мои ПК" ++++ +## Мои компьютеры +### Ноутбук +В настоящее время я пользуюсь ноутбуком HP OMEN +16-c0001ur, купленным за 140 тысяч рублей. Пока я внутрь него не залезал, +но планирую увеличить объём ОЗУ в будущем. + +Конфигурация ноутбука следующая: + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Процессор + AMD Ryzen 7 5800H +
Оперативная память + 2 плашки памяти DDR4-3200 по 8 ГБ (всего + 16 ГБ) +
Видеокарта +
    +
  • Встроенная AMD Radeon Graphics
    • +
  • + Дискретная NVIDIA GeForce RTX 3070 для ноутбуков с 8 ГБ + видеопамяти GDDR6 +
    • +
+
Постоянное хранилищеM.2 NVMe-накопитель на 1 ТБ
ОС + Windows 11 и Arch Linux + (увы, есть проблемы с дискретной видеокартой) +
Мониторы +
    +
  • + Экран ноутбука диагональю 16,1 дюймов с частотой 144 Гц + и разрешением 1920x1080 (16:9) +
    • +
  • + Внешний монитор ViewSonic VX2452MH c разрешением + 1920x1080 (16:9) +
    • +
+
+ +### Компьютер +Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он +собран компанией USN в линейке IGROMIR (и да, в 2013-м я был на Игромире +и после большой толпы и очередей зарёкся туда ходить). Судя по +данной статье, +точная модель — USN IGROMIR V1, хотя заявленного SSD-шника там не +было. Главное, что данный компьютер и сегодня хорошо справляется со +своими задачами. + +Естественно, компьютер за такой долгий срок обновлялся, сначала я +добавил терабайтник от старого компа, потом заказал SSD с алика, а в +2020-м я решился на замену ОЗУ и видеокарты. В 2022 я заменил два диска +по 1 ТБ на один диск на 2 ТБ, так как у первых двух срок службы подходил +к концу. (только новый почему-то постоянно останавлиется и заново +раскручивается...) + +В настоящее время компьютер мало используется в связи с появлением +ноутбука. + +Сегодняшняя конфигурация следующая: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Материнская плата + GIGABYTE GA-B75-D3V +
Процессор + Intel Core i7-3770 +
Оперативная память + 2 плашки памяти Patriot PSD38G16002 DDR3 по 8 ГБ + (всего 16 ГБ) +
Видеокарта + GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G + [GV-N165SWF2OC-4GD] +
Постоянное хранилище +
    +
  • KingDian S370 на 128 ГБ
    • +
  • + Western Digital Blue WD20EZBX на 2 ТБ +
    • + +
  • + Seagate Barracuda ST1000DM003 на 1 ТБ + +
    • +     + +
  • + Western Digital AV-GP WD10EVDS на 1 ТБ + +
    • +     +
+
ОС + Arch Linux и Windows 10 +
Мониторы +
    +
  • + ViewSonic VX2452MH c разрешением 1920x1080 + (16:9) +
    • +
  • + BenQ E910 c разрешением 1280x1024 (5:4) +
    • +
+
\ No newline at end of file diff --git a/_data/navigation-en.yml b/data/navigation-en.yml similarity index 89% rename from _data/navigation-en.yml rename to data/navigation-en.yml index 06ba817..7f88dba 100644 --- a/_data/navigation-en.yml +++ b/data/navigation-en.yml @@ -1,6 +1,6 @@ - name: Blog (in Russian) link: https://blog.weryskok.ru - name: My PC - link: /en/my_pc.html + link: /en/my-pc/ - name:  Minecraft-server (in Russian) link: https://discord.com/invite/KCuJ687jqA \ No newline at end of file diff --git a/_data/navigation.yml b/data/navigation.yml similarity index 90% rename from _data/navigation.yml rename to data/navigation.yml index 111342e..99e00b3 100644 --- a/_data/navigation.yml +++ b/data/navigation.yml @@ -1,6 +1,6 @@ - name: Блог link: https://blog.weryskok.ru - name: Мой ПК - link: /my_pc.html + link: /my-pc/ - name:  Minecraft-сервер link: https://discord.com/invite/KCuJ687jqA \ No newline at end of file diff --git a/en/my_pc.html b/en/my_pc.html deleted file mode 100644 index 1c25d6b..0000000 --- a/en/my_pc.html +++ /dev/null @@ -1,185 +0,0 @@ ---- -layout: default-en -title: My PCs ---- - -
-

My computers

-

Laptop

-

- Right now I am using - HP OMEN 16-c0001ur - laptop. I didn't try to replace any parts yet but I am planning to - increase RAM capacity in the future. -

- -

Laptop configuration is:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CPU - AMD Ryzen 7 5800H -
RAM - Two DDR4-3200 8 GB sticks (16 GB - in total) -
GPU -
    -
  • Integrated AMD Radeon Graphics
    • -
  • - Discrete NVIDIA GeForce RTX 3070 Laptop GPU with 8 - GB GDDR6 -
    • -
-
StorageM.2 NVMe SSD for 1 TB
Operating system - Windows 11 and Arch Linux - (sadly, there are issues with discrete GPU) -
Monitors -
    -
  • - Laptop's 16.1" display with 144 Hz refresh rate and - 1920x1080 (16:9) resoluton. -
    • -
  • - External ViewSonic VX2452MH monitor with - 1920x1080 (16:9) resoluton. -
    • -
-
- -

Desktop PC

-

- Well, it just so happens that my computer is a purchased unit from 2013. - It was assembled by USN company as part of IGROMIR series (and yes, in - 2013 I was at IGROMIR and after the big crowds and queues I refused to - go there again). Judging by - this article, the exact model is the USN IGROMIR V1, although the claimed SSD unit - was not there. The main thing is that this computer is still doing its - job well today. -

-

- Of course, the computer in such a long time was updated, first I added a - terabyte HDD from the old computer, Then I ordered an SSD from - AliExpress, and in 2020 I decided to replace the RAM and video card. In - 2022, I replaced two 1TB drives with one 2TB drive because the first two - were nearing the end of their life. (yet the new one oftenly restarts - itself for some reason) -

- -

The current configuration is:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
MotherboardGIGABYTE GA-B75-D3V
CPU - Intel Core i7-3770 -
RAM - 2 Patriot PSD38G16002 DDR3 8 GB sticks - (16 GB in total) -
Video card - GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G - (GV-N165SWF2OC-4GD) -
Storage -
    -
  • KingDian S370 for 128 GB
    • -
  • - Western Digital Blue WD20EZBX for - 2 TB -
    • - -
  • - Seagate Barracuda ST1000DM003 for - 1 TB -
    • -     - -
  • - Western Digital AV-GP WD10EVDS for - 1 TB -
    • -     -
-
Operating System - Manjaro Linux (I advice it for everyone) and - Windows 10 -
Monitors -
    -
  • - ViewSonic VX2452MH with - 1920x1080 (16:9) resoluton. -
    • -
  • - BenQ E910 with 1280x1024 (5:4) - resolution -
    • -
-
-
diff --git a/my_pc.html b/my_pc.html deleted file mode 100644 index 35fb93f..0000000 --- a/my_pc.html +++ /dev/null @@ -1,194 +0,0 @@ ---- -layout: default -title: Мои ПК ---- - -
-

Мои компьютеры

-

Ноутбук

-

- В настоящее время я пользуюсь ноутбуком - HP OMEN 16-c0001ur, купленным за 140 тысяч рублей. Пока я внутрь него не залезал, но - планирую увеличить объём ОЗУ в будущем. -

- -

Конфигурация ноутбука следующая:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Процессор - AMD Ryzen 7 5800H -
Оперативная память - 2 плашки памяти DDR4-3200 по - 8 ГБ (всего 16 ГБ) -
Видеокарта -
    -
  • Встроенная AMD Radeon Graphics
    • -
  • - Дискретная NVIDIA GeForce RTX 3070 для ноутбуков с 8 - ГБ видеопамяти GDDR6 -
    • -
-
Постоянное хранилищеM.2 NVMe-накопитель на 1 ТБ
ОС - Windows 11 и Arch Linux - (увы, есть проблемы с дискретной видеокартой) -
Мониторы -
    -
  • - Экран ноутбука диагональю 16,1 дюймов с частотой 144 - Гц и разрешением 1920x1080 (16:9) -
    • -
  • - Внешний монитор ViewSonic VX2452MH c разрешением - 1920x1080 (16:9) -
    • -
-
- -

Компьютер

-

- Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он - собран компанией USN в линейке IGROMIR (и да, в 2013-м я был на Игромире - и после большой толпы и очередей зарёкся туда ходить). Судя по - данной статье, точная модель — USN IGROMIR V1, хотя заявленного SSD-шника там не - было. Главное, что данный компьютер и сегодня хорошо справляется со - своими задачами. -

-

- Естественно, компьютер за такой долгий срок обновлялся, сначала я - добавил терабайтник от старого компа, потом заказал SSD с алика, а в - 2020-м я решился на замену ОЗУ и видеокарты. В 2022 я заменил два диска - по 1 ТБ на один диск на 2 ТБ, так как у первых двух срок службы подходил - к концу. (только новый почему-то постоянно останавлиется и заново - раскручивается...) -

-

- В настоящее время компьютер мало используется в связи с появлением - ноутбука. -

- -

Сегодняшняя конфигурация следующая:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Материнская плата - GIGABYTE GA-B75-D3V -
Процессор - Intel Core i7-3770 -
Оперативная память - 2 плашки памяти Patriot PSD38G16002 DDR3 по - 8 ГБ (всего 16 ГБ) -
Видеокарта - GIGABYTE GeForce GTX 1650 SUPER WINDFORCE OC 4G - [GV-N165SWF2OC-4GD] -
Постоянное хранилище -
    -
  • KingDian S370 на 128 ГБ
    • -
  • - Western Digital Blue WD20EZBX на - 2 ТБ -
    • - -
  • - Seagate Barracuda ST1000DM003 на - 1 ТБ -
    • -     - -
  • - Western Digital AV-GP WD10EVDS на - 1 ТБ -
    • -     -
-
ОС - Manjaro Linux (всем советую) и Windows 10 -
Мониторы -
    -
  • - ViewSonic VX2452MH c разрешением - 1920x1080 (16:9) -
    • -
  • - BenQ E910 c разрешением - 1280x1024 (5:4) -
    • -
-
-
diff --git a/android-chrome-192x192.png b/static/android-chrome-192x192.png similarity index 100% rename from android-chrome-192x192.png rename to static/android-chrome-192x192.png diff --git a/android-chrome-512x512.png b/static/android-chrome-512x512.png similarity index 100% rename from android-chrome-512x512.png rename to static/android-chrome-512x512.png diff --git a/apple-touch-icon.png b/static/apple-touch-icon.png similarity index 100% rename from apple-touch-icon.png rename to static/apple-touch-icon.png diff --git a/assets/images/dm_photo.jpg b/static/assets/images/dm_photo.jpg similarity index 100% rename from assets/images/dm_photo.jpg rename to static/assets/images/dm_photo.jpg diff --git a/assets/scripts/change_language.js b/static/assets/scripts/change_language.js similarity index 100% rename from assets/scripts/change_language.js rename to static/assets/scripts/change_language.js diff --git a/browserconfig.xml b/static/browserconfig.xml similarity index 100% rename from browserconfig.xml rename to static/browserconfig.xml diff --git a/favicon-16x16.png b/static/favicon-16x16.png similarity index 100% rename from favicon-16x16.png rename to static/favicon-16x16.png diff --git a/favicon-32x32.png b/static/favicon-32x32.png similarity index 100% rename from favicon-32x32.png rename to static/favicon-32x32.png diff --git a/favicon.ico b/static/favicon.ico similarity index 100% rename from favicon.ico rename to static/favicon.ico diff --git a/mstile-150x150.png b/static/mstile-150x150.png similarity index 100% rename from mstile-150x150.png rename to static/mstile-150x150.png diff --git a/safari-pinned-tab.svg b/static/safari-pinned-tab.svg similarity index 100% rename from safari-pinned-tab.svg rename to static/safari-pinned-tab.svg diff --git a/site.webmanifest b/static/site.webmanifest similarity index 100% rename from site.webmanifest rename to static/site.webmanifest diff --git a/404.html b/templates/404.html similarity index 64% rename from 404.html rename to templates/404.html index a3b658b..4c1bc5e 100644 --- a/404.html +++ b/templates/404.html @@ -1,12 +1,11 @@ ---- -layout: default -permalink: /404.html -title: Ошибка 404 ---- - +{% extends "base.html" %} +{% block title %}Ошибка 404{% endblock title %} +{% block content -%}

Ошибка 404

Здесь ничего нет, зря ищешь.

+{%- endblock content %} + diff --git a/_layouts/default-en.html b/templates/base.html similarity index 75% rename from _layouts/default-en.html rename to templates/base.html index 615bd65..182e7af 100644 --- a/_layouts/default-en.html +++ b/templates/base.html @@ -1,9 +1,17 @@ - + - {{ page.title }} + + {% block title %} + {% if section.title %} + {{ section.title }} + {% else %} + {{ page.title }} + {% endif %} + {% endblock title %} + - {% feed_meta %} {% seo %} - {% include header-en.html %} -
{{ content }}
- {% include footer.html %} + {% include "header.html" %} +
+ {% block content %} + {% if section.content %} + {{ section.content | safe }} + {% else %} + {{ page.content | safe }} + {% endif %} + {% endblock %} +
+ {% include "footer.html" %}