Merge pull request #89 from shikorism/feature/home-v2

ホーム画面の微リニューアル

app/Http/Controllers/HomeController.php

@@ -36,6 +36,31 @@ class HomeController extends Controller
         $categories = Information::CATEGORIES;
 
         if (Auth::check()) {
+            // チェックイン動向グラフ用のデータ取得
+            $groupByDay = Ejaculation::select(DB::raw(
+                <<<'SQL'
+to_char(ejaculated_date, 'YYYY/MM/DD') AS "date",
+count(*) AS "count"
+SQL
+            ))
+                ->join('users', function ($join) {
+                    $join->on('users.id', '=', 'ejaculations.user_id')
+                        ->where('users.accept_analytics', true);
+                })
+                ->where('ejaculated_date', '>=', now()->subDays(14))
+                ->groupBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')"))
+                ->orderBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')"))
+                ->get()
+                ->mapWithKeys(function ($item) {
+                    return [$item['date'] => $item['count']];
+                });
+            $globalEjaculationCounts = [];
+            $day = Carbon::now()->subDays(29);
+            for ($i = 0; $i < 30; $i++) {
+                $globalEjaculationCounts[$day->format('Y/m/d') . ' の総チェックイン数'] = $groupByDay[$day->format('Y/m/d')] ?? 0;
+                $day->addDay();
+            }
+
             // お惣菜コーナー用のデータ取得
             $publicLinkedEjaculations = Ejaculation::join('users', 'users.id', '=', 'ejaculations.user_id')
                 ->where('users.is_protected', false)
@@ -47,7 +72,7 @@ class HomeController extends Controller
                 ->take(10)
                 ->get();
 
-            return view('home')->with(compact('informations', 'categories', 'publicLinkedEjaculations'));
+            return view('home')->with(compact('informations', 'categories', 'globalEjaculationCounts', 'publicLinkedEjaculations'));
         } else {
             return view('guest')->with(compact('informations', 'categories'));
         }

public/css/tissue.css

@@ -24,6 +24,16 @@
     transition: filter .15s liner;
 }
 
+.list-group-item.no-side-border {
+    border-left: none;
+    border-right: none;
+    border-radius: 0;
+}
+
+.list-group-item.border-bottom-only:first-child {
+    border-top: none;
+}
+
 .list-group-item.border-bottom-only {
     border-left: none;
     border-right: none;
@@ -36,4 +46,15 @@
 
 .timeline-action-item {
     margin-left: 16px;
+}
+
+.tis-global-count-graph {
+    height: 90px;
+    border-bottom: 1px solid rgba(0, 0, 0, .125);
+}
+
+@media (min-width: 992px) {
+    .tis-sidebar-info {
+        font-size: small;
+    }
 }

public/js/tissue.js

@@ -0,0 +1,49 @@
+// app.jsの名はモジュールバンドラーを投入する日まで予約しておく。CSSも同じ。
+
+(function ($) {
+
+    $.fn.linkCard = function (options) {
+        var settings = $.extend({
+            endpoint: '/api/checkin/card'
+        }, options);
+
+        return this.each(function () {
+            var $this = $(this);
+            $.ajax({
+                url: settings.endpoint,
+                method: 'get',
+                type: 'json',
+                data: {
+                    url: $this.find('a').attr('href')
+                }
+            }).then(function (data) {
+                var $title = $this.find('.card-title');
+                var $desc = $this.find('.card-text');
+                var $image = $this.find('img');
+
+                if (data.title === '') {
+                    $title.hide();
+                } else {
+                    $title.text(data.title);
+                }
+
+                if (data.description === '') {
+                    $desc.hide();
+                } else {
+                    $desc.text(data.description);
+                }
+
+                if (data.image === '') {
+                    $image.hide();
+                } else {
+                    $image.attr('src', data.image);
+                }
+
+                if (data.title !== '' || data.description !== '' || data.image !== '') {
+                    $this.removeClass('d-none');
+                }
+            });
+        });
+    };
+
+})(jQuery);

resources/views/ejaculation/show.blade.php

@@ -112,42 +112,8 @@
             form.submit();
         });
 
-        $('.link-card').each(function () {
-            var $this = $(this);
-            $.ajax({
-                url: '{{ url('/api/checkin/card') }}',
-                method: 'get',
-                type: 'json',
-                data: {
-                    url: $this.find('a').attr('href')
-                }
-            }).then(function (data) {
-                var $title = $this.find('.card-title');
-                var $desc = $this.find('.card-text');
-                var $image = $this.find('img');
-
-                if (data.title === '') {
-                    $title.hide();
-                } else {
-                    $title.text(data.title);
-                }
-
-                if (data.description === '') {
-                    $desc.hide();
-                } else {
-                    $desc.text(data.description);
-                }
-
-                if (data.image === '') {
-                    $image.hide();
-                } else {
-                    $image.attr('src', data.image);
-                }
-
-                if (data.title !== '' || data.description !== '' || data.image !== '') {
-                    $this.removeClass('d-none');
-                }
-            });
+        $('.link-card').linkCard({
+            endpoint: '{{ url('/api/checkin/card') }}'
         });
     </script>
 @endpush

resources/views/home.blade.php

@@ -27,120 +27,122 @@
                     @endcomponent
                 </div>
             </div>
-        </div>
-        <div class="col-lg-8">
             <div class="card mb-4">
                 <div class="card-header">サイトからのお知らせ</div>
-                <div class="list-group list-group-flush">
+                <div class="list-group list-group-flush tis-sidebar-info">
                     @foreach($informations as $info)
                         <a class="list-group-item" href="{{ route('info.show', ['id' => $info->id]) }}">
-                        @if ($info->pinned)
-                            <span class="badge badge-secondary"><span class="oi oi-pin"></span>ピン留め</span>
-                        @endif
+                            @if ($info->pinned)
+                                <span class="badge badge-secondary"><span class="oi oi-pin"></span>ピン留め</span>
+                            @endif
                             <span class="badge {{ $categories[$info->category]['class'] }}">{{ $categories[$info->category]['label'] }}</span> {{ $info->title }} <small class="text-secondary">- {{ $info->created_at->format('n月j日') }}</small>
                         </a>
                     @endforeach
                     <a href="{{ route('info') }}" class="list-group-item text-right">お知らせ一覧 &raquo;</a>
                 </div>
             </div>
-            @if (!empty($publicLinkedEjaculations))
-                <div class="card mb-4">
-                    <div class="card-header">お惣菜コーナー</div>
-                    <div class="card-body">
-                        <p class="card-text">最近の公開チェックインから、オカズリンク付きのものを表示しています。</p>
-                    </div>
-                    <ul class="list-group list-group-flush">
-                        @foreach ($publicLinkedEjaculations as $ejaculation)
-                            <li class="list-group-item pt-3 pb-3">
-                                <!-- span -->
-                                <div class="d-flex justify-content-between">
-                                    <h5>
-                                        <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> {{ $ejaculation->user->display_name }}</a>
-                                        <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a>
-                                    </h5>
-                                    <div>
-                                        <a class="text-secondary timeline-action-item" href="{{ route('checkin', ['link' => $ejaculation->link, 'tags' => $ejaculation->textTags()]) }}"><span class="oi oi-reload" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン"></span></a>
-                                    </div>
-                                </div>
-                                <!-- tags -->
-                                @if ($ejaculation->tags->isNotEmpty())
-                                    <p class="mb-2">
-                                        @foreach ($ejaculation->tags as $tag)
-                                            <a class="badge badge-secondary" href="{{ route('search', ['q' => $tag->name]) }}"><span class="oi oi-tag"></span> {{ $tag->name }}</a>
-                                        @endforeach
-                                    </p>
-                                @endif
-                                <!-- okazu link -->
-                                @if (!empty($ejaculation->link))
-                                    <div class="row mx-0">
-                                        <div class="card link-card mb-2 px-0 col-12 col-md-6 d-none" style="font-size: small;">
-                                            <a class="text-dark card-link" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">
-                                                <img src="" alt="Thumbnail" class="card-img-top bg-secondary">
-                                                <div class="card-body">
-                                                    <h6 class="card-title font-weight-bold">タイトル</h6>
-                                                    <p class="card-text">コンテンツの説明文</p>
-                                                </div>
-                                            </a>
-                                        </div>
-                                        <p class="d-flex align-items-baseline mb-2 col-12 px-0">
-                                            <span class="oi oi-link-intact mr-1"></span><a class="overflow-hidden" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">{{ $ejaculation->link }}</a>
-                                        </p>
-                                    </div>
-                                @endif
-                                <!-- note -->
-                                @if (!empty($ejaculation->note))
-                                    <p class="mb-0 tis-word-wrap">
-                                        {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
-                                    </p>
-                                @endif
-                            </li>
-                        @endforeach
-                    </ul>
+        </div>
+        <div class="col-lg-8">
+            @if (!empty($globalEjaculationCounts))
+                <h5>チェックインの動向</h5>
+                <div class="w-100 mb-4 position-relative tis-global-count-graph">
+                    <canvas id="global-count-graph"></canvas>
                 </div>
             @endif
+            @if (!empty($publicLinkedEjaculations))
+                <h5 class="mb-3">お惣菜コーナー</h5>
+                <p class="text-secondary">最近の公開チェックインから、オカズリンク付きのものを表示しています。</p>
+                <ul class="list-group">
+                    @foreach ($publicLinkedEjaculations as $ejaculation)
+                        <li class="list-group-item no-side-border pt-3 pb-3 tis-word-wrap">
+                            <!-- span -->
+                            <div class="d-flex justify-content-between">
+                                <h5>
+                                    <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> {{ $ejaculation->user->display_name }}</a>
+                                    <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a>
+                                </h5>
+                                <div>
+                                    <a class="text-secondary timeline-action-item" href="{{ route('checkin', ['link' => $ejaculation->link, 'tags' => $ejaculation->textTags()]) }}"><span class="oi oi-reload" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン"></span></a>
+                                </div>
+                            </div>
+                            <!-- tags -->
+                            @if ($ejaculation->tags->isNotEmpty())
+                                <p class="mb-2">
+                                    @foreach ($ejaculation->tags as $tag)
+                                        <a class="badge badge-secondary" href="{{ route('search', ['q' => $tag->name]) }}"><span class="oi oi-tag"></span> {{ $tag->name }}</a>
+                                    @endforeach
+                                </p>
+                            @endif
+                            <!-- okazu link -->
+                            @if (!empty($ejaculation->link))
+                                <div class="row mx-0">
+                                    <div class="card link-card mb-2 px-0 col-12 col-md-6 d-none" style="font-size: small;">
+                                        <a class="text-dark card-link" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">
+                                            <img src="" alt="Thumbnail" class="card-img-top bg-secondary">
+                                            <div class="card-body">
+                                                <h6 class="card-title font-weight-bold">タイトル</h6>
+                                                <p class="card-text">コンテンツの説明文</p>
+                                            </div>
+                                        </a>
+                                    </div>
+                                    <p class="d-flex align-items-baseline mb-2 col-12 px-0">
+                                        <span class="oi oi-link-intact mr-1"></span><a class="overflow-hidden" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">{{ $ejaculation->link }}</a>
+                                    </p>
+                                </div>
+                            @endif
+                            <!-- note -->
+                            @if (!empty($ejaculation->note))
+                                <p class="mb-0 tis-word-wrap">
+                                    {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
+                                </p>
+                            @endif
+                        </li>
+                    @endforeach
+                </ul>
+            @endif
         </div>
     </div>
 </div>
 @endsection
 
 @push('script')
+    <script type="text/javascript" src="//cdn.jsdelivr.net/npm/chart.js@2.7.1/dist/Chart.min.js"></script>
     <script>
-        $('.link-card').each(function () {
-            var $this = $(this);
-            $.ajax({
-                url: '{{ url('/api/checkin/card') }}',
-                method: 'get',
-                type: 'json',
-                data: {
-                    url: $this.find('a').attr('href')
-                }
-            }).then(function (data) {
-                var $title = $this.find('.card-title');
-                var $desc = $this.find('.card-text');
-                var $image = $this.find('img');
+        $('.link-card').linkCard({
+            endpoint: '{{ url('/api/checkin/card') }}'
+        });
 
-                if (data.title === '') {
-                    $title.hide();
-                } else {
-                    $title.text(data.title);
+        new Chart(document.getElementById('global-count-graph').getContext('2d'), {
+            type: 'bar',
+            data: {
+                labels: @json(array_keys($globalEjaculationCounts)),
+                datasets: [{
+                    data: @json(array_values($globalEjaculationCounts)),
+                    backgroundColor: 'rgba(0, 0, 0, .1)',
+                    borderColor: 'rgba(0, 0, 0, .25)',
+                    borderWidth: 1
+                }]
+            },
+            options: {
+                maintainAspectRatio: false,
+                legend: {
+                    display: false
+                },
+                elements: {
+                    line: {}
+                },
+                scales: {
+                    xAxes: [{
+                        display: false
+                    }],
+                    yAxes: [{
+                        display: false,
+                        ticks: {
+                            beginAtZero: true
+                        }
+                    }]
                 }
-
-                if (data.description === '') {
-                    $desc.hide();
-                } else {
-                    $desc.text(data.description);
-                }
-
-                if (data.image === '') {
-                    $image.hide();
-                } else {
-                    $image.attr('src', data.image);
-                }
-
-                if (data.title !== '' || data.description !== '' || data.image !== '') {
-                    $this.removeClass('d-none');
-                }
-            });
+            }
         });
     </script>
 @endpush

resources/views/layouts/base.blade.php

@@ -134,6 +134,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.0/js.cookie.js"></script>
 <script type="text/javascript" src="{{ asset('js/bootstrap.min.js') }}"></script>
+<script type="text/javascript" src="{{ asset('js/tissue.js') }}"></script>
 <script>
     $(function(){
         @guest

resources/views/search/index.blade.php

@@ -80,42 +80,8 @@
 
 @push('script')
     <script>
-        $('.link-card').each(function () {
-            var $this = $(this);
-            $.ajax({
-                url: '{{ url('/api/checkin/card') }}',
-                method: 'get',
-                type: 'json',
-                data: {
-                    url: $this.find('a').attr('href')
-                }
-            }).then(function (data) {
-                var $title = $this.find('.card-title');
-                var $desc = $this.find('.card-text');
-                var $image = $this.find('img');
-
-                if (data.title === '') {
-                    $title.hide();
-                } else {
-                    $title.text(data.title);
-                }
-
-                if (data.description === '') {
-                    $desc.hide();
-                } else {
-                    $desc.text(data.description);
-                }
-
-                if (data.image === '') {
-                    $image.hide();
-                } else {
-                    $image.attr('src', data.image);
-                }
-
-                if (data.title !== '' || data.description !== '' || data.image !== '') {
-                    $this.removeClass('d-none');
-                }
-            });
+        $('.link-card').linkCard({
+            endpoint: '{{ url('/api/checkin/card') }}'
         });
     </script>
 @endpush

resources/views/user/profile.blade.php

@@ -136,42 +136,8 @@
             form.submit();
         });
 
-        $('.link-card').each(function () {
-            var $this = $(this);
-            $.ajax({
-                url: '{{ url('/api/checkin/card') }}',
-                method: 'get',
-                type: 'json',
-                data: {
-                    url: $this.find('a').attr('href')
-                }
-            }).then(function (data) {
-                var $title = $this.find('.card-title');
-                var $desc = $this.find('.card-text');
-                var $image = $this.find('img');
-
-                if (data.title === '') {
-                    $title.hide();
-                } else {
-                    $title.text(data.title);
-                }
-
-                if (data.description === '') {
-                    $desc.hide();
-                } else {
-                    $desc.text(data.description);
-                }
-
-                if (data.image === '') {
-                    $image.hide();
-                } else {
-                    $image.attr('src', data.image);
-                }
-
-                if (data.title !== '' || data.description !== '' || data.image !== '') {
-                    $this.removeClass('d-none');
-                }
-            });
+        $('.link-card').linkCard({
+            endpoint: '{{ url('/api/checkin/card') }}'
         });
     </script>
 @endpush