From 2c2dc313c2f9cfe850e4baacceeca8b646e25c53 Mon Sep 17 00:00:00 2001
From: sergeyyarkov <serzh.yarkov@gmail.com>
Date: Mon, 6 Jul 2020 22:04:30 +0300
Subject: [PATCH] tag collection

---
 src/components/Article/Article.js | 10 +++++-----
 src/components/Offers/Offers.js   |  2 +-
 src/pages/index.js                |  2 +-
 static/admin/config.yml           | 16 ++++++++++++----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/Article/Article.js b/src/components/Article/Article.js
index 23e1daa..34b937f 100644
--- a/src/components/Article/Article.js
+++ b/src/components/Article/Article.js
@@ -10,7 +10,7 @@ import VkIcon from '../../images/vk-icon.svg'
 import TwitterIcon from '../../images/twitter-icon__large.svg'
 import FacebookIcon from '../../images/facebook-icon__large.svg'
 
-const Article = ({ data: { title, image, description, category, tags, time, date }, html }) => {
+const Article = ({ data: { slug, title, image, description, category, tags, time, date }, html }) => {
   return (
     <>
       <SEO title={title} description={description} />
@@ -41,13 +41,13 @@ const Article = ({ data: { title, image, description, category, tags, time, date
           <div className="article-share">
             <span>Поделиться:</span>
             <div className="article-share__social">
-              <a href="/">
+              <a href={`/article/${slug}`}>
                 <VkIcon />
               </a>
-              <a href="/">
+              <a href={`/article/${slug}`}>
                 <TwitterIcon />
               </a>
-              <a href="/">
+              <a href={`/article/${slug}`}>
                 <FacebookIcon />
               </a>
             </div>
@@ -59,7 +59,7 @@ const Article = ({ data: { title, image, description, category, tags, time, date
           </div>
           <div className="article-tags">
             {tags.map((tag, i) => <div key={i} className="tag-item">
-              <Link to={`category/${tag}`}>{tag}</Link>
+              <Link to={`/tag/${slugify(tag)}`}>{tag}</Link>
             </div>)}
           </div>
           <div className="article-image">
diff --git a/src/components/Offers/Offers.js b/src/components/Offers/Offers.js
index 7fef3f8..81cd169 100644
--- a/src/components/Offers/Offers.js
+++ b/src/components/Offers/Offers.js
@@ -85,7 +85,7 @@ const Offers = () => {
       </div>
       <div className="offers-subscription offer-box">
         <div className="offers-subscription__heading offer-heading">
-          Читайте нас в Telegram
+           Читайте нас в Telegram
         </div>
         <div className="offers-subscription__content">
           <p>
diff --git a/src/pages/index.js b/src/pages/index.js
index 3393afc..a56c88f 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -43,7 +43,7 @@ const IndexPage = ({ data: { allMarkdownRemark: edges } }) => {
 
 export const query = graphql`
   {
-    allMarkdownRemark(filter: {frontmatter: {templateKey: {eq: "article"}}}, sort: {order: DESC, fields: frontmatter___date}) {
+    allMarkdownRemark(filter: {frontmatter: {templateKey: {eq: "article"}}}, sort: {order: DESC, fields: frontmatter___date}, limit: 10) {
       edges {
         node {
           frontmatter {
diff --git a/static/admin/config.yml b/static/admin/config.yml
index 4a76c02..892963c 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -10,16 +10,16 @@ collections:
     create: true
     slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
     fields:
-      - {label: "Template Key", name: "templateKey", widget: "hidden", default: "article"}
+      - {label: "Template Key", name: "templateKey", wisdget: "hidden", default: "article"}
       - {label: "Slug", name: "slug", widget: "string"}
       - {label: "Время чтения", name: "time", widget: "string"}
       - {label: "Заголовок", name: "title", widget: "string"}
       - {label: "Обложка", name: "image", widget: "image"}
-      - {label: "Категория", name: "category", widget: "relation", collection: "categories", valueField: "title", searchFields: ["title", "slug"]}
+      - {label: "Категория", name: "category", widget: "relation", collection: "categories", valueField: "title", searchFields: ["title"]}
       - {label: "Дата публикации", name: "date", widget: "datetime"}
       - {label: "Описание", name: "description", widget: "text"}
       - {label: "Содержание", name: "body", widget: "markdown"}
-      - {label: "Тэги", name: "tags", widget: "list"}
+      - {label: "Тэги", name: "tags", widget: "relation", multiple: true, collection: "tags", valueField: "title", searchFields: ["title"]}
   - name: 'categories'
     label: "Category"
     folder: 'content/categories'
@@ -27,4 +27,12 @@ collections:
     slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
     fields:
       - {label: "Template key", name: "templateKey", widget: "hidden", default: "category"}
-      - {label: "Название категории", name: "title", widget: "string"}
\ No newline at end of file
+      - {label: "Название категории", name: "title", widget: "string"}
+  - name: 'tags'
+    label: "Tag"
+    folder: 'content/tags'
+    create: true
+    slug: "{{year}}-{{month}}-{{day}}-{{slug}}"
+    fields:
+      - {label: "Template key", name: "templateKey", widget: "hidden", default: "tag"}
+      - {label: "Название тэга", name: "title", widget: "string"}
\ No newline at end of file