プロフィールの左カラムにある情報に関する処理をリファクタリング

resources/views/user/base.blade.php

@@ -4,29 +4,8 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-4">
-                <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>
-
-                        <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">({{ $ejaculations[0]['ejaculated_date'] }} にリセット)</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>
+                @component('components.profile', ['user' => $user])
+                @endcomponent
             </div>
             <div class="col-lg-8">
                 <ul class="nav nav-tabs">

resources/views/user/okazu.blade.php

@@ -0,0 +1,4 @@
+@extends('user.base')
+
+@section('tab-content')
+@endsection

resources/views/user/profile.blade.php

@@ -6,18 +6,18 @@
         <li class="list-group-item border-bottom-only pt-3 pb-3">
             <!-- span -->
             <div class="d-flex justify-content-between">
-                <h5>{{ $ejaculation['ejaculated_span'] ?? '精通' }} <small class="text-muted">{{ $ejaculation['before_date'] }}{{ !empty($ejaculation['before_date']) ? ' ～ ' : '' }}{{ $ejaculation['ejaculated_date'] }}</small></h5>
+                <h5>{{ $ejaculation->ejaculated_span ?? '精通' }} <small class="text-muted">{{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></h5>
                 @if ($user->id === Auth::user()->id)
                 <div>
                     <a class="text-secondary timeline-action-item" href="#"><span class="oi oi-pencil" data-toggle="tooltip" data-placement="bottom" title="修正"></span></a>
-                    <a class="text-secondary timeline-action-item" href="#" data-toggle="modal" data-target="#deleteCheckinModal" data-id="{{ $ejaculation['id'] }}" data-date="{{ $ejaculation['ejaculated_date'] }}"><span class="oi oi-trash" data-toggle="tooltip" data-placement="bottom" title="削除"></span></a>
+                    <a class="text-secondary timeline-action-item" href="#" data-toggle="modal" data-target="#deleteCheckinModal" data-id="{{ $ejaculation->id }}" data-date="{{ $ejaculation->ejaculated_date }}"><span class="oi oi-trash" data-toggle="tooltip" data-placement="bottom" title="削除"></span></a>
                 </div>
                 @endif
             </div>
             <!-- tags -->
-            @if ($ejaculation['is_private']) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}}
+            @if ($ejaculation->is_private) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}}
                 <p class="mb-2">
-                    @if ($ejaculation['is_private'])
+                    @if ($ejaculation->is_private)
                         <span class="badge badge-warning"><span class="oi oi-lock-locked"></span> 非公開</span>
                     @endif
                     {{--
@@ -39,9 +39,9 @@
             </div>
             --}}
             <!-- note -->
-            @if (!empty($ejaculation['note']))
+            @if (!empty($ejaculation->note))
                 <p class="mb-0">
-                    {!! Formatter::linkify(nl2br(e($ejaculation['note']))) !!}
+                    {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                 </p>
             @endif
         </li>

resources/views/user/stats.blade.php

@@ -0,0 +1,4 @@
+@extends('user.base')
+
+@section('tab-content')
+@endsection