Merge pull request #389 from WatWowMap/develop

Merge Develop into Main

.gitignore

@@ -38,6 +38,10 @@ server/src/models/Custom.js
 public/images/uicons/*
 !public/images/uicons/.gitkeep
 
+# Custom Image Folder for Custom Components
+public/images/custom/*
+!public/images/custom/.gitkeep
+
 # Ignore generated locales
 public/locales/*
 public/missing-locales/*

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "React based frontend map.",
   "main": "index.js",
   "author": "TurtIeSocks <[email protected]>",
@@ -16,7 +16,7 @@
     "create-locales": "node server/scripts/createLocales.js",
     "missing-locales": "node server/scripts/createLocales.js --missing",
     "config-migrate": "node server/scripts/configMigration.js",
-    "console": "node --experimental-repl-await ./server/src/console.js",
+    "console": "node --experimental-repl-await ./server/scripts/console.js",
     "migrate:make": "knex --knexfile server/knexfile.cjs migrate:make",
     "migrate:latest": "knex --knexfile server/knexfile.cjs migrate:latest",
     "migrate:rollback": "knex --knexfile server/knexfile.cjs migrate:rollback"
@@ -95,7 +95,7 @@
     "lru-cache": "^6.0.0",
     "morgan": "^1.10.0",
     "mysql2": "^2.3.3",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2",
     "node-geocoder": "^3.27.0",
     "nodes2ts": "^2.0.0",
     "objection": "^3.0.0",

public/base-locales/de.json

@@ -277,7 +277,7 @@
   "weather_subtitle": "Zeigt Wetterinformationen im Spiel für jede Zelle an",
   "user_profile": "Benutzer-Profil",
   "candy": "Bonbon",
-  "show_ex_badge": "Zeige EX Abzeichen",
+  "show_ex_badge": "EX Abzeichen anzeigen",
   "search": "Suche",
   "global_search_quests": "Füge den Name der Belohnung ein...",
   "global_search_pokestops": "Füge den Name des Pokestop ein...",
@@ -328,7 +328,7 @@
   "popup_pokemon_data_width": 11,
   "login_button": 10,
   "join_button": 10,
-  "show_dex_num_in_popup": "Zeige Pokedex # in Popup",
+  "show_dex_num_in_popup": "Pokedex # in Popup anzeigen",
   "popup": "Popup",
   "pvp_level": "Level {{level}} PVP Stats",
   "pvp_mega": "Mega PVP Stats",
@@ -390,7 +390,7 @@
   "webhook_selection": "{{name}} Auswahl",
   "message_of_the_day": "Nachricht des Tages",
   "has_quest_indicator": "Alternative Farbe für Stops mit Quests",
-  "show_ar_badge": "Zeige AR Symbol",
+  "show_ar_badge": "AR Symbol anzeigen",
   "raids_or": "Raidbosse separat filtern",
   "general": "Allgemeines",
   "link_global_and_advanced": "Verknüpfe Global und Erweitert",
@@ -454,7 +454,7 @@
   "error_creating_user": "Neuer Benutzer kann derzeit nicht registriert werden",
   "discord_linked": "Discord Verknüpft",
   "telegram_linked": "Telegram Verknüpft",
-  "slider_little": "kleine Schieberegler",
+  "slider_little": "Mini-Cup",
   "tile_servers": "Tileserver",
   "tile_servers_default": "Standard Tileserver",
   "alola": "Alola",
@@ -474,5 +474,19 @@
   "all": "Alle",
   "with_ar": "Mit AR",
   "without_ar": "Ohne AR",
-  "both": "Beide"
+  "both": "Beide",
+  "badge_0": "keiner",
+  "badge_1": "Bronze",
+  "badge_2": "Silber",
+  "badge_3": "Gold",
+  "gym_badge_menu": "Arenaorden bearbeiten",
+  "gym_badges": "Arenaorden",
+  "gym_badge_diamonds": "Arenaorden anzeigen",
+  "gym_badges_subtitle": "Die Arenaorden auf der Karte und als Liste auf der Profilseite anzeigen.",
+  "confirm_filters_reset": "Filter zurücksetzen",
+  "filters_reset_text": "Sollen die Einstellungen wirklich auf die Standardwerte zurückgesetzt werden? Das kann nicht rückgängig gemacht werden!",
+  "filters_reset_title": "Filter zurücksetzen",
+  "loading": "laden von {{category}}",
+  "loading_icons": "Icons abrufen",
+  "loading_invasions": "Rocket-Lineup abrufen"
 }

public/base-locales/en.json

@@ -475,5 +475,19 @@
   "pokemon_cell": "Pokemon's Location Could Vary",
   "timer_verified": "This Timer is Verified",
   "timer_unverified": "This Timer is Unverified",
-  "all": "All"
+  "all": "All",
+  "badge_0": "None",
+  "badge_1": "Bronze",
+  "badge_2": "Silver",
+  "badge_3": "Gold",
+  "gym_badge_menu": "Edit Gym Badge",
+  "gym_badges": "Gym Badges",
+  "gym_badge_diamonds": "Show Gym Badges",
+  "gym_badges_subtitle": "Displays Gym Badges on the map and a list in the profile page.",
+  "confirm_filters_reset": "Reset filters",
+  "filters_reset_text": "Are you sure you want to reset settings to default values? This cannot be undone!",
+  "filters_reset_title": "Reset filters",
+  "loading": "Loading {{category}}",
+  "loading_icons": "Fetching Icons",
+  "loading_invasions": "Fetching Invasions"
 }

public/base-locales/es.json

@@ -398,8 +398,8 @@
   "webhook_selection": "Selección de {{name}}",
   "server_dev_error_0": "{{variable_0}}",
   "navigation_controls": "Controles de navegación",
-  "navigation_controls_react": "Reaccionar",
-  "navigation_controls_leaflet": "Folleto",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Exclusivo",
   "all_moves": "Todos los movimientos",
   "move": "Muevete",
@@ -466,5 +466,8 @@
   "timer_verified": "Este temporizador está verificado",
   "timer_unverified": "Este temporizador no está verificado",
   "all": "Todo",
-  "both": "Ambos"
+  "both": "Ambos",
+  "loading_icons": "Obtener iconos",
+  "loading_invasions": "Ir a buscar invasiones",
+  "loading": "Cargando {{category}}"
 }

public/base-locales/fr.json

@@ -1,6 +1,6 @@
 {
   "login": "Connexion",
-  "click_once": "Ne cliquer 'Connexion' qu'une fois",
+  "click_once": "Ne cliquer 'Autoriser' qu'une fois",
   "save": "Enregistrer",
   "reset": "Réinitialiser",
   "close": "Fermer",
@@ -247,7 +247,7 @@
   "sidebar": "Barre latérale",
   "sliders": "Curseurs",
   "popups": "Popups",
-  "closing": "Fermeture",
+  "closing": "Conclusion",
   "shortcuts": "Raccourcis",
   "iv": "IV",
   "area_restrictions": "Restrictions de Zones",
@@ -352,7 +352,7 @@
   "pvp_ranking_min_cp": "PC min",
   "slider_pvp": "Rang",
   "profile_no": "Profil",
-  "template": "Template",
+  "template": "Modèle",
   "gender": "Sexe",
   "clean": "Effacer",
   "all_forms": "Toutes les formes",
@@ -385,7 +385,7 @@
   "global": "Global",
   "manage_webhook": "Gérer {{name}}",
   "drag_and_drop": "Glisser et déposer le marqueur pour définir votre emplacement",
-  "click_to_select": "Cliquer pour sélectionner",
+  "click_to_select": "Valider",
   "add_new": "Ajouter une alerte {{category}}",
   "my_location": "Ma position",
   "choose_on_map": "Choisir sur la carte",
@@ -423,7 +423,7 @@
   "poke_global": "Tous",
   "amount": "Quantité",
   "specific_gym": "Arène spéficique",
-  "search_location": "Recherche de lieux",
+  "search_location": "Recherche d'adresse",
   "search_specific": "Chercher un(e) {{category}} spécifique",
   "webhook_success_gym": "Les alertes d'arènes, œufs et changement d'équipe ont été ajoutées !",
   "slot_changes": "Changements de places",
@@ -471,5 +471,18 @@
   "pokemon_cell": "L'emplacement du Pokémon peut varier",
   "timer_verified": "Ce timer est vérifié",
   "timer_unverified": "Ce timer n'est pas vérifié",
-  "all": "Tout"
+  "all": "Tout",
+  "badge_0": "Sans",
+  "badge_1": "Bronze",
+  "badge_2": "Argent",
+  "badge_3": "Or",
+  "gym_badge_menu": "Editer Badge d'Arène",
+  "gym_badges": "Badges d'Arènes",
+  "gym_badge_diamonds": "Afficher les Badges d'Arènes",
+  "gym_badges_subtitle": "Affiche les badges d'arène sur la carte et une liste dans la page profile.",
+  "loading": "Chargement {{category}}",
+  "loading_icons": "Récupération des Icônes",
+  "loading_invasions": "Récupération des Invasions",
+  "login_button": 12,
+  "join_button": 12
 }

public/base-locales/it.json

@@ -1,8 +1,8 @@
 {
   "page": "Pagina {{page}}",
   "navigation_controls": "Controlli di navigazione",
-  "navigation_controls_react": "Reagire",
-  "navigation_controls_leaflet": "Volantino",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
   "exclusive": "Esclusivo",
   "all_moves": "Tutte le mosse",
   "move": "Mossa",
@@ -435,5 +435,8 @@
   "timer_verified": "Questo timer è verificato",
   "timer_unverified": "Questo timer non è verificato",
   "all": "Tutto",
-  "both": "Entrambi"
+  "both": "Entrambi",
+  "loading_icons": "Recupero delle icone",
+  "loading_invasions": "Recupero delle invasioni",
+  "loading": "Caricamento {{category}}"
 }

public/base-locales/ja.json

@@ -395,7 +395,7 @@
   "page": "ページ{{page}}",
   "navigation_controls": "ナビゲーションコントロール",
   "navigation_controls_react": "React",
-  "navigation_controls_leaflet": "リーフレット",
+  "navigation_controls_leaflet": "Leaflet",
   "exclusive": "エクスクルーシブ",
   "all_moves": "すべての動き",
   "move": "動く",
@@ -436,5 +436,8 @@
   "timer_verified": "このタイマーは検証済みです",
   "timer_unverified": "このタイマーは未確認です",
   "all": "全て",
-  "both": "両方"
+  "both": "両方",
+  "loading_icons": "アイコンの取得",
+  "loading_invasions": "侵略をフェッチする",
+  "loading": "{{category}}を読み込んでいます"
 }

public/base-locales/ko.json

@@ -34,8 +34,8 @@
   "weather_indicator": "날씨 부스트 표시기",
   "page": "페이지 {{page}}",
   "navigation_controls": "탐색 컨트롤",
-  "navigation_controls_react": "반응",
-  "navigation_controls_leaflet": "전단",
+  "navigation_controls_react": "React",
+  "navigation_controls_leaflet": "Leaflet",
   "exclusive": "독점적 인",
   "all_moves": "모든 동작",
   "move": "이동하다",
@@ -435,5 +435,8 @@
   "timer_verified": "이 타이머는 확인되었습니다",
   "timer_unverified": "이 타이머는 확인되지 않았습니다.",
   "all": "모두",
-  "both": "둘 다"
+  "both": "둘 다",
+  "loading_icons": "아이콘 가져오기",
+  "loading_invasions": "침략 가져오기",
+  "loading": "{{category}} 로드 중"
 }

public/base-locales/nl.json

@@ -475,5 +475,19 @@
   "webhook_advanced_save_width": 2,
   "login_button": 5,
   "join_button": 5,
-  "all": "Alle"
+  "all": "Alle",
+  "confirm_filters_reset": "Bevestig filters resetten",
+  "filters_reset_text": "Weet je zeker dat je de filters instellingen terug wilt zetten naar standaardwaarden? Dit kan niet ongedaan gemaakt worden!",
+  "filters_reset_title": "Filters resetten",
+  "badge_0": "Geen",
+  "badge_1": "Bronze",
+  "badge_2": "Silver",
+  "badge_3": "Gold",
+  "gym_badge_menu": "Bewerk Gym Badge",
+  "gym_badges": "Gym Badges",
+  "gym_badge_diamonds": "Toon Gym Badges",
+  "gym_badges_subtitle": "Toont Gym Badges op de kaart en een lijst op de profielpagina.",
+  "loading": "Loading {{category}}",
+  "loading_icons": "Pictogrammen aan het Ophalen",
+  "loading_invasions": "Invasions aan het Ophalen"
 }