Sync Develop to Main

.github/workflows/docker.yml

@@ -6,10 +6,31 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
+  Sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          cache: "yarn"
+      - name: Generate latest env vars
+        run: |
+          yarn gen-env-config
+      - name: Commit and push changes
+        uses: devops-infra/action-commit-push@v0.9.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          commit_message: Synced docker env vars with latest config
   Docker:
+    needs: Sync
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Set .gitsha
       if: github.event_name == 'push'

README.md

@@ -26,6 +26,8 @@ Pokemon GO Map frontend built with React.
 - Last Scanned Cells
 - Spawnpoints
 - Discord, Telegram, Local, and Custom Auth & Permission Based Viewing
+- Gym Badge tracking
+- Webhook alert management for [Poracle](https://github.com/KartulUdus/PoracleJS)
 - Extremely configurable and supports custom, git friendly, code injection
 
 ## Live Demo

esbuild.config.mjs

@@ -15,7 +15,7 @@ import aliasPlugin from 'esbuild-plugin-path-alias'
 import { eslintPlugin } from 'esbuild-plugin-eslinter'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const env = fs.existsSync(`${__dirname}/.env`) ? dotenv.config() : { parsed: {} }
+const env = fs.existsSync(`${__dirname}/.env`) ? dotenv.config() : { parsed: process.env }
 const { version } = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json')))
 const isDevelopment = Boolean(process.argv.includes('--dev'))
 const isRelease = Boolean(process.argv.includes('--release'))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",

public/base-locales/de.json

@@ -167,7 +167,8 @@
   "gyms_options": "Arena Optionen",
   "nests_options": "Nest Optionen",
   "wayfarer_options": "Wayfarer Optionen",
-  "admin_options": "Admin Option",
+  "admin_options": "Admin Optionen",
+  "weather_options": "Wetter Optionen",
   "clustering": "Clustering",
   "glow": "Leuchten",
   "legacy_filter": "Legacy Filter",
@@ -538,5 +539,13 @@
   "points": "Punkte",
   "day": "Tag",
   "days": "Tage",
-  "react_error": "Etwas ist schiefgelaufen"
+  "react_error": "Etwas ist schiefgelaufen",
+  "clickable_icon": "Icon ist anklickbar",
+  "two_stops_till_next": "2 Stops bis zur nächsten",
+  "one_stop_till_next": "1 Stop bis zur nächsten",
+  "no_more_gyms": "keine weitere Arena",
+  "light_map_border": "heller Kartenrand",
+  "dark_map_border": "dunkler Kartenrand",
+  "cell_blocked": "Zelle ist blockiert",
+  "poi_color": "POI Farbe"
 }

public/base-locales/en.json

@@ -535,5 +535,12 @@
   "day": "Day",
   "days": "Days",
   "react_error": "Something Went Wrong",
-  "clickable_icon": "Icon is Clickable"
+  "clickable_icon": "Icon is Clickable",
+  "two_stops_till_next": "2 stops until next",
+  "one_stop_till_next": "1 stop until next",
+  "no_more_gyms": "No more gyms",
+  "light_map_border": "Light Map Border",
+  "dark_map_border": "Dark Map Border",
+  "cell_blocked": "Cell Blocked",
+  "poi_color": "POI Color"
 }

public/base-locales/es.json

@@ -530,5 +530,14 @@
   "points": "Puntos",
   "day": "Día",
   "days": "Dias",
-  "react_error": "Algo salió mal"
+  "react_error": "Algo salió mal",
+  "clickable_icon": "Se puede hacer clic en el icono",
+  "weather_options": "Opciones meteorológicas",
+  "two_stops_till_next": "2 paradas hasta la próxima",
+  "one_stop_till_next": "1 parada hasta la próxima",
+  "no_more_gyms": "No más gimnasios",
+  "light_map_border": "Borde de mapa claro",
+  "dark_map_border": "Borde oscuro del mapa",
+  "cell_blocked": "Celda bloqueada",
+  "poi_color": "Color de punto de interés"
 }

public/base-locales/fr.json

@@ -537,5 +537,14 @@
   "points": "Points",
   "day": "Jour",
   "days": "Jours",
-  "react_error": "Un problème est survenu"
+  "react_error": "Un problème est survenu",
+  "clickable_icon": "L'icône est cliquable",
+  "weather_options": "Options météo",
+  "two_stops_till_next": "2 arrêts jusqu'à la prochaine",
+  "one_stop_till_next": "1 arrêt jusqu'au prochain",
+  "no_more_gyms": "Plus de gymnases",
+  "light_map_border": "Bordure de carte lumineuse",
+  "dark_map_border": "Bordure de carte sombre",
+  "cell_blocked": "Cellule bloquée",
+  "poi_color": "Couleur du point d'intérêt"
 }

public/base-locales/it.json

@@ -501,5 +501,14 @@
   "days": "Giorni",
   "scan_cells_subtitle": "Mostra l'ultima volta che una cella S2 è stata scansionata da un dispositivo",
   "locale_selection_ja": "日本語",
-  "react_error": "Qualcosa è andato storto"
+  "react_error": "Qualcosa è andato storto",
+  "clickable_icon": "L'icona è cliccabile",
+  "weather_options": "Opzioni meteo",
+  "two_stops_till_next": "2 fermate fino al prossimo",
+  "one_stop_till_next": "1 fermata fino al prossimo",
+  "no_more_gyms": "Niente più palestre",
+  "light_map_border": "Bordo mappa chiaro",
+  "dark_map_border": "Bordo mappa scuro",
+  "cell_blocked": "Cella bloccata",
+  "poi_color": "Colore PDI"
 }

public/base-locales/ja.json

@@ -501,5 +501,14 @@
   "day": "日",
   "days": "日々",
   "scan_cells_subtitle": "S2セルがデバイスによって最後にスキャンされた時刻を示します",
-  "react_error": "何かがおかしい"
+  "react_error": "何かがおかしい",
+  "clickable_icon": "アイコンはクリック可能",
+  "weather_options": "天気オプション",
+  "two_stops_till_next": "次まで2ストップ",
+  "one_stop_till_next": "次まで1ストップ",
+  "no_more_gyms": "これ以上のジムはありません",
+  "light_map_border": "ライトマップボーダー",
+  "dark_map_border": "ダークマップボーダー",
+  "cell_blocked": "セルがブロックされました",
+  "poi_color": "POIカラー"
 }

public/base-locales/ko.json

@@ -501,5 +501,14 @@
   "days": "날",
   "scan_cells_subtitle": "장치가 S2 셀을 마지막으로 스캔한 시간을 표시합니다.",
   "locale_selection_nl": "네덜란드",
-  "react_error": "문제가 발생했습니다."
+  "react_error": "문제가 발생했습니다.",
+  "clickable_icon": "아이콘을 클릭할 수 있음",
+  "weather_options": "날씨 옵션",
+  "two_stops_till_next": "다음까지 2정거장",
+  "one_stop_till_next": "다음까지 1정거장",
+  "no_more_gyms": "더 이상 체육관은 없습니다",
+  "light_map_border": "라이트 맵 테두리",
+  "dark_map_border": "어두운 지도 테두리",
+  "cell_blocked": "차단된 셀",
+  "poi_color": "POI 색상"
 }

public/base-locales/nl.json

@@ -533,5 +533,14 @@
   "points": "Punten",
   "day": "Dag",
   "days": "Dagen",
-  "react_error": "Er ging iets mis"
+  "react_error": "Er ging iets mis",
+  "clickable_icon": "Icoon is klikbaar",
+  "weather_options": "Weer opties",
+  "two_stops_till_next": "2 haltes tot de volgende",
+  "one_stop_till_next": "1 halte tot de volgende",
+  "no_more_gyms": "Geen sportscholen meer",
+  "light_map_border": "Lichte kaartrand",
+  "dark_map_border": "Donkere kaartrand",
+  "cell_blocked": "Cel geblokkeerd",
+  "poi_color": "POI-kleur"
 }

public/base-locales/pt-br.json

@@ -501,5 +501,14 @@
   "days": "Dias",
   "scan_cells_subtitle": "Mostra a última vez que uma célula S2 foi verificada por um dispositivo",
   "locale_selection_nl": "Países Baixos",
-  "react_error": "Algo deu errado"
+  "react_error": "Algo deu errado",
+  "clickable_icon": "O ícone é clicável",
+  "weather_options": "Opções de clima",
+  "two_stops_till_next": "2 paradas até a próxima",
+  "one_stop_till_next": "1 parada até a próxima",
+  "no_more_gyms": "Não há mais ginásios",
+  "light_map_border": "Borda do mapa de luz",
+  "dark_map_border": "Borda do mapa escuro",
+  "cell_blocked": "Célula bloqueada",
+  "poi_color": "Cor do POI"
 }

public/base-locales/ru.json

@@ -501,5 +501,14 @@
   "days": "Дни",
   "scan_cells_subtitle": "Показывает, когда устройство последний раз сканировало ячейку S2.",
   "locale_selection_nl": "Нидерланды",
-  "react_error": "Что-то пошло не так"
+  "react_error": "Что-то пошло не так",
+  "clickable_icon": "Иконка кликабельна",
+  "weather_options": "Параметры погоды",
+  "two_stops_till_next": "2 остановки до следующей",
+  "one_stop_till_next": "1 остановка до следующей",
+  "no_more_gyms": "Нет больше тренажерных залов",
+  "light_map_border": "Граница световой карты",
+  "dark_map_border": "Темная граница карты",
+  "cell_blocked": "Сотовый заблокирован",
+  "poi_color": "Цвет POI"
 }

public/base-locales/sv.json

@@ -501,5 +501,14 @@
   "days": "dagar",
   "scan_cells_subtitle": "Visar senaste gången en S2-cell skannades av en enhet",
   "locale_selection_nl": "nederländska",
-  "react_error": "Något gick fel"
+  "react_error": "Något gick fel",
+  "clickable_icon": "Ikonen är klickbar",
+  "weather_options": "Väderalternativ",
+  "two_stops_till_next": "2 stopp till nästa",
+  "one_stop_till_next": "1 stopp till nästa",
+  "no_more_gyms": "Inga fler gym",
+  "light_map_border": "Ljus kartgräns",
+  "dark_map_border": "Mörk kartgräns",
+  "cell_blocked": "Cell blockerad",
+  "poi_color": "POI-färg"
 }

public/base-locales/th.json

@@ -501,5 +501,14 @@
   "days": "วัน",
   "scan_cells_subtitle": "แสดงครั้งสุดท้ายที่อุปกรณ์ S2 สแกนเซลล์",
   "locale_selection_nl": "เนเธอร์แลนด์",
-  "react_error": "อะไรบางอย่างผิดปกติ"
+  "react_error": "อะไรบางอย่างผิดปกติ",
+  "clickable_icon": "ไอคอนคลิกได้",
+  "weather_options": "ตัวเลือกสภาพอากาศ",
+  "two_stops_till_next": "2 หยุดจนกว่าจะถึงถัดไป",
+  "one_stop_till_next": "1 หยุดจนกว่าจะถึงต่อไป",
+  "no_more_gyms": "ไม่มียิมอีกต่อไป",
+  "light_map_border": "เส้นขอบแผนที่แสง",
+  "dark_map_border": "เส้นขอบแผนที่มืด",
+  "cell_blocked": "เซลล์ถูกบล็อก",
+  "poi_color": "POI สี"
 }

public/base-locales/tr.json

@@ -1,3 +1,12 @@
 {
-  "react_error": "Bir şeyler yanlış gitti"
+  "react_error": "Bir şeyler yanlış gitti",
+  "clickable_icon": "Simge Tıklanabilir",
+  "weather_options": "Hava Durumu Seçenekleri",
+  "two_stops_till_next": "bir sonrakine kadar 2 durak",
+  "one_stop_till_next": "bir sonrakine kadar 1 durak",
+  "no_more_gyms": "Artık spor salonu yok",
+  "light_map_border": "Hafif Harita Sınırı",
+  "dark_map_border": "Karanlık Harita Kenarlığı",
+  "cell_blocked": "Hücre Engellendi",
+  "poi_color": "POI Rengi"
 }

public/base-locales/zh-tw.json

@@ -501,5 +501,14 @@
   "days": "天",
   "scan_cells_subtitle": "顯示設備上次掃描 S2 單元的時間",
   "locale_selection_nl": "荷蘭",
-  "react_error": "出問題了"
+  "react_error": "出問題了",
+  "clickable_icon": "圖標可點擊",
+  "weather_options": "天氣選項",
+  "two_stops_till_next": "2 站直到下一站",
+  "one_stop_till_next": "1 站到下一個",
+  "no_more_gyms": "沒有健身房了",
+  "light_map_border": "光照貼圖邊框",
+  "dark_map_border": "深色地圖邊框",
+  "cell_blocked": "單元格阻塞",
+  "poi_color": "興趣點顏色"
 }

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

@@ -318,7 +318,8 @@
       "clientTimeoutMinutes": {
         "__name": "MAP_MISC_CLIENT_TIMEOUT_MINUTES",
         "__format": "number"
-      }
+      },
+      "distanceUnit": "MAP_MISC_DISTANCE_UNIT"
     },
     "theme": {
       "style": "MAP_THEME_STYLE",
@@ -581,13 +582,22 @@
         "__format": "boolean"
       },
       "oldPortals": "CLIENT_SIDE_OPTIONS_WAYFARER_OLD_PORTALS",
-      "newPortals": "CLIENT_SIDE_OPTIONS_WAYFARER_NEW_PORTALS"
+      "newPortals": "CLIENT_SIDE_OPTIONS_WAYFARER_NEW_PORTALS",
+      "twoStopsTillNext": "CLIENT_SIDE_OPTIONS_WAYFARER_TWO_STOPS_TILL_NEXT",
+      "oneStopTillNext": "CLIENT_SIDE_OPTIONS_WAYFARER_ONE_STOP_TILL_NEXT",
+      "noMoreGyms": "CLIENT_SIDE_OPTIONS_WAYFARER_NO_MORE_GYMS",
+      "lightMapBorder": "CLIENT_SIDE_OPTIONS_WAYFARER_LIGHT_MAP_BORDER",
+      "darkMapBorder": "CLIENT_SIDE_OPTIONS_WAYFARER_DARK_MAP_BORDER",
+      "cellBlocked": "CLIENT_SIDE_OPTIONS_WAYFARER_CELL_BLOCKED",
+      "poiColor": "CLIENT_SIDE_OPTIONS_WAYFARER_POI_COLOR"
     },
     "weather": {
       "clickableIcon": {
         "__name": "CLIENT_SIDE_OPTIONS_WEATHER_CLICKABLE_ICON",
         "__format": "boolean"
-      }
+      },
+      "darkMapBorder": "CLIENT_SIDE_OPTIONS_WEATHER_DARK_MAP_BORDER",
+      "lightMapBorder": "CLIENT_SIDE_OPTIONS_WEATHER_LIGHT_MAP_BORDER"
     }
   },
   "defaultFilters": {

server/src/configs/default.json

@@ -133,7 +133,8 @@
       "noScanAreaOverlay": false,
       "permImageDir": "images/perms",
       "permArrayImages": false,
-      "clientTimeoutMinutes": 30
+      "clientTimeoutMinutes": 30,
+      "distanceUnit" : "km"
     },
     "theme": {
       "style": "dark",
@@ -260,10 +261,19 @@
     "wayfarer": {
       "clustering": true,
       "oldPortals": "#0000ff",
-      "newPortals": "#16b819"
+      "newPortals": "#16b819",
+      "twoStopsTillNext": "#ffa500",
+      "oneStopTillNext": "#ff0000",
+      "noMoreGyms": "#000000",
+      "lightMapBorder": "#000000",
+      "darkMapBorder": "#ff0000",
+      "cellBlocked": "#000000",
+      "poiColor": "#03ffff"
     },
     "weather": {
-      "clickableIcon": false
+      "clickableIcon": false,
+      "darkMapBorder": "#ff0000",
+      "lightMapBorder": "#246377"
     }
   },
   "defaultFilters": {

server/src/configs/local.example.json

@@ -67,6 +67,7 @@
   "database": {
     "schemas": [
       {
+        "note": "Scanner Database",
         "host": "127.0.0.1",
         "port": 3306,
         "username": "scanner_user",
@@ -83,14 +84,25 @@
         ]
       },
       {
+        "note": "React Map Database, where the migrations are ran through this app",
+        "host": "127.0.0.1",
+        "port": 3306,
+        "username": "reactmap_user",
+        "password": "reactmap_paw",
+        "database": "reactmap_db",
+        "useFor": [
+          "session",
+          "user"
+        ]
+      },
+      {
+        "note": "Manual Database generally used for storing nests or portal tables, more info on the Wiki",
         "host": "127.0.0.1",
         "port": 3306,
         "username": "manual_user",
         "password": "manual_pw",
         "database": "manual_db",
         "useFor": [
-          "session",
-          "user",
           "nest",
           "portal"
         ]