diff --git a/app.js b/app.js index f59f006..eacfe38 100644 --- a/app.js +++ b/app.js @@ -2,6 +2,7 @@ var createError = require('http-errors'); var express = require('express'); var path = require('path'); var cookieParser = require('cookie-parser'); +var cors = require('cors') var logger = require('morgan'); const { getUsers } = require('./lib/getUsers') @@ -22,6 +23,7 @@ const basicAuth = require('express-basic-auth') app.set('views', path.join(__dirname, 'views')); app.set('view engine', 'jade'); +app.use(cors()) app.use(logger('dev')); app.use(express.json()); app.use(express.urlencoded({ extended: false })); diff --git a/client/src/checkAuth.js b/client/src/checkAuth.js index 07414b1..5a19a7b 100644 --- a/client/src/checkAuth.js +++ b/client/src/checkAuth.js @@ -3,7 +3,7 @@ import axios from "axios"; async function readCookie() { try { - const res = await axios.get("/readCookie"); + const res = await axios.get("http://vps.k-world.me.uk:3001/readCookie"); console.log('IM CHECKING AUTH') if (res.data === "No Cookie Set") { console.log('I CHECKED AUTH') diff --git a/client/src/components/AddAccount.jsx b/client/src/components/AddAccount.jsx index 755fc47..310aac0 100644 --- a/client/src/components/AddAccount.jsx +++ b/client/src/components/AddAccount.jsx @@ -22,7 +22,7 @@ class AddAccount extends Component { } fetchOptions() { - fetch("/getStreamNames") + fetch("http://" + process.env.URL + ":3001/getStreamNames") .then((res) => { return res.json(); }) @@ -60,7 +60,7 @@ class AddAccount extends Component { console.log({ username, password, stream }); axios - .post(`/addAccount`, { + .post("http://" + process.env.URL + ":3001/addAccount", { username, password, stream, diff --git a/client/src/components/Home.jsx b/client/src/components/Home.jsx index cf0ad3f..2086692 100644 --- a/client/src/components/Home.jsx +++ b/client/src/components/Home.jsx @@ -6,7 +6,7 @@ import axios from "axios"; function App() { const deleteCookie = async () => { try { - await axios.get("/readCookie/clear"); + await axios.get("http://" + process.env.URL + ":3001/readCookie/clear"); } catch (e) { console.log(e); @@ -18,7 +18,7 @@ function App() { const auth = async () => { try { - const res = await axios.get("/login", { + const res = await axios.get("http://" + process.env.URL + ":3001/login", { auth: { username, password }, }); if (res.data.auth === "Success") { diff --git a/client/src/components/accountDropDown.jsx b/client/src/components/accountDropDown.jsx index 25ce558..11d4172 100644 --- a/client/src/components/accountDropDown.jsx +++ b/client/src/components/accountDropDown.jsx @@ -17,7 +17,7 @@ class DropDown extends React.Component { } fetchOptions() { - fetch("/getStreamNames") + fetch("http://" + process.env.URL + ":3001/getStreamNames") .then((res) => { return res.json(); }) diff --git a/client/src/components/accountTable.jsx b/client/src/components/accountTable.jsx index 47a968f..7c8d6cc 100644 --- a/client/src/components/accountTable.jsx +++ b/client/src/components/accountTable.jsx @@ -32,7 +32,7 @@ export default class MatDataTable extends Component { } componentDidMount(prevProps) { - const url = `/getUserAccounts`; + const url = "http://" + process.env.URL + ":3001/getUserAccounts"; axios.get(url).then((results) => { console.log(results); console.log(results.data); diff --git a/docker-compose.yml b/docker-compose.yml index f624b40..f773577 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,30 +11,32 @@ services: ports: - "3001:3001" environment: - - HOST=db + - DBHOST=vps.k-world.me.uk - DBUSER=root - DBPASS=example - DATABASE=BBLB_DNS + - DBPORT=3307 depends_on: - "db" - # frontend: - # build: - # context: ./client - # dockerfile: Dockerfile.prod - # image: "karl0ss/bblbtv_dns-frontend" - # ports: - # - "6969:6969" - # environment: - # - PORT=6969 - # links: - # - "backend" + frontend: + build: + context: ./client + dockerfile: Dockerfile.prod + image: "karl0ss/bblbtv_dns-frontend" + ports: + - "6969:6969" + environment: + - URL=vps.k-world.me.uk + - PORT=6969 + links: + - "backend" db: image: mariadb restart: always environment: MYSQL_ROOT_PASSWORD: example ports: - - 3306:3306 + - 3307:3306 adminer: image: adminer restart: always diff --git a/lib/mysql.js b/lib/mysql.js index babbb44..185d715 100644 --- a/lib/mysql.js +++ b/lib/mysql.js @@ -1,8 +1,8 @@ var mysql = require('sync-mysql'); var connection = new mysql({ - host: process.env.HOST, - port: 3306, + host: process.env.DBHOST, + port: process.env.DBPORT, user: process.env.DBUSER, password: process.env.DBPASS, database: process.env.DATABASE, diff --git a/package-lock.json b/package-lock.json index 37d070b..9df545c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -426,6 +426,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cryptr": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/cryptr/-/cryptr-6.0.2.tgz", diff --git a/package.json b/package.json index b1614ab..c28c478 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dependencies": { "bcrypt": "^5.0.0", "cookie-parser": "^1.4.5", + "cors": "^2.8.5", "cryptr": "^6.0.2", "express": "~4.16.1", "express-basic-auth": "^1.2.0",