From 7e9501ab9dfb9a1e2a8ad6b30ff5a7b336b137fb Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 21:59:01 +0900 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E5=85=AC=E9=96=8B=E3=82=A2=E3=82=AB?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=88=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/components/profile.blade.php | 41 +++--- resources/views/ejaculation/show.blade.php | 8 +- resources/views/user/okazu.blade.php | 6 + resources/views/user/profile.blade.php | 134 ++++++++++--------- resources/views/user/stats.blade.php | 6 + 5 files changed, 114 insertions(+), 81 deletions(-) diff --git a/resources/views/components/profile.blade.php b/resources/views/components/profile.blade.php index e4f5185..405952a 100644 --- a/resources/views/components/profile.blade.php +++ b/resources/views/components/profile.blade.php @@ -1,23 +1,32 @@
-

{{ $user->display_name }}

-
@{{ $user->name }}
+

+ {{ $user->display_name }} +

+
+ @{{ $user->name }} + @if ($user->is_protected) + + @endif +
-
現在のセッション
- @if (isset($currentSession)) -

{{ $currentSession }}経過

-

({{ $latestEjaculation->ejaculated_date->format('Y/m/d H:i') }} にリセット)

- @else -

計測がまだ始まっていません

-

(一度チェックインすると始まります)

+ @if (!$user->is_protected) +
現在のセッション
+ @if (isset($currentSession)) +

{{ $currentSession }}経過

+

({{ $latestEjaculation->ejaculated_date->format('Y/m/d H:i') }} にリセット)

+ @else +

計測がまだ始まっていません

+

(一度チェックインすると始まります)

+ @endif + +
概況
+

平均記録: {{ Formatter::formatInterval($summary[0]->average) }}

+

最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}

+

最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}

+

合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}

+

通算回数: {{ $summary[0]->total_checkins }}回

@endif - -
概況
-

平均記録: {{ Formatter::formatInterval($summary[0]->average) }}

-

最長記録: {{ Formatter::formatInterval($summary[0]->longest) }}

-

最短記録: {{ Formatter::formatInterval($summary[0]->shortest) }}

-

合計時間: {{ Formatter::formatInterval($summary[0]->total_times) }}

-

通算回数: {{ $summary[0]->total_checkins }}回

\ No newline at end of file diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php index 37b3311..fe86916 100644 --- a/resources/views/ejaculation/show.blade.php +++ b/resources/views/ejaculation/show.blade.php @@ -8,7 +8,13 @@ @endcomponent
- @if ($ejaculation->is_private && !(Auth::check() && $user->id === Auth::user()->id)) + @if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id)) +
+
+ このユーザはチェックイン履歴を公開していません。 +
+
+ @elseif ($ejaculation->is_private && !(Auth::check() && $user->id === Auth::user()->id))
非公開チェックインのため、表示できません diff --git a/resources/views/user/okazu.blade.php b/resources/views/user/okazu.blade.php index 6bc8f66..b0ef760 100644 --- a/resources/views/user/okazu.blade.php +++ b/resources/views/user/okazu.blade.php @@ -1,4 +1,10 @@ @extends('user.base') @section('tab-content') +@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id)) +

+ このユーザはチェックイン履歴を公開していません。 +

+@else +@endif @endsection \ No newline at end of file diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index d76cef6..6df3dec 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -1,73 +1,79 @@ @extends('user.base') @section('tab-content') - + - + +@endif @component('components.modal', ['id' => 'deleteCheckinModal']) @slot('title') diff --git a/resources/views/user/stats.blade.php b/resources/views/user/stats.blade.php index 6bc8f66..b0ef760 100644 --- a/resources/views/user/stats.blade.php +++ b/resources/views/user/stats.blade.php @@ -1,4 +1,10 @@ @extends('user.base') @section('tab-content') +@if ($user->is_protected && !(Auth::check() && $user->id === Auth::user()->id)) +

+ このユーザはチェックイン履歴を公開していません。 +

+@else +@endif @endsection \ No newline at end of file