From d681d3cee04ac5b34714ef039960c54ebc942fd6 Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Wed, 3 Jan 2024 18:44:06 +0100
Subject: [PATCH] Fixed error in database api

---
 {databases => client/public/databases}/airbases/caucasus.json  | 0
 {databases => client/public/databases}/airbases/falklands.json | 0
 {databases => client/public/databases}/airbases/marianas.json  | 0
 {databases => client/public/databases}/airbases/nevada.json    | 0
 {databases => client/public/databases}/airbases/normandy.json  | 0
 .../public/databases}/airbases/persiangulf.json                | 0
 {databases => client/public/databases}/airbases/sinaimap.json  | 0
 {databases => client/public/databases}/airbases/syria.json     | 0
 .../public/databases}/airbases/thechannel.json                 | 0
 client/routes/api/databases.js                                 | 3 ++-
 client/src/unit/databases/aircraftdatabase.ts                  | 2 +-
 client/src/unit/databases/groundunitdatabase.ts                | 2 +-
 client/src/unit/databases/helicopterdatabase.ts                | 2 +-
 client/src/unit/databases/navyunitdatabase.ts                  | 2 +-
 14 files changed, 6 insertions(+), 5 deletions(-)
 rename {databases => client/public/databases}/airbases/caucasus.json (100%)
 rename {databases => client/public/databases}/airbases/falklands.json (100%)
 rename {databases => client/public/databases}/airbases/marianas.json (100%)
 rename {databases => client/public/databases}/airbases/nevada.json (100%)
 rename {databases => client/public/databases}/airbases/normandy.json (100%)
 rename {databases => client/public/databases}/airbases/persiangulf.json (100%)
 rename {databases => client/public/databases}/airbases/sinaimap.json (100%)
 rename {databases => client/public/databases}/airbases/syria.json (100%)
 rename {databases => client/public/databases}/airbases/thechannel.json (100%)

diff --git a/databases/airbases/caucasus.json b/client/public/databases/airbases/caucasus.json
similarity index 100%
rename from databases/airbases/caucasus.json
rename to client/public/databases/airbases/caucasus.json
diff --git a/databases/airbases/falklands.json b/client/public/databases/airbases/falklands.json
similarity index 100%
rename from databases/airbases/falklands.json
rename to client/public/databases/airbases/falklands.json
diff --git a/databases/airbases/marianas.json b/client/public/databases/airbases/marianas.json
similarity index 100%
rename from databases/airbases/marianas.json
rename to client/public/databases/airbases/marianas.json
diff --git a/databases/airbases/nevada.json b/client/public/databases/airbases/nevada.json
similarity index 100%
rename from databases/airbases/nevada.json
rename to client/public/databases/airbases/nevada.json
diff --git a/databases/airbases/normandy.json b/client/public/databases/airbases/normandy.json
similarity index 100%
rename from databases/airbases/normandy.json
rename to client/public/databases/airbases/normandy.json
diff --git a/databases/airbases/persiangulf.json b/client/public/databases/airbases/persiangulf.json
similarity index 100%
rename from databases/airbases/persiangulf.json
rename to client/public/databases/airbases/persiangulf.json
diff --git a/databases/airbases/sinaimap.json b/client/public/databases/airbases/sinaimap.json
similarity index 100%
rename from databases/airbases/sinaimap.json
rename to client/public/databases/airbases/sinaimap.json
diff --git a/databases/airbases/syria.json b/client/public/databases/airbases/syria.json
similarity index 100%
rename from databases/airbases/syria.json
rename to client/public/databases/airbases/syria.json
diff --git a/databases/airbases/thechannel.json b/client/public/databases/airbases/thechannel.json
similarity index 100%
rename from databases/airbases/thechannel.json
rename to client/public/databases/airbases/thechannel.json
diff --git a/client/routes/api/databases.js b/client/routes/api/databases.js
index eea9667e..ed77e3f4 100644
--- a/client/routes/api/databases.js
+++ b/client/routes/api/databases.js
@@ -5,7 +5,8 @@ module.exports = function (databasesLocation) {
     const path = require("path");
 
     router.get('/:type/:name', function (req, res) {
-        console.log(req.params.database)
+		var contents = fs.readFileSync(path.join(databasesLocation, req.params.type, req.params.name + ".json"));
+        res.status(200).send(contents);
     });
 
     router.put('/save/:type/:name', function (req, res) {
diff --git a/client/src/unit/databases/aircraftdatabase.ts b/client/src/unit/databases/aircraftdatabase.ts
index 1c4069b3..f2e73ac0 100644
--- a/client/src/unit/databases/aircraftdatabase.ts
+++ b/client/src/unit/databases/aircraftdatabase.ts
@@ -5,7 +5,7 @@ import { UnitDatabase } from "./unitdatabase"
 
 export class AircraftDatabase extends UnitDatabase {
     constructor() {
-        super('databases/units/aircraftdatabase.json');
+        super('databases/units/aircraftdatabase');
     }
 
 	getCategory() {
diff --git a/client/src/unit/databases/groundunitdatabase.ts b/client/src/unit/databases/groundunitdatabase.ts
index a4d8213a..573b4215 100644
--- a/client/src/unit/databases/groundunitdatabase.ts
+++ b/client/src/unit/databases/groundunitdatabase.ts
@@ -4,7 +4,7 @@ import { UnitDatabase } from "./unitdatabase"
 
 export class GroundUnitDatabase extends UnitDatabase {
     constructor() {
-        super('databases/units/groundunitdatabase.json');
+        super('databases/units/groundunitdatabase');
     }
 
     getSpawnPointsByName(name: string) {
diff --git a/client/src/unit/databases/helicopterdatabase.ts b/client/src/unit/databases/helicopterdatabase.ts
index d105d282..c4fca6a9 100644
--- a/client/src/unit/databases/helicopterdatabase.ts
+++ b/client/src/unit/databases/helicopterdatabase.ts
@@ -4,7 +4,7 @@ import { UnitDatabase } from "./unitdatabase"
 
 export class HelicopterDatabase extends UnitDatabase {
     constructor() {
-        super('databases/units/helicopterdatabase.json');
+        super('databases/units/helicopterdatabase');
     }
 
     getSpawnPointsByName(name: string) {
diff --git a/client/src/unit/databases/navyunitdatabase.ts b/client/src/unit/databases/navyunitdatabase.ts
index 6f5111eb..baed5d84 100644
--- a/client/src/unit/databases/navyunitdatabase.ts
+++ b/client/src/unit/databases/navyunitdatabase.ts
@@ -4,7 +4,7 @@ import { UnitDatabase } from "./unitdatabase"
 
 export class NavyUnitDatabase extends UnitDatabase {
     constructor() {
-        super('databases/units/navyunitdatabase.json');
+        super('databases/units/navyunitdatabase');
     }
 
     getSpawnPointsByName(name: string) {