Merge pull request #225 from ExpDev07/dev

Update

Author: coalaura

app/Http/Controllers/PlayerController.php

@@ -9,6 +9,7 @@
 use App\Http\Resources\PlayerResource;
 use App\Http\Resources\WarningResource;
 use App\Player;
+use App\Warning;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\DB;
@@ -81,7 +82,7 @@ public function index(Request $request): Response
         $query->select([
             'steam_identifier', 'player_name', 'playtime', 'identifiers',
         ]);
-        $query->selectSub('SELECT COUNT(`id`) FROM `warnings` WHERE `player_id` = `user_id`', 'warning_count');
+        $query->selectSub('SELECT COUNT(`id`) FROM `warnings` WHERE `player_id` = `user_id` AND `warning_type` = \'' . Warning::TypeWarning . '\'', 'warning_count');
 
         $page = Paginator::resolveCurrentPage('page');
         $query->limit(15)->offset(($page - 1) * 15);

resources/js/Pages/Map/Index.vue

@@ -585,7 +585,7 @@ export default {
 </tr>`.replace(/\r?\n(\s{4})?/gm, ''));
                         }
 
-                        if (isInvisible) {
+                        if (isInvisible && !isStaff) {
                             invisibleList.push(`<tr title="` + (isStaff ? 'Is a staff member' : '') + `">
     <td class="pr-2"><a style="color:#54BBFF" target="_blank" href="/players/` + player.steamIdentifier + `">` + player.character.fullName + `</a></td>
     <td class="pr-2">is invisible</td>
@@ -714,7 +714,6 @@ export default {
             //this.debugLocations(require('../../data/tp_locations.json'));
 
             this.map.on('click', function (e) {
-                const conf = _this.getBounds();
                 let map = {
                     x: e.latlng.lng,
                     y: e.latlng.lat,

resources/js/Pages/Players/Show.vue

@@ -495,7 +495,7 @@
         <v-section>
             <template #header>
                 <h2>
-                    {{ t('players.form.warnings') }} ({{ player.warnings }})
+                    {{ t('players.show.warnings') }} ({{ player.warnings }})
                     <select class="inline-block ml-4 px-4 py-2 bg-gray-200 dark:bg-gray-600 border rounded"
                             id="warningFilter" @change="filterWarnings">
                         <option value="all" selected>{{ t('global.all') }}</option>

resources/js/data/tp_locations.json

@@ -129,7 +129,12 @@
             "x": 1135,
             "y": 284,
             "z": -51.3
-        }
+        },
+        "Cayo Perico": {
+            "x": 4815,
+            "y": -5023,
+            "z": 33.4
+        },
     },
     "staff": {
         "Rockford Hills Building Roof": {

resources/js/locales/en-us.json

@@ -349,13 +349,14 @@
             "warning_type": {
                 "warning": "Warning",
                 "note": "Note"
-            }
+            },
+            "warnings": "Warnings/Notes"
         },
         "form": {
             "identifier": "Identifier",
             "name": "Name",
             "playtime": "Playtime",
-            "warnings": "Warnings/Notes",
+            "warnings": "Warnings",
             "banned": "Banned"
         },
         "warning": {