From 6c574bd2aa05becd9c03a300f51e5c5a663acfee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Wed, 18 Jan 2017 18:45:34 +0100
Subject: [PATCH] Implement subtags
---
.gitlab-ci.yml | 20 ------
sitegin/tags.js | 86 +++++++++++++++++++++----
theme/sass/style.scss | 6 +-
theme/templates/article.html.nunj | 5 +-
theme/templates/partials/base.html.nunj | 2 +-
theme/templates/partials/list.html.nunj | 10 +++
6 files changed, 91 insertions(+), 38 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7852e69..d6067e06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,4 @@
stages:
- - test
- deploy
trigger:
@@ -9,25 +8,6 @@ trigger:
script:
- "curl -X POST -F token=$GITLAB_TOKEN -F ref=master https://git.ok1kvk.cz/api/v3/projects/72/trigger/builds"
-basictest:
- stage: test
- script:
- - node --version
- - npm --version
- - npm install
- - node index.js --contentdir sitegin/tests/content --staticdir sitegin/tests/static --builddir build --noserver
-
-unittest:
- stage: test
- script:
- - node --version
- - npm --version
- - npm install
- - npm test
- artifacts:
- paths:
- - coverage
-
cache:
paths:
- node_modules
diff --git a/sitegin/tags.js b/sitegin/tags.js
index bf8a32de..b81d174e 100644
--- a/sitegin/tags.js
+++ b/sitegin/tags.js
@@ -10,26 +10,24 @@ var toURL = function(url) {
module.exports = function(obj) {
console.log('Build step: Tags');
return new Promise(function(resolve, reject) {
- var tags = [];
- var tagPages = {};
+ var tags = [{
+ text: 'Všechny články a aktuality',
+ url: 'tag/vse',
+ }];
+ var tagPages = {
+ 'tag/vse': [],
+ };
obj.pages.forEach(function(article) {
- if(!article.metadata.tags && !article.metadata.notarticle) {
- article.metadata.tags = [ 'Článek' ];
+ if(!article.metadata.tags) {
+ article.metadata.tags = [];
}
if(article.metadata.tags) {
- if(!article.metadata.notarticle) {
- var hasarticletag = false;
- article.metadata.tags.forEach(function(tag) {
- if(toURL(tag) == 'clanek') hasarticletag = true;
- })
- if(!hasarticletag) article.metadata.tags.push('Článek');
- }
var ntags = [];
article.metadata.tags.forEach(function(tag) {
tag = {
text: tag,
- url: toURL(tag)
+ url: 'tag/'+toURL(tag)
}
ntags.push(tag);
if(tags.map(function(e) { return e.url; }).indexOf(tag.url) < 0)
@@ -37,6 +35,12 @@ module.exports = function(obj) {
if(tagPages[tag.url] === undefined) tagPages[tag.url] = [];
tagPages[tag.url].push(article)
})
+
+ if(!article.metadata.notarticle) {
+ ntags.push(tags[0])
+ tagPages[tags[0].url].push(article)
+ }
+
article.metadata.tags = ntags;
}
});
@@ -44,7 +48,8 @@ module.exports = function(obj) {
obj.tags = [];
if(!Array.isArray(obj.redirects)) obj.redirects = [];
- var generateTagPages = function(file, pageList) {
+ var generateTagPages = function(tag, pageList, subtags) {
+ const file = tag.url
var pg = {};
pg.type = 'redirect';
pg.file = file;
@@ -80,6 +85,8 @@ module.exports = function(obj) {
tagPage.file = file+'/'+p;
tagPage.type = 'tag';
+ tagPage.tag = tag;
+ tagPage.subtags = subtags;
tagPage.metadata.firstpage = firstpage;
tagPage.metadata.prevpage = prevpage;
tagPage.metadata.prevurl = prevurl;
@@ -104,8 +111,59 @@ module.exports = function(obj) {
});
}
+ const gen = (arr) => arr.map(a => ({ text: a, url: 'tag/'+toURL(a) }))
+ const subtags = {
+ 'tag/konstrukce': gen([
+ 'Konstrukce pro začáteÄŤnĂky',
+ 'HAM konstrukce',
+ 'Konstrukce s mikroprocesorem',
+ ]),
+ 'tag/stalo-se': gen([
+ 'Akce pro veřejnost',
+ 'Napsali o nás',
+ 'OcenÄ›nĂ',
+ 'Soutěž',
+ 'SK',
+ 'Radioklub',
+ ]),
+ 'tag/programovani': gen([
+ 'C/C++',
+ 'Javascript',
+ 'LaTeX',
+ 'Nástroje',
+ ]),
+ 'tag/mikroprocesory': gen([
+ 'AVR',
+ 'Periferie',
+ 'Knihovny',
+ ]),
+ 'tag/technicke-clanky': gen([
+ 'Eagle',
+ ]),
+ 'tag/zavody': gen([
+ 'HF',
+ 'VHF',
+ ]),
+ 'tag/aktuality': gen([
+ 'Pozvánky',
+ 'Stalo se',
+ 'Závody',
+ ]),
+ 'tag/clanky': gen([
+ 'ProgramovánĂ',
+ 'Mikroprocesory',
+ 'Konstrukce',
+ 'Technické články',
+ 'ZajĂmavosti',
+ ]),
+ 'tag/vse': gen([
+ 'Aktuality',
+ 'Články',
+ ])
+ }
tags.forEach(function(tag) {
- generateTagPages('tag/'+tag.url, tagPages[tag.url])
+
+ generateTagPages(tag, tagPages[tag.url], subtags[tag.url])
})
resolve(obj);
})
diff --git a/theme/sass/style.scss b/theme/sass/style.scss
index b89627cc..6df5fdcb 100644
--- a/theme/sass/style.scss
+++ b/theme/sass/style.scss
@@ -70,7 +70,7 @@ footer.page-footer {
}
#content, #search {
padding-bottom: 20px;
- padding-top: 104px;
+ padding-top: 70px;
margin: 0 auto;
}
html, body {
@@ -171,6 +171,10 @@ nav.subnav li {
right: 0;
}
+.breadcrumb, .breadcrumb:last-child {
+ color: rgba(0, 0, 0, 0.7);
+}
+
.search-icon svg, .menu-icon svg {
height: 64px;
width: 30px;
diff --git a/theme/templates/article.html.nunj b/theme/templates/article.html.nunj
index a4b88712..4a80f391 100644
--- a/theme/templates/article.html.nunj
+++ b/theme/templates/article.html.nunj
@@ -32,6 +32,7 @@
{% block content %}
<div class="section container" id="content">
+ <div class="row"> </div>
<div class="metadata">
<h2 id="title">{{ metadata.title }}</h2>
{% if not metadata.nodate %}
@@ -50,8 +51,8 @@
{% endif %}
<div class="tags">
{% for tag in metadata.tags %}
- {% if tag.url != "clanek" %}
- <a href="{{ config.baseurl }}/tag/{{ tag.url }}"><div class="chip">{{ tag.text }}</div></a>
+ {% if tag.url != "tag/vse" %}
+ <a href="{{ config.baseurl }}/{{ tag.url }}/1/"><div class="chip">{{ tag.text }}</div></a>
{% endif %}
{% endfor %}
</div>
diff --git a/theme/templates/partials/base.html.nunj b/theme/templates/partials/base.html.nunj
index 6ea4e843..795c0e7b 100644
--- a/theme/templates/partials/base.html.nunj
+++ b/theme/templates/partials/base.html.nunj
@@ -48,7 +48,7 @@
{{ svgs.menu("#fff",false) }}
</a>
<div style="z-index: 2" class="brand-logo">
- <a id="logo-container" href="{{ config.baseurl }}/tag/clanek/1/" >
+ <a id="logo-container" href="{{ config.baseurl }}/tag/vse/1/" >
<img class="hide-on-small-and-up" src="{{ config.baseurl }}/theme/icon56.png">
<img class="hide-on-med-and-up hide-on-ultra-small" src="{{ config.baseurl }}/theme/logo56.png">
<img class="hide-on-small-only" src="{{ config.baseurl }}/theme/logo64.png">
diff --git a/theme/templates/partials/list.html.nunj b/theme/templates/partials/list.html.nunj
index a69b000a..8832bad3 100644
--- a/theme/templates/partials/list.html.nunj
+++ b/theme/templates/partials/list.html.nunj
@@ -1,6 +1,16 @@
{% import "partials/svgs.html.nunj" as svgs %}
<div id=content class=container>
<div class="section">
+ <div class="row">
+ <div class="col">
+ <a class="breadcrumb">{{ tag.text }}</a>
+ {% if subtags %}
+ {% for subtag in subtags %}
+ <a href="{{ config.baseurl }}/{{ subtag.url }}" class="chip">{{ subtag.text }}</a>
+ {% endfor %}
+ {% endif %}
+ </div>
+ </div>
<div class="row">
{% for page in content %}
<div class="col s12 m6 l4"><!-- s12 m6 l4-->
--
GitLab