diff --git a/app-dist/static/index.html b/app-dist/static/index.html new file mode 100644 index 0000000..4bdcfcb --- /dev/null +++ b/app-dist/static/index.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + \ No newline at end of file diff --git a/server/package-lock.json b/server/package-lock.json index 74e30fb..cf0c84d 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -23,6 +23,12 @@ "@types/node": "*" } }, + "@types/cors": { + "version": "2.8.10", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", + "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==", + "dev": true + }, "@types/dotenv": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/@types/dotenv/-/dotenv-8.2.0.tgz", diff --git a/server/package.json b/server/package.json index 2630f04..b6b5496 100644 --- a/server/package.json +++ b/server/package.json @@ -4,7 +4,8 @@ "devDependencies": { "@types/node-fetch": "^2.5.8", "@types/dotenv": "^8.2.0", - "@types/express": "^4.17.11" + "@types/express": "^4.17.11", + "@types/cors": "^2.8.10" }, "scripts": { "dev": "concurrently -n \"typescript,nodemon\" -c \"bgGreen.gray.bold,bgYellow.gray.bold\" \"tsc -w\" \"nodemon ../app-dist/server/main.js\"" diff --git a/server/src/.env b/server/src/.env index 16a130a..2c60955 100644 --- a/server/src/.env +++ b/server/src/.env @@ -3,4 +3,5 @@ SERVER_ROOT=/climate MYSQL_ADDRESS=192.168.0.198 MYSQL_USERNAME=admin MYSQL_PW=sekna123jk -SENSOR_PING_INTERVAL=30 \ No newline at end of file +SENSOR_PING_INTERVAL=30 +DEV=true \ No newline at end of file diff --git a/server/src/main.ts b/server/src/main.ts index d4169a1..c1cc429 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -4,6 +4,7 @@ import {newMainRouter} from "./mainRouter"; import {setupCollections} from "./Collections"; import path from "path"; import {startSensorPinger} from "./pingSensors"; +import cors from "cors"; dotenv.config({ path: path.resolve(__dirname + "/.env") }); const SERVER_ROOT = process.env.SERVER_ROOT ?? "/"; @@ -14,6 +15,11 @@ async function main() { const mainRouter = newMainRouter(collections); const app = express(); app.use(express.json()); + if (process.env.DEV) { + app.use(cors({ + origin: "http://192.168.0.181/" + })); + } app.set("port", process.env.PORT || 3000); app.use(express.urlencoded({ extended: false})); app.locals = {