pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

チェックインに対してセンシティブフラグを付与可能とする対応を実施

Browse Source
This commit is contained in:
MitarashiDango
2019-09-07 19:57:44 +09:00
parent 743272f8d6
commit 06cc18565e
12 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/app.js vendored
View File

@@ -92,4 +92,10 @@ $(() => {
});
}
});
$(document).on('click', '.card-spoiler-overlay', function (event) {
const $this = $(this);
$this.siblings(".card-link").removeClass("card-spoiler");
$this.remove();
});
});

21
resources/assets/sass/components/_link-card.scss vendored
View File

@@ -30,4 +30,25 @@
.card-text {
white-space: pre-line;
}
.card-spoiler-overlay {
position: absolute;
z-index: 1000;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
.warning-text {
padding: 10px;
background-color: rgba(240, 240, 240, 0.8);
border-radius: 5px;
}
}
.card-spoiler {
z-index: 1;
filter: blur(15px) grayscale(100%);
}
}

2
resources/views/components/ejaculation.blade.php
View File

@@ -19,7 +19,7 @@
<!-- okazu link -->
@if (!empty($ejaculation->link))
<div class="row mx-0">
@component('components.link-card', ['link' => $ejaculation->link])
@component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
@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>

7
resources/views/components/link-card.blade.php
View File

@@ -1,5 +1,10 @@
<div class="card link-card mb-2 px-0 col-12 d-none" style="font-size: small;">
<a class="text-dark card-link" href="{{ $link }}" target="_blank" rel="noopener">
@if ($is_too_sensitive)
<div class="card-spoiler-overlay">
<span class="warning-text">クリックまたはタップで表示</span>
</div>
@endif
<a class="text-dark card-link {{ $is_too_sensitive ? 'card-spoiler' : '' }}" href="{{ $link }}" target="_blank" rel="noopener">
<div class="row no-gutters">
<div class="col-12 col-md-6 justify-content-center align-items-center">
<img src="" alt="Thumbnail" class="w-100 bg-secondary">

6
resources/views/ejaculation/checkin.blade.php
View File

@@ -85,6 +85,12 @@
<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-lock-locked"></span> チェックイン対象のオカズをより過激なオカズとして設定する
</label>
</div>
</div>
</div>

6
resources/views/ejaculation/edit.blade.php
View File

@@ -86,6 +86,12 @@
<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-lock-locked"></span> チェックイン対象のオカズをより過激なオカズとして設定する
</label>
</div>
</div>
</div>

2
resources/views/ejaculation/show.blade.php
View File

@@ -47,7 +47,7 @@
<!-- okazu link -->
@if (!empty($ejaculation->link))
<div class="row mx-0">
@component('components.link-card', ['link' => $ejaculation->link])
@component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
@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>

2
resources/views/user/profile.blade.php
View File

@@ -53,7 +53,7 @@
<!-- okazu link -->
@if (!empty($ejaculation->link))
<div class="row mx-0">
@component('components.link-card', ['link' => $ejaculation->link])
@component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
@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>