From cef451e588c781df4e565a5b17613a443c4f0c15 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 16 Dec 2023 05:36:59 -0700
Subject: [PATCH] Update routes

---
 resources/views/settings/privacy.blade.php    |  5 +-
 .../views/settings/privacy/blocked.blade.php  | 68 +++++++++----------
 .../views/settings/privacy/muted.blade.php    | 62 ++++++++---------
 routes/web.php                                |  1 +
 4 files changed, 64 insertions(+), 72 deletions(-)

diff --git a/resources/views/settings/privacy.blade.php b/resources/views/settings/privacy.blade.php
index 57f83c664..a1212141a 100644
--- a/resources/views/settings/privacy.blade.php
+++ b/resources/views/settings/privacy.blade.php
@@ -8,8 +8,9 @@
   <hr>
   <div class="form-group pb-1">
     <p>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Accounts</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Accounts</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.domain-blocks')}}">Domain Blocks</a>
     </p>
   </div>
   <form method="post">
diff --git a/resources/views/settings/privacy/blocked.blade.php b/resources/views/settings/privacy/blocked.blade.php
index e3b2eab2b..8906eae7d 100644
--- a/resources/views/settings/privacy/blocked.blade.php
+++ b/resources/views/settings/privacy/blocked.blade.php
@@ -2,40 +2,36 @@
 
 @section('section')
 
-  <div class="title">
-    <h3 class="font-weight-bold">Blocked Users</h3>
-  </div>
-  <hr>
-  <div class="form-group pb-1">
-    <p>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-primary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
-      {{-- <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-keywords')}}">Blocked keywords</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-instances')}}">Blocked instances</a> --}}
-    </p>
-  </div>
-  @if($users->count() > 0)
-  <ul class="list-group list-group-flush">
-    @foreach($users as $user)
-    <li class="list-group-item">
-      <div class="d-flex justify-content-between align-items-center font-weight-bold">
-        <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px">{{$user->username}}</a></span>
-        <span class="btn-group">
-          <form method="post">
-            @csrf
-            <input type="hidden" name="profile_id" value="{{$user->id}}">
-            <button type="submit" class="btn btn-outline-secondary btn-sm px-3 font-weight-bold">Unblock</button>
-          </form>
-        </span>
-      </div> 
-    </li>
-    @endforeach
-  </ul>
-  <div class="d-flex justify-content-center mt-3 font-weight-bold">
-    {{$users->links()}}
-  </div>
-  @else
-  <p class="lead">You are not blocking any accounts.</p>
-  @endif
+<div class="d-flex justify-content-between align-items-center">
+    <div class="title d-flex align-items-center" style="gap: 1rem;">
+        <p class="mb-0"><a href="/settings/privacy"><i class="far fa-chevron-left fa-lg"></i></a></p>
+        <h3 class="font-weight-bold mb-0">Blocked Accounts</h3>
+    </div>
+</div>
+<hr />
 
-@endsection
\ No newline at end of file
+@if($users->count() > 0)
+<div class="list-group">
+    @foreach($users as $user)
+    <div class="list-group-item">
+        <div class="d-flex justify-content-between align-items-center font-weight-bold">
+            <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">{{$user->username}}</a></span>
+            <span class="btn-group">
+                <form method="post">
+                    @csrf
+                    <input type="hidden" name="profile_id" value="{{$user->id}}">
+                    <button type="submit" class="btn btn-link btn-sm px-3 font-weight-bold">Unblock</button>
+                </form>
+            </span>
+        </div>
+    </div>
+    @endforeach
+</div>
+<div class="d-flex justify-content-center mt-3 font-weight-bold">
+    {{$users->links()}}
+</div>
+@else
+<p class="lead text-center font-weight-bold">You are not blocking any accounts.</p>
+@endif
+
+@endsection
diff --git a/resources/views/settings/privacy/muted.blade.php b/resources/views/settings/privacy/muted.blade.php
index a13b9b716..152b8d641 100644
--- a/resources/views/settings/privacy/muted.blade.php
+++ b/resources/views/settings/privacy/muted.blade.php
@@ -1,41 +1,35 @@
 @extends('settings.template')
 
 @section('section')
-
-  <div class="title">
-    <h3 class="font-weight-bold">Muted Users</h3>
-  </div>
-  <hr>
-  <div class="form-group pb-1">
-    <p>
-      <a class="btn btn-outline-primary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
-      {{-- <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-keywords')}}">Blocked keywords</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-instances')}}">Blocked instances</a> --}}
-    </p>
-  </div>
-  @if($users->count() > 0)
-  <ul class="list-group list-group-flush">
+<div class="d-flex justify-content-between align-items-center">
+    <div class="title d-flex align-items-center" style="gap: 1rem;">
+        <p class="mb-0"><a href="/settings/privacy"><i class="far fa-chevron-left fa-lg"></i></a></p>
+        <h3 class="font-weight-bold mb-0">Muted Accounts</h3>
+    </div>
+</div>
+<hr />
+@if($users->count() > 0)
+<div class="list-group">
     @foreach($users as $user)
-    <li class="list-group-item">
-      <div class="d-flex justify-content-between align-items-center font-weight-bold">
-        <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px">{{$user->username}}</a></span>
-        <span class="btn-group">
-          <form method="post">
-            @csrf
-            <input type="hidden" name="profile_id" value="{{$user->id}}">
-            <button type="submit" class="btn btn-outline-secondary btn-sm px-3 font-weight-bold">Unmute</button>
-          </form>
-        </span>
-      </div> 
-    </li>
+    <div class="list-group-item">
+        <div class="d-flex justify-content-between align-items-center font-weight-bold">
+            <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">{{$user->username}}</a></span>
+            <span class="btn-group">
+                <form method="post">
+                    @csrf
+                    <input type="hidden" name="profile_id" value="{{$user->id}}">
+                    <button type="submit" class="btn btn-link btn-sm px-3 font-weight-bold">Unmute</button>
+                </form>
+            </span>
+        </div>
+    </div>
     @endforeach
-  </ul>
-  <div class="d-flex justify-content-center mt-3 font-weight-bold">
+</div>
+<div class="d-flex justify-content-center mt-3 font-weight-bold">
     {{$users->links()}}
-  </div>
-  @else
-  <p class="lead">You are not muting any accounts.</p>
-  @endif
+</div>
+@else
+<p class="lead text-center font-weight-bold">You are not muting any accounts.</p>
+@endif
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/routes/web.php b/routes/web.php
index b823b8729..b8149a605 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -489,6 +489,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
 		Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate');
 		Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');
 		Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate');
+		Route::get('privacy/domain-blocks', 'SettingsController@domainBlocks')->name('settings.privacy.domain-blocks');
 		Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances');
 		Route::post('privacy/blocked-instances', 'SettingsController@blockedInstanceStore');
 		Route::post('privacy/blocked-instances/unblock', 'SettingsController@blockedInstanceUnblock')->name('settings.privacy.blocked-instances.unblock');