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

This commit is contained in:
shibafu 2020-10-25 17:22:04 +09:00
parent 41c7679423
commit 076e7d5d0d
4 changed files with 48 additions and 21 deletions

View File

@ -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

View File

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

View File

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

View File

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