Sync Dev to Main

package.json

@@ -125,6 +125,7 @@
     "@turf/destination": "^6.5.0",
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
+    "@turtlesocks/react-leaflet.locatecontrol": "^0.1.1",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.2",
     "chalkercli": "https://github.com/TurtIeSocks/chalkercli.git",
@@ -136,7 +137,7 @@
     "discord.js": "^14.7.1",
     "dlv": "^1.1.3",
     "dotenv": "^16.3.1",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "express-mysql-session": "^3.0.0",
     "express-rate-limit": "^5.2.6",
     "express-session": "^1.17.3",
@@ -150,7 +151,7 @@
     "i18next-http-backend": "^1.4.0",
     "knex": "^2.4.2",
     "leaflet": "1.9.4",
-    "leaflet.locatecontrol": "0.73.0",
+    "leaflet.locatecontrol": "0.81.0",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.43",
     "morgan": "^1.10.0",
@@ -210,7 +211,7 @@
     "rollup-plugin-delete": "^2.0.0",
     "semantic-release": "^19.0.5",
     "typescript": "^5.3.3",
-    "vite": "5.0.12",
+    "vite": "5.0.13",
     "vite-plugin-checker": "0.6.4"
   },
   "engines": {

packages/config/.configref

@@ -1 +1 @@
-24070
+24122

packages/locales/lib/human/de.json

@@ -284,6 +284,7 @@
   "global_search_portals": "Füge den Namen des Portals ein...",
   "global_search_nests": "Füge den Namen des Nestes ein...",
   "global_search_raids": "Füge den Namen des Raid Boss ein...",
+  "global_search_invasions": "Füge den Rüpel Typ, Namen oder Belohnungs-Pokémon Namen ein...",
   "raid_level_badges": "Raid Level Abzeichen",
   "options": "Optionen",
   "profile": "Profil",
@@ -301,6 +302,7 @@
   "invasion_icons": "Invasion Icons",
   "pokemon_timers": "Alle Pokemon Timer",
   "dialog_filter_footer_apply_to_all_width": 2,
+  "dialog_filter_footer_adv_menu_width": 2,
   "dialog_filter_footer_disable_all_width": 2,
   "dialog_filter_footer_enable_all_width": 2,
   "dialog_filter_footer_help_width": 2,
@@ -362,6 +364,7 @@
   "exclude_invasion_multi": "{{invasion}} ausschließen",
   "stardust": "Sternenstaub",
   "webhook_footer_help_width": 4,
+  "webhook_footer_feedback_width": 4,
   "webhook_footer_close_width": 4,
   "webhook_footer_add_new_width": 4,
   "dialog_filter_footer_next_width": 2,
@@ -424,7 +427,7 @@
   "webhook_success_gym": "Raids, Eier, und Team Wechsel Alarme wurden hinzugefügt!",
   "slot_changes": "Platzänderungen",
   "confirm_delete": "Dadurch wird die Tracking-Funktion für dieses Profil entfernt, bist du sicher?",
-  "confirm_copy": "Wähle das Profil, in das du \"{{profile}}\" kopieren möchtest. Dadurch wird das ausgewählte Profil vollständig überschrieben.",
+  "confirm_copy": "Wähle das Profil, das du zu \"{{profile}}\" kopieren möchtest, dadurch wird dieses Profil vollständig überschrieben.",
   "webhook_error": "{{name}} konnte das nicht verarbeiten.\nBitte versuche es später nochmals.",
   "profile_error": "Muss eindeutig und gültig sein",
   "team_0": "Neutral",
@@ -526,6 +529,8 @@
   "session_expired_body": "Deine Sitzung ist abgelaufen",
   "old_client_title": "Veraltet",
   "old_client_body": "Eine neue Version der Map ist verfügbar",
+  "early_old_client_title": "veraltet",
+  "early_old_client_body": "Eine alte Version dieser Map könnte im Browser zwischengespeichert sein, lösche den Cache, bevor diese Map verwendet werden kann.",
   "refresh": "Aktualisieren",
   "search_raids": "Suche nach Raids",
   "search_eggs": "Suche nach Eier",
@@ -637,6 +642,7 @@
   "showcase_rankings": "Showcase-Ranking",
   "showcase_rankings_subtitle": "Zeigt die Top-Rankingliste für einen Showcase an einem Pokestop an.",
   "no_access": "Kein Zugriff",
+  "cooldown": "Cooldown",
   "alerts": "Benachrichtigungen",
   "alert_manager": "Benachrichtigungs Manager",
   "menu": "Menü",
@@ -651,6 +657,7 @@
   "download": "download",
   "playground": "Playground",
   "locale": "Sprachen",
+  "saved": "gespeichert",
   "admin_subtitle": "codebasierter WYSIWYG-Editor für benutzerdefinierten Komponenten",
   "reported_error": "Dieser Fehler wurde dem Server mit Kennung gemeldet",
   "dark_mode": "Dunkelmodus",
@@ -734,5 +741,21 @@
   "reset_s2cells": "S2 Zellen zurücksetzen",
   "reset_spawnpoints": "Spawnpoints zurücksetzen",
   "reset_submission_cells": "Submission Zellen zurücksetzen",
-  "hisuian": "Hisui"
+  "hisuian": "Hisui",
+  "spacial_rend_range": "Raumschlag Effekt Bereich",
+  "key": "Schlüssel",
+  "ai": "KI",
+  "human": "Human",
+  "locales": "Locales",
+  "instructions": "Anleitung",
+  "locale_instructions_1": "Wähle im Dropdown-Menü eine Sprache aus.",
+  "locale_instructions_2": "Gib in der Spalte \"Human\" die gewünschten Übersetzungen ein.",
+  "locale_instructions_3": "Klicke auf die Schaltfläche \"$t(download)\", um eine JSON-Datei herunterzuladen.",
+  "locale_instructions_4": "Fork den GitHub-Repo-Link unten",
+  "locale_instructions_5": "Erstelle einen neuen Branch und benennen ihn mit der Sprache, die übersetzt werden soll.",
+  "locale_instructions_6": "Ersetze den Inhalt von \"packages/locales/lib/human/{{lng}}.json\" durch die heruntergeladene Datei.",
+  "locale_instructions_7": "Erstellen eine neue Pull Request auf den \"develop\" Branch.",
+  "locale_instructions_8": "Warte bis die Pull-Anfrage überprüft und gemerged wurde.",
+  "enter_translation": "Übersetzung eingeben",
+  "individual_filters": "Teilweise gefiltert"
 }

packages/locales/lib/human/fr.json

@@ -736,5 +736,37 @@
   "reset_spawnpoints": "Réinitialiser Points d'apparition",
   "reset_submission_cells": "Réinitialiser Wayfarer",
   "hisuian": "de Hisui",
-  "spacial_rend_range": "Portée Spatio-Rift"
+  "spacial_rend_range": "Portée Spatio-Rift",
+  "ai": "IA",
+  "device_audio": "Son d’appareil",
+  "early_old_client_body": "Une ancienne version du client de l'app pourrait être en mémoire dans votre navigateur. Veuillez vider le cache de votre navigateur.",
+  "early_old_client_title": "Version obsolète",
+  "egg_audio": "Son d’œuf",
+  "enter_translation": "Saisir la traduction",
+  "global_search_invasions": "Entrez le type de Sbire, son nom ou Pokémon de récompense...",
+  "gym_audio": "Son d'arène'",
+  "human": "Humain",
+  "individual_filters": "Filtres partiels",
+  "instructions": "Instructions",
+  "invasion_audio": "Son d’invasion",
+  "key": "Clé",
+  "locale_instructions_1": "Sélectionner une langue du menu déroulant",
+  "locale_instructions_2": "Entrer les traductions désirées dans la colonne \"Humain\"",
+  "locale_instructions_3": "Cliquer sur le bouton \"Télécharger\" pour obtenir le fichier JSON",
+  "locale_instructions_4": "Faire un clone du repo GitHub ci-dessous",
+  "locale_instructions_5": "Créer une branche et la nommer comme la langue traduite",
+  "locale_instructions_6": "Remplacer le contenu de \"packages/locales/lib/human/{{lng}}.json\" avec celui du fichier téléchargé.",
+  "locale_instructions_7": "Créer une demande de tirage \"PR\"",
+  "locale_instructions_8": "Attendre que la PR soit examinée et intégrée",
+  "locales": "Langues",
+  "misc_audio": "Son divers",
+  "nest_audio": "Son de nid",
+  "pokemon_audio": "Son de pokémon",
+  "pokestop_audio": "Son de pokéstop",
+  "raid_audio": "Son de raid",
+  "reward_audio": "Son de quête",
+  "spawnpoint_audio": "Son de point d’apparition",
+  "team_audio": "Son d’équipe",
+  "type_audio": "Son de type",
+  "weather_audio": "Son de météo"
 }

packages/types/package.json

@@ -21,7 +21,7 @@
     "@types/react": "^18.2.20",
     "@types/react-dom": "^18.0.9",
     "@turf/helpers": "^6.5.0",
-    "express": "^4.17.3",
+    "express": "^4.19.2",
     "knex": "^2.4.2",
     "loglevel": "^1.8.1",
     "objection": "^3.0.1",

packages/vite-plugins/package.json

@@ -16,6 +16,6 @@
     "@rm/logger": "*"
   },
   "devDependencies": {
-    "vite": "5.0.12"
+    "vite": "5.0.13"
   }
 }

server/src/configs/custom-environment-variables.json

@@ -1804,6 +1804,7 @@
       "__format": "json"
     },
     "defaultIcons": {},
+    "overrides": {},
     "cacheHrs": {
       "__name": "ICONS_CACHE_HRS",
       "__format": "number"
@@ -1997,6 +1998,7 @@
       "__format": "number"
     },
     "defaultAudio": {},
+    "overrides": {},
     "customizable": {
       "__name": "AUDIO_CUSTOMIZABLE",
       "__format": "json"

server/src/configs/default.json

@@ -907,14 +907,15 @@
     },
     {
       "name": "GeoURI",
-      "url": "geo:{x},{y}"
+      "url": "geo:{x},{y}?q={x},{y}"
     }
   ],
   "icons": {
     "Read_More_Here": "https://github.com/WatWowMap/ReactMap/wiki/06.-Icons-Configuration",
     "customizable": [],
     "styles": [],
     "defaultIcons": {},
+    "overrides": {},
     "cacheHrs": 1,
     "sizes": {
       "device": {
@@ -982,6 +983,7 @@
   "audio": {
     "cacheHrs": 1,
     "defaultAudio": {},
+    "overrides": {},
     "customizable": [],
     "styles": [
       {

src/components/Global.jsx

@@ -7,7 +7,6 @@ import { useMemory } from '@store/useMemory'
 
 function ApplyGlobal() {
   const online = useMemory((s) => s.online)
-
   return (
     <GlobalStyles
       styles={(theme) => {
@@ -70,23 +69,33 @@ function ApplyGlobal() {
               duration: theme.transitions.duration.standard,
               easing: theme.transitions.easing.easeInOut,
             }),
+            fontSize: 17,
           },
           '.leaflet-bar a:active, .leaflet-bar a:focus, .leaflet-bar a:hover': {
             backgroundColor: darken(
               theme.palette.grey[grey],
               darkMode ? 0.2 : 0.1,
             ),
           },
+          '.leaflet-control-locate.requesting span': {
+            color: theme.palette.text.primary,
+            animation: 'leaflet-control-locate-spin 2s linear infinite',
+          },
+          '.leaflet-control-locate.active a': {
+            color: 'rgb(32, 116, 182)',
+          },
+          '.leaflet-control-locate.active.following a': {
+            color: 'rgb(252, 132, 40)',
+          },
+          '.leaflet-control-locate a .leaflet-control-locate-spinner': {
+            backgroundImage: `url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="${encodeURIComponent(
+              theme.palette.text.primary,
+            )}" d="M304 48a48 48 0 1 1-96 0 48 48 0 0 1 96 0zm-48 368a48 48 0 1 0 0 96 48 48 0 0 0 0-96zm208-208a48 48 0 1 0 0 96 48 48 0 0 0 0-96zM96 256a48 48 0 1 0-96 0 48 48 0 0 0 96 0zm13 99a48 48 0 1 0 0 96 48 48 0 0 0 0-96zm294 0a48 48 0 1 0 0 96 48 48 0 0 0 0-96zM109 61a48 48 0 1 0 0 96 48 48 0 0 0 0-96z"/></svg>')`,
+          },
           '.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out':
             {
               lineHeight: '25px !important',
             },
-          [theme.breakpoints.down('sm')]: {
-            '.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out':
-              {
-                lineHeight: '30px !important',
-              },
-          },
           '.leaflet-bar a.leaflet-disabled': {
             backgroundColor: lighten(theme.palette.grey[grey], 0.2),
           },

src/components/popups/Navigation.jsx

@@ -15,7 +15,9 @@ export function Navigation({ lat, lon, size = 'large' }) {
   const url = useMemory((s) => s.settings.navigation[nav]?.url)
   return (
     <IconButton
-      href={url.replace('{x}', lat.toString()).replace('{y}', lon.toString())}
+      href={url
+        .replaceAll('{x}', lat.toString())
+        .replaceAll('{y}', lon.toString())}
       target="_blank"
       rel="noreferrer"
       size={size}

src/components/virtual/SelectorItem.jsx

@@ -54,12 +54,12 @@ export function SelectorItem({
     : 'error.dark'
 
   const handleClick = React.useCallback(() => {
-    const newFilter = { ...filter }
+    const newFilter = { all: false, enabled: false, ...filter }
     // red => green => blue => red
-    if (filter.all && hasAll) {
+    if (newFilter.all && hasAll) {
       newFilter.all = false
       newFilter.enabled = !easyMode
-    } else if (filter.enabled) {
+    } else if (newFilter.enabled) {
       newFilter.enabled = false
     } else {
       if (hasAll) newFilter.all = true
@@ -79,7 +79,7 @@ export function SelectorItem({
 
   const status =
     hasAll && !easyMode
-      ? filter?.all || filter.enabled
+      ? filter?.all || filter?.enabled
         ? filter?.all && filter?.enabled
           ? true
           : null

src/features/profile/Permissions.jsx

@@ -79,12 +79,13 @@ function PermCard({ perm }) {
     if (value)
       return (
         <Box
-          height="250px"
+          minHeight="250px"
           sx={{
             background: `url(/${permImageDir}/${perm}.png)`,
-            backgroundSize: 'cover',
+            backgroundSize: 'contain',
             backgroundPosition: 'center',
             backgroundRepeat: 'no-repeat',
+            aspectRatio: '1/1',
           }}
         />
       )

src/features/scanner/Popup.jsx

@@ -30,7 +30,9 @@ export function ScanOnDemandPopup({ children, mode }) {
       <List>
         <StyledListItemText
           className="no-leaflet-margin"
-          secondary={t('scan_next_choose')}
+          secondary={t(
+            mode === 'scanZone' ? 'scan_zone_choose' : 'scan_next_choose',
+          )}
         />
         <DividerWithMargin />
         {context.scannerType !== 'mad' && children}

src/features/webhooks/human/Location.jsx

@@ -88,7 +88,6 @@ const Location = () => {
 
   React.useEffect(
     () => () => {
-      lc.stop()
       useWebhookStore.setState({ location: [0, 0] })
     },
     [],
@@ -120,9 +119,9 @@ const Location = () => {
         <Button
           size="small"
           variant="contained"
-          color="secondary"
+          color={color}
           onClick={() => lc._onClick()}
-          startIcon={<MyLocation color={color} />}
+          startIcon={<MyLocation sx={{ color: 'white' }} />}
         >
           {t('my_location')}
         </Button>