pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ホームで表示する自身の情報と、ユーザーページで表示するプロフィール情報を別のものにした

Browse Source
This commit is contained in:
shibafu 2019-02-07 00:52:03 +09:00
parent 41e810c788
commit 1f7723614d
5 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/ViewComposers/ProfileComposer.php → app/Http/ViewComposers/ProfileStatsComposer.php
View File

@ -7,7 +7,7 @@ use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\View\View; use Illuminate\View\View;
class ProfileComposer class ProfileStatsComposer
{ {
public function __construct() public function __construct()
{ {

4
app/Providers/ViewComposerServiceProvider.php
View File

@ -2,7 +2,7 @@
namespace App\Providers; namespace App\Providers;
use App\Http\ViewComposers\ProfileComposer; use App\Http\ViewComposers\ProfileStatsComposer;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
@ -15,7 +15,7 @@ class ViewComposerServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
View::composer('components.profile', ProfileComposer::class); View::composer('components.profile-stats', ProfileStatsComposer::class);
} }
/** /**

15
resources/views/components/profile-stats.blade.php Normal file
View File

@ -0,0 +1,15 @@
<h6 class="font-weight-bold"><span class="oi oi-timer"></span> 現在のセッション</h6>
@if (isset($currentSession))
<p class="card-text mb-0">{{ $currentSession }}経過</p>
<p class="card-text">({{ $latestEjaculation->ejaculated_date->format('Y/m/d H:i') }} にリセット)</p>
@else
<p class="card-text mb-0">計測がまだ始まっていません</p>
<p class="card-text">(一度チェックインすると始まります)</p>
@endif
<h6 class="font-weight-bold"><span class="oi oi-graph"></span> 概況</h6>
<p class="card-text mb-0">平均記録: {{ Formatter::formatInterval($summary[0]->average) }}</p>
<p class="card-text mb-0">最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}</p>
<p class="card-text mb-0">最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}</p>
<p class="card-text mb-0">合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}</p>
<p class="card-text">通算回数: {{ $summary[0]->total_checkins }}回</p>

41
resources/views/components/profile.blade.php
View File

@ -1,19 +1,15 @@
<div class="card mb-4"> <div class="card mb-4">
<div class="card-body"> <div class="card-body">
<div class="d-flex flex-row align-items-end"> <img src="{{ $user->getProfileImageUrl(128) }}" class="rounded mb-1">
<img src="{{ $user->getProfileImageUrl(64) }}" class="rounded mr-2"> <h4 class="card-title">
<div class="d-flex flex-column overflow-hidden"> <a class="text-dark" href="{{ route('user.profile', ['name' => $user->name]) }}">{{ $user->display_name }}</a>
<h4 class="card-title @if (Route::currentRouteName() === 'home') text-truncate @endif"> </h4>
<a class="text-dark" href="{{ route('user.profile', ['name' => $user->name]) }}">{{ $user->display_name }}</a> <h6 class="card-subtitle">
</h4> <a class="text-muted" href="{{ route('user.profile', ['name' => $user->name]) }}">&commat;{{ $user->name }}</a>
<h6 class="card-subtitle"> @if ($user->is_protected)
<a class="text-muted" href="{{ route('user.profile', ['name' => $user->name]) }}">&commat;{{ $user->name }}</a> <span class="oi oi-lock-locked text-muted"></span>
@if ($user->is_protected) @endif
<span class="oi oi-lock-locked text-muted"></span> </h6>
@endif
</h6>
</div>
</div>
{{-- Bio --}} {{-- Bio --}}
@if (!empty($user->bio)) @if (!empty($user->bio))
@ -35,21 +31,8 @@
@if (!$user->is_protected || $user->isMe()) @if (!$user->is_protected || $user->isMe())
<div class="card mb-4"> <div class="card mb-4">
<div class="card-body"> <div class="card-body">
<h6 class="font-weight-bold"><span class="oi oi-timer"></span> 現在のセッション</h6> @component('components.profile-stats', ['user' => $user])
@if (isset($currentSession)) @endcomponent
<p class="card-text mb-0">{{ $currentSession }}経過</p>
<p class="card-text">({{ $latestEjaculation->ejaculated_date->format('Y/m/d H:i') }} にリセット)</p>
@else
<p class="card-text mb-0">計測がまだ始まっていません</p>
<p class="card-text">(一度チェックインすると始まります)</p>
@endif
<h6 class="font-weight-bold"><span class="oi oi-graph"></span> 概況</h6>
<p class="card-text mb-0">平均記録: {{ Formatter::formatInterval($summary[0]->average) }}</p>
<p class="card-text mb-0">最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}</p>
<p class="card-text mb-0">最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}</p>
<p class="card-text mb-0">合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}</p>
<p class="card-text">通算回数: {{ $summary[0]->total_checkins }}回</p>
</div> </div>
</div> </div>
@endif @endif

22
resources/views/home.blade.php
View File

@ -7,8 +7,26 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
@component('components.profile', ['user' => Auth::user()]) <div class="card mb-4">
@endcomponent <div class="card-body">
<div class="d-flex flex-row align-items-end mb-4">
<img src="{{ Auth::user()->getProfileImageUrl(48) }}" class="rounded mr-2">
<div class="d-flex flex-column overflow-hidden">
<h5 class="card-title text-truncate">
<a class="text-dark" href="{{ route('user.profile', ['name' => Auth::user()->name]) }}">{{ Auth::user()->display_name }}</a>
</h5>
<h6 class="card-subtitle">
<a class="text-muted" href="{{ route('user.profile', ['name' => Auth::user()->name]) }}">&commat;{{ Auth::user()->name }}</a>
@if (Auth::user()->is_protected)
<span class="oi oi-lock-locked text-muted"></span>
@endif
</h6>
</div>
</div>
@component('components.profile-stats', ['user' => Auth::user()])
@endcomponent
</div>
</div>
</div> </div>
<div class="col-lg-8"> <div class="col-lg-8">
<div class="card mb-4"> <div class="card mb-4">