Add link to microblog title in timeline

pradoslaw · Jan 30, 2024 · ae8e6b9 · ae8e6b9
1 parent 016a5a8
commit ae8e6b9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/resources/js/components/microblog/microblog.vue b/resources/js/components/microblog/microblog.vue
@@ -15,8 +15,12 @@
         <div class="media-body">
           <div class="d-flex flex-nowrap">
             <div class="flex-shrink-0 mr-auto">
-              <h5 class="media-heading"><vue-username :user="microblog.user"></vue-username></h5>
-
+              <h5 class="media-heading stand-alone" v-if="stand_alone">
+                <vue-username :user="microblog.user"></vue-username>
+              </h5>
+              <p class="media-heading" v-else>
+                <vue-username :user="microblog.user"/> dodał <b>wpis</b> na <a :href="microblog.url">mikroblogu</a>.
+              </p>
               <ul class="list-inline mb-0 list-inline-bullet-sm text-muted">
                 <li class="list-inline-item"><a :href="microblog.url" class="text-muted small"><vue-timeago :datetime="microblog.created_at"></vue-timeago></a></li>
                 <li class="list-inline-item small">{{ microblog.views }} {{ microblog.views | declination(['wyświetlenie', 'wyświetlenia', 'wyświetleń']) }}</li>
@@ -206,6 +210,9 @@
     @Prop()
     wrap!: boolean;
 
+    @Prop()
+    stand_alone!: boolean;
+
     mounted() {
       if (this.wrap && this.microblogText.clientHeight > 300) {
         this.isWrapped = true;

diff --git a/resources/sass/components/microblog/_microblog.scss b/resources/sass/components/microblog/_microblog.scss
@@ -9,9 +9,14 @@
     margin-bottom: 2px;
 
     a {
-      font-size: 16px;
       color: $link-color-darker;
     }
+
+    &.stand-alone {
+      a {
+        font-size: 16px;
+      }
+    }
   }
 
   textarea {
@@ -22,7 +27,7 @@
   }
 
   .media-body {
-    min-width: 0;  // thanks to this, text will not overflow its parent
+    min-width: 0; // thanks to this, text will not overflow its parent
   }
 }
 

diff --git a/resources/views/home.twig b/resources/views/home.twig
@@ -210,7 +210,7 @@
                 <i class="fas fa-shapes" v-if="activity.type === 'microblog'"></i>
               </div>
               <div class="body">
-                <vue-microblog v-if="activity.type === 'microblog'" :key="activity.id" :microblog="activity" :wrap="true"></vue-microblog>
+                <vue-microblog v-if="activity.type === 'microblog'" :key="activity.id" :microblog="activity" :wrap="true" :stand_alone="false"></vue-microblog>
                 <template v-else-if="activity.excerpt">
                   <div :class="['item', activity.type]">
                     <div class="d-flex">
@@ -234,7 +234,7 @@
             </a>
           </h4>
           <div v-for="microblog in microblogs">
-            <vue-microblog :key="microblog.id" :microblog="microblog" :wrap="true"></vue-microblog>
+            <vue-microblog :key="microblog.id" :microblog="microblog" :wrap="true" :old="true"></vue-microblog>
           </div>
           <div class="mt-3 mb-3 d-flex justify-content-center">
             <vue-pagination

diff --git a/resources/views/microblog/home.twig b/resources/views/microblog/home.twig
@@ -55,7 +55,7 @@
         </div>
       {% endif %}
 
-      <vue-microblog v-for="microblog in microblogs" :key="microblog.id" :microblog="microblog" :wrap="true"></vue-microblog>
+      <vue-microblog v-for="microblog in microblogs" :key="microblog.id" :microblog="microblog" :wrap="true" :stand_alone="true"></vue-microblog>
 
       <div class="mt-3 mb-3 d-flex justify-content-center">
         <vue-pagination :current-page="currentPage" :total-pages="totalPages" @change="changePage"></vue-pagination>

diff --git a/resources/views/microblog/view.twig b/resources/views/microblog/view.twig
@@ -7,7 +7,7 @@
 {% block container %}
   <div id="js-microblog" class="row">
     <div class="col-md-9">
-      <vue-microblog :microblog="microblog" :wrap="false"></vue-microblog>
+      <vue-microblog :microblog="microblog" :wrap="false" :stand_alone="true"></vue-microblog>
     </div>
     {% include 'microblog.aside' %}
     <vue-notifications position="bottom right"></vue-notifications>

diff --git a/resources/views/profile/partials/microblog.twig b/resources/views/profile/partials/microblog.twig
@@ -9,7 +9,7 @@
   </nav>
 
   <template v-if="microblogs.length > 0">
-    <vue-microblog v-for="microblog in microblogs" :key="microblog.id" :microblog="microblog" :wrap="true"></vue-microblog>
+    <vue-microblog v-for="microblog in microblogs" :key="microblog.id" :microblog="microblog" :wrap="true" :stand_alone="true"></vue-microblog>
   </template>
 
   <div v-else class="card card-default">