Merge pull request #233 from WatWowMap/develop

Update Main

.gitignore

@@ -2,10 +2,14 @@
 /dist/
 
 # Config files
+server/src/configs/*
+!server/src/configs/default.json
+!server/src/configs/config.example.json
+!server/src/configs/areas.example.json
 .env
-config.json
-areas.json
-masterfile.json
+
+# Masterfile
+server/src/data/masterfile.json
 
 # Docker file
 /docker-compose.yml

.yarnrc

@@ -0,0 +1 @@
+engine-strict=true

Dockerfile

@@ -5,7 +5,7 @@
 # - mount areas.json to /home/node/server/src/configs/areas.json
 # - Also mount every other configuration file necessary into the according directory.
 
-FROM node:12-alpine
+FROM node:14-alpine
 
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PATH=$PATH:/home/node/.npm-global/bin

README.md

@@ -215,9 +215,33 @@ ReactMap supports multiple domain config options. Under the "multiDomain" object
 ## Using the .env File
 - From the root of the directory `cp example.env .env`
 - `nano .env`
-- If you want to use Google Analytics, you can add your ID here. Only use debug mode during development.
+- If you want to use Google Analytics, you can add your ID here. 
+- If you want to use debug mode, add "ANALYTICS_DEBUG_MODE=true" to your `.env`. Only use debug mode during development.
 - You can also set a title for the map if you want it to load it up a bit faster compared to the default Map title.
 
+## Message of the Day
+You can add one time MotD's for your community to see upon opening the map from your config. Simply increment the index to make sure your users see the latest message, then add an many messages as you want in the message array. It accepts an array of strings or objects that have `title`, `body`, and `footer` properties, all are optional. The map will display all messages in the messages array, so you'll need to clear old ones out if you don't wish for them to display.
+
+```json
+  "messageOfTheDay": {
+    "index": 1,
+    "messages": [
+      {
+        "title": "Title 1",
+        "body": "Body 1",
+        "footer": "Footer 1"
+      },
+      {
+        "title": "Title 2",
+        "body": "Body 2"
+      },
+      {
+        "footer": "Footer 3"
+      },
+      "I am a boring message"
+    ]
+  }
+```
 ## Credits
 
 - [MapJS](https://github.com/WatWowMap/MapJS)

example.env

@@ -1,3 +1,2 @@
 GOOGLE_ANALYTICS_ID=
-ANALYTICS_DEBUG_MODE=false
 TITLE=Map

package.json

@@ -19,6 +19,10 @@
     "migrate:latest": "knex --knexfile server/knexfile.cjs migrate:latest",
     "migrate:rollback": "knex --knexfile server/knexfile.cjs migrate:rollback"
   },
+  "engines": {
+    "node": ">=14",
+    "yarn": "1.22.x"
+  },
   "devDependencies": {
     "@babel/core": "^7.13.10",
     "@babel/eslint-parser": "^7.13.10",
@@ -76,7 +80,7 @@
     "i18next-browser-languagedetector": "^6.1.1",
     "i18next-fs-backend": "^1.1.1",
     "i18next-http-backend": "^1.2.6",
-    "knex": "^0.95.1",
+    "knex": "^0.95.11",
     "leaflet": "^1.7.1",
     "leaflet.locatecontrol": "^0.73.0",
     "leaflet.markercluster": "^1.4.1",
@@ -85,7 +89,7 @@
     "mysql": "^2.18.1",
     "node-fetch": "^2.6.1",
     "nodes2ts": "^2.0.0",
-    "objection": "Vincit/objection.js#chore/knex-0-95-0",
+    "objection": "^3.0.0-alpha.4",
     "ohbem": "^1.3.0",
     "passport": "^0.4.1",
     "passport-discord": "https://github.com/tonestrike/passport-discord.git",
@@ -94,7 +98,7 @@
     "react-dom": "^17.0.2",
     "react-ga": "^3.3.0",
     "react-i18next": "^11.9.0",
-    "react-leaflet": "3.1.0",
+    "react-leaflet": "3.2.2",
     "react-leaflet-markercluster": "3.0.0-rc1",
     "react-router-dom": "^5.2.0",
     "react-virtualized-auto-sizer": "^1.0.5",

public/base-locales/de.json

@@ -107,6 +107,7 @@
   "exEligible": "EX Raid",
   "inBattle": "Im Kampf",
   "allPokestops": "Alle Pokestops",
+  "allGyms": "Alle Arenen",
   "lures": " Lockmodule",
   "quests": "Quests",
   "invasions": "Invasionen",
@@ -175,43 +176,10 @@
   "altForms": "alle Formen",
   "Alola": "Alola",
   "Galarian": "Galar",
-  "Bug": "Käfer",
-  "Dark": "Unlicht",
-  "Dragon": "Drachen",
-  "Electric": "Elektro",
-  "Fairy": "Fee",
-  "Flying": "Flug",
-  "Fighting": "Kampf",
-  "Fire": "Feuer",
-  "Ghost": "Geist",
-  "Grass": "Pflanze",
-  "Ground": "Boden",
-  "Ice": "Eis",
-  "Normal": "Normal",
-  "Poison": "Gift",
-  "Psychic": "Psycho",
-  "Rock": "Gestein",
-  "Steel": "Stahl",
-  "Water": "Wasser",
-  "Kanto": "Kanto",
-  "Johto": "Johto",
-  "Hoenn": "Hoenn",
-  "Sinnoh": "Sinnoh",
-  "Unova": "Einall",
-  "Kalos": "Kalos",
-  "Galar": "Galar",
   "showing": "Zeigen",
   "instance": "Instanz",
   "online": "Online",
   "offline": "Offline",
-  "weather0": "None",
-  "weather1": "Sonnig/klar",
-  "weather2": "Regnerisch",
-  "weather3": "Teilweise bewölkt",
-  "weather4": "Bewölkt",
-  "weather5": "Windig",
-  "weather6": "Schnee",
-  "weather7": "Neblig",
   "boostedTypes": "Wetterboost",
   "pokemonOptions": "Pokemon Optionen",
   "pokestopsOptions": "Pokestop Optionen",
@@ -296,6 +264,11 @@
   "tutorialClosing3": "Es gibt viele ästhetische Optionen für jede Kategorie, aber bedenke, je mehr du deiner Map hinzufügst, desto höher ist die Wahrscheinlichkeit, dass deine Map einfriert",
   "tutorialClosing4": "Das Tutorial kann erneut angezeigt werden, indem du es im Bereich Einstellungen in der Seitenleiste auswählst",
   "tutorialClosing5": "Bleiben Sie sicher und viel Glück!",
+  "intro": "Einleitung",
+  "sidebar": "Seitenleiste",
+  "sliders": "Schieberegler",
+  "poups": "Popups",
+  "closing": "Schließen",
   "shortcuts": "Verknüpfungen",
   "iv": "IV",
   "areaRestrictions": "Gebietseinschränkungen",
@@ -375,5 +348,24 @@
   "showDexNumInPopup": "Zeige Pokedex # in Popup",
   "popup": "Popup",
   "pvpLevel": "Level {{level}} PVP Stats",
-  "pvpMega": "Mega PVP Stats"
+  "pvpMega": "Mega PVP Stats",
+  "arQuest_true": "AR Task",
+  "arQuest_false": "No AR",
+  "excludeQuestMulti": "{{reward}} ausschließen",
+  "excludeLure": "Lockmodul ausschließen",
+  "popupPokestopSeenTimerWidth": 7,
+  "clusterLimit_0": "Limit von {{variable_0}} ({{variable_1}}) wurde erreicht",
+  "clusterLimit_1": "Bitte reinzoomen oder die Filter einschränken",
+  "showPolygons": "Polygone anzeigen",
+  "excludeInvasionMulti": "{{invasion}} ausschließen",
+  "messageOfTheDay": "Nachricht des Tages",
+  "hasQuestIndicator": "Alternative Farbe für Stops mit Quests",
+  "showArBadge": "Zeige AR Symbol",
+  "raidsOr": "Raidbosse separat filtern",
+  "general": "Allgemeines",
+  "linkGlobalAndAdvanced": "Verknüpfe Global und Erweitert",
+  "normalForms": "Normalformen",
+  "weatherIndicator": "Wetter Symbol",
+  "page": "Seite {{page}}",
+  "navigationControls": "Navigations-Steuerungen"
 }