From 5364bcac783fe2f4a3fe8982873ede9bf9bed73e Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Mon, 21 May 2018 04:28:51 +0200
Subject: [PATCH] posts stuff! gettin places

---
 assets/less/mio/classes/forum/post.less   | 65 +++++++++++++++++++++++
 assets/less/mio/classes/forum/topics.less |  4 +-
 assets/less/mio/classes/navigation.less   |  2 +-
 assets/less/mio/main.less                 |  3 +-
 public/forum/topic.php                    |  3 +-
 views/mio/forum/macros.twig               | 41 ++++++++++----
 6 files changed, 104 insertions(+), 14 deletions(-)
 create mode 100644 assets/less/mio/classes/forum/post.less

diff --git a/assets/less/mio/classes/forum/post.less b/assets/less/mio/classes/forum/post.less
new file mode 100644
index 00000000..33bc39ea
--- /dev/null
+++ b/assets/less/mio/classes/forum/post.less
@@ -0,0 +1,65 @@
+.forum__post {
+    display: flex;
+    border: 1px solid #9475b2;
+    box-shadow: 0 1px 2px #9475b2;
+    background-color: #fbeeff;
+    margin: 2px 0;
+
+    &__content {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        flex-shrink: 1;
+
+        &__text {
+            margin: 2px;
+            line-height: 1.2em;
+        }
+
+        &__info {
+            font-size: .9em;
+            line-height: 1.7em;
+            padding: 0 2px;
+            border-bottom: 1px solid #9475b2;
+            display: flex;
+            justify-content: space-between;
+
+            &__link {
+                color: inherit;
+                text-decoration: none;
+
+                &:hover {
+                    text-decoration: underline;
+                }
+            }
+        }
+    }
+
+    &__author {
+        border-right: 1px solid #9475b2;
+        padding: 5px;
+        text-align: center;
+        flex-grow: 0;
+        flex-shrink: 0;
+
+        &__link {
+            color: inherit;
+            text-decoration: none;
+        }
+
+        &__avatar {
+            width: 120px;
+            height: 120px;
+            box-shadow: 0 1px 2px #9475b2;
+        }
+
+        &__username {
+            font-size: 1.5em;
+            line-height: 1.7em;
+
+            &:hover {
+                text-decoration: underline;
+            }
+        }
+    }
+}
diff --git a/assets/less/mio/classes/forum/topics.less b/assets/less/mio/classes/forum/topics.less
index 5e166cf7..3ba42a1a 100644
--- a/assets/less/mio/classes/forum/topics.less
+++ b/assets/less/mio/classes/forum/topics.less
@@ -52,7 +52,7 @@
 
             &__author {
                 font-size: .9em;
-                line-height: 1.3em;
+                line-height: 1em;
 
                 &__name {
                     color: inherit;
@@ -68,7 +68,7 @@
 
         &__stat {
             line-height: 1.2em;
-            min-width: 50px;
+            min-width: 70px;
 
             &--posts {
                 font-size: 1.3em;
diff --git a/assets/less/mio/classes/navigation.less b/assets/less/mio/classes/navigation.less
index fcab6792..a1e70f83 100644
--- a/assets/less/mio/classes/navigation.less
+++ b/assets/less/mio/classes/navigation.less
@@ -1,7 +1,7 @@
 @mio-navigation-mobile: 1000px;
 
 .navigation {
-    margin: 5px 0;
+    margin: 2px 0;
     width: 100%;
     display: flex;
     border-width: 0;
diff --git a/assets/less/mio/main.less b/assets/less/mio/main.less
index 0451ad1b..c5f697e5 100644
--- a/assets/less/mio/main.less
+++ b/assets/less/mio/main.less
@@ -72,5 +72,6 @@ body {
 
 // Forums
 @import "classes/forum/actions";
-@import "classes/forum/topics";
 @import "classes/forum/listing";
+@import "classes/forum/post";
+@import "classes/forum/topics";
diff --git a/public/forum/topic.php b/public/forum/topic.php
index 0adfe2a8..368ae8d8 100644
--- a/public/forum/topic.php
+++ b/public/forum/topic.php
@@ -45,7 +45,8 @@ if (!$topic) {
 
 $getPosts = $db->prepare('
     SELECT
-        `post_id`, `post_text`, `post_created`
+        `post_id`, `post_text`, `post_created`,
+        `topic_id`
     FROM `msz_forum_posts`
     WHERE `topic_id` = :topic_id
     AND `post_deleted` IS NULL
diff --git a/views/mio/forum/macros.twig b/views/mio/forum/macros.twig
index 210cdf87..63a91b0a 100644
--- a/views/mio/forum/macros.twig
+++ b/views/mio/forum/macros.twig
@@ -60,8 +60,8 @@
         </div>
 
         <div class="forum__listing__entry__stats">
-            <div class="forum__listing__entry__topics">{{ forum.forum_topic_count|number_format }}</div>
-            <div class="forum__listing__entry__posts">{{ forum.forum_post_count|number_format }}</div>
+            <div class="forum__listing__entry__topics" title="Topics">{{ forum.forum_topic_count|number_format }}</div>
+            <div class="forum__listing__entry__posts" title="Posts">{{ forum.forum_post_count|number_format }}</div>
         </div>
 
         <div class="forum__listing__entry__activity">
@@ -129,11 +129,11 @@
         </div>
 
         <div class="forum__topics__entry__stats">
-            <div class="forum__topics__entry__stat forum__topics__entry__stat--posts">
-                {{ topic.topic_post_count }}
+            <div class="forum__topics__entry__stat forum__topics__entry__stat--posts" title="Posts">
+                {{ topic.topic_post_count|number_format }}
             </div>
-            <div class="forum__topics__entry__stat forum__topics__entry__stat--views">
-                {{ topic.topic_view_count }}
+            <div class="forum__topics__entry__stat forum__topics__entry__stat--views" title="Views">
+                {{ topic.topic_view_count|number_format }}
             </div>
         </div>
 
@@ -174,9 +174,32 @@
 {% macro forum_post_entry(post, is_opening_post) %}
     {% set is_opening_post = is_opening_post|default(false) %}
 
-    <div class="container" id="p{{ post.post_id }}">
-        <div class="container__content">
-            {{ post.post_text }}
+    <div class="forum__post" id="p{{ post.post_id }}">
+        <div class="forum__post__author">
+            <a class="forum__post__author__link" href="/profile.php?u=1">
+                <div
+                    class="avatar forum__post__author__avatar"
+                    style="background-image:url('/profile.php?u=1&amp;m=avatar');">
+                </div>
+                <div class="forum__post__author__username">me</div>
+            </a>
+            <div class="forum__post__author__joined">
+                joined ages ago
+            </div>
+        </div>
+
+        <div class="forum__post__content">
+            <div class="forum__post__content__info">
+                <a class="forum__post__content__info__link" href="/forum/topic.php?t={{ post.topic_id }}#p{{ post.post_id }}">
+                    {{ post.post_created }}
+                </a>
+                <a class="forum__post__content__info__link" href="/forum/topic.php?p={{ post.post_id }}#p{{ post.post_id }}">
+                    #{{ post.post_id }}
+                </a>
+            </div>
+            <div class="forum__post__content__text">
+                {{ post.post_text }}
+            </div>
         </div>
     </div>
 {% endmacro %}