diff --git a/backend/package-lock.json b/backend/package-lock.json index 0c85eb5..a11e58f 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { + "cors": "^2.8.5", "dotenv": "^17.2.2", "express": "^5.1.0", "mysql2": "^3.14.5" @@ -145,6 +146,19 @@ "node": ">=6.6.0" } }, + "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==", + "license": "MIT", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/debug": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", @@ -630,6 +644,15 @@ "node": ">= 0.6" } }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", diff --git a/backend/package.json b/backend/package.json index e5a2d49..0f6559a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -10,6 +10,7 @@ "start": "node src/index.js" }, "dependencies": { + "cors": "^2.8.5", "dotenv": "^17.2.2", "express": "^5.1.0", "mysql2": "^3.14.5" diff --git a/backend/server.cert b/backend/server.cert new file mode 100644 index 0000000..7cad3b7 --- /dev/null +++ b/backend/server.cert @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDazCCAlOgAwIBAgIUUq6H25NfXBYaD9fbli2HGIQ1VxUwDQYJKoZIhvcNAQEL +BQAwRTELMAkGA1UEBhMCREUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM +GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNTA5MTAxOTM5MDlaFw0yNjA5 +MTAxOTM5MDlaMEUxCzAJBgNVBAYTAkRFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCL+OkcPq5JwJ3t8Rm7rx02IcthoHGE+8EmclxWVhQ0 +DYT8cLCyT9Ywo6KpVE9sLK3bBkG5/5lZ3obRw4p58yKwS4iIvH2cg79mlih6d1oM +P48Xkqc5yuKul5eOjoJ91SoSrjfzau/BzQfvFhUz070rkM/pTDifxSq5/Es2/gxO +GVKEyUBXl4dxNrhs+Kyel9owlEsAEFShzQMRG8kRNtefSLuSdfQTre1TZGGNx/bt +bceO7XIb/0kRBWPCZlPk5uTLHFhEDfVoTVCwXH3C9sLEzT2Zt5BeNRjLx838Dciu +tPaml7o8JkNtNS7fyAgcNvUQFJS1ce6U3/afyJHyDcVPAgMBAAGjUzBRMB0GA1Ud +DgQWBBRxwSd2xwdkqLroHeW5K5r9axklnTAfBgNVHSMEGDAWgBRxwSd2xwdkqLro +HeW5K5r9axklnTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAf +EmNPUoEp2ttS/NsKQbYXfX+fkSjhIrcXetTON05B5Pth3TDTp1YD6xPrhJ8No5/a +Nxv/nmKGVjtMluS5bmluinCpcHvtVUQDI9PH7lDWWcJcoqMiiNoVNykhZRaMR+b2 +1pRukOe7PkiFpWuMFiyaon9dtGAxiutzRKRq5b46UpVlZUZM6Ch0EYygoJU8Fw2a +aMt3aso8R8ErpbtucEqGMRZkKERHX3qUraLtVLB2Stphumf05HWSibsuHD3ABnSB +Uirn8nDdwCCacN0P9bESSdVjnurJUPNcDW8v4NnE+L1/9M2wzusHczFwyg6nJ1mk +WeNLj9XcAC0wUnflA/uw +-----END CERTIFICATE----- diff --git a/backend/server.key b/backend/server.key new file mode 100644 index 0000000..0ebfee5 --- /dev/null +++ b/backend/server.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCL+OkcPq5JwJ3t +8Rm7rx02IcthoHGE+8EmclxWVhQ0DYT8cLCyT9Ywo6KpVE9sLK3bBkG5/5lZ3obR +w4p58yKwS4iIvH2cg79mlih6d1oMP48Xkqc5yuKul5eOjoJ91SoSrjfzau/BzQfv +FhUz070rkM/pTDifxSq5/Es2/gxOGVKEyUBXl4dxNrhs+Kyel9owlEsAEFShzQMR +G8kRNtefSLuSdfQTre1TZGGNx/btbceO7XIb/0kRBWPCZlPk5uTLHFhEDfVoTVCw +XH3C9sLEzT2Zt5BeNRjLx838DciutPaml7o8JkNtNS7fyAgcNvUQFJS1ce6U3/af +yJHyDcVPAgMBAAECggEAQK18sdN435WEpG0zEdmh6uCExRDJQ8S9BJH1fuN5pG/W +0nsT+uEPPRxvzkSqCnc+wqVKe7LS3ocHzyfG9gDWN5Y/ecd3V3o9WB7sh2JdFqnL +6f2XDgpk4n4jxvis7Y4xSb59FhqEvQ2Lq/uNQoyFrfrVR50z0QffbV9aNggAEZnM +6c+Yz57Ez7ebxLGoLHf1sswytAjdLMZqVzUtaQp8ieTAILtG4RrAg+5DwKTe3JaF +cHkabDgrjs5b3L/Q/bSMtBXSALYQYW5L63AlW1Dp3pYXXdtGALfn2jOzLb0LZ2bc +dWL5GAGdPvlJJUGCx9BHMbUNQDW6KsUg2EHAfWlbeQKBgQC9i9qI5vz0DkZqWbHq +REngCBoFL3nvdvsil3ucwiTuSuuiLriFrofdRUtvCAJQSKhHOPGrxdZfm/IpXgtA +Ma82vGKEQIv/hhD/72X/U6pmd6vwmBwUm6DfoiIf4DQSAfABT2vTs5tk79svKcXH +CxwFuBHdlDU6f2MyhrroICjnUwKBgQC9C7H0kwnwjKL+KTW58LwtPsVG9D1rXeZe +DEHZ5sU9r0eRVV+30dtCl+Jj/MSZMtSvCJYYi4OLdCEG83X4UqxG2/UpxVbjgF8D +s5jhbko+3sB9n5DQ8msq99v9vw/dtbPboY0LixkQlKUooVWQYCmk5KafUFliH0hX +EZV0mmoWlQKBgQC162iPRMM6qgjDQdsUcP5GWwA+QdbSEmvuQ12MknlHi/ij7BuF +koErybogkptF2rZHxUuOBY8+rDm7oltB/W2hJyWWsSyszku6mFZYvEAroGgRvqwU +y1mXydDerxzKu7lSSJvAz/0w31SK65i69NqsUoIzHHAJ+QGIGO+ConsfqQKBgCc/ +VFS4aincqMIngBX4Wrjx/Tb74fx2ZCtGVC2O8Yga6brMhLC/CsxKiB/GDHLZ0Ln+ +CFtUK506INk2lllVoJqdc8qWQ7G7pv43vRegNB3VVRU/mWsnyQQErVGC5yJaZNrG +MWgiGrQMiDVlOUReEoc/STBuGAB9CiG5btPkcv35AoGBALiUO4aoKTEvo8AIZRv1 +T2fj9oaP5uAvMb9BxKrRDGzLcJ64qvsag5t1IiiZJe85cP987Wp0k29dQgQq+9FY +UxeT1t63J9UrXZRkUThBbNd1/7MDwZhPe6VbZnK2uqv1Zn8+XmViNkeujzqXYRH1 +TWaGeuGd0QsDq5RRSeSvQJHc +-----END PRIVATE KEY----- diff --git a/backend/src/index.js b/backend/src/index.js index a847ae4..1501a61 100644 --- a/backend/src/index.js +++ b/backend/src/index.js @@ -1,5 +1,8 @@ import dotenv from 'dotenv'; +import fs from 'fs'; +import https from 'https'; import express from 'express'; +import cors from 'cors'; import path from 'path'; import { fileURLToPath } from 'url'; import apiRouter from './api.js'; @@ -12,6 +15,7 @@ const app = express(); db.initDB(); +app.use(cors()); app.use(express.json()) app.use(express.urlencoded({ extended: true })) //app.use(express.static(path.join(__dirname, "public"), { @@ -19,6 +23,11 @@ app.use(express.urlencoded({ extended: true })) //})); app.use("/api", apiRouter); -const server = app.listen(5555, () => { +const options = { + key: fs.readFileSync('server.key'), + cert: fs.readFileSync('server.cert') +}; + +const server = https.createServer(options, app).listen(5555, () => { console.log(`Server running on http://localhost:${server.address().port}`); }); \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b4a594f..958ecd3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,6 +10,7 @@ "hasInstallScript": true, "dependencies": { "@quasar/extras": "^1.16.4", + "axios": "^1.11.0", "quasar": "^2.16.0", "vue": "^3.4.18", "vue-router": "^4.0.0" @@ -2276,6 +2277,12 @@ "dev": true, "license": "MIT" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, "node_modules/autoprefixer": { "version": "10.4.21", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz", @@ -2314,6 +2321,17 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz", + "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/b4a": { "version": "1.6.7", "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", @@ -2565,7 +2583,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -2833,6 +2850,18 @@ "dev": true, "license": "MIT" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -3087,6 +3116,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -3182,7 +3220,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -3260,7 +3297,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3270,7 +3306,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -3280,7 +3315,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -3289,6 +3323,21 @@ "node": ">= 0.4" } }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/esbuild": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz", @@ -3879,6 +3928,26 @@ "dev": true, "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", @@ -3896,6 +3965,22 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/form-data": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -3964,7 +4049,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3984,7 +4068,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -4009,7 +4092,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -4096,7 +4178,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4126,7 +4207,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4135,11 +4215,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -4733,7 +4827,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -4811,7 +4904,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -4824,7 +4916,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -5445,6 +5536,12 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 92901e5..6a95f30 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -16,6 +16,7 @@ }, "dependencies": { "@quasar/extras": "^1.16.4", + "axios": "^1.11.0", "quasar": "^2.16.0", "vue": "^3.4.18", "vue-router": "^4.0.0" diff --git a/frontend/quasar.config.js b/frontend/quasar.config.js index e2c0376..84e0fe5 100644 --- a/frontend/quasar.config.js +++ b/frontend/quasar.config.js @@ -11,7 +11,9 @@ export default defineConfig((/* ctx */) => { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli-vite/boot-files - boot: [], + boot: [ + "healthcheck" + ], // https://v2.quasar.dev/quasar-cli-vite/quasar-config-file#css css: ['app.scss'], @@ -73,7 +75,7 @@ export default defineConfig((/* ctx */) => { // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-file#devserver devServer: { // https: true, - open: true, // opens browser window automatically + open: false, // opens browser window automatically }, // https://v2.quasar.dev/quasar-cli-vite/quasar-config-file#framework diff --git a/frontend/src/boot/healthcheck.js b/frontend/src/boot/healthcheck.js new file mode 100644 index 0000000..28078d9 --- /dev/null +++ b/frontend/src/boot/healthcheck.js @@ -0,0 +1,18 @@ +import axios from "axios"; + +export default async () => { + + + try { + + const response = await axios.get("https://localhost:5555/api/healthcheck"); + + if (!response.data || response.data.status !== "ok") { + console.log("a") + window.location.href = '/#/error?msg=API%20unreachable'; + } + } catch (err) { + console.log(err) + window.location.href = '/#/error?msg=API%20unreachable'; + } +}; diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue index 6777f22..0be55c6 100644 --- a/frontend/src/layouts/MainLayout.vue +++ b/frontend/src/layouts/MainLayout.vue @@ -5,7 +5,7 @@ - Hackathon 25 | Digitale Helfer für Dart + Hackathon 25 | Digitale Helfer für Dart (Navbar ist nur fürs testen da) diff --git a/frontend/src/pages/ErrorPage.vue b/frontend/src/pages/ErrorPage.vue new file mode 100644 index 0000000..49da3ea --- /dev/null +++ b/frontend/src/pages/ErrorPage.vue @@ -0,0 +1,13 @@ + + + diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js index 3d81a52..ef48ded 100644 --- a/frontend/src/router/routes.js +++ b/frontend/src/router/routes.js @@ -6,7 +6,9 @@ const routes = [ { path: '', component: () => import('pages/IndexPage.vue') }, { path: 'test_DartPicker', component: () => import('pages/testDartPickerPage.vue') }, { path: 'test_NumbersPage', component: () => import('pages/testNumbersPage.vue') }, - { path: 'test_WebSpeechApi', component: () => import('pages/testWebSpeechApi.vue') } + { path: 'test_WebSpeechApi', component: () => import('pages/testWebSpeechApi.vue') }, + + { path: 'error', component: () => import('pages/ErrorPage.vue') } ], },