Resolve .env conflict

.env

@@ -1,22 +0,0 @@
-PORT=3000
-
-DB_HOST=85.215.63.122
-DB_PORT=3306
-DB_USER=dok
-DB_PASSWORD=RLR+2DHmZ6XJGotT2F7Ylrpdptc
-DB_NAME=dok
-
-OFFLINE_SERVER_1=Test Server Alpha
-OFFLINE_SERVER_2=Test Server Beta
-
-APP_URL=https://spiel.dynastyofknights.com
-
-SESSION_SECRET=irgendein_langer_geheimer_zufallstext_123!
-
-MAIL_HOST=smtp.ionos.de
-MAIL_USER=register@dynastyofknights.com
-MAIL_PASS=111168-j-62217DwmbwPK
-
-STRIPE_SECRET_KEY=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
-STRIPE_WEBHOOK_SECRET=whsec_byep5YQAyglVulaMMaZsQcysUvMA0QN9
-APP_URL=https://spiel.dynastyofknights.com

.gitignore

@@ -1 +1 @@
-servers.db
+servers.db.env

node_modules/.package-lock.json

@@ -2682,6 +2682,23 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stripe": {
+      "version": "22.0.1",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-22.0.1.tgz",
+      "integrity": "sha512-Yw764pZ6s8Xu4CtUZdD5uWOkw6gc9xzO9OKylCuj1gMhMDLbyGbDtaPNNSFE4mB6njYSHESYIVbF1iIzUfAl2g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tar": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",

package-lock.json

@@ -23,7 +23,8 @@
         "mysql2": "^3.19.1",
         "nodemailer": "^8.0.2",
         "socket.io": "^4.8.3",
-        "sqlite3": "^5.1.7"
+        "sqlite3": "^5.1.7",
+        "stripe": "^22.0.1"
       }
     },
     "node_modules/@gar/promisify": {
@@ -2704,6 +2705,23 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/stripe": {
+      "version": "22.0.1",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-22.0.1.tgz",
+      "integrity": "sha512-Yw764pZ6s8Xu4CtUZdD5uWOkw6gc9xzO9OKylCuj1gMhMDLbyGbDtaPNNSFE4mB6njYSHESYIVbF1iIzUfAl2g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tar": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",

package.json

@@ -23,7 +23,8 @@
     "mysql2": "^3.19.1",
     "nodemailer": "^8.0.2",
     "socket.io": "^4.8.3",
-    "sqlite3": "^5.1.7"
+    "sqlite3": "^5.1.7",
+    "stripe": "^22.0.1"
   },
   "description": ""
 }