av/homepage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add wishlist page

Browse Source
This commit is contained in:
Anton Vakhrushev 2018-04-29 12:36:39 +03:00
parent 5adf5b1afe
commit e9c790048a
9 changed files with 135 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/_assets/common/base_style.scss Normal file
View File

@ -0,0 +1,18 @@
html,
body {
font-size: 18px;
font-family: 'PT Serif', serif;
padding: 0;
margin: 0;
@media (max-width: 839px) {
font-size: 16px;
}
@media (max-width: 480px) {
margin: {
left: 15px;
right: 15px;
}
}
}

19
source/_assets/layout_default/style.scss
View File

@ -1,21 +1,4 @@
html, @import '../common/base_style.scss';
body {
font-size: 18px;
font-family: 'PT Serif', serif;
padding: 0;
margin: 0;
@media (max-width: 839px) {
font-size: 16px;
}
@media (max-width: 480px) {
margin: {
left: 15px;
right: 15px;
}
}
}
.content { .content {
width: 840px; width: 840px;

42
source/_assets/layout_internal/style.scss Normal file
View File

@ -0,0 +1,42 @@
@import '../common/base_style.scss';
.navigation {
display: block;
border-bottom: 1px solid #eee;
}
.navigation__actions {
list-style: none;
margin: 0;
padding: 0;
}
.navigation__action {
display: inline-block;
margin: {
top: 1em;
bottom: 1em;
};
}
.navigation__link {
}
.page {
width: 840px;
margin: 0 auto;
@media (max-width: 839px) {
margin: 20px 0;
width: auto;
}
@media (max-width: 480px) {
margin: 10px 0;
width: auto;
}
}
.content {
}

10
source/_includes/head.twig Normal file
View File

@ -0,0 +1,10 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://fonts.googleapis.com/css?family=PT+Serif:400,700&amp;subset=cyrillic" rel="stylesheet">
<title>
{% if page.title is defined %}
{{ page.title }} - {{ site.title }}
{% else %}
{{ site.title }}
{% endif %}
</title>

11
source/_layouts/default.html.twig
View File

@ -1,16 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> {% include 'head.twig' %}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://fonts.googleapis.com/css?family=PT+Serif:400,700&amp;subset=cyrillic" rel="stylesheet">
<title>
{% if page.title is defined %}
{{ page.title }} - {{ site.title }}
{% else %}
{{ site.title }}
{% endif %}
</title>
</head> </head>
<body> <body>

35
source/_layouts/internal.html.twig Normal file
View File

@ -0,0 +1,35 @@
<!DOCTYPE html>
<html>
<head>
{% include 'head.twig' %}
</head>
<body>
<div class="page">
<nav class="navigation">
<ul class="navigation__actions">
<li class="navigation__action">
<a class="navigation__link" href="/">
Главная
</a>
</li>
</ul>
</nav>
<main class="content">
{% block content %}{% endblock %}
</main>
</div>
{% include 'counters.twig' %}
<script src="/static/layout_internal.js?v={{ date().timestamp }}"></script>
{% block js %}
{# extra js scripts here #}
{% endblock %}
</body>
</html>

3
source/index.html.twig
View File

@ -26,6 +26,9 @@ layout: default
<li> <li>
<a href="/about/me">обо мне</a> <a href="/about/me">обо мне</a>
</li> </li>
<li>
<a href="/wishlist">вишлист</a>
</li>
</ul> </ul>
<h2 class="heading">Написать</h2> <h2 class="heading">Написать</h2>

23
source/wishlist.twig Normal file
View File

@ -0,0 +1,23 @@
---
layout: internal
---
{% block content %}
<h1>Вишлист</h1>
<h2>Книги</h2>
<ul>
<li>
<a href="https://store.artlebedev.ru/books/calligraphy/kniga-pro-bukvy2/">
Книга про буквы от Аа до Яя
</a>
</li>
<li>
<a href="https://store.artlebedev.ru/books/izdal/yazyk-shablonov/">
Язык шаблонов
</a>
</li>
</ul>
{% endblock %}

2
webpack.config.js
View File

@ -11,7 +11,9 @@ module.exports = income_env => {
mode: is_prod ? 'production' : 'development', mode: is_prod ? 'production' : 'development',
entry: { entry: {
layout_default: './source/_assets/layout_default/style.scss', layout_default: './source/_assets/layout_default/style.scss',
layout_internal: './source/_assets/layout_internal/style.scss',
about_me: './source/_assets/about_me/index.js', about_me: './source/_assets/about_me/index.js',
// wishlist: './source/_assets/wishlist/index.js',
}, },
output: { output: {
filename: '[name].js', filename: '[name].js',