diff --git a/app/src/components/TerminalPart.vue b/app/src/components/TerminalPart.vue
index 34709af..98baa6f 100644
--- a/app/src/components/TerminalPart.vue
+++ b/app/src/components/TerminalPart.vue
@@ -1,5 +1,3 @@
-
-
@@ -13,128 +11,72 @@
-->
-
diff --git a/app/vite.config.js b/app/vite.config.js
index 05c1740..1f7dfa2 100644
--- a/app/vite.config.js
+++ b/app/vite.config.js
@@ -4,4 +4,12 @@ import vue from '@vitejs/plugin-vue'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [vue()],
+ server: {
+ proxy: {
+ '/api': {
+ target: 'http://localhost:3000', // the server url
+ ws: true,
+ },
+ },
+ },
})
diff --git a/server/package.json b/server/package.json
index 6a40895..5d5bab5 100644
--- a/server/package.json
+++ b/server/package.json
@@ -11,6 +11,7 @@
},
"dependencies": {
"commander": "^11.0.0",
+ "cors": "^2.8.5",
"dockerode": "^3.3.5",
"express": "^4.18.2",
"jsonwebtoken": "^9.0.1",
diff --git a/server/src/api/socket.js b/server/src/api/socket.js
index d1f33e5..a7df255 100644
--- a/server/src/api/socket.js
+++ b/server/src/api/socket.js
@@ -4,7 +4,11 @@ import Session from '../models/session.js'
import { defaultUser, genSessionJWT } from '../utils/auth.js'
export default (server) => {
- const io = new Server(server)
+ const io = new Server(server, {
+ cors: {
+ origin: '*',
+ },
+ })
io.use(async (socket, next) => {
console.log('Authenticating...')
diff --git a/server/src/index.js b/server/src/index.js
index 4b5ad47..b63400d 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -3,6 +3,7 @@ import express from 'express'
import http from 'http'
import YAML from 'yaml'
import swaggerUI from 'swagger-ui-express'
+import cors from 'cors'
import socketServer from './api/socket.js'
import connectDB from './db.js'
@@ -22,6 +23,11 @@ async function main() {
const swaggerDocument = YAML.parse(file)
app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument))
app.use(express.json())
+ app.use(
+ cors({
+ origin: '*',
+ })
+ )
app.get('/', (req, res) => {
res.send('Hello World!')
diff --git a/yarn.lock b/yarn.lock
index 47e89d5..e7d8450 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1602,7 +1602,7 @@ cookie@~0.4.1:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
-cors@~2.8.5:
+cors@^2.8.5, cors@~2.8.5:
version "2.8.5"
resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==