diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d52b2eb..7826eb3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "dependencies": { "core-js": "^3.8.3", + "cors": "^2.8.5", "vue": "^3.2.13", "vue-router": "^4.0.3" }, @@ -5291,6 +5292,18 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz", @@ -9644,7 +9657,6 @@ "version": "4.1.1", "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -12861,7 +12873,6 @@ "version": "1.1.2", "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -18452,6 +18463,15 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "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" + } + }, "cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz", @@ -21940,8 +21960,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { "version": "1.12.3", @@ -24490,8 +24509,7 @@ "vary": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" }, "verror": { "version": "1.10.1", diff --git a/frontend/package.json b/frontend/package.json index a596e12..ab03099 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,6 +13,7 @@ "main": "background.js", "dependencies": { "core-js": "^3.8.3", + "cors": "^2.8.5", "vue": "^3.2.13", "vue-router": "^4.0.3" }, diff --git a/frontend/src/app.js b/frontend/src/app.js index 9395c3b..2bc53ba 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -1,13 +1,14 @@ const express = require( 'express' ); let app = express(); const path = require( 'path' ); +const cors = require( 'cors' ); const fs = require( 'fs' ); const bodyParser = require( 'body-parser' ); const dialog = require( 'electron' ).dialog; app.use( bodyParser.urlencoded( { extended: false } ) ); app.use( bodyParser.json() ); - +app.use( cors() ); app.get( '/', ( request, response ) => { response.send( 'Hello world' ); diff --git a/frontend/src/components/mediaPool.vue b/frontend/src/components/mediaPool.vue index c6b5828..77a951f 100644 --- a/frontend/src/components/mediaPool.vue +++ b/frontend/src/components/mediaPool.vue @@ -36,11 +36,22 @@ return { hasLoadedSongs: false, songQueue: [], + loadedDirs: [], } }, methods: { + getLoadedDirs () { + + }, loadSongs() { - fetch( 'http://localhost:8081/openSongs' ) + fetch( 'http://localhost:8081/openSongs' ).then( res => { + if ( res.status === 200 ) { + res.json().then( json => { + this.hasLoadedSongs = true; + this.loadedDirs = json.data; + } ); + } + } ); } } }