From 28215491cab131a1333d8efe2bb55bf740cda967 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 2 Jan 2019 16:21:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0?=
=?UTF-8?q?=20=D1=81=20=D0=B0=D0=BB=D1=8C=D0=B1=D0=BE=D0=BC=D0=B0=D0=BC?=
=?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Makefile | 1 -
app/config/sculpin_kernel.yml | 2 +-
source/_albums/white-sea.html.twig | 61 +++++++++++++++++++
source/_assets/layout_album/style.scss | 8 +++
.../_assets/layout_internal/navigation.scss | 2 +
source/_includes/navigation.twig | 3 +
source/_layouts/album.html.twig | 11 ++++
source/_layouts/internal.html.twig | 8 ++-
source/albums.html.twig | 17 ++++++
source/index.html.twig | 7 +++
webpack.config.js | 1 +
11 files changed, 116 insertions(+), 5 deletions(-)
create mode 100644 source/_albums/white-sea.html.twig
create mode 100644 source/_assets/layout_album/style.scss
create mode 100644 source/_layouts/album.html.twig
create mode 100644 source/albums.html.twig
diff --git a/Makefile b/Makefile
index 470d75a..383f0bc 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ format:
./tools/npm run format-js
./tools/npm run format-vue
./tools/npm run format-style
- ./tools/npm run format-md
format-php:
./tools/php-cs-fixer fix
diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
index 506cb06..bb3e2c9 100644
--- a/app/config/sculpin_kernel.yml
+++ b/app/config/sculpin_kernel.yml
@@ -9,7 +9,7 @@ sculpin_content_types:
type: path
path: _albums
singular_name: album
- layout: internal
+ layout: album
permalink: albums/:basename/
enabled: true
taxonomies:
diff --git a/source/_albums/white-sea.html.twig b/source/_albums/white-sea.html.twig
new file mode 100644
index 0000000..109ab29
--- /dev/null
+++ b/source/_albums/white-sea.html.twig
@@ -0,0 +1,61 @@
+---
+title: Белое море - 2011, 2013 года
+description: Фотографии с поездок на Белое море в самую короткую ночь в году
+---
+{% block content %}
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9222/46045840.28/0_98765_7fc8895f_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9222/46045840.28/0_98765_7fc8895f_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9312/46045840.28/0_98748_e6ab013e_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9312/46045840.28/0_98748_e6ab013e_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9231/46045840.28/0_98749_b4fb46a9_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9231/46045840.28/0_98749_b4fb46a9_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9305/46045840.28/0_9874a_afbf859b_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9305/46045840.28/0_9874a_afbf859b_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9171/46045840.28/0_98747_7d4ca4c9_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9171/46045840.28/0_98747_7d4ca4c9_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9217/46045840.28/0_9874b_e42da6b4_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9217/46045840.28/0_9874b_e42da6b4_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9228/46045840.28/0_9874f_9af8aa8f_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9228/46045840.28/0_9874f_9af8aa8f_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9301/46045840.28/0_9875a_d96bfbd7_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9301/46045840.28/0_9875a_d96bfbd7_XL.jpg"/>
+ </a>
+ </center>
+
+ <center>
+ <a href="http://img-fotki.yandex.ru/get/9324/46045840.28/0_98756_13fee051_XXXL.jpg">
+ <img src="http://img-fotki.yandex.ru/get/9324/46045840.28/0_98756_13fee051_XL.jpg"/>
+ </a>
+ </center>
+
+{% endblock %}
diff --git a/source/_assets/layout_album/style.scss b/source/_assets/layout_album/style.scss
new file mode 100644
index 0000000..0d0a33c
--- /dev/null
+++ b/source/_assets/layout_album/style.scss
@@ -0,0 +1,8 @@
+@import '../vars';
+@import '../base_style';
+
+.album-content {
+ img {
+ max-width: 100%;
+ }
+}
diff --git a/source/_assets/layout_internal/navigation.scss b/source/_assets/layout_internal/navigation.scss
index 635266b..9dcad97 100644
--- a/source/_assets/layout_internal/navigation.scss
+++ b/source/_assets/layout_internal/navigation.scss
@@ -1,6 +1,7 @@
.navigation {
display: block;
border-bottom: 1px solid #eee;
+ margin-bottom: 1em;
&__actions {
list-style: none;
@@ -13,6 +14,7 @@
margin: {
top: 1em;
bottom: 1em;
+ right: 1em;
}
}
diff --git a/source/_includes/navigation.twig b/source/_includes/navigation.twig
index fb9c266..ef43413 100644
--- a/source/_includes/navigation.twig
+++ b/source/_includes/navigation.twig
@@ -3,5 +3,8 @@
<li class="navigation__action">
<a class="navigation__link" href="/">Главная</a>
</li>
+ <li class="navigation__action">
+ <a class="navigation__link" href="/albums/">Альбомы</a>
+ </li>
</ul>
</nav>
diff --git a/source/_layouts/album.html.twig b/source/_layouts/album.html.twig
new file mode 100644
index 0000000..ba7f8f6
--- /dev/null
+++ b/source/_layouts/album.html.twig
@@ -0,0 +1,11 @@
+{% extends 'internal.html.twig' %}
+
+{% block css %}
+ <link rel="stylesheet" href="/static/layout_album.css?v={{ date().timestamp }}">
+{% endblock %}
+
+{% block main %}
+ <main class="content album-content">
+ {% block content %}{% endblock %}
+ </main>
+{% endblock %}
diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig
index 1956fa4..a435eb0 100644
--- a/source/_layouts/internal.html.twig
+++ b/source/_layouts/internal.html.twig
@@ -13,9 +13,11 @@
{% include 'navigation.twig' %}
- <main class="content">
- {% block content %}{% endblock %}
- </main>
+ {% block main %}
+ <main class="content">
+ {% block content %}{% endblock %}
+ </main>
+ {% endblock %}
</div>
diff --git a/source/albums.html.twig b/source/albums.html.twig
new file mode 100644
index 0000000..ae6d875
--- /dev/null
+++ b/source/albums.html.twig
@@ -0,0 +1,17 @@
+---
+layout: internal
+title: Фотоальбомы
+description: Фотоальбомы
+use: [albums]
+---
+{% block content %}
+
+ <h1>{{ title }}</h1>
+
+ <ul>
+ {% for album in data.albums %}
+ <li><a href="{{ album.url }}">{{ album.title }}</a></li>
+ {% endfor %}
+ </ul>
+
+{% endblock %}
diff --git a/source/index.html.twig b/source/index.html.twig
index 3359705..68ceb92 100644
--- a/source/index.html.twig
+++ b/source/index.html.twig
@@ -20,6 +20,13 @@ description: Личный сайт Антона Вахрушева
</li>
</ul>
+ <h2 class="heading">Смотреть</h2>
+ <ul>
+ <li>
+ <a href="/albums/">альбомы с фотографиями</a>
+ </li>
+ </ul>
+
<h2 class="heading">Читать</h2>
<ul>
<li>
diff --git a/webpack.config.js b/webpack.config.js
index 18c7965..71d8e31 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -62,6 +62,7 @@ module.exports = (env = {}) => {
entry: {
layout_default: './source/_assets/layout_default/style.scss',
layout_internal: './source/_assets/layout_internal/style.scss',
+ layout_album: './source/_assets/layout_album/style.scss',
index: './source/_assets/index/index.js',
about_me: './source/_assets/about_me/index.js',
predictor: './source/_assets/predictor/index.js',