From a9cc8239be3dba6ac4bae6512019e41c8eaf0503 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:07:18 +0200 Subject: [PATCH 1/5] Seperate info about user into new view --- .../views/profile/partial/user-info.blade.php | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 resources/views/profile/partial/user-info.blade.php diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php new file mode 100644 index 00000000..23922e12 --- /dev/null +++ b/resources/views/profile/partial/user-info.blade.php @@ -0,0 +1,77 @@ +
+
+
+
+
+ +
+
+
+
+
+ {{$user->username}} + @if($owner == true) + + + + @elseif ($following == true) + + + + @elseif ($following == false) + + + + @endif + {{-- TODO: Implement action dropdown + +
+ +
+ Report User + Block User +
+
+ + --}} +
+
+
+ {{$user->statuses()->whereNull('in_reply_to_id')->count()}} + Posts +
+
+ + {{$user->followerCount(true)}} + Followers + +
+
+ + {{$user->followingCount(true)}} + Following + +
+
+

+ {{$user->name}} + @if($user->remote_url) + REMOTE PROFILE + @endif + {{$user->bio}} +

+
+
+
+
+
From d03c762146f9c5651ecae2d21159ad8f2550af5e Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:19:13 +0200 Subject: [PATCH 2/5] Adapt show to new partial --- resources/views/profile/show.blade.php | 151 +++++++------------------ 1 file changed, 38 insertions(+), 113 deletions(-) diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index c2206387..d1115ffe 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -2,134 +2,59 @@ @section('content') +@include('profile.partial.user-info') + +@if($owner == true) +
+ +
+@endif
- -
-
-
- -
-
-
-
-
- {{$user->username}} - @if($owner == true) - - - - @elseif ($following == true) - - - - @elseif ($following == false) - - - - @endif - {{-- TODO: Implement action dropdown - -
- -
- Report User - Block User -
-
- --}} -
-
-
- {{$user->statuses()->whereNull('in_reply_to_id')->count()}} - Posts -
-
- - {{$user->followerCount(true)}} - Followers - -
-
- - {{$user->followingCount(true)}} - Following - -
-
-

- {{$user->name}} - @if($user->remote_url) - REMOTE PROFILE - @endif - {{$user->bio}} -

-
-
-
-
- @if($owner == true) -
- -
- @endif - @if($owner && request()->is('*/saved'))

{{__('profile.savedWarning')}}

@endif - @if($timeline->count() > 0) - @foreach($timeline as $status) -
- -
-
-
-
- - {{$status->likes_count}} - - - {{$status->comments_count}} - -
-
+ @foreach($timeline as $status) +
+ +
+
+
+
+ + {{$status->likes_count}} + + + {{$status->comments_count}} + +
- -
- @endforeach +
+ +
+ @endforeach @else -
-
-
-
-

{{ __('profile.emptyTimeline') }}

-
+
+
+
+
+

{{ __('profile.emptyTimeline') }}

+
@endif
-
@endsection From 412c3c81225a771cc67476a643e4f55486aad9f4 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:21:54 +0200 Subject: [PATCH 3/5] Adapt following to partial --- resources/views/profile/following.blade.php | 41 +-------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 27aae9ec..7985b707 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -2,46 +2,9 @@ @section('content') +@include('profile.partial.user-info') +
- -
-
-
- -
-
-
-
-
- {{$profile->username}} -
-
-
- - {{$profile->statuses()->whereNull('in_reply_to_id')->count()}} - Posts - -
-
- - {{$profile->followerCount(true)}} - Followers - -
-
- - {{$profile->followingCount(true)}} - Following - -
-
-

- {{$profile->name}} -

-
-
-
-
@if($following->count() !== 0)
    From f09acf51b6677b7dd9301ab85b1dd850d57eb9d2 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 18:22:41 +0200 Subject: [PATCH 4/5] Adapt following to partial --- resources/views/profile/followers.blade.php | 41 +-------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 75ff0e93..1352f319 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -2,46 +2,9 @@ @section('content') +@include('profile.partial.user-info') +
    - -
    -
    -
    - -
    -
    -
    -
    -
    - {{$profile->username}} -
    -
    -
    - - {{$profile->statuses()->whereNull('in_reply_to_id')->count()}} - Posts - -
    -
    - - {{$profile->followerCount(true)}} - Followers - -
    -
    - - {{$profile->followingCount(true)}} - Following - -
    -
    -

    - {{$profile->name}} -

    -
    -
    -
    -
    @if($followers->count() !== 0)
      From 022d23ff7978f70062dc59f7b9b2e1737f44c422 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sun, 3 Jun 2018 20:44:25 +0200 Subject: [PATCH 5/5] Restore link to user profile --- resources/views/profile/partial/user-info.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/profile/partial/user-info.blade.php b/resources/views/profile/partial/user-info.blade.php index 23922e12..13326794 100644 --- a/resources/views/profile/partial/user-info.blade.php +++ b/resources/views/profile/partial/user-info.blade.php @@ -47,8 +47,10 @@
    + {{$user->statuses()->whereNull('in_reply_to_id')->count()}} Posts +