From cf5bf2b2746ff32964856c3f5e068c08aec201dc Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Mon, 4 Mar 2019 22:30:34 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=8A=E6=83=A3=E8=8F=9C=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=8A=E3=83=BC=E3=82=92=E3=82=82=E3=81=A3=E3=81=A8=E3=81=9F?=
 =?UTF-8?q?=E3=81=8F=E3=81=95=E3=82=93=E8=A6=8B=E3=82=8B=E7=94=BB=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/TimelineController.php | 23 +++++++
 resources/views/home.blade.php              |  3 +
 resources/views/timeline/public.blade.php   | 68 +++++++++++++++++++++
 routes/web.php                              |  2 +
 4 files changed, 96 insertions(+)
 create mode 100644 app/Http/Controllers/TimelineController.php
 create mode 100644 resources/views/timeline/public.blade.php

diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php
new file mode 100644
index 0000000..a179537
--- /dev/null
+++ b/app/Http/Controllers/TimelineController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Ejaculation;
+use Illuminate\Http\Request;
+
+class TimelineController extends Controller
+{
+    public function showPublic()
+    {
+        $ejaculations = Ejaculation::join('users', 'users.id', '=', 'ejaculations.user_id')
+            ->where('users.is_protected', false)
+            ->where('ejaculations.is_private', false)
+            ->where('ejaculations.link', '<>', '')
+            ->orderBy('ejaculations.ejaculated_date', 'desc')
+            ->select('ejaculations.*')
+            ->with('user', 'tags')
+            ->paginate(21);
+
+        return view('timeline.public')->with(compact('ejaculations'));
+    }
+}
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index ccafb85..6c443ec 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -91,6 +91,9 @@
                             @endif
                         </li>
                     @endforeach
+                    <li class="list-group-item no-side-border text-right">
+                        <a href="{{ route('timeline.public') }}">もっと見る &raquo;</a>
+                    </li>
                 </ul>
             @endif
         </div>
diff --git a/resources/views/timeline/public.blade.php b/resources/views/timeline/public.blade.php
new file mode 100644
index 0000000..74bdf0d
--- /dev/null
+++ b/resources/views/timeline/public.blade.php
@@ -0,0 +1,68 @@
+@extends('layouts.base')
+
+@section('title', 'お惣菜コーナー')
+
+@section('content')
+    <div class="container pb-1">
+        <h2 class="mb-3">お惣菜コーナー</h2>
+        <p class="text-secondary">公開チェックインから、オカズリンク付きのものを表示しています。</p>
+    </div>
+    <div class="container-fluid">
+        <div class="row mx-1">
+            @foreach($ejaculations as $ejaculation)
+                <div class="col-12 col-lg-6 col-xl-4 py-3 tis-word-wrap border-top">
+                    <!-- 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>
+                            @if ($ejaculation->user->isMe())
+                                <a class="text-secondary timeline-action-item" href="{{ route('checkin.edit', ['id' => $ejaculation->id]) }}"><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>
+                            @endif
+                        </div>
+                    </div>
+                    <!-- tags -->
+                    @if ($ejaculation->is_private || $ejaculation->tags->isNotEmpty())
+                        <p class="mb-2">
+                            @if ($ejaculation->is_private)
+                                <span class="badge badge-warning"><span class="oi oi-lock-locked"></span> 非公開</span>
+                            @endif
+                            @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">
+                            @component('components.link-card', ['link' => $ejaculation->link])
+                            @endcomponent
+                            <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
+                </div>
+            @endforeach
+        </div>
+        {{ $ejaculations->links(null, ['className' => 'mt-4 justify-content-center']) }}
+    </div>
+@endsection
+
+@push('script')
+    <script>
+        $('.link-card').linkCard({
+            endpoint: '{{ url('/api/checkin/card') }}'
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index dc78587..a772f46 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -28,6 +28,8 @@ Route::middleware('auth')->group(function () {
     Route::put('/checkin/{id}', 'EjaculationController@update')->name('checkin.update');
     Route::delete('/checkin/{id}', 'EjaculationController@destroy')->name('checkin.destroy');
 
+    Route::get('/timeline/public', 'TimelineController@showPublic')->name('timeline.public');
+
     Route::redirect('/setting', '/setting/profile', 301);
     Route::get('/setting/profile', 'SettingController@profile')->name('setting');
     Route::post('/setting/profile', 'SettingController@updateProfile')->name('setting.profile.update');