Merge pull request #1595 from LiquidPL/fix-785

Add pending and graveyarded beatmapsets to profile page
ppy · Nov 14, 2017 · 3acd106 · 3acd106
2 parents b6cc123 + 38d20f6
commit 3acd106
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 103 deletions.
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -165,6 +165,14 @@ public function beatmapsets($id, $type)
             case 'ranked_and_approved':
                 return $this->rankedAndApprovedBeatmapsets($this->user, $this->perPage, $this->offset);
 
+            case 'unranked':
+                return $this->unrankedBeatmapsets($this->user, $this->perPage, $this->offset);
+
+            case 'graveyard':
+                $this->parsePaginationParams(2);
+
+                return $this->graveyardBeatmapsets($this->user, $this->perPage, $this->offset);
+
             default:
                 abort(404);
         }
@@ -209,6 +217,8 @@ public function show($id, $mode = null)
                 'page',
                 'recentActivities',
                 'rankedAndApprovedBeatmapsetCount',
+                'unrankedBeatmapsetCount',
+                'graveyardBeatmapsetCount',
                 'favouriteBeatmapsetCount',
             ]
         );
@@ -244,6 +254,8 @@ public function show($id, $mode = null)
                 'most_played' => $this->mostPlayedBeatmapsets($user),
                 'ranked_and_approved' => $this->rankedAndApprovedBeatmapsets($user),
                 'favourite' => $this->favouriteBeatmapsets($user),
+                'unranked' => $this->unrankedBeatmapsets($user),
+                'graveyard' => $this->graveyardBeatmapsets($user),
             ];
 
             $kudosu = $this->recentKudosu($user);
@@ -362,6 +374,30 @@ private function favouriteBeatmapsets($user, $perPage = 6, $offset = 0)
         );
     }
 
+    private function unrankedBeatmapsets($user, $perPage = 6, $offset = 0)
+    {
+        return json_collection(
+            $user->profileBeatmapsetsUnranked()
+                ->limit($perPage)
+                ->offset($offset)
+                ->get(),
+            'BeatmapsetCompact',
+            ['beatmaps']
+        );
+    }
+
+    private function graveyardBeatmapsets($user, $perPage = 2, $offset = 0)
+    {
+        return json_collection(
+            $user->profileBeatmapsetsGraveyard()
+                ->limit($perPage)
+                ->offset($offset)
+                ->get(),
+            'BeatmapsetCompact',
+            ['beatmaps']
+        );
+    }
+
     private function scoresBest($user, $mode, $perPage = 5, $offset = 0)
     {
         $scores = $user->scoresBest($mode, true)

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -1325,6 +1325,20 @@ public function profileBeatmapsetsFavourite()
             ->with('beatmaps');
     }
 
+    public function profileBeatmapsetsUnranked()
+    {
+        return $this->beatmapsets()
+            ->unranked()
+            ->with('beatmaps');
+    }
+
+    public function profileBeatmapsetsGraveyard()
+    {
+        return $this->beatmapsets()
+            ->graveyard()
+            ->with('beatmaps');
+    }
+
     public function isValid()
     {
         $this->validationErrors()->reset();

diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php
@@ -33,6 +33,8 @@ class UserTransformer extends Fractal\TransformerAbstract
         'page',
         'recentActivities',
         'rankedAndApprovedBeatmapsetCount',
+        'unrankedBeatmapsetCount',
+        'graveyardBeatmapsetCount',
         'favouriteBeatmapsetCount',
         'disqus_auth',
     ];
@@ -144,6 +146,24 @@ public function includeRankedAndApprovedBeatmapsetCount(User $user)
         });
     }
 
+    public function includeUnrankedBeatmapsetCount(User $user)
+    {
+        return $this->item($user, function ($user) {
+            return [
+                $user->profileBeatmapsetsUnranked()->count(),
+            ];
+        });
+    }
+
+    public function includeGraveyardBeatmapsetCount(User $user)
+    {
+        return $this->item($user, function ($user) {
+            return [
+                $user->profileBeatmapsetsGraveyard()->count(),
+            ];
+        });
+    }
+
     public function includeFavouriteBeatmapsetCount(User $user)
     {
         return $this->item($user, function ($user) {

diff --git a/resources/assets/coffee/react/profile-page/beatmaps.coffee b/resources/assets/coffee/react/profile-page/beatmaps.coffee
@@ -24,6 +24,11 @@ class ProfilePage.Beatmaps extends React.PureComponent
     allBeatmapsets =
       favouriteBeatmapsets: @props.favouriteBeatmapsets
       rankedAndApprovedBeatmapsets: @props.rankedAndApprovedBeatmapsets
+      unrankedBeatmapsets: @props.unrankedBeatmapsets
+      graveyardBeatmapsets: @props.graveyardBeatmapsets
+
+    perPage =
+      graveyardBeatmapsets: 2
 
     div
       className: 'page-extra'
@@ -50,7 +55,7 @@ class ProfilePage.Beatmaps extends React.PureComponent
                   collection: beatmapsets
                   propertyName: section
                   pagination: @props.pagination[section]
-                  perPage: 6
+                  perPage: perPage[section] ? 6
                   route: laroute.route 'users.beatmapsets',
                     user: @props.user.id
                     type: sectionSnaked

diff --git a/resources/assets/coffee/react/profile-page/main.coffee b/resources/assets/coffee/react/profile-page/main.coffee
@@ -57,6 +57,8 @@ class ProfilePage.Main extends React.PureComponent
       beatmapPlaycounts: @props.beatmapsets.most_played
       favouriteBeatmapsets: @props.beatmapsets.favourite
       rankedAndApprovedBeatmapsets: @props.beatmapsets.ranked_and_approved
+      unrankedBeatmapsets: @props.beatmapsets.unranked
+      graveyardBeatmapsets: @props.beatmapsets.graveyard
       recentlyReceivedKudosu: @props.recentlyReceivedKudosu
       showMorePagination: {}
 
@@ -142,9 +144,13 @@ class ProfilePage.Main extends React.PureComponent
           user: @state.user
           favouriteBeatmapsets: @state.favouriteBeatmapsets
           rankedAndApprovedBeatmapsets: @state.rankedAndApprovedBeatmapsets
+          unrankedBeatmapsets: @state.unrankedBeatmapsets
+          graveyardBeatmapsets: @state.graveyardBeatmapsets
           counts:
             favouriteBeatmapsets: @state.user.favouriteBeatmapsetCount[0]
             rankedAndApprovedBeatmapsets: @state.user.rankedAndApprovedBeatmapsetCount[0]
+            unrankedBeatmapsets: @state.user.unrankedBeatmapsetCount[0]
+            graveyardBeatmapsets: @state.user.graveyardBeatmapsetCount[0]
           pagination: @state.showMorePagination
         component: ProfilePage.Beatmaps
 

diff --git a/resources/lang/en/users.php b/resources/lang/en/users.php
@@ -96,7 +96,21 @@
                 'achieved-on' => 'Achieved on :date',
             ],
             'beatmaps' => [
+                'none' => 'None... yet.',
                 'title' => 'Beatmaps',
+
+                'favourite' => [
+                    'title' => 'Favourite Beatmaps (:count)',
+                ],
+                'graveyard' => [
+                    'title' => 'Graveyarded Beatmaps (:count)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Ranked & Approved Beatmaps (:count)',
+                ],
+                'unranked' => [
+                    'title' => 'Pending Beatmaps (:count)',
+                ],
             ],
             'historical' => [
                 'empty' => 'No performance records. :(',
@@ -174,16 +188,6 @@
                 'title' => 'Ranks',
                 'weighted_pp' => 'weighted: :pp (:percentage)',
             ],
-            'beatmaps' => [
-                'title' => 'Beatmaps',
-                'favourite' => [
-                    'title' => 'Favourite Beatmaps (:count)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Ranked & Approved Beatmaps (:count)',
-                ],
-                'none' => 'None... yet.',
-            ],
         ],
         'page' => [
             'description' => '<strong>me!</strong> is a personal customisable area in your profile page.',

diff --git a/resources/lang/es/users.php b/resources/lang/es/users.php
@@ -91,7 +91,15 @@
                 'achieved-on' => 'Obtenido el :date',
             ],
             'beatmaps' => [
+                'none' => 'Ninguno... aún.',
                 'title' => 'Beatmaps',
+
+                'favourite' => [
+                    'title' => 'Beatmaps Favoritos (:count)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Beatmaps Rankeados & Aprobados (:count)',
+                ],
             ],
             'historical' => [
                 'empty' => 'Sin récords de rendimiento. :(',
@@ -169,16 +177,6 @@
                 'title' => 'Rangos',
                 'weighted_pp' => 'valorado en: :pp (:percentage)',
             ],
-            'beatmaps' => [
-                'title' => 'Beatmaps',
-                'favourite' => [
-                    'title' => 'Beatmaps Favoritos (:count)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Beatmaps Rankeados & Aprobados (:count)',
-                ],
-                'none' => 'Ninguno... aún.',
-            ],
         ],
         'page' => [
             'description' => '<strong>sobre mi!</strong> es una área personalizable en tu perfil.',

diff --git a/resources/lang/fr/users.php b/resources/lang/fr/users.php
@@ -95,7 +95,15 @@
                 'achieved-on' => 'Acquis le :date',
             ],
             'beatmaps' => [
+                'none' => 'Aucune... Pour le moment.',
                 'title' => 'Beatmaps',
+
+                'favourite' => [
+                    'title' => 'Beatmaps favorites (:count)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Beatmaps classées et approuvées (:count)',
+                ],
             ],
             'historical' => [
                 'empty' => 'Aucun enregistrement de performance. :(',
@@ -173,16 +181,6 @@
                 'title' => 'Classements',
                 'weighted_pp' => 'pondéré: :pp (:percentage)',
             ],
-            'beatmaps' => [
-                'title' => 'Beatmaps',
-                'favourite' => [
-                    'title' => 'Beatmaps favorites (:count)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Beatmaps classées et approuvées (:count)',
-                ],
-                'none' => 'Aucune... Pour le moment.',
-            ],
         ],
         'page' => [
             'description' => '<strong>Moi!</strong> est une zone personnalisable du profil.',

diff --git a/resources/lang/it/users.php b/resources/lang/it/users.php
@@ -83,7 +83,15 @@
                 'achieved-on' => 'Raggiunto il :date',
             ],
             'beatmaps' => [
-                'title' => 'Beatmaps',
+                'none' => 'Nessuna... per ora.',
+                'title' => 'Beatmap',
+
+                'favourite' => [
+                    'title' => 'Beatmaps Preferite (:count)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Beatmap Rankate e Approvate (:count)',
+                ],
             ],
             'historical' => [
                 'empty' => 'Nessuna registrazione della performance. :(', // record as "registrazione", like "we have no performance data to show you"
@@ -136,16 +144,6 @@
                 'title' => 'Rank',
                 'weighted_pp' => 'valutata: :pp (:percentage)', // "ponderata" - "pesata" - "valutata", i think "valutata" as "evalutated" is better
             ],
-            'beatmaps' => [
-                'title' => 'Beatmap',
-                'favourite' => [
-                    'title' => 'Beatmaps Preferite (:count)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Beatmap Rankate e Approvate (:count)',
-                ],
-                'none' => 'Nessuna... per ora.',
-            ],
         ],
         'page' => [
             'description' => '<strong>io!</strong> è un\'area personale personalizzabile nella tua pagina del profilo.',

diff --git a/resources/lang/ko/users.php b/resources/lang/ko/users.php
@@ -96,7 +96,15 @@
                 'achieved-on' => ':date에 달성함',
             ],
             'beatmaps' => [
+                'none' => '아직... 없네요...',
                 'title' => '비트맵',
+
+                'favourite' => [
+                    'title' => '즐겨찾기한 비트맵 (:count개)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Ranked / Approved 된 비트맵 (:count개)',
+                ],
             ],
             'historical' => [
                 'empty' => '기록된 플레이가 없습니다. :(',
@@ -174,16 +182,6 @@
                 'title' => '순위',
                 'weighted_pp' => '가중치 적용: :pp (:percentage)', // 높은 경쟁력을 가진 맵(구맵들)은 가중치가 줄어들고 본래 pp에서 가중치를 곱한 만큼의 실 pp를 받게됨
             ],
-            'beatmaps' => [
-                'title' => '비트맵',
-                'favourite' => [
-                    'title' => '즐겨찾기한 비트맵 (:count개)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Ranked / Approved 된 비트맵 (:count개)',
-                ],
-                'none' => '아직... 없네요...',
-            ],
         ],
         'page' => [
             'description' => '<strong>me!</strong>는 유저 프로필 페이지에서 개인이 꾸밀 수 있는 공간입니다.',

diff --git a/resources/lang/nl/users.php b/resources/lang/nl/users.php
@@ -80,7 +80,15 @@
                 'achieved-on' => 'Behaald op :date',
             ],
             'beatmaps' => [
+                'none' => 'Nog geen...',
                 'title' => 'Beatmaps',
+
+                'favourite' => [
+                    'title' => 'Favoriete Beatmaps (:count)',
+                ],
+                'ranked_and_approved' => [
+                    'title' => 'Gerankte & Goedgekeurde Beatmaps (:count)',
+                ],
             ],
             'historical' => [
                 'empty' => 'Geen prestatiegegevens. :(',
@@ -133,16 +141,6 @@
                 'title' => 'Ranks',
                 'weighted_pp' => 'gewogen: :pp (:percentage)',
             ],
-            'beatmaps' => [
-                'title' => 'Beatmaps',
-                'favourite' => [
-                    'title' => 'Favoriete Beatmaps (:count)',
-                ],
-                'ranked_and_approved' => [
-                    'title' => 'Gerankte & Goedgekeurde Beatmaps (:count)',
-                ],
-                'none' => 'Nog geen...',
-            ],
         ],
         'page' => [
             'description' => '<strong>ik!</strong> is een persoonlijk bewerkbaar gedeelte van je profiel.',