非公開アカウント対応

This commit is contained in:
shibafu 2017-11-05 21:59:01 +09:00
parent d0c9e3a3af
commit 7e9501ab9d
5 changed files with 114 additions and 81 deletions

View File

@ -1,10 +1,18 @@
<div class="card mb-4">
<div class="card-body">
<img src="{{ $user->getProfileImageUrl(64) }}" 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 mb-4"><a class="text-muted" href="{{ route('user.profile', ['name' => $user->name]) }}">&commat;{{ $user->name }}</a></h6>
<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" 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>
<h6 class="font-weight-bold"><span class="oi oi-timer"></span> 現在のセッション</h6>
@if (!$user->is_protected)
<h6 class="font-weight-bold mt-4"><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>
@ -19,5 +27,6 @@
<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>
@endif
</div>
</div>

View File

@ -8,7 +8,13 @@
@endcomponent
</div>
<div class="col-lg-8">
@if ($ejaculation->is_private && !(Auth::check() && $user->id === Auth::user()->id))
@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id))
<div class="card">
<div class="card-body">
<span class="oi oi-lock-locked"></span> このユーザはチェックイン履歴を公開していません。
</div>
</div>
@elseif ($ejaculation->is_private && !(Auth::check() && $user->id === Auth::user()->id))
<div class="card">
<div class="card-body">
<span class="oi oi-lock-locked"></span> 非公開チェックインのため、表示できません

View File

@ -1,4 +1,10 @@
@extends('user.base')
@section('tab-content')
@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id))
<p class="mt-4">
<span class="oi oi-lock-locked"></span> このユーザはチェックイン履歴を公開していません。
</p>
@else
@endif
@endsection

View File

@ -1,7 +1,12 @@
@extends('user.base')
@section('tab-content')
<ul class="list-group">
@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id))
<p class="mt-4">
<span class="oi oi-lock-locked"></span> このユーザはチェックイン履歴を公開していません。
</p>
@else
<ul class="list-group">
@forelse ($ejaculations as $ejaculation)
<li class="list-group-item border-bottom-only pt-3 pb-3">
<!-- span -->
@ -50,8 +55,8 @@
<p>まだチェックインしていません。</p>
</li>
@endforelse
</ul>
<ul class="pagination mt-4 justify-content-center">
</ul>
<ul class="pagination mt-4 justify-content-center">
<li class="page-item {{ $ejaculations->currentPage() === 1 ? 'disabled' : '' }}">
<a class="page-link" href="{{ $ejaculations->previousPageUrl() }}" aria-label="Previous">
<span aria-hidden="true">&laquo;</span>
@ -67,7 +72,8 @@
<span class="sr-only">Next</span>
</a>
</li>
</ul>
</ul>
@endif
@component('components.modal', ['id' => 'deleteCheckinModal'])
@slot('title')

View File

@ -1,4 +1,10 @@
@extends('user.base')
@section('tab-content')
@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id))
<p class="mt-4">
<span class="oi oi-lock-locked"></span> このユーザはチェックイン履歴を公開していません。
</p>
@else
@endif
@endsection