Merge pull request #1013 from WatWowMap/develop

Sync dev to main

.github/workflows/main.yml

@@ -16,9 +16,9 @@ jobs:
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
   release:
     needs: [config, locales, lint]
-    if: needs.locales.outputs.made_commit != 'true' && needs.config.outputs.made_commit != 'true'
+    if: needs.locales.outputs.made_commit != 'true' && needs.config.outputs.made_commit != 'true' && always()
     uses: ./.github/workflows/release.yml
   docker:
     needs: [config, locales, lint]
-    if: needs.locales.outputs.made_commit != 'true' && needs.config.outputs.made_commit != 'true'
+    if: needs.locales.outputs.made_commit != 'true' && needs.config.outputs.made_commit != 'true' && always()
     uses: ./.github/workflows/docker.yml

.vscode/settings.json

@@ -14,5 +14,6 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.formatOnSave": true,
-  "docwriter.style": "JSDoc"
+  "docwriter.style": "JSDoc",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

CHANGELOG.md

@@ -1,3 +1,84 @@
+# [1.33.0-develop.7](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.6...v1.33.0-develop.7) (2024-05-11)
+
+
+### Bug Fixes
+
+* update uicons lib ([8c82e8d](https://github.com/WatWowMap/ReactMap/commit/8c82e8dfe93f3341fdf76a8b925dda02e3519a1f))
+
+# [1.33.0-develop.6](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.5...v1.33.0-develop.6) (2024-05-11)
+
+
+### Bug Fixes
+
+* add   ([0cd5f0f](https://github.com/WatWowMap/ReactMap/commit/0cd5f0f3fc77464b6a175e277ef5fe6341c72b42))
+* add type to gpd object ([0501b8d](https://github.com/WatWowMap/ReactMap/commit/0501b8d8c531a46cc794760291b8a81f9240eea4))
+* no more react components ([1469280](https://github.com/WatWowMap/ReactMap/commit/1469280d98c2c530ec008b9555e02cd891ba7228))
+* use number instead ([38c3542](https://github.com/WatWowMap/ReactMap/commit/38c3542e4faff6507b3273cb68dee59e4fac064a))
+
+
+### Features
+
+* support displaying best buddy badge in gym defenders ([5f53b8f](https://github.com/WatWowMap/ReactMap/commit/5f53b8f512539a971a9ffbe1c3561e40a901b660))
+
+# [1.33.0-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.4...v1.33.0-develop.5) (2024-05-11)
+
+
+### Bug Fixes
+
+* possible fix edgecase scenario for missing `selectedWebhook` ([5f8d1c9](https://github.com/WatWowMap/ReactMap/commit/5f8d1c9a2ade62959894f1dda6d71e8d659aeefa))
+
+# [1.33.0-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.3...v1.33.0-develop.4) (2024-05-09)
+
+
+### Bug Fixes
+
+* add JSON.parse as requested ([cadf5e9](https://github.com/WatWowMap/ReactMap/commit/cadf5e98accef4bc5ba3cd7dea65fefbbd8872ec))
+* add temp_evo to display as well ([02ce747](https://github.com/WatWowMap/ReactMap/commit/02ce747811a4c8ac3d505403e95ee475da1e234d))
+* assign to the correct object ([fffb64f](https://github.com/WatWowMap/ReactMap/commit/fffb64f164cc7ae13e8a70ea5ab7673e4f89e30b))
+* fix nullability as requested ([9e6692a](https://github.com/WatWowMap/ReactMap/commit/9e6692af8f75d145fe776154460652ea481d642d))
+* new variable just4u ([6fdc152](https://github.com/WatWowMap/ReactMap/commit/6fdc15267734fd247d98ebde4a38b4bac902e99d))
+* tyie ([0634d89](https://github.com/WatWowMap/ReactMap/commit/0634d8959a3543933a3f31e0817589c53e68272a))
+
+
+### Features
+
+* add support for guarding_pokemon_display ([0579fc4](https://github.com/WatWowMap/ReactMap/commit/0579fc451f48795aa41f7253cb17592aa669ed31))
+
+# [1.33.0-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.2...v1.33.0-develop.3) (2024-04-27)
+
+
+### Bug Fixes
+
+* pvp filter in when `all` is set ([2acf75f](https://github.com/WatWowMap/ReactMap/commit/2acf75fb107f2b06f31a9e195b1d3ae158c8368a))
+
+# [1.33.0-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.33.0-develop.1...v1.33.0-develop.2) (2024-04-23)
+
+
+### Bug Fixes
+
+* gym badge counts ([67f3b0d](https://github.com/WatWowMap/ReactMap/commit/67f3b0de9837924b0e6e37645a199f2b0b54e795))
+
+# [1.33.0-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.32.1-develop.1...v1.33.0-develop.1) (2024-04-21)
+
+
+### Bug Fixes
+
+* added migration for gym badges, fixed gold badge count not appearing on profile ([e9f9474](https://github.com/WatWowMap/ReactMap/commit/e9f947436d62e68b46ade0948441d2507dbf01d5))
+* fixed new badge type in profile, refactored ternary in a positive way ([8bd1f90](https://github.com/WatWowMap/ReactMap/commit/8bd1f905347933e68dd00d8708067cb7ea29dfe8))
+* updating translations based on feedback from Fabio1988 and lenisko ([7d9ec75](https://github.com/WatWowMap/ReactMap/commit/7d9ec75886b0fa0365b37d86c4377011ec39cd6c))
+
+
+### Features
+
+* added "basic" level gym badge ([4c4d3a4](https://github.com/WatWowMap/ReactMap/commit/4c4d3a4ee131a65c5c55f1c42f3972245de54f0f))
+
+## [1.32.1-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.32.0...v1.32.1-develop.1) (2024-04-12)
+
+
+### Bug Fixes
+
+* ci ([6b4fa8a](https://github.com/WatWowMap/ReactMap/commit/6b4fa8a5316454d2da32c1999271835f83822a99))
+
 # [1.32.0](https://github.com/WatWowMap/ReactMap/compare/v1.31.0...v1.32.0) (2024-04-12)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.32.0",
+  "version": "1.33.0-develop.7",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -155,7 +155,7 @@
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.43",
     "morgan": "^1.10.0",
-    "mysql2": "^3.4.0",
+    "mysql2": "^3.9.7",
     "node-cache": "^5.1.2",
     "node-fetch": "2.6.7",
     "node-geocoder": "^4.2.0",
@@ -176,7 +176,7 @@
     "source-map": "^0.7.4",
     "suncalc": "^1.9.0",
     "supercluster": "^8.0.1",
-    "uicons.js": "^1.1.1",
+    "uicons.js": "^1.1.4",
     "zustand": "4.4.6"
   },
   "devDependencies": {

packages/config/.configref

@@ -1 +1 @@
-24122
+24145

packages/locales/lib/generated/de.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Dieser Timer ist nicht verifiziert",
   "all": "Alle",
   "badge_0": "Keins",
-  "badge_1": "Bronze",
-  "badge_2": "Silber",
-  "badge_3": "Gold",
+  "badge_1": "Basis",
+  "badge_2": "Bronze",
+  "badge_3": "Silber",
+  "badge_4": "Gold",
   "gym_badge_menu": "Fitness Abzeichen bearbeiten",
   "gym_badges": "Fitness Abzeichen",
   "gym_badge_diamonds": "Zeige Fitness Abzeichen",

packages/locales/lib/generated/es.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Este Temporizador no está Verificado",
   "all": "Todos",
   "badge_0": "Ninguno",
-  "badge_1": "Bronce",
-  "badge_2": "Plata",
-  "badge_3": "Oro",
+  "badge_1": "Básico",
+  "badge_2": "Bronce",
+  "badge_3": "Plata",
+  "badge_4": "Oro",
   "gym_badge_menu": "Editar Insignia de Gimnasio",
   "gym_badges": "Insignias de Gimnasio",
   "gym_badge_diamonds": "Mostrar Insignias de Gimnasio",

packages/locales/lib/generated/fr.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Ce Minuteur n'est pas Vérifié",
   "all": "Tout",
   "badge_0": "Aucun",
-  "badge_1": "Bronze",
-  "badge_2": "Argent",
-  "badge_3": "Or",
+  "badge_1": "Basique",
+  "badge_2": "Bronze",
+  "badge_3": "Argent",
+  "badge_4": "Or",
   "gym_badge_menu": "Modifier le Badge de Salle de Sport",
   "gym_badges": "Badges de Salle de Sport",
   "gym_badge_diamonds": "Afficher les Badges de Salle de Sport",

packages/locales/lib/generated/hi.json

@@ -466,9 +466,10 @@
   "timer_unverified": "यह टाइमर असत्यापित है",
   "all": "सभी",
   "badge_0": "कोई नहीं",
-  "badge_1": "कांस्य",
-  "badge_2": "रजत",
-  "badge_3": "सोना",
+  "badge_1": "मूल",
+  "badge_2": "कांस्य",
+  "badge_3": "रजत",
+  "badge_4": "सोना",
   "gym_badge_menu": "जिम बैज संपादित करें",
   "gym_badges": "जिम बैज",
   "gym_badge_diamonds": "जिम बैज दिखाएं",

packages/locales/lib/generated/id.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Timer ini Tidak Terverifikasi",
   "all": "Semua",
   "badge_0": "Tidak Ada",
-  "badge_1": "Bronze",
-  "badge_2": "Perak",
-  "badge_3": "Emas",
+  "badge_1": "Dasar",
+  "badge_2": "Bronze",
+  "badge_3": "Perak",
+  "badge_4": "Emas",
   "gym_badge_menu": "Edit Lencana Gym",
   "gym_badges": "Lencana Gym",
   "gym_badge_diamonds": "Tampilkan Lencana Gym",

packages/locales/lib/generated/it.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Este Timer não está Verificado",
   "all": "Todos",
   "badge_0": "Nenhum",
-  "badge_1": "Bronze",
-  "badge_2": "Prata",
-  "badge_3": "Ouro",
+  "badge_1": "Básico",
+  "badge_2": "Bronze",
+  "badge_3": "Prata",
+  "badge_4": "Ouro",
   "gym_badge_menu": "Editar Insígnia de Ginásio",
   "gym_badges": "Insígnias de Ginásio",
   "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",

packages/locales/lib/generated/ja.json

@@ -466,9 +466,10 @@
   "timer_unverified": "このタイマーは未検証です",
   "all": "すべて",
   "badge_0": "なし",
-  "badge_1": "ブロンズ",
-  "badge_2": "シルバー",
-  "badge_3": "ゴールド",
+  "badge_1": "基本",
+  "badge_2": "ブロンズ",
+  "badge_3": "シルバー",
+  "badge_4": "ゴールド",
   "gym_badge_menu": "ジムバッジを編集",
   "gym_badges": "ジムバッジ",
   "gym_badge_diamonds": "ジムバッジを表示",

packages/locales/lib/generated/ko.json

@@ -377,9 +377,10 @@
   "timer_unverified": "이 타이머는 미검증",
   "all": "모두",
   "badge_0": "없음",
-  "badge_1": "브론즈",
-  "badge_2": "실버",
-  "badge_3": "골드",
+  "badge_1": "기본",
+  "badge_2": "브론즈",
+  "badge_3": "실버",
+  "badge_4": "골드",
   "gym_badge_menu": "체육관 배지 편집",
   "gym_badges": "체육관 배지",
   "gym_badge_diamonds": "체육관 배지 보기",

packages/locales/lib/generated/nl.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Deze Timer is Niet Geverifieerd",
   "all": "Alles",
   "badge_0": "Geen",
-  "badge_1": "Brons",
-  "badge_2": "Zilver",
-  "badge_3": "Goud",
+  "badge_1": "Basis",
+  "badge_2": "Brons",
+  "badge_3": "Zilver",
+  "badge_4": "Goud",
   "gym_badge_menu": "Bewerk Gym Badge",
   "gym_badges": "Gym Badges",
   "gym_badge_diamonds": "Toon Gym Badges",

packages/locales/lib/generated/pl.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Ten Timer Nie Jest Zweryfikowany",
   "all": "Wszystkie",
   "badge_0": "Brak",
-  "badge_1": "Brązowy",
-  "badge_2": "Srebrny",
-  "badge_3": "Złoty",
+  "badge_1": "Podst.",
+  "badge_2": "Brązowy",
+  "badge_3": "Srebrny",
+  "badge_4": "Złoty",
   "gym_badge_menu": "Edytuj Odznaki Siłowni",
   "gym_badges": "Odznaki Siłowni",
   "gym_badge_diamonds": "Pokaż Odznaki Siłowni",

packages/locales/lib/generated/pt-br.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Este Temporizador não está Verificado",
   "all": "Todos",
   "badge_0": "Nenhum",
-  "badge_1": "Bronze",
-  "badge_2": "Prata",
-  "badge_3": "Ouro",
+  "badge_1": "Básico",
+  "badge_2": "Bronze",
+  "badge_3": "Prata",
+  "badge_4": "Ouro",
   "gym_badge_menu": "Editar Insígnia de Ginásio",
   "gym_badges": "Insígnias de Ginásio",
   "gym_badge_diamonds": "Mostrar Insígnias de Ginásio",

packages/locales/lib/generated/ru.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Этот Таймер Не Проверен",
   "all": "Все",
   "badge_0": "Нет",
-  "badge_1": "Бронза",
-  "badge_2": "Серебро",
-  "badge_3": "Золото",
+  "badge_1": "Базовый",
+  "badge_2": "Бронза",
+  "badge_3": "Серебро",
+  "badge_4": "Золото",
   "gym_badge_menu": "Редактировать Значок Спортзала",
   "gym_badges": "Значки Спортзалов",
   "gym_badge_diamonds": "Показать Значки Спортзала",

packages/locales/lib/generated/sv.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Denna Timer är Ej Verifierad",
   "all": "Alla",
   "badge_0": "Ingen",
-  "badge_1": "Brons",
-  "badge_2": "Silver",
-  "badge_3": "Guld",
+  "badge_1": "Grundläggande",
+  "badge_2": "Brons",
+  "badge_3": "Silver",
+  "badge_4": "Guld",
   "gym_badge_menu": "Redigera Gymmärke",
   "gym_badges": "Gymmärken",
   "gym_badge_diamonds": "Visa Gymmärken",

packages/locales/lib/generated/th.json

@@ -466,9 +466,10 @@
   "timer_unverified": "ตัวจับเวลานี้ยังไม่ได้รับการยืนยัน",
   "all": "ทั้งหมด",
   "badge_0": "ไม่มี",
-  "badge_1": "ทองแดง",
-  "badge_2": "เงิน",
-  "badge_3": "ทอง",
+  "badge_1": "พื้นฐาน",
+  "badge_2": "ทองแดง",
+  "badge_3": "เงิน",
+  "badge_4": "ทอง",
   "gym_badge_menu": "แก้ไขเหรียญยิม",
   "gym_badges": "เหรียญยิม",
   "gym_badge_diamonds": "แสดงเหรียญยิม",

packages/locales/lib/generated/tr.json

@@ -466,9 +466,10 @@
   "timer_unverified": "Bu Zamanlayıcı Doğrulanmadı",
   "all": "Tümü",
   "badge_0": "Yok",
-  "badge_1": "Bronz",
-  "badge_2": "Gümüş",
-  "badge_3": "Altın",
+  "badge_1": "Temel",
+  "badge_2": "Bronz",
+  "badge_3": "Gümüş",
+  "badge_4": "Altın",
   "gym_badge_menu": "Spor Salonu Rozeti Düzenle",
   "gym_badges": "Spor Salonu Rozetleri",
   "gym_badge_diamonds": "Spor Salonu Rozetlerini Göster",

packages/locales/lib/generated/zh-tw.json

@@ -466,9 +466,10 @@
   "timer_unverified": "此計時器未經驗證",
   "all": "全部",
   "badge_0": "無",
-  "badge_1": "銅",
-  "badge_2": "銀",
-  "badge_3": "金",
+  "badge_1": "基礎",
+  "badge_2": "銅",
+  "badge_3": "銀",
+  "badge_4": "金",
   "gym_badge_menu": "編輯健身房徽章",
   "gym_badges": "健身房徽章",
   "gym_badge_diamonds": "顯示健身房徽章",

packages/locales/lib/human/de.json

@@ -479,9 +479,10 @@
   "without_ar": "Ohne AR",
   "both": "Beide",
   "badge_0": "keiner",
-  "badge_1": "Bronze",
-  "badge_2": "Silber",
-  "badge_3": "Gold",
+  "badge_1": "Basis",
+  "badge_2": "Bronze",
+  "badge_3": "Silber",
+  "badge_4": "Gold",
   "gym_badge_menu": "Arenaorden bearbeiten",
   "gym_badges": "Arenaorden",
   "gym_badge_diamonds": "Arenaorden anzeigen",

packages/locales/lib/human/en.json

@@ -141,6 +141,7 @@
   "starts": "Starts",
   "ends": "Ends",
   "defender": "Defender",
+  "best_buddy": "Best buddy",
   "cp": "CP",
   "kilogram": "kg",
   "meter": "m",
@@ -517,9 +518,10 @@
   "timer_unverified": "This Timer is Unverified",
   "all": "All",
   "badge_0": "None",
-  "badge_1": "Bronze",
-  "badge_2": "Silver",
-  "badge_3": "Gold",
+  "badge_1": "Basic",
+  "badge_2": "Bronze",
+  "badge_3": "Silver",
+  "badge_4": "Gold",
   "gym_badge_menu": "Edit Gym Badge",
   "gym_badges": "Gym Badges",
   "gym_badge_diamonds": "Show Gym Badges",