From 41eb81de7613ac5598163680c4673adc5e7bfe9b Mon Sep 17 00:00:00 2001 From: Jaiden Date: Sun, 25 May 2025 00:02:40 -0400 Subject: [PATCH 01/15] i hope this works --- app/Livewire/App/Pfp.php | 8 ++------ resources/views/livewire/app/navbar.blade.php | 5 ++++- resources/views/livewire/app/pfp.blade.php | 7 ++++++- resources/views/livewire/pages/profile.blade.php | 2 +- resources/views/livewire/posts/comment.blade.php | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/Livewire/App/Pfp.php b/app/Livewire/App/Pfp.php index e5f6fbd..264bad4 100644 --- a/app/Livewire/App/Pfp.php +++ b/app/Livewire/App/Pfp.php @@ -7,16 +7,12 @@ use Livewire\Component; class Pfp extends Component { - public string $user = ''; + public User $user; public string $size = '3rem'; public string $shape = 'circle'; public function render() { - $u = User::find($this->user); - return view('livewire.app.pfp', [ - 'pfp' => $u->getAvatarBase64(), - 'name' => $u->name, - ]); + return view('livewire.app.pfp'); } } diff --git a/resources/views/livewire/app/navbar.blade.php b/resources/views/livewire/app/navbar.blade.php index 81ad235..e24b0c4 100644 --- a/resources/views/livewire/app/navbar.blade.php +++ b/resources/views/livewire/app/navbar.blade.php @@ -36,7 +36,10 @@ @auth - {{ Auth::user()->name }} + @endauth diff --git a/resources/views/livewire/app/pfp.blade.php b/resources/views/livewire/app/pfp.blade.php index e0f1867..5ab3356 100644 --- a/resources/views/livewire/app/pfp.blade.php +++ b/resources/views/livewire/app/pfp.blade.php @@ -1,3 +1,8 @@
- +
diff --git a/resources/views/livewire/pages/profile.blade.php b/resources/views/livewire/pages/profile.blade.php index 146d81a..140c864 100644 --- a/resources/views/livewire/pages/profile.blade.php +++ b/resources/views/livewire/pages/profile.blade.php @@ -1,7 +1,7 @@
- + + + Sign out + @endauth
diff --git a/resources/views/livewire/app/pfp.blade.php b/resources/views/livewire/app/pfp.blade.php index fb157ea..6767b75 100644 --- a/resources/views/livewire/app/pfp.blade.php +++ b/resources/views/livewire/app/pfp.blade.php @@ -1,11 +1,8 @@ -@php use Illuminate\Support\Facades\Storage; @endphp -
- id")) - image="{{ $user->getAvatarBase64() }}" - @endif - label="avatar for {{ $user->name }}" - shape="{{ $shape }}" - style="--size: {{ $size }}" - > -
+id")) + image="{{ $user->getAvatarBase64() }}" + @endif + label="avatar for {{ $user->name }}" + shape="{{ $shape }}" + style="--size: {{ $size }}" +> diff --git a/resources/views/livewire/app/user-card.blade.php b/resources/views/livewire/app/user-card.blade.php new file mode 100644 index 0000000..78562cd --- /dev/null +++ b/resources/views/livewire/app/user-card.blade.php @@ -0,0 +1,13 @@ +
+ + +
diff --git a/resources/views/livewire/pages/profile.blade.php b/resources/views/livewire/pages/profile.blade.php index 140c864..cb9e224 100644 --- a/resources/views/livewire/pages/profile.blade.php +++ b/resources/views/livewire/pages/profile.blade.php @@ -1,8 +1,11 @@
-