Merge branch 'release/5.3.3'

* release/5.3.3: fixes ui and the user model default
austintoddj · Mar 19, 2020 · b8cfe22 · b8cfe22
2 parents 9e834c6 + 8136115
commit b8cfe22
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=a1181bb11d92257655e6",
+    "/js/app.js": "/js/app.js?id=5ce98842c22b2f720178",
     "/css/app.css": "/css/app.css?id=48eae9fc081d95312ccd",
     "/css/app-dark.css": "/css/app-dark.css?id=96ccf9a9c90446210f79",
     "/favicon.ico": "/favicon.ico?id=f7a1a9d5196af323a9eb"

diff --git a/resources/js/screens/stats/StatsIndex.vue b/resources/js/screens/stats/StatsIndex.vue
@@ -90,13 +90,17 @@
                         </div>
                     </div>
 
-                    <div v-else class="mt-5">
-                        <p class="lead text-center text-muted mt-5 pt-5">
-                            {{ trans.app.you_have_no_published_posts }}
-                        </p>
-                        <p class="lead text-center text-muted mt-1">
-                            {{ trans.app.stats_are_made_available }}
-                        </p>
+                    <div v-else class="card shadow border-0 mt-5">
+                        <div class="card-body p-0">
+                            <div class="my-5">
+                                <p class="lead text-center text-muted mt-5">
+                                    {{ trans.app.you_have_no_published_posts }}
+                                </p>
+                                <p class="lead text-center text-muted mt-1">
+                                    {{ trans.app.stats_are_made_available }}
+                                </p>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

diff --git a/resources/js/screens/tags/TagsIndex.vue b/resources/js/screens/tags/TagsIndex.vue
@@ -45,8 +45,8 @@
                         <infinite-loading @infinite="fetchData" spinner="spiral">
                             <span slot="no-more"></span>
                             <div slot="no-results" class="text-left">
-                                <div class="mt-5">
-                                    <p class="lead text-center text-muted mt-5 pt-5">
+                                <div class="my-5">
+                                    <p class="lead text-center text-muted mt-5">
                                         {{ trans.app.you_have_no_tags }}
                                     </p>
                                     <p class="lead text-center text-muted mt-1">

diff --git a/resources/js/screens/topics/TopicsIndex.vue b/resources/js/screens/topics/TopicsIndex.vue
@@ -48,8 +48,8 @@
                         <infinite-loading @infinite="fetchData" spinner="spiral">
                             <span slot="no-more"></span>
                             <div slot="no-results" class="text-left">
-                                <div class="mt-5">
-                                    <p class="lead text-center text-muted mt-5 pt-5">
+                                <div class="my-5">
+                                    <p class="lead text-center text-muted mt-5">
                                         {{ trans.app.you_have_no_topics }}
                                     </p>
                                     <p class="lead text-center text-muted mt-1">

diff --git a/src/Post.php b/src/Post.php
@@ -118,7 +118,7 @@ public function topic()
      */
     public function user()
     {
-        return $this->belongsTo(config('canvas.user'));
+        return $this->belongsTo(config('canvas.user', \Illuminate\Foundation\Auth\User::class));
     }
 
     /**

diff --git a/src/UserMeta.php b/src/UserMeta.php
@@ -39,7 +39,7 @@ class UserMeta extends Model
      */
     public function user()
     {
-        return $this->belongsTo(config('canvas.user'));
+        return $this->belongsTo(config('canvas.user', \Illuminate\Foundation\Auth\User::class));
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,7 @@ public function topic() @@
          */
         public function user()
         {
-            return $this->belongsTo(config('canvas.user'));
+            return $this->belongsTo(config('canvas.user', \Illuminate\Foundation\Auth\User::class));
         }
         /**
@@ Expand Down @@