Use country singleton in more places and clean up styling

nanaya · Dec 10, 2024 · 34535b4 · 34535b4
1 parent 7aca7a3
commit 34535b4
Show file tree

Hide file tree

Showing 16 changed files with 89 additions and 54 deletions.
diff --git a/app/Http/Controllers/BeatmapsController.php b/app/Http/Controllers/BeatmapsController.php
@@ -74,7 +74,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType,
             'type' => $type,
             'user' => $currentUser,
         ]);
-        $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'processHistory']);
+        $scores = $esFetch->all()->loadMissing(['beatmap', 'user', 'processHistory']);
         $userScore = $esFetch->userBest();
         $scoreTransformer = new ScoreTransformer($scoreTransformerType);
 

diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php
@@ -393,7 +393,6 @@ public function show($id)
 
         $posts->load([
             'lastEditor',
-            'user.country',
             'user.rank',
             'user.supporterTagPurchases',
             'user.userGroups',

diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
@@ -166,15 +166,14 @@ public function index($mode, $type)
 
         if ($type === 'country') {
             $stats = CountryStatistics::where('display', 1)
-                ->with('country')
                 ->where('mode', $modeInt)
                 ->orderBy('performance', 'desc');
         } else {
             $class = UserStatistics\Model::getClass($mode, $this->params['variant']);
             $table = (new $class())->getTable();
             $ppColumn = $class::ppColumn();
             $stats = $class
-                ::with(['user', 'user.country'])
+                ::with('user')
                 ->where($ppColumn, '>', 0)
                 ->whereHas('user', function ($userQuery) {
                     $userQuery->default();

diff --git a/app/Models/DeletedUser.php b/app/Models/DeletedUser.php
@@ -7,6 +7,7 @@
 
 class DeletedUser extends User
 {
+    public null $country_acronym = null;
     public $user_avatar = null;
     public $username = '[deleted user]';
 

diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php
@@ -676,7 +676,7 @@ public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId)
 
     public function topScores()
     {
-        return $this->userHighScores()->forRanking()->with('user.country');
+        return $this->userHighScores()->forRanking()->with('user');
     }
 
     private function assertHostRoomAllowance()

diff --git a/app/Models/Spotlight.php b/app/Models/Spotlight.php
@@ -96,13 +96,11 @@ public function ranking(string $mode)
         // These models will not have the correct table name set on them
         // as they get overriden when Laravel hydrates them.
         return $this->userStats($mode)
-            ->with(['user', 'user.country'])
-            ->whereHas('user', function ($userQuery) {
-                $model = new User();
+            ->with('user')
+            ->whereHas('user', fn ($userQuery) =>
                 $userQuery
-                    ->from($model->tableName(true))
-                    ->default();
-            })
+                    ->from($userQuery->getModel()->tableName(true))
+                    ->default())
             ->orderBy('ranked_score', 'desc')
             ->limit(static::SPOTLIGHT_MAX_RESULTS);
     }

diff --git a/app/Transformers/CountryStatisticsTransformer.php b/app/Transformers/CountryStatisticsTransformer.php
@@ -24,8 +24,10 @@ public function transform(CountryStatistics $stat)
 
     public function includeCountry(CountryStatistics $stat)
     {
-        return $stat->country === null
+        $country = app('countries')->byCode($stat->country_code);
+
+        return $country === null
             ? $this->primitive(null)
-            : $this->item($stat->country, new CountryTransformer());
+            : $this->item($country, new CountryTransformer());
     }
 }
diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less
@@ -123,7 +123,7 @@
 
   &__flags {
     display: flex;
-    gap: 5px;
+    gap: 10px;
     margin-top: 10px;
     font-size: 15px; // icon size
 

diff --git a/resources/css/bem/ranking-page-table.less b/resources/css/bem/ranking-page-table.less
@@ -105,6 +105,12 @@
     margin-left: 10px;
   }
 
+  &__flags {
+    display: inline-flex;
+    gap: 10px;
+    font-size: @flag-size-medium; // icon size
+  }
+
   &__user-link {
     display: flex;
     align-items: center;

diff --git a/resources/views/forum/topics/_post_info.blade.php b/resources/views/forum/topics/_post_info.blade.php
@@ -71,14 +71,14 @@ class="forum-post-info__row forum-post-info__row--title"
         </div>
     @endif
 
-    @if ($user->country !== null)
+    @if (($countryAcronym = $user->country_acronym) !== null)
         <div class="forum-post-info__row forum-post-info__row--flag">
             <a href="{{route('rankings', [
                 'mode' => default_mode(),
                 'type' => 'performance',
-                'country' => $user->country->getKey(),
+                'country' => $countryAcronym,
             ])}}">
-                @include('objects._flag_country', ['country' => $user->country])
+                @include('objects._flag_country', ['country' => app('countries')->byCode($countryAcronym)])
             </a>
         </div>
     @endif

diff --git a/resources/views/multiplayer/rooms/_rankings_table.blade.php b/resources/views/multiplayer/rooms/_rankings_table.blade.php
@@ -19,6 +19,9 @@
         </tr>
     </thead>
     <tbody>
+        @php
+            $countries = app('countries');
+        @endphp
         @foreach ([$userScore, ...$scores] as $index => $score)
             @if ($score === null)
                 @continue
@@ -35,10 +38,11 @@
                 </td>
                 <td class="ranking-page-table__column">
                     <div class="ranking-page-table__user-link">
-                        @include('objects._flag_country', [
-                            'country' => $score->user->country,
-                            'modifiers' => 'medium',
-                        ])
+                        <span class="ranking-page-table__flags">
+                            @include('objects._flag_country', [
+                                'country' => $countries->byCode($score->user->country_acronym),
+                            ])
+                        </span>
                         <a
                             href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode ?? null]) }}"
                             class="ranking-page-table__user-link-text js-usercard"

diff --git a/resources/views/rankings/_spotlight_rankings_table.blade.php b/resources/views/rankings/_spotlight_rankings_table.blade.php
@@ -31,17 +31,21 @@
         </tr>
     </thead>
     <tbody>
+        @php
+            $countries = app('countries');
+        @endphp
         @foreach ($scores as $index => $score)
             <tr class="ranking-page-table__row{{$score->user->isActive() ? '' : ' ranking-page-table__row--inactive'}}">
                 <td class="ranking-page-table__column ranking-page-table__column--rank">
                     #{{ $index + 1 }}
                 </td>
                 <td class="ranking-page-table__column">
                     <div class="ranking-page-table__user-link">
-                        @include('objects._flag_country', [
-                            'country' => $score->user->country,
-                            'modifiers' => 'medium',
-                        ])
+                        <span class="ranking-page-table__flags">
+                            @include('objects._flag_country', [
+                                'country' => $countries->byCode($score->user->country_acronym),
+                            ])
+                        </span>
                         <a
                             href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                             class="ranking-page-table__user-link-text js-usercard"

diff --git a/resources/views/rankings/country.blade.php b/resources/views/rankings/country.blade.php
@@ -28,7 +28,13 @@
             </tr>
         </thead>
         <tbody>
+            @php
+                $countries = app('countries');
+            @endphp
             @foreach ($scores as $index => $score)
+                @php
+                    $country = $countries->byCode($score->country_code);
+                @endphp
                 <tr class="ranking-page-table__row">
                     <td class="ranking-page-table__column ranking-page-table__column--rank">
                         #{{ $scores->firstItem() + $index }}
@@ -39,14 +45,13 @@
                                 href="{{route('rankings', [
                                     'mode' => $mode,
                                     'type' => 'performance',
-                                    'country' => $score->country->acronym,
+                                    'country' => $country->getKey(),
                             ])}}">
-                                @include('objects._flag_country', [
-                                    'country' => $score->country->acronym,
-                                    'modifiers' => 'medium',
-                                ])
+                                <span class="ranking-page-table__flags">
+                                    @include('objects._flag_country', ['country' => $country])
+                                </span>
                                 <span class="ranking-page-table__country-link-text">
-                                    {{ $score->country->name }}
+                                    {{ $country->name }}
                                 </span>
                             </a>
                         </div>

diff --git a/resources/views/rankings/kudosu.blade.php b/resources/views/rankings/kudosu.blade.php
@@ -30,17 +30,21 @@
             </tr>
         </thead>
         <tbody>
+            @php
+                $countries = app('countries');
+            @endphp
             @foreach ($scores as $index => $user)
                 <tr class="{{ class_with_modifiers('ranking-page-table__row', ['inactive' => !$user->isActive()]) }}">
                     <td class="ranking-page-table__column ranking-page-table__column--rank">
                         #{{ i18n_number_format($index + $firstScoreRank) }}
                     </td>
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            @include('objects._flag_country', [
-                                'country' => $user->country_acronym,
-                                'modifiers' => 'medium',
-                            ])
+                            <span class="ranking-page-table__flags">
+                                @include('objects._flag_country', [
+                                    'country' => $countries->byCode($user->country_acronym),
+                                ])
+                            </span>
                             {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
                         </div>
                     </td>

diff --git a/resources/views/rankings/performance.blade.php b/resources/views/rankings/performance.blade.php
@@ -79,6 +79,9 @@
             </tr>
         </thead>
         <tbody>
+            @php
+                $countries = app('countries');
+            @endphp
             @foreach ($scores as $index => $score)
                 <tr class="ranking-page-table__row{{$score->user->isActive() ? '' : ' ranking-page-table__row--inactive'}}">
                     <td class="ranking-page-table__column ranking-page-table__column--rank">
@@ -108,19 +111,21 @@ class="{{ class_with_modifiers('ranking-page-table__column', 'rank-change-icon',
                     @endif
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            <a
-                                href="{{ route('rankings', [
-                                    'mode' => $mode,
-                                    'type' => 'performance',
-                                    'country' => $score->user->country->acronym,
-                                    'variant' => $variant,
-                                ]) }}"
-                            >
-                                @include('objects._flag_country', [
-                                    'country' => $score->user->country,
-                                    'modifiers' => 'medium',
-                                ])
-                            </a>
+                            <span class="ranking-page-table__flags">
+                                <a
+                                    class="u-contents"
+                                    href="{{ route('rankings', [
+                                        'mode' => $mode,
+                                        'type' => 'performance',
+                                        'country' => $score->user->country_acronym,
+                                        'variant' => $variant,
+                                    ]) }}"
+                                >
+                                    @include('objects._flag_country', [
+                                        'country' => $countries->byCode($score->user->country_acronym),
+                                    ])
+                                </a>
+                            </span>
                             <a
                                 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                                 class="ranking-page-table__user-link-text js-usercard"

diff --git a/resources/views/rankings/score.blade.php b/resources/views/rankings/score.blade.php
@@ -42,19 +42,27 @@
             </tr>
         </thead>
         <tbody>
+            @php
+                $countries = app('countries');
+            @endphp
             @foreach ($scores as $index => $score)
                 <tr class="ranking-page-table__row{{$score->user->isActive() ? '' : ' ranking-page-table__row--inactive'}}">
                     <td class="ranking-page-table__column ranking-page-table__column--rank">
                         #{{ $scores->firstItem() + $index }}
                     </td>
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            <a href="{{route('rankings', ['mode' => $mode, 'type' => 'performance', 'country' => $score->user->country->acronym])}}">
-                                @include('objects._flag_country', [
-                                    'country' => $score->user->country,
-                                    'modifiers' => 'medium',
-                                ])
-                            </a>
+                            <span class="ranking-page-table__flags">
+                                <a href="{{ route('rankings', [
+                                    'country' => $score->user->country_acronym,
+                                    'mode' => $mode,
+                                    'type' => 'performance',
+                                ]) }}">
+                                    @include('objects._flag_country', [
+                                        'country' => $countries->byCode($score->user->country_acronym),
+                                    ])
+                                </a>
+                            </span>
                             <a
                                 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                                 class="ranking-page-table__user-link-text js-usercard"