Merge pull request #536 from shikorism/fix/degrade-show-checkin

チェックイン個別ページのユーザープロフィールが半分消えているのを修正

resources/views/components/profile-bio.blade.php

@@ -0,0 +1,20 @@
+@if (!empty($user->bio) || !empty($user->url))
+    <div class="card mb-4">
+        <div class="card-body">
+            {{-- Bio --}}
+            @if (!empty($user->bio))
+                <p class="card-text mb-0">
+                    {!! Formatter::linkify(nl2br(e($user->bio))) !!}
+                </p>
+            @endif
+
+            {{-- URL --}}
+            @if (!empty($user->url))
+                <p class="card-text d-flex mt-3">
+                    <span class="oi oi-link-intact mr-1 mt-1"></span>
+                    <a href="{{ $user->url }}" rel="me nofollow noopener" target="_blank" class="text-truncate">{{ preg_replace('~\Ahttps?://~', '', $user->url) }}</a>
+                </p>
+            @endif
+        </div>
+    </div>
+@endif

resources/views/components/profile.blade.php

@@ -1,23 +1,32 @@
-@if (!empty($user->bio) || !empty($user->url))
-    <div class="card mb-4">
-        <div class="card-body">
-            {{-- Bio --}}
-            @if (!empty($user->bio))
-                <p class="card-text mb-0">
-                    {!! Formatter::linkify(nl2br(e($user->bio))) !!}
-                </p>
+<div class="card mb-4">
+    <div class="card-body">
+        <img src="{{ $user->getProfileImageUrl(128) }}" srcset="{{ Formatter::profileImageSrcSet($user, 128) }}" class="rounded mb-1">
+        <h4 class="card-title">
+            <a class="text-dark" href="{{ route('user.profile', ['name' => $user->name]) }}">{{ $user->display_name }}</a>
+        </h4>
+        <h6 class="card-subtitle">
+            <a class="text-muted font-weight-normal" href="{{ route('user.profile', ['name' => $user->name]) }}">&commat;{{ $user->name }}</a>
+            @if ($user->is_protected)
+                <span class="oi oi-lock-locked text-muted"></span>
             @endif
+        </h6>
 
-            {{-- URL --}}
-            @if (!empty($user->url))
-                <p class="card-text d-flex mt-3">
-                    <span class="oi oi-link-intact mr-1 mt-1"></span>
-                    <a href="{{ $user->url }}" rel="me nofollow noopener" target="_blank" class="text-truncate">{{ preg_replace('~\Ahttps?://~', '', $user->url) }}</a>
-                </p>
-            @endif
-        </div>
+        {{-- Bio --}}
+        @if (!empty($user->bio))
+            <p class="card-text mt-3 mb-0">
+                {!! Formatter::linkify(nl2br(e($user->bio))) !!}
+            </p>
+        @endif
+
+        {{-- URL --}}
+        @if (!empty($user->url))
+            <p class="card-text d-flex mt-3">
+                <span class="oi oi-link-intact mr-1 mt-1"></span>
+                <a href="{{ $user->url }}" rel="me nofollow noopener" target="_blank" class="text-truncate">{{ preg_replace('~\Ahttps?://~', '', $user->url) }}</a>
+            </p>
+        @endif
     </div>
-@endif
+</div>
 
 @if (!$user->is_protected || $user->isMe())
     <div class="card mb-4">

resources/views/user/base.blade.php

@@ -34,10 +34,6 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-4">
-                @if (Route::currentRouteName() === 'user.profile')
-                    @component('components.profile', ['user' => $user])
-                    @endcomponent
-                @endif
                 @section('sidebar')
                 @show
             </div>

resources/views/user/profile.blade.php

@@ -11,6 +11,8 @@
 @section('sidebar')
     {{-- TODO: タイムラインとオカズのテンプレを分けたら条件外す --}}
     @if (Route::currentRouteName() === 'user.profile')
+    @component('components.profile-bio', ['user' => $user])
+    @endcomponent
     @if (!empty($tags) && (!$user->is_protected || $user->isMe()))
         <div class="card mb-4">
             <div class="card-header">