feat(content warnings): misc QoL / fixes

ScuffedNewt · Oct 4, 2024 · ad814df · ad814df
1 parent 8c3192e
commit ad814df
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/public/images/content_warning.png b/public/images/content_warning.png
diff --git a/resources/views/character/_image_info.blade.php b/resources/views/character/_image_info.blade.php
@@ -8,7 +8,7 @@
                         <i class="fas fa-times" aria-hidden="true"></i>
                     </a>
                 </span>
-                <img src="{{ asset('images/content-warning.png') }}" class="mb-1" alt="Content Warning" style="height: 10vh;" />
+                <img src="{{ asset('images/content_warning.png') }}" class="mb-1" alt="Content Warning" style="height: 10vh;" />
                 <h5>
                     <i class="fa fa-exclamation-triangle mr-2"></i>Character Warnings<i class="fa fa-exclamation-triangle ml-2"></i>
                 </h5>

diff --git a/resources/views/character/bank.blade.php b/resources/views/character/bank.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/character.blade.php b/resources/views/character/character.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/character_logs.blade.php b/resources/views/character/character_logs.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/currency_logs.blade.php b/resources/views/character/currency_logs.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/edit_profile.blade.php b/resources/views/character/edit_profile.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/gallery.blade.php b/resources/views/character/gallery.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/images.blade.php b/resources/views/character/images.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/ownership_logs.blade.php b/resources/views/character/ownership_logs.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/profile.blade.php b/resources/views/character/profile.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/submission_logs.blade.php b/resources/views/character/submission_logs.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/transfer.blade.php b/resources/views/character/transfer.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/character/update_form.blade.php b/resources/views/character/update_form.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('meta-img')
-    {{ $character->image->thumbnailUrl }}
+    {{ $character->image->content_warnings ? asset('images/content_warning.png') : $character->image->thumbnailUrl }}
 @endsection
 
 @section('profile-content')

diff --git a/resources/views/comments/_comment.blade.php b/resources/views/comments/_comment.blade.php
@@ -79,7 +79,7 @@ class="comment border p-3 rounded {{ $comment->is_featured ? 'border-success bg-
     <div class="media-body row mw-100 mx-0 mb-3" style="flex:1;flex-wrap:wrap;">
         @if (isset($compact) && !$compact)
             <div class="d-none d-md-block">
-                <img class="mr-3 mt-2" src="/images/avatars/default.jpg" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
+                <img class="mr-3 mt-2" src="{{ asset('images/avatars/default.jpg') }}" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
             </div>
         @endif
         <div class="d-block bg-light" style="flex:1">

diff --git a/resources/views/comments/_perma_comments.blade.php b/resources/views/comments/_perma_comments.blade.php
@@ -85,7 +85,7 @@ class="comment border p-3 rounded {{ $limit == 0 ? 'shadow-sm border-info' : ''
 @endif
 <div class="media-body row mw-100 mx-0" style="flex:1;flex-wrap:wrap;">
     <div class="d-none d-md-block">
-        <img class="mr-3 mt-2" src="/images/avatars/default.jpg" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
+        <img class="mr-3 mt-2" src="{{ asset('images/avatars/default.jpg') }}" style="width:70px; height:70px; border-radius:50%;" alt="Default Avatar">
     </div>
     <div class="d-block bg-light" style="flex:1">
         <div class="border p-3 rounded {{ $limit == 0 ? 'shadow-sm border-info' : '' }}">

diff --git a/resources/views/user/_profile_content.blade.php b/resources/views/user/_profile_content.blade.php
@@ -130,7 +130,7 @@
             <div class="col-md-3 col-6 text-center">
                 <div>
                     @if ((Auth::check() && Auth::user()->settings->content_warning_visibility == 0 && isset($character->character_warning)) || (isset($character->character_warning) && !Auth::check()))
-                        <a href="{{ $character->url }}"><img src="{{ asset('/images/content_warning.png') }}" class="img-thumbnail" alt="Content Warning - {{ $character->fullName }}" /></a>
+                        <a href="{{ $character->url }}"><img src="{{ asset('images/content_warning.png') }}" class="img-thumbnail" alt="Content Warning - {{ $character->fullName }}" /></a>
                     @else
                         <a href="{{ $character->url }}"><img src="{{ $character->image->thumbnailUrl }}" class="img-thumbnail" alt="{{ $character->fullName }}" /></a>
                     @endif

diff --git a/resources/views/widgets/_character_warning_js.blade.php b/resources/views/widgets/_character_warning_js.blade.php
@@ -5,8 +5,9 @@
             type: "GET",
             dataType: 'json',
 
-            error: function() {
-                callback();
+            error: function(data) {
+                console.log('Error getting warnings');
+                console.log(data);
             },
             success: function(options) {
                 $('#warningList').selectize({
@@ -20,7 +21,6 @@
                     preload: true,
                     options: options,
                     onInitialize: function() {
-                        console.log(this.$input.attr('data-init-value'));
                         let existingOptions = this.$input.attr('data-init-value') ? JSON.parse(this.$input.attr('data-init-value')) : [];
                         var self = this;
                         if (Object.prototype.toString.call(existingOptions) ===

diff --git a/resources/views/widgets/_gallery_thumb.blade.php b/resources/views/widgets/_gallery_thumb.blade.php
@@ -1,5 +1,5 @@
 @if (isset($submission->content_warning))
-    <img class="img-thumbnail" src="{{ asset('/images/content_warning.png') }}" alt="Content Warning" />
+    <img class="img-thumbnail" src="{{ asset('images/content_warning.png') }}" alt="Content Warning" />
 @elseif(isset($submission->hash))
     <img class="img-thumbnail" src="{{ $submission->thumbnailUrl }}" alt="Submission thumbnail" />
 @else