Make site use jekyll (and minor fixes)

This commit is contained in:
Alexander Minkin 2021-08-24 00:10:49 +03:00
parent 5d8328fb89
commit 2a52ecedec
15 changed files with 566 additions and 555 deletions

13
.gitignore vendored
View file

@ -1,4 +1,9 @@
minified/* # Ignore metadata generated by Jekyll
index.min.html _site/
404.min.html .sass-cache/
my_pc.min.html .jekyll-cache/
.jekyll-metadata
# Ignore folders generated by Bundler
.bundle/
vendor/

View file

@ -1,75 +1,10 @@
<!DOCTYPE html> ---
<html lang="ru"> layout: default
permalink: /404.html
<head> ---
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>404 — WerySkok.ru</title>
<script src="https://kit.fontawesome.com/48d163f212.js" crossorigin="anonymous"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap" rel="stylesheet">
<style>
body {
font-family: 'Inter', sans-serif;
}
</style>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff">
</head>
<body class="d-flex flex-column h-100">
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
<div class="container">
<a class="navbar-brand" href="https://weryskok.ru">WerySkok.ru</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Открыть меню">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="https://blog.weryskok.ru">Блог</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/my_pc.html">Мой ПК</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://t.me/WerySkok"><i class="fab fa-telegram-plane"></i></a>
</li>
</ul>
</div>
</div>
</nav>
<main class="flex-shrink-0">
<section class="d-flex align-items-center justify-content-center vh-100"> <section class="d-flex align-items-center justify-content-center vh-100">
<div> <div>
<h1 class="display-3">Ошибка 404</h1> <h1 class="display-3">Ошибка 404</h1>
<p>Здесь ничего нет, зря ищешь.</p> <p>Здесь ничего нет, зря ищешь.</p>
</div> </div>
</section> </section>
</main>
<footer class="bg-dark text-light py-2 mt-5">
<div class="container py-2">
<div class="btn-group float-end">
<a class="btn btn-primary" href="https://t.me/werychan"><i class="fab fa-telegram-plane"></i></a>
<a class="btn btn-primary" href="https://vk.com/weryskok"><i class="fab fa-vk"></i></a>
<a rel="me" class="btn btn-primary" href="https://mastodon.ml/@WerySkok"><i
class="fab fa-mastodon"></i></a>
</div>
<p>WerySkok.ru, 2021</p>
</div>
</footer>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
crossorigin="anonymous"></script>
</body>
</html>

15
Gemfile Normal file
View file

@ -0,0 +1,15 @@
# 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

93
Gemfile.lock Normal file
View file

@ -0,0 +1,93 @@
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.9)
cssminify2 (2.0.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.8.1)
ffi (1.15.3)
forwardable-extended (2.6.0)
htmlcompressor (0.4.0)
http_parser.rb (0.6.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
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.15.1)
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.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.7.1)
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.5.1)
json-minify (0.0.3)
json (> 0)
kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.0)
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.6)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.26.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.7.0)
webrick (1.7.0)
PLATFORMS
x86_64-linux
DEPENDENCIES
jekyll
jekyll-feed
jekyll-minifier
jekyll-seo-tag
jekyll-sitemap
webrick
BUNDLED WITH
2.2.26

5
_config.yml Normal file
View file

@ -0,0 +1,5 @@
plugins:
- jekyll-feed
- jekyll-sitemap
- jekyll-seo-tag
- jekyll-minifier

4
_data/navigation.yml Normal file
View file

@ -0,0 +1,4 @@
- name: Блог
link: https://blog.weryskok.ru
- name: Мой ПК
link: /my_pc.html

11
_includes/footer.html Normal file
View file

@ -0,0 +1,11 @@
<footer class="bg-dark text-light py-2 mt-5">
<div class="container py-2">
<div class="btn-group float-end">
<a class="btn btn-primary" href="https://t.me/werychan"><i class="fab fa-telegram-plane"></i></a>
<a class="btn btn-primary" href="https://vk.com/weryskok"><i class="fab fa-vk"></i></a>
<a rel="me" class="btn btn-primary" href="https://mastodon.ml/@WerySkok"><i
class="fab fa-mastodon"></i></a>
</div>
<p>WerySkok.ru, 2021</p>
</div>
</footer>

22
_includes/header.html Normal file
View file

@ -0,0 +1,22 @@
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
<div class="container">
<a class="navbar-brand" href="https://weryskok.ru">WerySkok.ru</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Открыть меню">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
{% for item in site.data.navigation %}
<li class="nav-item">
<a href="{{ item.link }}" class="nav-link{% if page.url==item.link %} active{% endif %}" {% if
page.url==item.link %}aria-current="page" {% endif %}>{{ item.name }}</a>
</li>
{% endfor %}
<li class="nav-item">
<a class="nav-link" href="https://t.me/WerySkok"><i class="fab fa-telegram-plane"></i></a>
</li>
</ul>
</div>
</div>
</nav>

43
_layouts/default.html Normal file
View file

@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ page.title }}</title>
<script src="https://kit.fontawesome.com/48d163f212.js" crossorigin="anonymous"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap" rel="stylesheet">
<style>
body {
font-family: 'Inter', sans-serif;
}
main > .container {
padding-top: 60px;
}
</style>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff">
{% feed_meta %}
{% seo %}
</head>
<body class="d-flex flex-column h-100">
{% include header.html %}
<main class="flex-shrink-0">
{{ content }}
</main>
{% include footer.html %}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
crossorigin="anonymous"></script>
</body>
</html>

0
_sass/main.scss Normal file
View file

7
about.md Normal file
View file

@ -0,0 +1,7 @@
---
layout: default
title: About
---
# About page
This page tells you a little bit about me.

3
assets/css/styles.scss Normal file
View file

@ -0,0 +1,3 @@
---
---
@import "main";

View file

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

View file

@ -1,59 +1,12 @@
<!DOCTYPE html> ---
<html lang="ru"> layout: default
title: Главная
<head> ---
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Главная — WerySkok.ru</title>
<script src="https://kit.fontawesome.com/48d163f212.js" crossorigin="anonymous"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap" rel="stylesheet">
<style>
body {
font-family: 'Inter', sans-serif;
}
</style>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff">
</head>
<body class="d-flex flex-column h-100">
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
<div class="container">
<a class="navbar-brand" href="https://weryskok.ru">WerySkok.ru</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Открыть меню">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="https://blog.weryskok.ru">Блог</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/my_pc.html">Мой ПК</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://t.me/WerySkok"><i class="fab fa-telegram-plane"></i></a>
</li>
</ul>
</div>
</div>
</nav>
<main class="flex-shrink-0">
<section class="d-flex align-items-center justify-content-center vh-100"> <section class="d-flex align-items-center justify-content-center vh-100">
<!-- на этот блок ушло много слёз, помогите --> <!-- на этот блок ушло много слёз, помогите -->
<div class="row justify-content-center me-0"> <div class="row justify-content-center me-0">
<div class="col-8 col-md-6"> <div class="col-8 col-md-6">
<img src="imgs/avatar.jpg" alt="Аватар, под которым я сижу в интернете" class="rounded float-md-end" <img src="/assets/images/avatar.jpg" alt="Аватар, под которым я сижу в интернете" class="rounded float-md-end"
height="300px"> height="300px">
</div> </div>
<div class="col-8 col-md-6"> <div class="col-8 col-md-6">
@ -323,21 +276,3 @@
</div> </div>
</div> </div>
</section> </section>
</main>
<footer class="bg-dark text-light py-2 mt-5">
<div class="container py-2">
<div class="btn-group float-end">
<a class="btn btn-primary" href="https://t.me/werychan"><i class="fab fa-telegram-plane"></i></a>
<a class="btn btn-primary" href="https://vk.com/weryskok"><i class="fab fa-vk"></i></a>
<a rel="me" class="btn btn-primary" href="https://mastodon.ml/@WerySkok"><i
class="fab fa-mastodon"></i></a>
</div>
<p>WerySkok.ru, 2021</p>
</div>
</footer>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
crossorigin="anonymous"></script>
</body>
</html>

View file

@ -1,57 +1,7 @@
<!DOCTYPE html> ---
<html lang="ru"> layout: default
title: Мой ПК
<head> ---
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Мой ПК — WerySkok.ru</title>
<script src="https://kit.fontawesome.com/48d163f212.js" crossorigin="anonymous"></script>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap" rel="stylesheet">
<style>
body {
font-family: 'Inter', sans-serif;
}
main > .container {
padding-top: 60px;
}
</style>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff">
</head>
<body class="d-flex flex-column h-100">
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light">
<div class="container">
<a class="navbar-brand" href="https://weryskok.ru">WerySkok.ru</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Открыть меню">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link" href="https://blog.weryskok.ru">Блог</a>
</li>
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/my_pc.html">Мой ПК</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://t.me/WerySkok"><i class="fab fa-telegram-plane"></i></a>
</li>
</ul>
</div>
</div>
</nav>
<main class="flex-shrink-0">
<section class="container mb-5"> <section class="container mb-5">
<h1 class="display-5 mb-4">Мой компьютер</h1> <h1 class="display-5 mb-4">Мой компьютер</h1>
<p>Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он собран компанией USN в линейке <p>Так сложилось, что мой компьютер — покупной блок аж из 2013 года. Он собран компанией USN в линейке
@ -112,25 +62,8 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table>
<p>Думаю, что если бы не искусственные ограничения Microsoft, данный компьютер потянул бы и Windows 11, <p>Думаю, что если бы не искусственные ограничения Microsoft, данный компьютер потянул бы и Windows 11,
но раз они заявляют его несовместимым, то я не вижу смысла и пробовать ¯\_(ツ)_/¯</p> но раз они заявляют его несовместимым, то я не вижу смысла и пробовать ¯\_(ツ)_/¯</p>
</table>
</section> </section>
</main>
<footer class="bg-dark text-light py-2 mt-5">
<div class="container py-2">
<div class="btn-group float-end">
<a class="btn btn-primary" href="https://t.me/werychan"><i class="fab fa-telegram-plane"></i></a>
<a class="btn btn-primary" href="https://vk.com/weryskok"><i class="fab fa-vk"></i></a>
<a rel="me" class="btn btn-primary" href="https://mastodon.ml/@WerySkok"><i
class="fab fa-mastodon"></i></a>
</div>
<p>WerySkok.ru, 2021</p>
</div>
</footer>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-b5kHyXgcpbZJO/tY9Ul7kGkf1S0CWuKcCD38l8YkeH8z8QjE0GmW1gYU5S9FOnJ0"
crossorigin="anonymous"></script>
</body>
</html>