From ab4bb9a0204c46c4ebfe1b593811149ac753c119 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 25 Mar 2023 03:38:38 -0600 Subject: [PATCH 1/2] Update private profile view, add rel=me support, hide avatar/bio when not logged in and add robots meta tag to block search engine indexing on private profiles --- resources/views/layouts/app-guest.blade.php | 38 +++++++++++++++++++ resources/views/layouts/app.blade.php | 32 ++-------------- resources/views/layouts/spa.blade.php | 7 ++-- .../profile/partial/private-info.blade.php | 2 +- resources/views/profile/private.blade.php | 10 ++--- 5 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 resources/views/layouts/app-guest.blade.php diff --git a/resources/views/layouts/app-guest.blade.php b/resources/views/layouts/app-guest.blade.php new file mode 100644 index 000000000..6adcffac4 --- /dev/null +++ b/resources/views/layouts/app-guest.blade.php @@ -0,0 +1,38 @@ + + + + + + + + {{ $title ?? config('app.name', 'Pixelfed') }} + + + + + + + @stack('meta') + + + + + + + + + @stack('styles') + + + @include('layouts.partial.nav') +
+ @yield('content') +
+ @include('layouts.partial.footer') + + + + + @stack('scripts') + + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 4cd507820..94f90ed97 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,7 +10,7 @@ {{ $title ?? config_cache('app.name') }} - + @@ -21,8 +21,8 @@ - - + + @if(request()->cookie('dark-mode')) @@ -58,30 +58,6 @@ @stack('scripts') -
-
-
-
    -
  • - -
    • -
  • - -
    • -
  • -
    - -
    -
    • -
  • - -
    • -
  • - -
    • -
-
-
@endauth @@ -91,7 +67,7 @@ - + {{ $title ?? config('app.name', 'Pixelfed') }} diff --git a/resources/views/layouts/spa.blade.php b/resources/views/layouts/spa.blade.php index 68967128a..3aa4316cb 100644 --- a/resources/views/layouts/spa.blade.php +++ b/resources/views/layouts/spa.blade.php @@ -7,17 +7,18 @@ {{ $title ?? config_cache('app.name') }} - + @stack('meta') + - - + + diff --git a/resources/views/profile/partial/private-info.blade.php b/resources/views/profile/partial/private-info.blade.php index 6b7096bde..aa3eb344e 100644 --- a/resources/views/profile/partial/private-info.blade.php +++ b/resources/views/profile/partial/private-info.blade.php @@ -3,7 +3,7 @@
- +
diff --git a/resources/views/profile/private.blade.php b/resources/views/profile/private.blade.php index a738c6603..ffff37d49 100644 --- a/resources/views/profile/private.blade.php +++ b/resources/views/profile/private.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app',['title' => $user->username . " on " . config('app.name')]) +@extends('layouts.app-guest',['title' => $user->username . " on " . config('app.name')]) @section('content') @if (session('error')) @@ -7,7 +7,9 @@
@endif @include('profile.partial.private-info') - +@if($user->website) +{{$user->website}} +@endif
@@ -29,9 +31,5 @@ @endsection @push('meta') - - -@if($user->remote_url) -@endif @endpush From 994668fd9837ef23cea13379f2441d42d1ad9e63 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 25 Mar 2023 03:39:20 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41338d426..a6bf99f53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -139,6 +139,8 @@ - Update ap helpers, fix album order bug by setting media order ([871f798c](https://github.com/pixelfed/pixelfed/commit/871f798c)) - Update image pipeline, dispatch jobs to mmo queue and add "replace_id" param to v2/media endpoint to dispatch delayed MediaDeletePipeline job for original media id to improve media gc on supported clients ([5a67e9f9](https://github.com/pixelfed/pixelfed/commit/5a67e9f9)) - Update admin instance management, improve filtering/sorting and add import/export support ([d5d9500d](https://github.com/pixelfed/pixelfed/commit/d5d9500d)) +- Update Post component, show state error when status account is null or missing ([e6dc6234](https://github.com/pixelfed/pixelfed/commit/e6dc6234)) +- Update private profile view, add rel=me support, hide avatar/bio when not logged in and add robots meta tag to block search engine indexing on private profiles ([ab4bb9a0](https://github.com/pixelfed/pixelfed/commit/ab4bb9a0)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)