From 184b04a8574b5b925759d606cb963c4540caa6f9 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 25 Aug 2019 18:35:42 +0200
Subject: [PATCH] comment

---
 layout/category.html       |  2 +-
 layout/comment.html        | 19 ++++++-----
 layout/item.html           |  2 +-
 layout/item_nosummary.html |  4 +--
 layout/page.html           |  2 +-
 layout/post.html           | 11 +++++--
 layout/rss_item.xml        |  4 +--
 makesite.py                | 66 ++++++++++++++++++++------------------
 static/css/style.css       | 19 +++++++++++
 9 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/layout/category.html b/layout/category.html
index 7773c83..83f953a 100644
--- a/layout/category.html
+++ b/layout/category.html
@@ -1 +1 @@
-<span><a href="/{{ url }}.html">{{ category }}</a></span>
+<span><a href="/{{ url }}/">{{ category }}</a></span>
diff --git a/layout/comment.html b/layout/comment.html
index e679bc4..78f31e1 100644
--- a/layout/comment.html
+++ b/layout/comment.html
@@ -1,8 +1,11 @@
-<div>
-    <img src="https://www.gravatar.com/avatar/{{ avatar }}.jpg" style="float:left; margin-right:10px" height="32"
-        width="32">
-    <span>{{ author }}</span>
-    <span>{{ site }}</span>
-    <span> - {{ date }}</span>
-    <p>{{ content }}</p>
-</div>
\ No newline at end of file
+<div class="comment-detail">
+    <img src="https://www.gravatar.com/avatar/{{ avatar }}.jpg" style="float:left; margin-right:10px" height="32" width="32">
+    <div class="comment-body">    
+        <span class="comment-author">{{ author }}</span>
+        <!-- <span>{{ site }}</span> -->   
+        </span><span> - {{ date }}</span>
+        <p>{{ content }}</p>
+    </div>
+</div>
+
+ 
\ No newline at end of file
diff --git a/layout/item.html b/layout/item.html
index cd941e0..17eb79a 100644
--- a/layout/item.html
+++ b/layout/item.html
@@ -1,5 +1,5 @@
 <div class="article">
-    <h1><a href="/{{ year }}/{{ slug }}.html">{{ title }}</a></h1>
+    <h1><a href="/{{ post_url }}">{{ title }}</a></h1>
     <p class="meta">{{ category_label}}<span>{{ friendly_date }}</span><span class="comment-indicator">{{ comment_label }}</span></p>
     <p class="summary">{{ summary }}</p>
 </div>
diff --git a/layout/item_nosummary.html b/layout/item_nosummary.html
index 2a2ff48..fa30530 100644
--- a/layout/item_nosummary.html
+++ b/layout/item_nosummary.html
@@ -1,5 +1,5 @@
 <div class="article">
-    <h1><a href="/{{ year }}/{{ slug }}.html">{{ title }}</a></h1>
-    <p class="meta">{{ category_label}}<span>{{ friendly_date }}</span></p>
+    <h1><a href="/{{ post_url }}">{{ title }}</a></h1>
+    <p class="meta">{{ category_label}}<span>{{ friendly_date }}</span><span class="comment-indicator">{{ comment_label }}</span></p>
     <p></p>
 </div>
diff --git a/layout/page.html b/layout/page.html
index c0bb69b..eec5c16 100644
--- a/layout/page.html
+++ b/layout/page.html
@@ -36,7 +36,7 @@
         <div><a href="/"><img src="/logos/logo@96px.png"></img></a></div>
         <div class="txtright" id="menu-blog">
             <a href="/">Blog</a>
-            <a href="/archives.html">Archives</a>
+            <a href="/archives/">Archives</a>
         </div>
     </div>
 
diff --git a/layout/post.html b/layout/post.html
index 42c5ec2..01c6bad 100644
--- a/layout/post.html
+++ b/layout/post.html
@@ -3,8 +3,11 @@
     <p class="meta">{{ category_label}}<span>{{ friendly_date }}</span></p>
     {{ content }}
 
+    <div class="comment-separator"></div>
+
     {{ comments }}
-    
+
+<!--
     <div id="comment-form">
         <strong>Votre commentaire</strong>
         <form role="form" action="/newcomment" autocomplete="off" method="post">
@@ -17,7 +20,7 @@
                 <input class="hidden" id="token" name="token" type="text" placeholder="Blog"
                     value="{{ stacosys_token }}">
                 <input class="hidden" id="url" name="url" type="text" placeholder="Article"
-                    value="{{ year }}/{{ slug }}">
+                    value="/{{ post_url }}">
                 <input class="hidden" id="captcha" name="captcha" type="text"
                     placeholder="Etes vous humain ?">
             </fieldset>
@@ -44,6 +47,8 @@
                 class="button--info">Prévisualiser</button>
         </form>
     </div>
+-->
+
 </div>
 
 <script type="text/javascript"><!--
@@ -63,4 +68,4 @@
     }
 
     window.onload = showbonus;
---></script>
\ No newline at end of file
+--></script>
diff --git a/layout/rss_item.xml b/layout/rss_item.xml
index dc8823b..2735bc6 100644
--- a/layout/rss_item.xml
+++ b/layout/rss_item.xml
@@ -1,7 +1,7 @@
 <item>
-<guid>{{ site_url }}/{{ year }}/{{ slug }}.html</guid>
+<guid>{{ site_url }}/{{ post_url }}</guid>
 <title>{{ title }}</title>
-<link>{{ site_url }}/{{ year }}/{{ slug }}.html</link>
+<link>{{ site_url }}/{{ post_url }}</link>
 <description>
 <![CDATA[
 <p>
diff --git a/makesite.py b/makesite.py
index a87743a..26bf5ed 100755
--- a/makesite.py
+++ b/makesite.py
@@ -41,7 +41,6 @@ import locale
 import requests
 import commonmark
 
-
 # set user locale
 locale.setlocale(locale.LC_ALL, "")
 
@@ -117,7 +116,7 @@ def read_content(filename):
         content[key] = val
 
     # slugify post title
-    content['slug'] = slugify(content['title'])
+    content["slug"] = slugify(content["title"])
 
     # Separate content from headers.
     text = text[end:]
@@ -184,7 +183,9 @@ def get_friendly_date(date_str):
     return dt.strftime("%d %b %Y")
 
 
-def make_posts(src, src_pattern, dst, layout, category_layout, comment_layout, **params):
+def make_posts(
+    src, src_pattern, dst, layout, category_layout, comment_layout, **params
+):
     """Generate posts from posts directory."""
     items = []
 
@@ -198,6 +199,7 @@ def make_posts(src, src_pattern, dst, layout, category_layout, comment_layout, *
         page_params["date_path"] = page_params["date"].replace("-", "/")
         page_params["friendly_date"] = get_friendly_date(page_params["date"])
         page_params["year"] = page_params["date"].split("-")[0]
+        page_params["post_url"] = page_params["year"] + "/" + page_params["slug"]
 
         # categories
         categories = get_categories(page_params)
@@ -215,36 +217,36 @@ def make_posts(src, src_pattern, dst, layout, category_layout, comment_layout, *
             )
 
         # stacosys comments
-        page_params['comment_count'] = 0
-        if params['stacosys_url']:
-            req_url = params['stacosys_url'] + '/comments'
+        page_params["comment_count"] = 0
+        if params["stacosys_url"]:
+            req_url = params["stacosys_url"] + "/comments"
             query_params = dict(
-                token=params['stacosys_token'],
-                url='/' + page_params['year'] + '/' + page_params['slug']
+                token=params["stacosys_token"], url="/" + page_params["post_url"] + "/"
             )
             resp = requests.get(url=req_url, params=query_params)
-            comments = resp.json()['data']
-
+            comments = resp.json()["data"]
             out_comments = []
             for comment in comments:
-                out_comment = render(comment_layout, author=comment['author'], avatar=comment.get('avatar',''), site=comment.get('site', ''),
-                    date=comment['date'], content=commonmark.commonmark(comment['content']))
+                out_comment = render(
+                    comment_layout,
+                    author=comment["author"],
+                    avatar=comment.get("avatar", ""),
+                    site=comment.get("site", ""),
+                    date=comment["date"],
+                    content=commonmark.commonmark(comment["content"]),
+                )
                 out_comments.append(out_comment)
             page_params["comments"] = "".join(out_comments)
-            page_params['comment_count'] = len(comments)
+            page_params["comment_count"] = len(comments)
 
         content["year"] = page_params["year"]
+        content["post_url"] = page_params["post_url"]
         content["categories"] = page_params["categories"]
         content["category_label"] = page_params["category_label"]
         content["friendly_date"] = page_params["friendly_date"]
         content["comment_count"] = page_params["comment_count"]
         items.append(content)
 
-        # TODO DEBUG
-        # print(page_params)
-        # print(content)
-        # break
-
         dst_path = render(dst, **page_params)
         output = render(layout, **page_params)
 
@@ -279,13 +281,15 @@ def make_list(
         item_params = dict(params, **post)
         if "summary" not in item_params:
             item_params["summary"] = truncate(post["content"])
-        if "comment_count" in item_params and item_params['comment_count']:
-            if item_params['comment_count'] == 1:
-                item_params['comment_label'] = '1 commentaire'
+        if "comment_count" in item_params and item_params["comment_count"]:
+            if item_params["comment_count"] == 1:
+                item_params["comment_label"] = "1 commentaire"
             else:
-                item_params['comment_label'] = str(item_params['comment_count']) + ' commentaires'
+                item_params["comment_label"] = (
+                    str(item_params["comment_count"]) + " commentaires"
+                )
         else:
-            item_params['comment_label'] = ''
+            item_params["comment_label"] = ""
         item = render(item_layout, **item_params)
         items.append(item)
     params["content"] = "".join(items)
@@ -310,7 +314,7 @@ def main():
         "site_url": "http://localhost:8000",
         "current_year": datetime.datetime.now().year,
         "stacosys_token": "",
-        "stacosys_url": ""
+        "stacosys_url": "",
     }
 
     # If params.json exists, load it.
@@ -333,7 +337,7 @@ def main():
     rss_item_xml = fread("layout/rss_item.xml")
     sitemap_xml = fread("layout/sitemap.xml")
     sitemap_item_xml = fread("layout/sitemap_item.xml")
-    
+
     # Combine layouts to form final layouts.
     post_layout = render(page_layout, content=post_layout)
     list_layout = render(page_layout, content=list_layout)
@@ -342,7 +346,7 @@ def main():
     blog_posts = make_posts(
         "posts",
         "**/*.md",
-        "_site/{{ year }}/{{ slug }}.html",
+        "_site/{{ post_url }}/index.html",
         post_layout,
         category_layout,
         comment_layout,
@@ -361,7 +365,7 @@ def main():
         if page == last_page:
             params["next_page"] = ""
         else:
-            params["next_page"] = "page" + str(page + 1) + ".html"
+            params["next_page"] = "/page" + str(page + 1) + "/"
         if page == 1:
             params["previous_page"] = ""
             make_list(
@@ -374,10 +378,10 @@ def main():
                 **params
             )
         else:
-            params["previous_page"] = "page" + str(page - 1) + ".html"
+            params["previous_page"] = "/page" + str(page - 1) + "/"
         make_list(
             chunk,
-            "_site/page" + str(page) + ".html",
+            "_site/page" + str(page) + "/index.html",
             list_layout,
             item_layout,
             banner_layout,
@@ -398,7 +402,7 @@ def main():
         params["category"] = cat
         make_list(
             catpost[cat],
-            "_site/" + slugify(cat) + ".html",
+            "_site/" + slugify(cat) + "/index.html",
             list_layout,
             item_nosummary_layout,
             category_title_layout,
@@ -409,7 +413,7 @@ def main():
     # Create archive page
     make_list(
         blog_posts,
-        "_site/archives.html",
+        "_site/archives/index.html",
         list_layout,
         item_nosummary_layout,
         archive_title_layout,
diff --git a/static/css/style.css b/static/css/style.css
index c7a51ad..1698c6d 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -156,10 +156,29 @@ a:hover, a:active {
     display: none;
 }
 
+.comment-separator { 
+    height:1px;
+    background:#717171;
+    border-bottom:2px solid #6E9CC7;
+    margin-bottom: 8px;
+}
+
 .comment-indicator {
     color: coral;
 }
 
+.comment-author {
+    font-weight: bold; 
+}
+
+.comment-detail {
+    margin-bottom: 25px;
+}
+
+.comment-body {
+    margin-left: 42px;
+}
+
 /* Footer */
 footer {
     background: #f0f0f0;