From 0e09b0fb74a716dc98c50ab827725ae163a6937d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 8 Apr 2019 15:53:00 +0200
Subject: [PATCH] fixed design differences between alpha & nitro - Post Page -
 [X] Title and Author Position reversed - [X] Design & Format of Post-Date +
 Position - [X] No Category Names - [X] Actions/Reactions & Tags reversed

---
 webapp/components/Category.vue         |  16 ++++
 webapp/components/RelativeDateTime.vue |  72 +++++++++++++++++
 webapp/components/Tag.vue              |  15 ++++
 webapp/components/User.vue             |  91 ++++++++-------------
 webapp/pages/post/_id/_slug/index.vue  | 108 +++++++++----------------
 5 files changed, 174 insertions(+), 128 deletions(-)
 create mode 100644 webapp/components/Category.vue
 create mode 100644 webapp/components/RelativeDateTime.vue
 create mode 100644 webapp/components/Tag.vue

diff --git a/webapp/components/Category.vue b/webapp/components/Category.vue
new file mode 100644
index 000000000..aa4eee877
--- /dev/null
+++ b/webapp/components/Category.vue
@@ -0,0 +1,16 @@
+<template>
+  <ds-tag>
+    <ds-icon size="large" :name="icon"/>
+    {{ name }}
+  </ds-tag>
+</template>
+
+<script>
+export default {
+  name: 'hc-category',
+  props: {
+    icon: { type: String },
+    name: { type: String }
+  }
+}
+</script>
diff --git a/webapp/components/RelativeDateTime.vue b/webapp/components/RelativeDateTime.vue
new file mode 100644
index 000000000..da5737d1d
--- /dev/null
+++ b/webapp/components/RelativeDateTime.vue
@@ -0,0 +1,72 @@
+<template>
+  <span :title="absoluteTime">{{ relativeDateTime }}</span>
+</template>
+
+<script>
+import moment from 'moment'
+
+export default {
+  name: 'hc-relative-date-time',
+  props: {
+    dateTime: {
+      type: [Date, String]
+    }
+  },
+  data() {
+    return {
+      relativeDateTime: null,
+      interval: 15000,
+      timeout: null,
+      absoluteTime: null
+    }
+  },
+  computed: {
+    locale() {
+      return this.$i18n.locale() || 'en'
+    }
+  },
+  watch: {
+    locale() {
+      this.calcRelativeDateTime()
+    },
+    dateTime(dateTime) {
+      this.calcRelativeDateTime()
+    }
+  },
+  methods: {
+    calcRelativeDateTime() {
+      clearTimeout(this.timeout)
+      let t = moment(this.dateTime).locale(this.locale)
+      this.absoluteTime = t.format('llll')
+
+      this.relativeDateTime = t.utc().fromNow()
+
+      if (!process.browser) {
+        return
+      }
+
+      if (
+        this.relativeDateTime ===
+        t
+          .add(this.interval, 'milliseconds')
+          .utc()
+          .fromNow()
+      ) {
+        this.interval += 15000
+      }
+      this.timeout = setTimeout(() => {
+        this.calcRelativeDateTime()
+      }, this.interval)
+    }
+  },
+  created() {
+    this.calcRelativeDateTime()
+  },
+  mounted() {
+    this.calcRelativeDateTime()
+  },
+  destroyed() {
+    clearTimeout(this.timeout)
+  }
+}
+</script>
diff --git a/webapp/components/Tag.vue b/webapp/components/Tag.vue
new file mode 100644
index 000000000..af2985b5f
--- /dev/null
+++ b/webapp/components/Tag.vue
@@ -0,0 +1,15 @@
+<template>
+  <ds-tag>
+    <ds-icon name="tag"/>
+    {{ name }}
+  </ds-tag>
+</template>
+
+<script>
+export default {
+  name: 'hc-tag',
+  props: {
+    name: { type: String }
+  }
+}
+</script>
diff --git a/webapp/components/User.vue b/webapp/components/User.vue
index dd176a67d..bd9189a06 100644
--- a/webapp/components/User.vue
+++ b/webapp/components/User.vue
@@ -1,39 +1,21 @@
 <template>
   <div v-if="!user || ((user.disabled || user.deleted) && !isModerator)">
-    <div style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;">
-      <ds-avatar
-        style="display: inline-block; vertical-align: middle;"
-        size="32px"
-      />
+    <div
+      style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;"
+    >
+      <ds-avatar style="display: inline-block; vertical-align: middle;" size="32px"/>
     </div>
     <div style="display: inline-block; height: 100%; vertical-align: middle;">
-      <b
-        class="username"
-        style="vertical-align: middle;"
-      >
-        Anonymus
-      </b>
+      <b class="username" style="vertical-align: middle;">Anonymus</b>
     </div>
   </div>
-  <dropdown
-    v-else
-    :class="{'disabled-content': user.disabled}"
-    placement="top-start"
-    offset="0"
-  >
-    <template
-      slot="default"
-      slot-scope="{openMenu, closeMenu, isOpen}"
-    >
-      <nuxt-link
-        :to="userLink"
-        :class="['user', isOpen && 'active']"
-      >
-        <div
-          @mouseover="openMenu(true)"
-          @mouseleave="closeMenu(true)"
-        >
-          <div style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;">
+  <dropdown v-else :class="{'disabled-content': user.disabled}" placement="top-start" offset="0">
+    <template slot="default" slot-scope="{openMenu, closeMenu, isOpen}">
+      <nuxt-link :to="userLink" :class="['user', isOpen && 'active']">
+        <div @mouseover="openMenu(true)" @mouseleave="closeMenu(true)">
+          <div
+            style="display: inline-block; float: left; margin-right: 4px;  height: 100%; vertical-align: middle;"
+          >
             <ds-avatar
               :image="user.avatar"
               :name="user.name"
@@ -45,21 +27,21 @@
             <b
               class="username"
               style="vertical-align: middle;"
-            >
-              {{ user.name | truncate(trunc, 18) }}
-            </b>
+            >{{ user.name | truncate(trunc, 18) }}</b>
+          </div>
+          <!-- Time -->
+          <div v-if="dateTime" style="display: inline;">
+            <ds-text align="right" size="small" color="soft">
+              <ds-icon name="clock"/>&nbsp;
+              <hc-relative-date-time :dateTime="dateTime"/>
+            </ds-text>
           </div>
         </div>
       </nuxt-link>
     </template>
-    <template
-      slot="popover"
-    >
+    <template slot="popover">
       <div style="min-width: 250px">
-        <hc-badges
-          v-if="user.badges && user.badges.length"
-          :badges="user.badges"
-        />
+        <hc-badges v-if="user.badges && user.badges.length" :badges="user.badges"/>
         <ds-text
           v-if="user.location"
           align="center"
@@ -68,18 +50,13 @@
           style="margin-top: 5px"
           bold
         >
-          <ds-icon name="map-marker" /> {{ user.location.name }}
+          <ds-icon name="map-marker"/>
+          {{ user.location.name }}
         </ds-text>
-        <ds-flex
-          style="margin-top: -10px"
-        >
+        <ds-flex style="margin-top: -10px">
           <ds-flex-item class="ds-tab-nav-item">
             <ds-space margin="small">
-              <ds-number
-                :count="fanCount"
-                :label="$t('profile.followers')"
-                size="x-large"
-              />
+              <ds-number :count="fanCount" :label="$t('profile.followers')" size="x-large"/>
             </ds-space>
           </ds-flex-item>
           <ds-flex-item class="ds-tab-nav-item ds-tab-nav-item-active">
@@ -99,11 +76,7 @@
             </ds-space>
           </ds-flex-item>
         </ds-flex>
-        <ds-flex
-          v-if="!itsMe"
-          gutter="x-small"
-          style="margin-bottom: 0;"
-        >
+        <ds-flex v-if="!itsMe" gutter="x-small" style="margin-bottom: 0;">
           <ds-flex-item :width="{base: 3}">
             <hc-follow-button
               :follow-id="user.id"
@@ -114,7 +87,7 @@
           </ds-flex-item>
           <ds-flex-item :width="{base: 1}">
             <ds-button fullwidth>
-              <ds-icon name="user-times" />
+              <ds-icon name="user-times"/>
             </ds-button>
           </ds-flex-item>
         </ds-flex>
@@ -125,21 +98,25 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+
+import HcRelativeDateTime from '~/components/RelativeDateTime.vue'
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcBadges from '~/components/Badges.vue'
 import Dropdown from '~/components/Dropdown'
-import { mapGetters } from 'vuex'
 
 export default {
   name: 'HcUser',
   components: {
+    HcRelativeDateTime,
     HcFollowButton,
     HcBadges,
     Dropdown
   },
   props: {
     user: { type: Object, default: null },
-    trunc: { type: Number, default: null }
+    trunc: { type: Number, default: null },
+    dateTime: { type: [Date, String], default: null }
   },
   computed: {
     ...mapGetters({
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 49340ae9b..6ac443187 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -1,15 +1,12 @@
 <template>
-  <transition
-    name="fade"
-    appear
-  >
+  <transition name="fade" appear>
     <ds-card
       v-if="post && ready"
       :image="post.image"
-      :header="post.title"
       :class="{'post-card': true, 'disabled-content': post.disabled}"
     >
-      <hc-user :user="post.author" />
+      <ds-space margin-bottom="small"/>
+      <hc-user :user="post.author" :dateTime="post.createdAt"/>
       <no-ssr>
         <content-menu
           placement="bottom-end"
@@ -18,27 +15,33 @@
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
-      <ds-space margin-bottom="small" />
+      <ds-space margin-bottom="small"/>
+      <ds-heading tag="h3" no-margin>{{ post.title }}</ds-heading>
+      <ds-space margin-bottom="small"/>
       <!-- Content -->
       <!-- eslint-disable vue/no-v-html -->
       <!-- TODO: replace editor content with tiptap render view -->
-      <div
-        class="content hc-editor-content"
-        v-html="post.content"
-      />
-      <ds-space>
-        <ds-text
-          v-if="post.createdAt"
-          align="right"
-          size="small"
-          color="soft"
-        >
-          {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
-        </ds-text>
-      </ds-space>
+      <div class="content hc-editor-content" v-html="post.content"/>
       <!-- eslint-enable vue/no-v-html -->
+      <ds-space margin="xx-large"/>
+      <!-- Categories -->
+      <div class="categories">
+        <ds-space margin="xx-small"/>
+        <hc-category
+          v-for="category in post.categories"
+          v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
+          :key="category.id"
+          :icon="category.icon"
+          :name="category.name"
+        />
+      </div>
+      <ds-space margin-bottom="small"/>
+      <!-- Tags -->
+      <div class="tags" v-if="post.tags && post.tags.length">
+        <ds-space margin="xx-small"/>
+        <hc-tag v-for="tag in post.tags" :key="tag.id" :name="tag.name"/>
+      </div>
       <!-- Shout Button -->
-      <ds-space margin="xx-large" />
       <hc-shout-button
         v-if="post.author"
         :disabled="isAuthor(post.author.id)"
@@ -46,68 +49,26 @@
         :is-shouted="post.shoutedByCurrentUser"
         :post-id="post.id"
       />
-      <!-- Categories -->
-      <ds-icon
-        v-for="category in post.categories"
-        :key="category.id"
-        v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
-        :name="category.icon"
-        size="large"
-      />&nbsp;
-      <ds-space margin-bottom="small" />
-      <!--<div class="tags">
-      <ds-icon name="compass" /> <ds-tag
-        v-for="category in post.categories"
-        :key="category.id"
-      >
-        {{ category.name }}
-      </ds-tag>
-    </div>-->
-      <!-- Tags -->
-      <template v-if="post.tags && post.tags.length">
-        <ds-space margin="xx-small" />
-        <div class="tags">
-          <ds-icon name="tags" /> <ds-tag
-            v-for="tag in post.tags"
-            :key="tag.id"
-          >
-            <ds-icon name="tag" /> {{ tag.name }}
-          </ds-tag>
-        </div>
-      </template>
-      <ds-space margin="small" />
+      <ds-space margin="small"/>
       <!-- Comments -->
       <ds-section slot="footer">
         <h3 style="margin-top: 0;">
           <span>
-            <ds-icon name="comments" />
+            <ds-icon name="comments"/>
             <ds-tag
               v-if="post.comments"
               style="margin-top: -4px; margin-left: -12px; position: absolute;"
               color="primary"
               size="small"
               round
-            >
-              {{ post.commentsCount }}
-            </ds-tag> &nbsp; Comments
+            >{{ post.commentsCount }}</ds-tag>&nbsp; Comments
           </span>
         </h3>
-        <ds-space margin-bottom="large" />
-        <div
-          v-if="post.comments"
-          id="comments"
-          class="comments"
-        >
-          <comment
-            v-for="comment in post.comments"
-            :key="comment.id"
-            :comment="comment"
-          />
+        <ds-space margin-bottom="large"/>
+        <div v-if="post.comments" id="comments" class="comments">
+          <comment v-for="comment in post.comments" :key="comment.id" :comment="comment"/>
         </div>
-        <hc-empty
-          v-else
-          icon="messages"
-        />
+        <hc-empty v-else icon="messages"/>
       </ds-section>
     </ds-card>
   </transition>
@@ -115,6 +76,9 @@
 
 <script>
 import gql from 'graphql-tag'
+
+import HcCategory from '~/components/Category.vue'
+import HcTag from '~/components/Tag.vue'
 import ContentMenu from '~/components/ContentMenu'
 import HcUser from '~/components/User.vue'
 import HcShoutButton from '~/components/ShoutButton.vue'
@@ -127,6 +91,8 @@ export default {
     mode: 'out-in'
   },
   components: {
+    HcTag,
+    HcCategory,
     HcUser,
     HcShoutButton,
     HcEmpty,