Sync Dev to Main

.eslintignore

@@ -1,2 +1,5 @@
 dist
-node_modules
+node_modules
+public/missing-locales
+public/images/custom
+public/images/uicons

.eslintrc

@@ -2,7 +2,8 @@
   "extends": [
     "airbnb",
     "airbnb/rules/react",
-    "eslint:recommended"
+    "eslint:recommended",
+    "prettier"
   ],
   "parserOptions": {
     "ecmaVersion": "latest"

.github/workflows/lint.yml

@@ -2,20 +2,29 @@ name: Lint
 on: [push]
 
 jobs:
-  Lint:
+  lint:
+    name: Run Basic Checks
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [16.x]
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
+      - name: Checkout Code
+        id: checkout-code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          cache: 'yarn'
 
-    - name: Test the Testcases
-      run:
-        npm install -g yarn
-        yarn install
-        yarn build
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Lint
+        run: yarn eslint:check
+
+      - name: Prettier
+        run: yarn prettier:check
+
+      - name: Build
+        run: yarn build

.github/workflows/release.yml

@@ -0,0 +1,23 @@
+name: Release
+on: [release]
+
+jobs:
+  sentry:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        id: checkout-code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Sentry Build
+        run: yarn release

.prettierignore

@@ -0,0 +1,5 @@
+dist
+node_modules
+public/missing-locales
+public/images/custom
+public/images/uicons

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "trailingComma": "all",
+  "singleQuote": true
+}

.vscode/extensions.json

@@ -6,6 +6,6 @@
     "esbenp.prettier-vscode",
     "leizongmin.node-module-intellisense",
     "eg2.vscode-npm-script",
-    "2gua.rainbow-brackets"
+    "graphql.vscode-graphql"
   ]
 }

.vscode/settings.json

@@ -3,19 +3,12 @@
     "public/base-locales"
   ],
   "i18n-ally.keystyle": "flat",
-  "[typescript]": {
-    "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
   "[javascript]": {
     "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascriptreact]": {
     "editor.autoClosingBrackets": "always",
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.2.7",
+  "version": "1.3.0",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",
@@ -23,7 +23,11 @@
     "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",
-    "release": "node server/scripts/newRelease.js"
+    "release": "node server/scripts/newRelease.js",
+    "prettier:check": "prettier --check \"**/*.{js,jsx}\"",
+    "prettier:fix": "prettier --write \"**/*.{js,jsx}\"",
+    "eslint:check": "eslint \"**/*.{js,jsx}\"",
+    "eslint:fix": "eslint \"**/*.{js,jsx}\" --fix"
   },
   "engines": {
     "node": ">=16",
@@ -39,12 +43,14 @@
     "esbuild-server": "^0.1.0",
     "eslint": "^8.9.0",
     "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "nodemon": "^2.0.7"
+    "nodemon": "^2.0.7",
+    "prettier": "^2.6.2"
   },
   "dependencies": {
     "@apollo/client": "^3.3.11",
@@ -54,6 +60,7 @@
     "@material-ui/styles": "^4.11.4",
     "@sentry/react": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
+    "@turf/boolean-overlap": "^6.5.0",
     "@turf/boolean-point-in-polygon": "^6.5.0",
     "@turf/center": "^6.3.0",
     "@turf/destination": "^6.5.0",
@@ -97,7 +104,7 @@
     "prop-types": "^15.7.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-ga": "^3.3.0",
+    "react-ga4": "^1.4.1",
     "react-i18next": "^11.16.7",
     "react-leaflet": "3.2.2",
     "react-leaflet-markercluster": "3.0.0-rc1",

public/base-locales/de.json

@@ -547,5 +547,9 @@
   "light_map_border": "heller Kartenrand",
   "dark_map_border": "dunkler Kartenrand",
   "cell_blocked": "Zelle ist blockiert",
-  "poi_color": "POI Farbe"
+  "poi_color": "POI Farbe",
+  "ultra_beast": "Ultrabestie",
+  "quest_condition": "Questbedingung",
+  "always_show_labels": "Labels immer anzeigen",
+  "scan_areas_options": "Optionen für Scanbereiche"
 }

public/base-locales/en.json

@@ -543,5 +543,8 @@
   "light_map_border": "Light Map Border",
   "dark_map_border": "Dark Map Border",
   "cell_blocked": "Cell Blocked",
-  "poi_color": "POI Color"
+  "poi_color": "POI Color",
+  "quest_condition": "Quest Condition",
+  "always_show_labels": "Always Show Labels",
+  "scan_areas_options": "Scan Areas Options"
 }

public/base-locales/es.json

@@ -539,5 +539,9 @@
   "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"
+  "poi_color": "Color de punto de interés",
+  "ultra_beast": "Ultrabestia",
+  "quest_condition": "Condición de misión",
+  "always_show_labels": "Mostrar siempre etiquetas",
+  "scan_areas_options": "Opciones de áreas de escaneo"
 }

public/base-locales/fr.json

@@ -540,11 +540,15 @@
   "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",
+  "two_stops_till_next": "2 pokéstops jusqu'à la prochaine",
+  "one_stop_till_next": "1 pokéstops jusqu'à la prochaine",
+  "no_more_gyms": "Plus d'arènes",
+  "light_map_border": "Bordure de carte claire",
   "dark_map_border": "Bordure de carte sombre",
   "cell_blocked": "Cellule bloquée",
-  "poi_color": "Couleur du point d'intérêt"
+  "poi_color": "Couleur du point d'intérêt",
+  "ultra_beast": "Ultra Bête",
+  "quest_condition": "État de la quête",
+  "always_show_labels": "Toujours afficher les étiquettes",
+  "scan_areas_options": "Options des zones de numérisation"
 }

public/base-locales/it.json

@@ -510,5 +510,9 @@
   "light_map_border": "Bordo mappa chiaro",
   "dark_map_border": "Bordo mappa scuro",
   "cell_blocked": "Cella bloccata",
-  "poi_color": "Colore PDI"
+  "poi_color": "Colore PDI",
+  "ultra_beast": "Ultra bestia",
+  "quest_condition": "Condizione di ricerca",
+  "always_show_labels": "Mostra sempre le etichette",
+  "scan_areas_options": "Opzioni delle aree di scansione"
 }

public/base-locales/ja.json

@@ -510,5 +510,9 @@
   "light_map_border": "ライトマップボーダー",
   "dark_map_border": "ダークマップボーダー",
   "cell_blocked": "セルがブロックされました",
-  "poi_color": "POIカラー"
+  "poi_color": "POIカラー",
+  "ultra_beast": "ウルトラビースト",
+  "quest_condition": "クエスト条件",
+  "always_show_labels": "常にラベルを表示する",
+  "scan_areas_options": "スキャンエリアオプション"
 }

public/base-locales/ko.json

@@ -510,5 +510,9 @@
   "light_map_border": "라이트 맵 테두리",
   "dark_map_border": "어두운 지도 테두리",
   "cell_blocked": "차단된 셀",
-  "poi_color": "POI 색상"
+  "poi_color": "POI 색상",
+  "ultra_beast": "울트라 비스트",
+  "quest_condition": "퀘스트 조건",
+  "always_show_labels": "항상 레이블 표시",
+  "scan_areas_options": "스캔 영역 옵션"
 }

public/base-locales/nl.json

@@ -542,5 +542,9 @@
   "light_map_border": "Lichte kaartrand",
   "dark_map_border": "Donkere kaartrand",
   "cell_blocked": "Cel geblokkeerd",
-  "poi_color": "POI-kleur"
+  "poi_color": "POI-kleur",
+  "ultra_beast": "Ultrabeest",
+  "quest_condition": "Quest-voorwaarde",
+  "always_show_labels": "Altijd labels weergeven",
+  "scan_areas_options": "Opties voor scangebieden"
 }

public/base-locales/pt-br.json

@@ -510,5 +510,9 @@
   "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"
+  "poi_color": "Cor do POI",
+  "ultra_beast": "Ultra Besta",
+  "quest_condition": "Condição da Missão",
+  "always_show_labels": "Sempre mostrar marcadores",
+  "scan_areas_options": "Opções de áreas de digitalização"
 }

public/base-locales/ru.json

@@ -510,5 +510,9 @@
   "light_map_border": "Граница световой карты",
   "dark_map_border": "Темная граница карты",
   "cell_blocked": "Сотовый заблокирован",
-  "poi_color": "Цвет POI"
+  "poi_color": "Цвет POI",
+  "ultra_beast": "Ультра Чудовище",
+  "quest_condition": "Состояние квеста",
+  "always_show_labels": "Всегда показывать ярлыки",
+  "scan_areas_options": "Параметры областей сканирования"
 }

public/base-locales/sv.json

@@ -510,5 +510,9 @@
   "light_map_border": "Ljus kartgräns",
   "dark_map_border": "Mörk kartgräns",
   "cell_blocked": "Cell blockerad",
-  "poi_color": "POI-färg"
+  "poi_color": "POI-färg",
+  "ultra_beast": "Ultra Beast",
+  "quest_condition": "Quest tillstånd",
+  "always_show_labels": "Visa alltid etiketter",
+  "scan_areas_options": "Alternativ för skanningsområden"
 }

public/base-locales/th.json

@@ -510,5 +510,9 @@
   "light_map_border": "เส้นขอบแผนที่แสง",
   "dark_map_border": "เส้นขอบแผนที่มืด",
   "cell_blocked": "เซลล์ถูกบล็อก",
-  "poi_color": "POI สี"
+  "poi_color": "POI สี",
+  "ultra_beast": "อุลตร้าบีสท์",
+  "quest_condition": "เงื่อนไขภารกิจ",
+  "always_show_labels": "แสดงป้ายกำกับเสมอ",
+  "scan_areas_options": "ตัวเลือกพื้นที่สแกน"
 }

public/base-locales/tr.json

@@ -8,5 +8,9 @@
   "light_map_border": "Hafif Harita Sınırı",
   "dark_map_border": "Karanlık Harita Kenarlığı",
   "cell_blocked": "Hücre Engellendi",
-  "poi_color": "POI Rengi"
+  "poi_color": "POI Rengi",
+  "ultra_beast": "Ultra Canavar",
+  "quest_condition": "Görev Durumu",
+  "always_show_labels": "Etiketleri Her Zaman Göster",
+  "scan_areas_options": "Tarama Alanları Seçenekleri"
 }

public/base-locales/zh-tw.json

@@ -510,5 +510,9 @@
   "light_map_border": "光照貼圖邊框",
   "dark_map_border": "深色地圖邊框",
   "cell_blocked": "單元格阻塞",
-  "poi_color": "興趣點顏色"
+  "poi_color": "興趣點顏色",
+  "ultra_beast": "超野獸",
+  "quest_condition": "任務條件",
+  "always_show_labels": "始終顯示標籤",
+  "scan_areas_options": "掃描區域選項"
 }