diff --git a/backend/api/package-lock.json b/backend/api/package-lock.json index d786a7e..2f317a3 100644 --- a/backend/api/package-lock.json +++ b/backend/api/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "cors": "^2.8.5", "express": "^4.18.2", "express-validator": "^6.14.2", "helmet": "^6.0.1", @@ -308,6 +309,18 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "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/create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", @@ -645,6 +658,14 @@ "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==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-inspect": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", @@ -1347,6 +1368,15 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "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" + } + }, "create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", @@ -1604,6 +1634,11 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, + "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==" + }, "object-inspect": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", diff --git a/backend/api/package.json b/backend/api/package.json index e553c95..6a62047 100644 --- a/backend/api/package.json +++ b/backend/api/package.json @@ -11,6 +11,7 @@ "author": "jweissen", "license": "ISC", "dependencies": { + "cors": "^2.8.5", "express": "^4.18.2", "express-validator": "^6.14.2", "helmet": "^6.0.1", diff --git a/backend/api/src/app.ts b/backend/api/src/app.ts index 281b190..17361ac 100644 --- a/backend/api/src/app.ts +++ b/backend/api/src/app.ts @@ -1,6 +1,7 @@ import express from 'express'; import helmet from "helmet"; import morgan from 'morgan'; +import cors from 'cors'; import {leaderboardRoute} from "./leaderboardRoute.js"; import {userRoute} from "./userRoute.js"; import {gameRoute} from "./gameRoute.js"; @@ -10,6 +11,7 @@ const app = express() const port = 3000 app.use(helmet()) +app.use(cors()) // configure & use logger let morganFormatted = morgan('[:date[iso]] :method :url - :status') diff --git a/backend/api/src/model/Time.ts b/backend/api/src/model/Time.ts deleted file mode 100644 index 69cf57b..0000000 --- a/backend/api/src/model/Time.ts +++ /dev/null @@ -1,6 +0,0 @@ -export interface Time { - seconds: number, - minutes?: number, - hours?: number, - days?: number, -} \ No newline at end of file diff --git a/backend/api/src/model/UserScores.ts b/backend/api/src/model/UserScores.ts index 3e2e7bf..aefa123 100644 --- a/backend/api/src/model/UserScores.ts +++ b/backend/api/src/model/UserScores.ts @@ -1,10 +1,10 @@ -import {Time} from "./Time.js"; + export interface UserScores { userId: number, highscore: number, totalScore: number, - totalPlaytime: Time, + totalPlaytime: string, averageScore: number, gamesPlayed: number, } \ No newline at end of file