From df07aecd88a030bd6d02fc33b81d6ed75022f3dc Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 22 Oct 2017 19:41:41 +0900 Subject: [PATCH 01/49] =?UTF-8?q?=E6=97=A7=E3=83=AC=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=82=A6=E3=83=88=E3=81=AE=E9=80=80=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/auth/login.blade.php | 2 +- resources/views/auth/register.blade.php | 2 +- resources/views/ejaculation/checkin.blade.php | 2 +- resources/views/guest.blade.php | 2 +- resources/views/home.blade.php | 2 +- resources/views/layouts/{base.blade.php => base-old.blade.php} | 0 resources/views/user/profile.blade.php | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename resources/views/layouts/{base.blade.php => base-old.blade.php} (100%) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index e98313b..cf5bdd0 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base-old') @section('content')
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 961a9e5..7edea93 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base-old') @section('content')
diff --git a/resources/views/ejaculation/checkin.blade.php b/resources/views/ejaculation/checkin.blade.php index d101135..24b2067 100644 --- a/resources/views/ejaculation/checkin.blade.php +++ b/resources/views/ejaculation/checkin.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base-old') @section('content')
diff --git a/resources/views/guest.blade.php b/resources/views/guest.blade.php index 012db60..9aa8092 100644 --- a/resources/views/guest.blade.php +++ b/resources/views/guest.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base-old') @section('content')
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index e8b45e8..ae43013 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base-old') @section('head') @endsection @section('content')
-
-
-
- {{ Auth::user()->display_name }} -

@{{ Auth::user()->name }}

-
-

av_timer現在のセッション

+
+
+
+ +

{{ Auth::user()->display_name }}

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

{{ $currentSession }}経過

-

({{ $ejaculations[0]['ejaculated_date'] }} にリセット)

+

{{ $currentSession }}経過

+

({{ $ejaculations[0]['ejaculated_date'] }} にリセット)

@else -

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

-

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

+

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

+

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

@endif - @if (isset($summary) && $summary[0]->total_checkins > 0) -
-

assessment概況

-

平均記録: {{ 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 }}回回

-
-
    - @forelse ($ejaculations as $ejaculation) - @if ($loop->first) -
  • - 最近のチェックイン -
    • - @endif - -
  • - {{ $ejaculation['ejaculated_span'] ?? '精通' }} {{ $ejaculation['before_date'] }}{{ !empty($ejaculation['before_date']) ? ' ～ ' : '' }}{{ $ejaculation['ejaculated_date'] }} -
    - {{ $ejaculation['note'] }} -
    - @if ($ejaculation['is_private']) - lock 非公開チェックイン - @endif - {{--
    結月ゆかり
    -
    琴葉茜
    --}} -
    • - - @if ($loop->index === 7) -
  • -
    - もっと見る -
    -
    • - @break - @endif - @empty -
  • -
    - まだチェックインがありません。右上のチェックインボタンから今すぐ精通！ -
    -
    • - @endforelse -
+
+
+
サイトからのお知らせ
+
+ 重要 オープンβテスト 第2シーズンとしてサービス中 + アップデート ver.2017-[season] アップデートのお知らせ + 不具合情報 存在が不具合であることについて + お知らせ一覧 » +
+
+
+
ランキング
+
+

参加しているランキングはありません。自信のあるお題を探して、参加登録してみませんか？

+

参加登録をすると、定期的に集計されてここにあなたの順位が表示されます。

+
+
+ ランキング一覧 » +
+
+
+
穴兄弟レーダー
+
+

+ あなたがよく使うタグやオカズから、関連していそうなオカズリンクを探して表示しています。 +

+
+
+ +
#タグ
+

薄い本のタイトル

+ https://www.toranoana.jp/mailorder/article/**/****/**/**/**********.html + + +
#タグ
+

イラストのタイトル

+ https://www.pixiv.net/member_illust.php?mode=medium&illust_id=******** + + もっと見る » +
+
-
@endsection diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 410ec6a..c8b8c15 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -46,7 +46,7 @@
  • From 70421eabb092e1abfd2795741c93d8c49c1f43f0 Mon Sep 17 00:00:00 2001 From: shibafu Date: Mon, 30 Oct 2017 20:17:25 +0900 Subject: [PATCH 06/49] Fix Typo --- resources/views/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 322f3fe..d339ae6 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -27,7 +27,7 @@

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

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

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

    -

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

    +

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

From e9b19e7be1e36437caf267ad8fee24729d99eacc Mon Sep 17 00:00:00 2001 From: shibafu Date: Mon, 30 Oct 2017 22:03:34 +0900 Subject: [PATCH 07/49] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AC=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/user/profile.blade.php | 166 ++++++++++++++++--------- 1 file changed, 107 insertions(+), 59 deletions(-) diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index a9490b7..1672459 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base-old') +@extends('layouts.base') @section('head') -@endsection - -@section('content') -
-
-
-
-
- -

{{ $user->display_name }}

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

{{ $currentSession }}経過

-

({{ $ejaculations[0]['ejaculated_date'] }} にリセット)

- @else -

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

-

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

+@section('tab-content') +
    + @forelse ($ejaculations as $ejaculation) +
  • + +
    +
    {{ $ejaculation['ejaculated_span'] ?? '精通' }} {{ $ejaculation['before_date'] }}{{ !empty($ejaculation['before_date']) ? ' ～ ' : '' }}{{ $ejaculation['ejaculated_date'] }}
    + @if ($user->id === Auth::user()->id) +
    + + +
    + @endif +
    + + @if ($ejaculation['is_private']) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}} +

    + @if ($ejaculation['is_private']) + 非公開 @endif + {{-- + 催眠音声 + 適当なタグ + --}} +

    + @endif + + {{-- +
    + + Thumbnail +
    +
    タイトル
    +

    コンテンツの説明文

    +
    +     +
    + --}} + + @if (!empty($ejaculation['note'])) +

    + {{ $ejaculation['note'] }} +

    + @endif +
    • + @empty +
  • +

    まだチェックインしていません。

    +
    • + @endforelse +
+ -
概況
-

平均記録: {{ 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 }}回

-
-
-
-
- -
-
-
    - @forelse ($ejaculations as $ejaculation) -
  • - -
    -
    {{ $ejaculation['ejaculated_span'] ?? '精通' }} {{ $ejaculation['before_date'] }}{{ !empty($ejaculation['before_date']) ? ' ～ ' : '' }}{{ $ejaculation['ejaculated_date'] }}
    -
    - - -
    -
    - - @if ($ejaculation['is_private']) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}} -

    - @if ($ejaculation['is_private']) - 非公開 - @endif - {{-- - 催眠音声 - 適当なタグ - --}} -

    - @endif - - {{-- -
    - - Thumbnail -
    -
    タイトル
    -

    コンテンツの説明文

    -
    -     -
    - --}} - - @if (!empty($ejaculation['note'])) -

    - {{ $ejaculation['note'] }} -

    - @endif -
    • - @empty -
  • -

    まだチェックインしていません。

    -
    • - @endforelse -
- -
-
- -
-
- -
-
-
-
-
+@component('components.modal', ['id' => 'deleteCheckinModal']) + @slot('title') + 削除確認 + @endslot + のチェックインを削除してもよろしいですか？ +
+ {{ csrf_field() }} + {{ method_field('DELETE') }} +
+ @slot('footer') + + + @endslot +@endcomponent @endsection + +@push('script') + +@endpush \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 8c0605a..f552f10 100644 --- a/routes/web.php +++ b/routes/web.php @@ -23,4 +23,5 @@ Route::get('/user/{name?}', 'UserController@profile')->name('profile'); Route::middleware('auth')->group(function () { Route::get('/checkin', 'EjaculationController@create')->name('checkin'); Route::post('/checkin', 'EjaculationController@store')->name('checkin'); + Route::delete('/checkin/{id}', 'EjaculationController@destroy')->name('checkin.destroy'); }); \ No newline at end of file From edcc2bceafac1f32544b104a6a26d28259a80322 Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 3 Nov 2017 18:10:50 +0900 Subject: [PATCH 09/49] =?UTF-8?q?profile=E3=83=AB=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=90=8D=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/EjaculationController.php | 2 +- resources/views/home.blade.php | 4 ++-- resources/views/layouts/base.blade.php | 12 ++++++------ resources/views/user/base.blade.php | 10 +++++----- routes/web.php | 8 +++++--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php index ba9e249..b648abd 100644 --- a/app/Http/Controllers/EjaculationController.php +++ b/app/Http/Controllers/EjaculationController.php @@ -59,6 +59,6 @@ class EjaculationController extends Controller $ejaculation = Ejaculation::findOrFail($id); $user = User::findOrFail($ejaculation->user_id); $ejaculation->delete(); - return redirect()->route('profile', ['name' => $user->name])->with('status', '削除しました。'); + return redirect()->route('user.profile', ['name' => $user->name])->with('status', '削除しました。'); } } \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index e1b0176..f163762 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -10,8 +10,8 @@
-

{{ Auth::user()->display_name }}

-
@{{ Auth::user()->name }}
+

{{ Auth::user()->display_name }}

+
@{{ Auth::user()->name }}
現在のセッション
@if (isset($currentSession)) diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 2817a1f..520b18b 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -30,14 +30,14 @@
  • ホーム
    • -
  • - タイムライン +
  • + タイムライン
    • -
  • - グラフ +
  • + グラフ
    • -
  • - オカズ +
  • + オカズ
    • {{--
  • ランキング diff --git a/resources/views/user/base.blade.php b/resources/views/user/base.blade.php index 7143bfb..8eb53b2 100644 --- a/resources/views/user/base.blade.php +++ b/resources/views/user/base.blade.php @@ -7,8 +7,8 @@
    -

    {{ $user->display_name }}

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

    {{ $user->display_name }}

    +
    @{{ $user->name }}
    現在のセッション
    @if (isset($currentSession)) @@ -31,13 +31,13 @@
    diff --git a/routes/web.php b/routes/web.php index f552f10..17879c1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,9 +16,11 @@ Auth::routes(); Route::get('/', 'HomeController@index')->name('home'); Route::get('/user', function() { - return redirect()->route('profile', ['name' => Auth::user()->name]); -})->middleware('auth')->name('profile'); -Route::get('/user/{name?}', 'UserController@profile')->name('profile'); + return redirect()->route('user.profile', ['name' => Auth::user()->name]); +})->middleware('auth')->name('user.profile'); +Route::get('/user/{name?}', 'UserController@profile')->name('user.profile'); +Route::get('/user/{name}/stats', 'UserController@stats')->name('user.stats'); +Route::get('/user/{name}/okazu', 'UserController@okazu')->name('user.okazu'); Route::middleware('auth')->group(function () { Route::get('/checkin', 'EjaculationController@create')->name('checkin'); From d94c444b558330cd6fce51940f30d5e8a530d1ae Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 3 Nov 2017 20:38:09 +0900 Subject: [PATCH 10/49] =?UTF-8?q?=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/HomeController.php | 10 +++++- app/Http/Controllers/InfoController.php | 34 ++++++++++++++++++ app/Information.php | 20 +++++++++++ composer.json | 1 + composer.lock | 2 +- ..._11_03_182707_create_information_table.php | 36 +++++++++++++++++++ resources/views/home.blade.php | 10 +++--- resources/views/info/index.blade.php | 32 +++++++++++++++++ resources/views/info/show.blade.php | 15 ++++++++ routes/web.php | 5 ++- 10 files changed, 158 insertions(+), 7 deletions(-) create mode 100644 app/Http/Controllers/InfoController.php create mode 100644 app/Information.php create mode 100644 database/migrations/2017_11_03_182707_create_information_table.php create mode 100644 resources/views/info/index.blade.php create mode 100644 resources/views/info/show.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a3b447d..9659481 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Ejaculation; +use App\Information; use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -71,7 +72,14 @@ FROM SQL , ['user_id' => Auth::id()]); - return view('home')->with(compact('ejaculations', 'currentSession', 'summary')); + $informations = Information::query() + ->select('id', 'category', 'pinned', 'title', 'created_at') + ->orderBy('pinned') + ->orderByDesc('created_at') + ->paginate(3); + $categories = Information::CATEGORIES; + + return view('home')->with(compact('ejaculations', 'currentSession', 'summary', 'informations', 'categories')); } else { return view('guest'); } diff --git a/app/Http/Controllers/InfoController.php b/app/Http/Controllers/InfoController.php new file mode 100644 index 0000000..423eeba --- /dev/null +++ b/app/Http/Controllers/InfoController.php @@ -0,0 +1,34 @@ +select('id', 'category', 'pinned', 'title', 'created_at') + ->orderBy('pinned') + ->orderByDesc('created_at') + ->paginate(20); + return view('info.index')->with([ + 'informations' => $informations, + 'categories' => Information::CATEGORIES + ]); + } + + public function show($id) + { + $information = Information::findOrFail($id); + $parser = new \Parsedown(); + $compiledContent = $parser->text($information->content); + return view('info.show')->with([ + 'info' => $information, + 'category' => Information::CATEGORIES[$information->category], + 'compiledContent' => $compiledContent + ]); + } +} diff --git a/app/Information.php b/app/Information.php new file mode 100644 index 0000000..e0ae6ed --- /dev/null +++ b/app/Information.php @@ -0,0 +1,20 @@ + ['label' => 'お知らせ', 'class' => 'badge-info'], + 1 => ['label' => 'アップデート', 'class' => 'badge-success'], + 2 => ['label' => '不具合情報', 'class' => 'badge-danger'], + 3 => ['label' => 'メンテナンス', 'class' => 'badge-warning'] + ]; + + protected $dates = ['deleted_at']; +} diff --git a/composer.json b/composer.json index 9a7f989..026373f 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,7 @@ "type": "project", "require": { "php": ">=7.0.0", + "erusev/parsedown": "^1.6", "laravel/framework": "5.5.*", "laravel/tinker": "~1.0" }, diff --git a/composer.lock b/composer.lock index da09051..2dd5121 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "eed5a1a98b90f1543f877bbea7faf5ed", + "content-hash": "d5db680b40d4d68ebfb31b031548657a", "packages": [ { "name": "dnoegel/php-xdg-base-dir", diff --git a/database/migrations/2017_11_03_182707_create_information_table.php b/database/migrations/2017_11_03_182707_create_information_table.php new file mode 100644 index 0000000..8df1493 --- /dev/null +++ b/database/migrations/2017_11_03_182707_create_information_table.php @@ -0,0 +1,36 @@ +increments('id'); + $table->integer('category'); + $table->boolean('pinned')->default(false); + $table->text('title'); + $table->text('content'); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('information'); + } +} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index f163762..d3ad6e6 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -35,10 +35,12 @@
    サイトからのお知らせ
    - 重要 オープンβテスト 第2シーズンとしてサービス中 - アップデート ver.2017-[season] アップデートのお知らせ - 不具合情報 存在が不具合であることについて - お知らせ一覧 » + @foreach($informations as $info) + + {{ $categories[$info->category]['label'] }} {{ $info->title }} - {{ $info->created_at->format('n月j日') }} + + @endforeach + お知らせ一覧 »
    diff --git a/resources/views/info/index.blade.php b/resources/views/info/index.blade.php new file mode 100644 index 0000000..fac5aa9 --- /dev/null +++ b/resources/views/info/index.blade.php @@ -0,0 +1,32 @@ +@extends('layouts.base') + +@section('content') +
    +

    サイトからのお知らせ

    +
    +
    + @foreach($informations as $info) + + {{ $categories[$info->category]['label'] }} {{ $info->title }} - {{ $info->created_at->format('n月j日') }} + + @endforeach +
    + +
    +@endsection \ No newline at end of file diff --git a/resources/views/info/show.blade.php b/resources/views/info/show.blade.php new file mode 100644 index 0000000..47505f0 --- /dev/null +++ b/resources/views/info/show.blade.php @@ -0,0 +1,15 @@ +@extends('layouts.base') + +@section('content') +
    + +

    {{ $category['label'] }} {{ $info->title }}

    +

    {{ $info->created_at->format('Y年n月j日') }}

    + {!! $compiledContent !!} +
    +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 17879c1..704bc30 100644 --- a/routes/web.php +++ b/routes/web.php @@ -26,4 +26,7 @@ Route::middleware('auth')->group(function () { Route::get('/checkin', 'EjaculationController@create')->name('checkin'); Route::post('/checkin', 'EjaculationController@store')->name('checkin'); Route::delete('/checkin/{id}', 'EjaculationController@destroy')->name('checkin.destroy'); -}); \ No newline at end of file +}); + +Route::get('/info', 'InfoController@index')->name('info'); +Route::get('/info/{id}', 'InfoController@show')->where('id', '[0-9]+')->name('info.show'); \ No newline at end of file From efea60fc8130b8c5ed55f2b2a7ac73b330cd461e Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 3 Nov 2017 23:23:36 +0900 Subject: [PATCH 11/49] =?UTF-8?q?Parsedown=E3=82=92=E3=83=97=E3=83=A9?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E7=B5=8C=E7=94=B1=E3=81=A7=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/InfoController.php | 5 +- composer.json | 4 +- composer.lock | 101 ++++++++++++++++++------ resources/views/info/show.blade.php | 2 +- 4 files changed, 83 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/InfoController.php b/app/Http/Controllers/InfoController.php index 423eeba..4b6ef31 100644 --- a/app/Http/Controllers/InfoController.php +++ b/app/Http/Controllers/InfoController.php @@ -23,12 +23,9 @@ class InfoController extends Controller public function show($id) { $information = Information::findOrFail($id); - $parser = new \Parsedown(); - $compiledContent = $parser->text($information->content); return view('info.show')->with([ 'info' => $information, - 'category' => Information::CATEGORIES[$information->category], - 'compiledContent' => $compiledContent + 'category' => Information::CATEGORIES[$information->category] ]); } } diff --git a/composer.json b/composer.json index 026373f..21bfed3 100644 --- a/composer.json +++ b/composer.json @@ -6,9 +6,9 @@ "type": "project", "require": { "php": ">=7.0.0", - "erusev/parsedown": "^1.6", "laravel/framework": "5.5.*", - "laravel/tinker": "~1.0" + "laravel/tinker": "~1.0", + "parsedown/laravel": "~1.0" }, "require-dev": { "filp/whoops": "~2.0", diff --git a/composer.lock b/composer.lock index 2dd5121..231987b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d5db680b40d4d68ebfb31b031548657a", + "content-hash": "8fd656953b9909fbcbecf476db92f15c", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -348,16 +348,16 @@ }, { "name": "laravel/framework", - "version": "v5.5.18", + "version": "v5.5.19", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1cc21baac11551377734b8c17ead17db4c34fe21" + "reference": "c678100e84934ec85c9f8bc26bd0a60222682719" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1cc21baac11551377734b8c17ead17db4c34fe21", - "reference": "1cc21baac11551377734b8c17ead17db4c34fe21", + "url": "https://api.github.com/repos/laravel/framework/zipball/c678100e84934ec85c9f8bc26bd0a60222682719", + "reference": "c678100e84934ec85c9f8bc26bd0a60222682719", "shasum": "" }, "require": { @@ -475,7 +475,7 @@ "framework", "laravel" ], - "time": "2017-10-19T12:50:26+00:00" + "time": "2017-10-25T19:10:45+00:00" }, { "name": "laravel/tinker", @@ -703,7 +703,7 @@ }, { "name": "mtdowling/cron-expression", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/mtdowling/cron-expression.git", @@ -897,6 +897,63 @@ ], "time": "2017-09-27T21:40:39+00:00" }, + { + "name": "parsedown/laravel", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/parsedown/laravel.git", + "reference": "d97b0b4ae21340ecbaa04f4f0a8fde9f33df0117" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/parsedown/laravel/zipball/d97b0b4ae21340ecbaa04f4f0a8fde9f33df0117", + "reference": "d97b0b4ae21340ecbaa04f4f0a8fde9f33df0117", + "shasum": "" + }, + "require": { + "erusev/parsedown": "~1.6", + "php": ">=5.6" + }, + "require-dev": { + "orchestra/testbench": "^3.4", + "php": ">=7.1", + "phpunit/phpunit": "^6.3" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Parsedown\\Providers\\ParsedownServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/Support/helpers.php" + ], + "psr-4": { + "Parsedown\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Agostini", + "email": "edu.agostini@gmail.com" + } + ], + "description": "Official Laravel Wrapper of Parsedown.", + "homepage": "http://parsedown.org", + "keywords": [ + "laravel", + "parsedown" + ], + "time": "2017-08-23T02:26:10+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -2733,16 +2790,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "5.2.2", + "version": "5.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b" + "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8ed1902a57849e117b5651fc1a5c48110946c06b", - "reference": "8ed1902a57849e117b5651fc1a5c48110946c06b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", + "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", "shasum": "" }, "require": { @@ -2751,7 +2808,7 @@ "php": "^7.0", "phpunit/php-file-iterator": "^1.4.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^1.4.11 || ^2.0", + "phpunit/php-token-stream": "^2.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^3.0", "sebastian/version": "^2.0.1", @@ -2793,7 +2850,7 @@ "testing", "xunit" ], - "time": "2017-08-03T12:40:43+00:00" + "time": "2017-11-03T13:47:33+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3171,30 +3228,30 @@ }, { "name": "sebastian/comparator", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a" + "reference": "1174d9018191e93cb9d719edec01257fc05f8158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", - "reference": "ae068fede81d06e7bb9bb46a367210a3d3e1fe6a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158", + "reference": "1174d9018191e93cb9d719edec01257fc05f8158", "shasum": "" }, "require": { "php": "^7.0", "sebastian/diff": "^2.0", - "sebastian/exporter": "^3.0" + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -3225,13 +3282,13 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-08-03T07:14:59+00:00" + "time": "2017-11-03T07:16:52+00:00" }, { "name": "sebastian/diff", diff --git a/resources/views/info/show.blade.php b/resources/views/info/show.blade.php index 47505f0..b342654 100644 --- a/resources/views/info/show.blade.php +++ b/resources/views/info/show.blade.php @@ -10,6 +10,6 @@

    {{ $category['label'] }} {{ $info->title }}

    {{ $info->created_at->format('Y年n月j日') }}

    - {!! $compiledContent !!} + @parsedown($info->content)
    @endsection \ No newline at end of file From 53f34c12cc1d4297adc6aa3360d4e2317bf6060b Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 3 Nov 2017 23:47:38 +0900 Subject: [PATCH 12/49] =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=8C=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E3=81=97=E3=80=81URL=E3=81=A3=E3=81=BD=E3=81=84=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=88=97=E3=82=92=E3=83=AA=E3=83=B3=E3=82=AF=E5=8C=96?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Utilities/Formatter.php | 20 +++++++++ composer.json | 1 + composer.lock | 47 +++++++++++++++++++++- resources/views/layouts/base-old.blade.php | 4 +- resources/views/user/profile.blade.php | 2 +- 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/app/Utilities/Formatter.php b/app/Utilities/Formatter.php index bb87a61..fd7da98 100644 --- a/app/Utilities/Formatter.php +++ b/app/Utilities/Formatter.php @@ -2,8 +2,18 @@ namespace App\Utilities; +use Misd\Linkify\Linkify; + class Formatter { + /** @var Linkify */ + private $linkify; + + public function __construct() + { + $this->linkify = new Linkify(); + } + /** * 通算秒数を日数と時分にフォーマットします。 * @param int|float $value 通算秒数 @@ -16,4 +26,14 @@ class Formatter $minutes = floor($value % 3600 / 60); return "{$days}日 {$hours}時間 {$minutes}分"; } + + /** + * テキスト内のURLをHTMLのリンクに置き換えます。 + * @param string $text テキスト + * @return string URLをリンクに置き換えた文字列 + */ + public function linkify($text) + { + return $this->linkify->processUrls($text); + } } \ No newline at end of file diff --git a/composer.json b/composer.json index 21bfed3..6a8cc49 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "php": ">=7.0.0", "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", + "misd/linkify": "^1.1", "parsedown/laravel": "~1.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 231987b..c766e56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "8fd656953b9909fbcbecf476db92f15c", + "content-hash": "49697b9f7b0f02fe37b2bff14bddf200", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -623,6 +623,51 @@ ], "time": "2017-08-06T17:41:04+00:00" }, + { + "name": "misd/linkify", + "version": "v1.1.4", + "source": { + "type": "git", + "url": "https://github.com/misd-service-development/php-linkify.git", + "reference": "3481b148806a23b4001712de645247a1a4dcc10a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/misd-service-development/php-linkify/zipball/3481b148806a23b4001712de645247a1a4dcc10a", + "reference": "3481b148806a23b4001712de645247a1a4dcc10a", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Misd\\Linkify\\": "src/Misd/Linkify" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Converts URLs and email addresses in text into HTML links", + "homepage": "https://github.com/misd-service-development/php-linkify", + "keywords": [ + "convert", + "email address", + "link", + "url" + ], + "time": "2017-08-17T08:33:35+00:00" + }, { "name": "monolog/monolog", "version": "1.23.0", diff --git a/resources/views/layouts/base-old.blade.php b/resources/views/layouts/base-old.blade.php index 2865eae..6534525 100644 --- a/resources/views/layouts/base-old.blade.php +++ b/resources/views/layouts/base-old.blade.php @@ -20,7 +20,7 @@ @if (Auth::check()) @@ -45,7 +45,7 @@ diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 121edef..51cbdd1 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -41,7 +41,7 @@ @if (!empty($ejaculation['note']))

    - {{ $ejaculation['note'] }} + {!! Formatter::linkify(nl2br(e($ejaculation['note']))) !!}

    @endif
    • From 6ed0938694d500254964a05fcb1f402c22a0c06a Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 01:26:52 +0900 Subject: [PATCH 13/49] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AE=E5=B7=A6=E3=82=AB=E3=83=A9=E3=83=A0?= =?UTF-8?q?=E3=81=AB=E3=81=82=E3=82=8B=E6=83=85=E5=A0=B1=E3=81=AB=E9=96=A2?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=82=92=E3=83=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Ejaculation.php | 4 ++ app/Http/Controllers/HomeController.php | 46 +------------- app/Http/Controllers/UserController.php | 49 ++++++--------- app/Http/ViewComposers/ProfileComposer.php | 61 +++++++++++++++++++ app/Providers/ViewComposerServiceProvider.php | 30 +++++++++ config/app.php | 1 + resources/views/components/profile.blade.php | 23 +++++++ resources/views/home.blade.php | 25 +------- resources/views/user/base.blade.php | 25 +------- resources/views/user/okazu.blade.php | 4 ++ resources/views/user/profile.blade.php | 12 ++-- resources/views/user/stats.blade.php | 4 ++ 12 files changed, 157 insertions(+), 127 deletions(-) create mode 100644 app/Http/ViewComposers/ProfileComposer.php create mode 100644 app/Providers/ViewComposerServiceProvider.php create mode 100644 resources/views/components/profile.blade.php create mode 100644 resources/views/user/okazu.blade.php create mode 100644 resources/views/user/stats.blade.php diff --git a/app/Ejaculation.php b/app/Ejaculation.php index f6f8628..8b975ef 100644 --- a/app/Ejaculation.php +++ b/app/Ejaculation.php @@ -13,4 +13,8 @@ class Ejaculation extends Model 'note', 'geo_latitude', 'geo_longitude', 'is_private' ]; + + protected $dates = [ + 'ejaculated_date' + ]; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9659481..e8b1e5e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -28,50 +28,6 @@ class HomeController extends Controller public function index() { if (Auth::check()) { - $ejaculations = Ejaculation::select(DB::raw(<<<'SQL' -to_char(ejaculated_date, 'YYYY/MM/DD HH24:MI') AS ejaculated_date, -note, -is_private, -to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date, -to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span -SQL -)) - ->where(['user_id' => Auth::id()]) - ->orderBy('ejaculated_date', 'desc') - ->limit(9) - ->get(); - - // 現在のオナ禁セッションの経過時間 - if (count($ejaculations) > 0) { - $currentSession = Carbon::parse($ejaculations[0]['ejaculated_date']) - ->diff(Carbon::now()) - ->format('%a日 %h時間 %i分'); - } else { - $currentSession = null; - } - - // 概況欄のデータ取得 - $summary = DB::select(<<<'SQL' -SELECT - avg(span) AS average, - max(span) AS longest, - min(span) AS shortest, - sum(span) AS total_times, - count(*) AS total_checkins -FROM - ( - SELECT - extract(epoch from ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)) AS span - FROM - ejaculations - WHERE - user_id = :user_id - ORDER BY - ejaculated_date DESC - ) AS temp -SQL -, ['user_id' => Auth::id()]); - $informations = Information::query() ->select('id', 'category', 'pinned', 'title', 'created_at') ->orderBy('pinned') @@ -79,7 +35,7 @@ SQL ->paginate(3); $categories = Information::CATEGORIES; - return view('home')->with(compact('ejaculations', 'currentSession', 'summary', 'informations', 'categories')); + return view('home')->with(compact('informations', 'categories')); } else { return view('guest'); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index f398126..bb17762 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -23,7 +23,7 @@ class UserController extends Controller // チェックインの取得 $query = Ejaculation::select(DB::raw(<<<'SQL' id, -to_char(ejaculated_date, 'YYYY/MM/DD HH24:MI') AS ejaculated_date, +ejaculated_date, note, is_private, to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date, @@ -37,37 +37,26 @@ SQL $ejaculations = $query->orderBy('ejaculated_date', 'desc') ->paginate(20); - // 現在のオナ禁セッションの経過時間 - if (count($ejaculations) > 0) { - $currentSession = Carbon::parse($ejaculations[0]['ejaculated_date']) - ->diff(Carbon::now()) - ->format('%a日 %h時間 %i分'); - } else { - $currentSession = null; + return view('user.profile')->with(compact('user', 'ejaculations')); + } + + public function stats($name) + { + $user = User::where('name', $name)->first(); + if (empty($user)) { + abort(404); } - // 概況欄のデータ取得 - $summary = DB::select(<<<'SQL' -SELECT - avg(span) AS average, - max(span) AS longest, - min(span) AS shortest, - sum(span) AS total_times, - count(*) AS total_checkins -FROM - ( - SELECT - extract(epoch from ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)) AS span - FROM - ejaculations - WHERE - user_id = :user_id - ORDER BY - ejaculated_date DESC - ) AS temp -SQL - , ['user_id' => $user->id]); + return view('user.stats')->with(compact('user')); + } - return view('user.profile')->with(compact('user', 'ejaculations', 'currentSession', 'summary')); + public function okazu($name) + { + $user = User::where('name', $name)->first(); + if (empty($user)) { + abort(404); + } + + return view('user.okazu')->with(compact('user')); } } diff --git a/app/Http/ViewComposers/ProfileComposer.php b/app/Http/ViewComposers/ProfileComposer.php new file mode 100644 index 0000000..5a0f862 --- /dev/null +++ b/app/Http/ViewComposers/ProfileComposer.php @@ -0,0 +1,61 @@ +offsetExists('user')) { + throw new \LogicException('View data "user" was not exist.'); + } + $user = $view->offsetGet('user'); + + // 現在のオナ禁セッションの経過時間 + $latestEjaculation = Ejaculation::select('ejaculated_date') + ->where('user_id', $user->id) + ->orderByDesc('ejaculated_date') + ->first(); + if (!empty($latestEjaculation)) { + $currentSession = $latestEjaculation->ejaculated_date + ->diff(Carbon::now()) + ->format('%a日 %h時間 %i分'); + } else { + $currentSession = null; + } + + // 概況欄のデータ取得 + $summary = DB::select(<<<'SQL' +SELECT + avg(span) AS average, + max(span) AS longest, + min(span) AS shortest, + sum(span) AS total_times, + count(*) AS total_checkins +FROM + ( + SELECT + extract(epoch from ejaculated_date - lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)) AS span + FROM + ejaculations + WHERE + user_id = :user_id + ORDER BY + ejaculated_date DESC + ) AS temp +SQL + , ['user_id' => $user->id]); + + $view->with(compact('latestEjaculation', 'currentSession', 'summary')); + } +} \ No newline at end of file diff --git a/app/Providers/ViewComposerServiceProvider.php b/app/Providers/ViewComposerServiceProvider.php new file mode 100644 index 0000000..bb4f062 --- /dev/null +++ b/app/Providers/ViewComposerServiceProvider.php @@ -0,0 +1,30 @@ + +
    + +

    {{ $user->display_name }}

    +
    @{{ $user->name }}
    + +
    現在のセッション
    + @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 }}回

    +
    +
    \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index d3ad6e6..4e9aae1 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -7,29 +7,8 @@
    -
    -
    - -

    {{ Auth::user()->display_name }}

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

    {{ $currentSession }}経過

    -

    ({{ $ejaculations[0]['ejaculated_date'] }} にリセット)

    - @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 }}回

    -
    -
    + @component('components.profile', ['user' => Auth::user()]) + @endcomponent
    diff --git a/resources/views/user/base.blade.php b/resources/views/user/base.blade.php index 8eb53b2..732a569 100644 --- a/resources/views/user/base.blade.php +++ b/resources/views/user/base.blade.php @@ -4,29 +4,8 @@
    -
    -
    - -

    {{ $user->display_name }}

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

    {{ $currentSession }}経過

    -

    ({{ $ejaculations[0]['ejaculated_date'] }} にリセット)

    - @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 }}回

    -
    -
    + @component('components.profile', ['user' => $user]) + @endcomponent
      diff --git a/resources/views/user/okazu.blade.php b/resources/views/user/okazu.blade.php new file mode 100644 index 0000000..6bc8f66 --- /dev/null +++ b/resources/views/user/okazu.blade.php @@ -0,0 +1,4 @@ +@extends('user.base') + +@section('tab-content') +@endsection \ No newline at end of file diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 51cbdd1..6caaf0f 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -6,18 +6,18 @@
    • -
      {{ $ejaculation['ejaculated_span'] ?? '精通' }} {{ $ejaculation['before_date'] }}{{ !empty($ejaculation['before_date']) ? ' ～ ' : '' }}{{ $ejaculation['ejaculated_date'] }}
      +
      {{ $ejaculation->ejaculated_span ?? '精通' }} {{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}
      @if ($user->id === Auth::user()->id)
      - +
      @endif
      - @if ($ejaculation['is_private']) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}} + @if ($ejaculation->is_private) {{-- TODO: タグを付けたら、タグが空じゃないかも判定に加える --}}

      - @if ($ejaculation['is_private']) + @if ($ejaculation->is_private) 非公開 @endif {{-- @@ -39,9 +39,9 @@

    --}} - @if (!empty($ejaculation['note'])) + @if (!empty($ejaculation->note))

    - {!! Formatter::linkify(nl2br(e($ejaculation['note']))) !!} + {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

    @endif diff --git a/resources/views/user/stats.blade.php b/resources/views/user/stats.blade.php new file mode 100644 index 0000000..6bc8f66 --- /dev/null +++ b/resources/views/user/stats.blade.php @@ -0,0 +1,4 @@ +@extends('user.base') + +@section('tab-content') +@endsection \ No newline at end of file From 723bb236c9ed7e69e8cb3b384fbe742aa3f9e481 Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 10:32:16 +0900 Subject: [PATCH 14/49] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=8C=E9=9D=9E=E3=83=AD?= =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AB=E3=82=B3=E3=82=B1?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/layouts/base.blade.php | 2 +- resources/views/user/profile.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 520b18b..75b006e 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -60,7 +60,7 @@ @endauth @guest -
    + ログイン
    @endguest diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 6caaf0f..137beae 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -7,7 +7,7 @@
    {{ $ejaculation->ejaculated_span ?? '精通' }} {{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}
    - @if ($user->id === Auth::user()->id) + @if (Auth::check() && $user->id === Auth::user()->id)
    From 94918fc33719aab66e22031cc208ab97ba7df7da Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 19:14:36 +0900 Subject: [PATCH 15/49] =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AC=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 別にレイアウト変わってないので焼き直しが正しい --- .../Controllers/EjaculationController.php | 11 +- resources/views/ejaculation/checkin.blade.php | 141 +++++++++++------- 2 files changed, 91 insertions(+), 61 deletions(-) diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php index b648abd..78ba14d 100644 --- a/app/Http/Controllers/EjaculationController.php +++ b/app/Http/Controllers/EjaculationController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\User; +use Carbon\Carbon; use Validator; use App\Ejaculation; use Illuminate\Http\Request; @@ -23,15 +24,17 @@ class EjaculationController extends Controller 'note' => 'nullable|string|max:500', ])->after(function ($validator) use ($request) { // 日時の重複チェック - $dt = $request->input('date') . ' ' . $request->input('time'); - if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $dt])->count()) { - $validator->errors()->add('datetime', '既にこの日時にチェックインしているため、登録できません。'); + if (!$validator->errors()->hasAny(['date', 'time'])) { + $dt = $request->input('date') . ' ' . $request->input('time'); + if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $dt])->count()) { + $validator->errors()->add('datetime', '既にこの日時にチェックインしているため、登録できません。'); + } } })->validate(); Ejaculation::create([ 'user_id' => Auth::id(), - 'ejaculated_date' => $request->input('date') . ' ' . $request->input('time'), + 'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $request->input('date') . ' ' . $request->input('time')), 'note' => $request->input('note') ?? '', 'is_private' => $request->has('is_private') ?? false ]); diff --git a/resources/views/ejaculation/checkin.blade.php b/resources/views/ejaculation/checkin.blade.php index 24b2067..4130d60 100644 --- a/resources/views/ejaculation/checkin.blade.php +++ b/resources/views/ejaculation/checkin.blade.php @@ -1,83 +1,110 @@ -@extends('layouts.base-old') +@extends('layouts.base') @section('content')
    -

    今致してる？

    -
    -
    - {{ csrf_field() }} +

    今致してる？

    +
    +
    +
    + + {{ csrf_field() }} -
    -
    -
    - today - - +
    +
    + + @if ($errors->has('date')) - {{ $errors->first('date') }} +
    {{ $errors->first('date') }}
    @endif
    -
    - schedule - - +
    + + @if ($errors->has('time')) - {{ $errors->first('time') }} +
    {{ $errors->first('time') }}
    @endif
    @if ($errors->has('datetime')) -
    - {{ $errors->first('datetime') }} -
    +
    + {{ $errors->first('datetime') }} +
    @endif -
    - label - - +
    + {{-- +
    +
    + + + + スペース区切りで複数入力できます。 +
    - {{--
    --}} - {{--TODO: Material Chipsデータのシリアライズとかをjsで書いておく必要あるかも？ --}} - {{--label--}} - {{--
    --}} - {{----}} - {{--
    --}} -
    - comment - - - +
    +
    +
    + + + + オカズのURLを貼り付けて登録することができます。 + +
    +
    +
    +
    このオカズで合っていますか？
    +
    +
    + +
    +

    タイトル

    + 概要 +
    +
    + 決定 + キャンセル +
    +
    +
    +
    + --}} +
    +
    + + + + 最大 500 文字 + @if ($errors->has('note')) - {{ $errors->first('note') }} +
    {{ $errors->first('note') }}
    @endif
    -
    -
    -
    オプション
    -

    - - -

    +
    +

    オプション

    +
    +
    + +
    -
    -
    - -
    + +
    +
    -
    - + +
    @endsection -@section('script') - -@endsection \ No newline at end of file +@push('script') +@endpush \ No newline at end of file From 016d4d8e3f28c6bf9b83fada1e38137bdcfb895e Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 19:31:50 +0900 Subject: [PATCH 16/49] =?UTF-8?q?word-wrap=E4=BD=95=E3=82=82=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/tissue.css | 4 ++++ resources/views/user/profile.blade.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/css/tissue.css b/public/css/tissue.css index 6670dc0..c5c0f87 100644 --- a/public/css/tissue.css +++ b/public/css/tissue.css @@ -7,6 +7,10 @@ background: linear-gradient(to bottom, #f8f9fa, #fff) } +.tis-word-wrap { + word-wrap: break-word; +} + .list-group-item.border-bottom-only { border-left: none; border-right: none; diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 137beae..296fde1 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -40,7 +40,7 @@ --}} @if (!empty($ejaculation->note)) -

    +

    {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}

    @endif From fca4c21d3a44f5a777363499fd30e89c5506c436 Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 5 Nov 2017 19:51:31 +0900 Subject: [PATCH 17/49] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86=E3=83=B3=E3=83=84=E5=B9=85?= =?UTF-8?q?=E3=82=92=E7=B8=AE=E3=82=81=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/layouts/base.blade.php | 90 +++++++++++++------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 75b006e..291cddc 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -20,50 +20,52 @@ {{ csrf_field() }} - {{ config('app.name', 'Tissue') }} - -