Revert "Release 20200823.1100"

resources/views/components/ejaculation.blade.php

@@ -6,19 +6,14 @@
     </h5>
 </div>
 <!-- tags -->
-@if ($ejaculation->is_private || $ejaculation->source !== 'web' || $ejaculation->tags->isNotEmpty())
+@if ($ejaculation->is_private || $ejaculation->source === 'csv' || $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
-        @switch ($ejaculation->source)
-            @case ('csv')
-                <span class="badge badge-info"><span class="oi oi-cloud-upload"></span> インポート</span>
-                @break
-            @case ('webhook')
-                <span class="badge badge-info" data-toggle="tooltip" title="Webhookからチェックイン"><span class="oi oi-flash"></span></span>
-                @break
-        @endswitch
+        @if ($ejaculation->source === 'csv')
+            <span class="badge badge-info"><span class="oi oi-cloud-upload"></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

resources/views/ejaculation/checkin.blade.php

@@ -3,15 +3,99 @@
 @section('title', 'チェックイン')
 
 @section('content')
-<div class="container">
+<div id="app" class="container">
     <h2>今致してる？</h2>
     <hr>
     <div class="row justify-content-center mt-5">
         <div class="col-lg-6">
             <form method="post" action="{{ route('checkin') }}">
                 {{ csrf_field() }}
-                <div id="checkinForm">
-                    <div class="text-center small" style="height: 640px;">しばらくお待ちください…</div>
+
+                <div class="form-row">
+                    <div class="form-group col-sm-6">
+                        <label for="date"><span class="oi oi-calendar"></span> 日付</label>
+                        <input id="date" name="date" type="text" class="form-control {{ $errors->has('date') || $errors->has('datetime') ? ' is-invalid' : '' }}"
+                               pattern="^20[0-9]{2}/(0[1-9]|1[0-2])/(0[1-9]|[12][0-9]|3[01])$" value="{{ old('date') ?? $defaults['date'] }}" required>
+
+                        @if ($errors->has('date'))
+                            <div class="invalid-feedback">{{ $errors->first('date') }}</div>
+                        @endif
+                    </div>
+                    <div class="form-group col-sm-6">
+                        <label for="time"><span class="oi oi-clock"></span> 時刻</label>
+                        <input id="time" name="time" type="text" class="form-control {{ $errors->has('time') || $errors->has('datetime') ? ' is-invalid' : '' }}"
+                               pattern="^([01][0-9]|2[0-3]):[0-5][0-9]$" value="{{ old('time') ?? $defaults['time'] }}" required>
+
+                        @if ($errors->has('time'))
+                            <div class="invalid-feedback">{{ $errors->first('time') }}</div>
+                        @endif
+                    </div>
+                    @if ($errors->has('datetime'))
+                        <div class="form-group col-sm-12" style="margin-top: -1rem;">
+                            <small class="text-danger">{{ $errors->first('datetime') }}</small>
+                        </div>
+                    @endif
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="tagInput"><span class="oi oi-tags"></span> タグ</label>
+                        <tag-input id="tagInput" name="tags" value="{{ old('tags') ?? $defaults['tags'] }}" :is-invalid="{{ $errors->has('tags') ? 'true' : 'false' }}"></tag-input>
+                        <small class="form-text text-muted">
+                            Tab, Enter, 半角スペースのいずれかで入力確定します。
+                        </small>
+
+                        @if ($errors->has('tags'))
+                            <div class="invalid-feedback">{{ $errors->first('tags') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="link"><span class="oi oi-link-intact"></span> オカズリンク</label>
+                        <input id="link" name="link" type="text" autocomplete="off" class="form-control {{ $errors->has('link') ? ' is-invalid' : '' }}"
+                               placeholder="http://..." value="{{ old('link') ?? $defaults['link'] }}"
+                               @change="onChangeLink">
+                        <small class="form-text text-muted">
+                            オカズのURLを貼り付けて登録することができます。
+                        </small>
+                        @if ($errors->has('link'))
+                            <div class="invalid-feedback">{{ $errors->first('link') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <metadata-preview :metadata="metadata" :state="metadataLoadState"></metadata-preview>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="note"><span class="oi oi-comment-square"></span> ノート</label>
+                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4">{{ old('note') ?? $defaults['note'] }}</textarea>
+                        <small class="form-text text-muted">
+                            最大 500 文字
+                        </small>
+                        @if ($errors->has('note'))
+                            <div class="invalid-feedback">{{ $errors->first('note') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-row mt-4">
+                    <p>オプション</p>
+                    <div class="form-group col-sm-12">
+                        <div class="custom-control custom-checkbox mb-3">
+                            <input id="isPrivate" name="is_private" type="checkbox" class="custom-control-input" {{ old('is_private') || $defaults['is_private'] ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isPrivate">
+                            <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
+                            </label>
+                        </div>
+                        <div class="custom-control custom-checkbox mb-3">
+                            <input id="isTooSensitive" name="is_too_sensitive" type="checkbox" class="custom-control-input" {{ old('is_too_sensitive') || $defaults['is_too_sensitive'] ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isTooSensitive">
+                            <span class="oi oi-warning"></span> チェックイン対象のオカズをより過激なオカズとして設定する
+                            </label>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="text-center">
+                    <button class="btn btn-primary" type="submit">チェックイン</button>
                 </div>
             </form>
             <p class="text-center small mt-4"><strong>Tips</strong>: ブックマークレットや共有機能で、簡単にチェックインできます！ <a href="{{ route('checkin.tools') }}" target="_blank" rel="noopener">使い方はこちら</a></p>
@@ -21,6 +105,5 @@
 @endsection
 
 @push('script')
-    <script id="initialState" type="application/json">@json($initialState)</script>
     <script src="{{ mix('js/checkin.js') }}"></script>
 @endpush

resources/views/ejaculation/edit.blade.php

@@ -3,7 +3,7 @@
 @section('title', 'チェックインの修正')
 
 @section('content')
-<div class="container">
+<div id="app" class="container">
     <h2>チェックインの修正</h2>
     <hr>
     <div class="row justify-content-center mt-5">
@@ -11,8 +11,92 @@
             <form method="post" action="{{ route('checkin.update', ['id' => $ejaculation->id]) }}">
                 {{ method_field('PUT') }}
                 {{ csrf_field() }}
-                <div id="checkinForm">
-                    <div class="text-center small" style="height: 640px;">しばらくお待ちください…</div>
+
+                <div class="form-row">
+                    <div class="form-group col-sm-6">
+                        <label for="date"><span class="oi oi-calendar"></span> 日付</label>
+                        <input id="date" name="date" type="text" class="form-control {{ $errors->has('date') || $errors->has('datetime') ? ' is-invalid' : '' }}"
+                               pattern="^20[0-9]{2}/(0[1-9]|1[0-2])/(0[1-9]|[12][0-9]|3[01])$" value="{{ old('date') ?? $ejaculation->ejaculated_date->format('Y/m/d') }}" required>
+
+                        @if ($errors->has('date'))
+                            <div class="invalid-feedback">{{ $errors->first('date') }}</div>
+                        @endif
+                    </div>
+                    <div class="form-group col-sm-6">
+                        <label for="time"><span class="oi oi-clock"></span> 時刻</label>
+                        <input id="time" name="time" type="text" class="form-control {{ $errors->has('time') || $errors->has('datetime') ? ' is-invalid' : '' }}"
+                               pattern="^([01][0-9]|2[0-3]):[0-5][0-9]$" value="{{ old('time') ?? $ejaculation->ejaculated_date->format('H:i') }}" required>
+
+                        @if ($errors->has('time'))
+                            <div class="invalid-feedback">{{ $errors->first('time') }}</div>
+                        @endif
+                    </div>
+                    @if ($errors->has('datetime'))
+                        <div class="form-group col-sm-12" style="margin-top: -1rem;">
+                            <small class="text-danger">{{ $errors->first('datetime') }}</small>
+                        </div>
+                    @endif
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="tagInput"><span class="oi oi-tags"></span> タグ</label>
+                        <tag-input id="tagInput" name="tags" value="{{ old('tags') ?? $ejaculation->textTags() }}" :is-invalid="{{ $errors->has('tags') ? 'true' : 'false' }}"></tag-input>
+                        <small class="form-text text-muted">
+                            Tab, Enter, 半角スペースのいずれかで入力確定します。
+                        </small>
+
+                        @if ($errors->has('tags'))
+                            <div class="invalid-feedback">{{ $errors->first('tags') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="link"><span class="oi oi-link-intact"></span> オカズリンク</label>
+                        <input id="link" name="link" type="text" autocomplete="off" class="form-control {{ $errors->has('link') ? ' is-invalid' : '' }}"
+                               placeholder="http://..." value="{{ old('link') ?? $ejaculation->link }}"
+                               @change="onChangeLink">
+                        <small class="form-text text-muted">
+                            オカズのURLを貼り付けて登録することができます。
+                        </small>
+                        @if ($errors->has('link'))
+                            <div class="invalid-feedback">{{ $errors->first('link') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <metadata-preview :metadata="metadata" :state="metadataLoadState"></metadata-preview>
+                <div class="form-row">
+                    <div class="form-group col-sm-12">
+                        <label for="note"><span class="oi oi-comment-square"></span> ノート</label>
+                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4">{{ old('note') ?? $ejaculation->note }}</textarea>
+                        <small class="form-text text-muted">
+                            最大 500 文字
+                        </small>
+                        @if ($errors->has('note'))
+                            <div class="invalid-feedback">{{ $errors->first('note') }}</div>
+                        @endif
+                    </div>
+                </div>
+                <div class="form-row mt-4">
+                    <p>オプション</p>
+                    <div class="form-group col-sm-12">
+                        <div class="custom-control custom-checkbox mb-3">
+                            <input id="isPrivate" name="is_private" type="checkbox" class="custom-control-input" {{ (is_bool(old('is_private')) ? old('is_private') : $ejaculation->is_private) ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isPrivate">
+                            <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
+                            </label>
+                        </div>
+                        <div class="custom-control custom-checkbox mb-3">
+                            <input id="isTooSensitive" name="is_too_sensitive" type="checkbox" class="custom-control-input" {{ (is_bool(old('is_too_sensitive')) ? old('is_too_sensitive') : $ejaculation->is_too_sensitive) ? 'checked' : '' }}>
+                            <label class="custom-control-label" for="isTooSensitive">
+                            <span class="oi oi-warning"></span> チェックイン対象のオカズをより過激なオカズとして設定する
+                            </label>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="text-center">
+                    <button class="btn btn-primary" type="submit">チェックイン</button>
                 </div>
             </form>
         </div>
@@ -21,6 +105,5 @@
 @endsection
 
 @push('script')
-    <script id="initialState" type="application/json">@json($initialState)</script>
     <script src="{{ mix('js/checkin.js') }}"></script>
 @endpush

resources/views/ejaculation/show.blade.php

@@ -34,19 +34,14 @@
                             <h5>{{ $ejaculatedSpan ?? '精通' }} <small class="text-muted">{{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></h5>
                         </div>
                         <!-- tags -->
-                        @if ($ejaculation->is_private || $ejaculation->source !== 'web' || $ejaculation->tags->isNotEmpty())
+                        @if ($ejaculation->is_private || $ejaculation->source === 'csv' || $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
-                            @switch ($ejaculation->source)
-                                @case ('csv')
-                                    <span class="badge badge-info"><span class="oi oi-cloud-upload"></span> インポート</span>
-                                    @break
-                                @case ('webhook')
-                                    <span class="badge badge-info" data-toggle="tooltip" title="Webhookからチェックイン"><span class="oi oi-flash"></span></span>
-                                    @break
-                            @endswitch
+                            @if ($ejaculation->source === 'csv')
+                                <span class="badge badge-info"><span class="oi oi-cloud-upload"></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

resources/views/setting/base.blade.php

@@ -10,8 +10,6 @@
                        href="{{ route('setting') }}"><span class="oi oi-person mr-1"></span> プロフィール</a>
                     <a class="list-group-item list-group-item-action {{ Route::currentRouteName() === 'setting.privacy' ? 'active' : '' }}"
                        href="{{ route('setting.privacy') }}"><span class="oi oi-shield mr-1"></span> プライバシー</a>
-                    <a class="list-group-item list-group-item-action {{ Route::currentRouteName() === 'setting.webhooks' ? 'active' : '' }}"
-                       href="{{ route('setting.webhooks') }}"><span class="oi oi-link-intact mr-1"></span> Webhook</a>
                     <a class="list-group-item list-group-item-action {{ Route::currentRouteName() === 'setting.import' ? 'active' : '' }}"
                        href="{{ route('setting.import') }}"><span class="oi oi-data-transfer-upload mr-1"></span> データのインポート</a>
                     <a class="list-group-item list-group-item-action {{ Route::currentRouteName() === 'setting.export' ? 'active' : '' }}"

resources/views/setting/webhooks.blade.php

@@ -1,70 +0,0 @@
-@extends('setting.base')
-
-@section('title', 'Webhook')
-
-@section('tab-content')
-    <h3>Incoming Webhook</h3>
-    <hr>
-    <p>さまざまなシステムと連携してチェックインを行うためのWebhook URLを作成することができます。APIドキュメントは<a href="{{ url('/apidoc.html') }}">こちら</a>から参照いただけます。</p>
-    <h4>新規作成</h4>
-    <div class="card mt-3">
-        <div class="card-body">
-            <h6 class="font-weight-bold">おことわり</h6>
-            <p>Webhook APIは予告なく仕様変更を行う場合がございます。また、サーバに対する過剰なリクエストや、不審な公開チェックインを繰り返している場合には管理者の裁量によって予告なく無効化(削除)する場合があります。</p>
-            <p>通常利用と同様、1分以内のチェックインは禁止されていることを考慮してください。また、テスト目的であれば非公開チェックインをご活用ください。</p>
-            <hr>
-            @if (count($webhooks) >= $webhooksLimit)
-                <p class="my-0 text-danger">1ユーザーが作成可能なWebhookは、{{ $webhooksLimit }}件までに制限されています。</p>
-            @else
-                <form action="{{ route('setting.webhooks.store') }}" method="post">
-                    {{ csrf_field() }}
-                    <div class="form-group">
-                        <label for="name">名前 (メモ)</label>
-                        <input id="name" class="form-control {{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" type="text" required>
-                        <small class="form-text text-muted">後で分かるように名前を付けておいてください。</small>
-                        @if ($errors->has('name'))
-                            <div class="invalid-feedback">{{ $errors->first('name') }}</div>
-                        @endif
-                    </div>
-                    <button class="btn btn-primary" type="submit">新規作成</button>
-                </form>
-            @endif
-        </div>
-    </div>
-    @if (!$webhooks->isEmpty())
-        <h4 class="mt-4">作成済みのWebhook</h4>
-        <div class="list-group mt-3">
-        @foreach ($webhooks as $webhook)
-            <div class="list-group-item d-flex justify-content-between align-items-center">
-                <div class="flex-grow-1 mr-2">
-                    <div>{{ $webhook->name }}</div>
-                    <input class="webhook-url form-control form-control-sm mt-1" type="text" value="{{ url('/api/webhooks/checkin/' . $webhook->id) }}" readonly>
-                </div>
-                <div class="ml-2">
-                    <button class="btn btn-outline-secondary copy-to-clipboard" type="button" data-toggle="popover" data-trigger="manual" data-placement="top" data-content="コピーしました！">コピー</button>
-                    <button class="btn btn-outline-danger" type="button" data-target="#deleteIncomingWebhookModal" data-id="{{ $webhook->id }}">削除</button>
-                </div>
-            </div>
-        @endforeach
-        </div>
-    @endif
-
-    @component('components.modal', ['id' => 'deleteIncomingWebhookModal'])
-        @slot('title')
-            削除確認
-        @endslot
-        Webhookを削除してもよろしいですか？
-        @slot('footer')
-            <form action="{{ route('setting.webhooks.destroy', ['webhook' => '@']) }}" method="post">
-                {{ csrf_field() }}
-                {{ method_field('DELETE') }}
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">キャンセル</button>
-                <button type="submit" class="btn btn-danger">削除</button>
-            </form>
-        @endslot
-    @endcomponent
-@endsection
-
-@push('script')
-    <script src="{{ mix('js/setting/webhooks.js') }}"></script>
-@endpush

resources/views/user/profile.blade.php

@@ -51,19 +51,14 @@
                     <h5>{{ $ejaculation->ejaculated_span ?? '精通' }} <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->before_date }}{{ !empty($ejaculation->before_date) ? ' ～ ' : '' }}{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a></h5>
                 </div>
                 <!-- tags -->
-                @if ($ejaculation->is_private || $ejaculation->source !== 'web' || $ejaculation->tags->isNotEmpty())
+                @if ($ejaculation->is_private || $ejaculation->source === 'csv' || $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
-                        @switch ($ejaculation->source)
-                            @case ('csv')
-                                <span class="badge badge-info"><span class="oi oi-cloud-upload"></span> インポート</span>
-                                @break
-                            @case ('webhook')
-                                <span class="badge badge-info" data-toggle="tooltip" title="Webhookからチェックイン"><span class="oi oi-flash"></span></span>
-                                @break
-                        @endswitch
+                        @if ($ejaculation->source === 'csv')
+                            <span class="badge badge-info"><span class="oi oi-cloud-upload"></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