diff --git a/.gitignore b/.gitignore index a28d73d..2abc4c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -examp_frontend/ -postgres/db +db/ */.env -.env +.env* todo sqldumps/ +logs/ +dist/ diff --git a/backend/package-lock.json b/backend/package-lock.json index d77a092..a1e6346 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9,11 +9,174 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "@prisma/client": "^6.14.0", + "@types/node": "^24.2.1", "cors": "^2.8.5", "dotenv": "^17.0.1", "express": "^5.1.0", "knex": "^3.1.0", - "pg": "^8.16.3" + "pg": "^8.16.3", + "prisma": "^6.14.0", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + }, + "devDependencies": { + "nodemon": "^3.1.10" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@prisma/client": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-6.14.0.tgz", + "integrity": "sha512-8E/Nk3eL5g7RQIg/LUj1ICyDmhD053STjxrPxUtCRybs2s/2sOEcx9NpITuAOPn07HEpWBfhAVe1T/HYWXUPOw==", + "hasInstallScript": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "peerDependencies": { + "prisma": "*", + "typescript": ">=5.1.0" + }, + "peerDependenciesMeta": { + "prisma": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/@prisma/config": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/config/-/config-6.14.0.tgz", + "integrity": "sha512-IwC7o5KNNGhmblLs23swnfBjADkacBb7wvyDXUWLwuvUQciKJZqyecU0jw0d7JRkswrj+XTL8fdr0y2/VerKQQ==", + "license": "Apache-2.0", + "dependencies": { + "c12": "3.1.0", + "deepmerge-ts": "7.1.5", + "effect": "3.16.12", + "empathic": "2.0.0" + } + }, + "node_modules/@prisma/debug": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-6.14.0.tgz", + "integrity": "sha512-j4Lf+y+5QIJgQD4sJWSbkOD7geKx9CakaLp/TyTy/UDu9Wo0awvWCBH/BAxTHUaCpIl9USA5VS/KJhDqKJSwug==", + "license": "Apache-2.0" + }, + "node_modules/@prisma/engines": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-6.14.0.tgz", + "integrity": "sha512-LhJjqsALFEcoAtF07nSaOkVguaxw/ZsgfROIYZ8bAZDobe7y8Wy+PkYQaPOK1iLSsFgV2MhCO/eNrI1gdSOj6w==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.14.0", + "@prisma/engines-version": "6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49", + "@prisma/fetch-engine": "6.14.0", + "@prisma/get-platform": "6.14.0" + } + }, + "node_modules/@prisma/engines-version": { + "version": "6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49.tgz", + "integrity": "sha512-EgN9ODJpiX45yvwcngoStp3uQPJ3l+AEVoQ6dMMO2QvmwIlnxfApzKmJQExzdo7/hqQANrz5txHJdGYHzOnGHA==", + "license": "Apache-2.0" + }, + "node_modules/@prisma/fetch-engine": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-6.14.0.tgz", + "integrity": "sha512-MPzYPOKMENYOaY3AcAbaKrfvXVlvTc6iHmTXsp9RiwCX+bPyfDMqMFVUSVXPYrXnrvEzhGHfyiFy0PRLHPysNg==", + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.14.0", + "@prisma/engines-version": "6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49", + "@prisma/get-platform": "6.14.0" + } + }, + "node_modules/@prisma/get-platform": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-6.14.0.tgz", + "integrity": "sha512-7VjuxKNwjnBhKfqPpMeWiHEa2sVjYzmHdl1slW6STuUCe9QnOY0OY1ljGSvz6wpG4U8DfbDqkG1yofd/1GINww==", + "license": "Apache-2.0", + "dependencies": { + "@prisma/debug": "6.14.0" + } + }, + "node_modules/@standard-schema/spec": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz", + "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==", + "license": "MIT" + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "license": "MIT" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "license": "MIT" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "license": "MIT" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "24.2.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz", + "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==", + "license": "MIT", + "dependencies": { + "undici-types": "~7.10.0" } }, "node_modules/accepts": { @@ -29,6 +192,70 @@ "node": ">= 0.6" } }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "license": "MIT", + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "license": "MIT" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/body-parser": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", @@ -49,6 +276,30 @@ "node": ">=18" } }, + "node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -58,6 +309,46 @@ "node": ">= 0.8" } }, + "node_modules/c12": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/c12/-/c12-3.1.0.tgz", + "integrity": "sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==", + "license": "MIT", + "dependencies": { + "chokidar": "^4.0.3", + "confbox": "^0.2.2", + "defu": "^6.1.4", + "dotenv": "^16.6.1", + "exsolve": "^1.0.7", + "giget": "^2.0.0", + "jiti": "^2.4.2", + "ohash": "^2.0.11", + "pathe": "^2.0.3", + "perfect-debounce": "^1.0.0", + "pkg-types": "^2.2.0", + "rc9": "^2.1.2" + }, + "peerDependencies": { + "magicast": "^0.3.5" + }, + "peerDependenciesMeta": { + "magicast": { + "optional": true + } + } + }, + "node_modules/c12/node_modules/dotenv": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -87,6 +378,30 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/citty": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz", + "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==", + "license": "MIT", + "dependencies": { + "consola": "^3.2.3" + } + }, "node_modules/colorette": { "version": "2.0.19", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", @@ -102,6 +417,28 @@ "node": ">=14" } }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/confbox": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz", + "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==", + "license": "MIT" + }, + "node_modules/consola": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", + "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==", + "license": "MIT", + "engines": { + "node": "^14.18.0 || >=16.10.0" + } + }, "node_modules/content-disposition": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", @@ -154,6 +491,12 @@ "node": ">= 0.10" } }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "license": "MIT" + }, "node_modules/debug": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", @@ -171,6 +514,21 @@ } } }, + "node_modules/deepmerge-ts": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.5.tgz", + "integrity": "sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/defu": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", + "license": "MIT" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -180,6 +538,21 @@ "node": ">= 0.8" } }, + "node_modules/destr": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz", + "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==", + "license": "MIT" + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/dotenv": { "version": "17.0.1", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.0.1.tgz", @@ -212,6 +585,25 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "license": "MIT" }, + "node_modules/effect": { + "version": "3.16.12", + "resolved": "https://registry.npmjs.org/effect/-/effect-3.16.12.tgz", + "integrity": "sha512-N39iBk0K71F9nb442TLbTkjl24FLUzuvx2i1I2RsEAQsdAdUTuUoW0vlfUXgkMTUOnYqKnWcFfqw4hK4Pw27hg==", + "license": "MIT", + "dependencies": { + "@standard-schema/spec": "^1.0.0", + "fast-check": "^3.23.1" + } + }, + "node_modules/empathic": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/empathic/-/empathic-2.0.0.tgz", + "integrity": "sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==", + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -326,6 +718,47 @@ "url": "https://opencollective.com/express" } }, + "node_modules/exsolve": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz", + "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==", + "license": "MIT" + }, + "node_modules/fast-check": { + "version": "3.23.2", + "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-3.23.2.tgz", + "integrity": "sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT", + "dependencies": { + "pure-rand": "^6.1.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/finalhandler": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz", @@ -361,6 +794,21 @@ "node": ">= 0.8" } }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -422,6 +870,36 @@ "integrity": "sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA==", "license": "MIT" }, + "node_modules/giget": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz", + "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==", + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.0", + "defu": "^6.1.4", + "node-fetch-native": "^1.6.6", + "nypm": "^0.6.0", + "pathe": "^2.0.3" + }, + "bin": { + "giget": "dist/cli.mjs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -434,6 +912,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", @@ -495,6 +983,13 @@ "node": ">=0.10.0" } }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true, + "license": "ISC" + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -519,6 +1014,19 @@ "node": ">= 0.10" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", @@ -534,12 +1042,54 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/is-promise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "license": "MIT" }, + "node_modules/jiti": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz", + "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==", + "license": "MIT", + "bin": { + "jiti": "lib/jiti-cli.mjs" + } + }, "node_modules/knex": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/knex/-/knex-3.1.0.tgz", @@ -626,6 +1176,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "license": "ISC" + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -677,6 +1233,19 @@ "node": ">= 0.6" } }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -692,6 +1261,108 @@ "node": ">= 0.6" } }, + "node_modules/node-fetch-native": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz", + "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==", + "license": "MIT" + }, + "node_modules/nodemon": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.1.10.tgz", + "integrity": "sha512-WDjw3pJ0/0jMFmyNDp3gvY2YizjLmmOUQo6DEBY+JgdvW/yQ9mEeSw6H5ythl5Ny2ytb7f9C2nIbjSxMNzbJXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^4", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^7.5.3", + "simple-update-notifier": "^2.0.0", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nodemon/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/nodemon/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nypm": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.1.tgz", + "integrity": "sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==", + "license": "MIT", + "dependencies": { + "citty": "^0.1.6", + "consola": "^3.4.2", + "pathe": "^2.0.3", + "pkg-types": "^2.2.0", + "tinyexec": "^1.0.1" + }, + "bin": { + "nypm": "dist/cli.mjs" + }, + "engines": { + "node": "^14.16.0 || >=16.10.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -713,6 +1384,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/ohash": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", + "license": "MIT" + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -758,6 +1435,18 @@ "node": ">=16" } }, + "node_modules/pathe": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", + "license": "MIT" + }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "license": "MIT" + }, "node_modules/pg": { "version": "8.16.3", "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", @@ -847,6 +1536,30 @@ "split2": "^4.1.0" } }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pkg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz", + "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==", + "license": "MIT", + "dependencies": { + "confbox": "^0.2.2", + "exsolve": "^1.0.7", + "pathe": "^2.0.3" + } + }, "node_modules/postgres-array": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", @@ -886,6 +1599,31 @@ "node": ">=0.10.0" } }, + "node_modules/prisma": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-6.14.0.tgz", + "integrity": "sha512-QEuCwxu+Uq9BffFw7in8In+WfbSUN0ewnaSUKloLkbJd42w6EyFckux4M0f7VwwHlM3A8ssaz4OyniCXlsn0WA==", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "@prisma/config": "6.14.0", + "@prisma/engines": "6.14.0" + }, + "bin": { + "prisma": "build/index.js" + }, + "engines": { + "node": ">=18.18" + }, + "peerDependencies": { + "typescript": ">=5.1.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -899,6 +1637,29 @@ "node": ">= 0.10" } }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true, + "license": "MIT" + }, + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ], + "license": "MIT" + }, "node_modules/qs": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", @@ -938,6 +1699,29 @@ "node": ">= 0.8" } }, + "node_modules/rc9": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz", + "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==", + "license": "MIT", + "dependencies": { + "defu": "^6.1.4", + "destr": "^2.0.3" + } + }, + "node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/rechoir": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", @@ -1021,6 +1805,19 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, + "node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/send": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz", @@ -1136,6 +1933,19 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/simple-update-notifier": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", + "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/split2": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", @@ -1154,6 +1964,19 @@ "node": ">= 0.8" } }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -1184,6 +2007,25 @@ "node": ">=8" } }, + "node_modules/tinyexec": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.1.tgz", + "integrity": "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==", + "license": "MIT" + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -1193,6 +2035,59 @@ "node": ">=0.6" } }, + "node_modules/touch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz", + "integrity": "sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==", + "dev": true, + "license": "ISC", + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "license": "MIT", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, "node_modules/type-is": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", @@ -1207,6 +2102,32 @@ "node": ">= 0.6" } }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true, + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz", + "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==", + "license": "MIT" + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -1216,6 +2137,12 @@ "node": ">= 0.8" } }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "license": "MIT" + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -1239,6 +2166,15 @@ "engines": { "node": ">=0.4" } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } } } } diff --git a/backend/package.json b/backend/package.json index bc51cbe..ae27440 100644 --- a/backend/package.json +++ b/backend/package.json @@ -3,19 +3,26 @@ "version": "1.0.0", "main": "index.js", "scripts": { - "dev": "node backendServer.js", - "demo": "node backendServer.js", - "production": "node backendServer.js" + "dev": "nodemon ./src/index.js", + "production": "node ./src/index.js" }, "keywords": [], "author": "", "license": "ISC", "description": "", "dependencies": { + "@prisma/client": "^6.14.0", + "@types/node": "^24.2.1", "cors": "^2.8.5", "dotenv": "^17.0.1", "express": "^5.1.0", "knex": "^3.1.0", - "pg": "^8.16.3" + "pg": "^8.16.3", + "prisma": "^6.14.0", + "ts-node": "^10.9.2", + "typescript": "^5.9.2" + }, + "devDependencies": { + "nodemon": "^3.1.10" } } diff --git a/backend/prisma/migrations/0_init/migration.sql b/backend/prisma/migrations/0_init/migration.sql new file mode 100644 index 0000000..bd0a6f2 --- /dev/null +++ b/backend/prisma/migrations/0_init/migration.sql @@ -0,0 +1,93 @@ +-- CreateSchema +CREATE SCHEMA IF NOT EXISTS "public"; + +-- CreateTable +CREATE TABLE "public"."ingredients" ( + "id" SERIAL NOT NULL, + "name" VARCHAR(255) NOT NULL, + "type" VARCHAR(255), + "notes" VARCHAR(255), + "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + + CONSTRAINT "ingredients_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "public"."knex_migrations" ( + "id" SERIAL NOT NULL, + "name" VARCHAR(255), + "batch" INTEGER, + "migration_time" TIMESTAMPTZ(6), + + CONSTRAINT "knex_migrations_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "public"."knex_migrations_lock" ( + "index" SERIAL NOT NULL, + "is_locked" INTEGER, + + CONSTRAINT "knex_migrations_lock_pkey" PRIMARY KEY ("index") +); + +-- CreateTable +CREATE TABLE "public"."recipe_ingredients" ( + "id" SERIAL NOT NULL, + "recipe_id" INTEGER NOT NULL, + "ingredient_id" INTEGER, + "quantity" VARCHAR(255), + "unit" VARCHAR(255), + "notes" VARCHAR(255), + "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "raw" VARCHAR(255) DEFAULT '', + + CONSTRAINT "recipe_ingredients_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "public"."recipe_steps" ( + "id" SERIAL NOT NULL, + "recipe_id" INTEGER, + "step_number" INTEGER, + "instruction" VARCHAR(510), + "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + + CONSTRAINT "recipe_steps_pkey" PRIMARY KEY ("id") +); + +-- CreateTable +CREATE TABLE "public"."recipes" ( + "id" SERIAL NOT NULL, + "name" VARCHAR(255) NOT NULL, + "cuisine" VARCHAR(255) NOT NULL, + "created_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updated_at" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP, + "author" VARCHAR(255), + "stars" INTEGER, + "prep_minutes" INTEGER, + "cook_minutes" INTEGER, + + CONSTRAINT "recipes_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE UNIQUE INDEX "ingredients_name_unique" ON "public"."ingredients"("name"); + +-- CreateIndex +CREATE INDEX "recipe_ingredients_ingredient_id_index" ON "public"."recipe_ingredients"("ingredient_id"); + +-- CreateIndex +CREATE INDEX "recipe_ingredients_recipe_id_index" ON "public"."recipe_ingredients"("recipe_id"); + +-- CreateIndex +CREATE INDEX "recipe_steps_recipe_id_index" ON "public"."recipe_steps"("recipe_id"); + +-- CreateIndex +CREATE UNIQUE INDEX "recipe_steps_recipe_id_step_number_unique" ON "public"."recipe_steps"("recipe_id", "step_number"); + +-- CreateIndex +CREATE UNIQUE INDEX "recipes_name_unique" ON "public"."recipes"("name"); + diff --git a/backend/prisma/migrations/20250813174641_remove_knex_migration_tables/migration.sql b/backend/prisma/migrations/20250813174641_remove_knex_migration_tables/migration.sql new file mode 100644 index 0000000..24c3f6b --- /dev/null +++ b/backend/prisma/migrations/20250813174641_remove_knex_migration_tables/migration.sql @@ -0,0 +1,12 @@ +/* + Warnings: + + - You are about to drop the `knex_migrations` table. If the table is not empty, all the data it contains will be lost. + - You are about to drop the `knex_migrations_lock` table. If the table is not empty, all the data it contains will be lost. + +*/ +-- DropTable +DROP TABLE "public"."knex_migrations"; + +-- DropTable +DROP TABLE "public"."knex_migrations_lock"; diff --git a/backend/prisma/migrations/20250813232401_recipe_relationships/migration.sql b/backend/prisma/migrations/20250813232401_recipe_relationships/migration.sql new file mode 100644 index 0000000..ee438dc --- /dev/null +++ b/backend/prisma/migrations/20250813232401_recipe_relationships/migration.sql @@ -0,0 +1,20 @@ +/* + Warnings: + + - You are about to drop the `ingredients` table. If the table is not empty, all the data it contains will be lost. + +*/ +-- AlterTable +ALTER TABLE "public"."recipe_ingredients" ADD COLUMN "recipesId" INTEGER; + +-- AlterTable +ALTER TABLE "public"."recipe_steps" ADD COLUMN "recipesId" INTEGER; + +-- DropTable +DROP TABLE "public"."ingredients"; + +-- AddForeignKey +ALTER TABLE "public"."recipe_ingredients" ADD CONSTRAINT "recipe_ingredients_recipesId_fkey" FOREIGN KEY ("recipesId") REFERENCES "public"."recipes"("id") ON DELETE SET NULL ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "public"."recipe_steps" ADD CONSTRAINT "recipe_steps_recipesId_fkey" FOREIGN KEY ("recipesId") REFERENCES "public"."recipes"("id") ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/backend/prisma/migrations/20250813233727_fix_relationship_ref/migration.sql b/backend/prisma/migrations/20250813233727_fix_relationship_ref/migration.sql new file mode 100644 index 0000000..94e83af --- /dev/null +++ b/backend/prisma/migrations/20250813233727_fix_relationship_ref/migration.sql @@ -0,0 +1,11 @@ +-- DropForeignKey +ALTER TABLE "public"."recipe_ingredients" DROP CONSTRAINT "recipe_ingredients_recipesId_fkey"; + +-- DropForeignKey +ALTER TABLE "public"."recipe_steps" DROP CONSTRAINT "recipe_steps_recipesId_fkey"; + +-- AddForeignKey +ALTER TABLE "public"."recipe_ingredients" ADD CONSTRAINT "recipe_ingredients_recipe_id_fkey" FOREIGN KEY ("recipe_id") REFERENCES "public"."recipes"("id") ON DELETE RESTRICT ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "public"."recipe_steps" ADD CONSTRAINT "recipe_steps_recipe_id_fkey" FOREIGN KEY ("recipe_id") REFERENCES "public"."recipes"("id") ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/backend/prisma/migrations/migration_lock.toml b/backend/prisma/migrations/migration_lock.toml new file mode 100644 index 0000000..044d57c --- /dev/null +++ b/backend/prisma/migrations/migration_lock.toml @@ -0,0 +1,3 @@ +# Please do not edit this file manually +# It should be added in your version-control system (e.g., Git) +provider = "postgresql" diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma new file mode 100644 index 0000000..c45a072 --- /dev/null +++ b/backend/prisma/schema.prisma @@ -0,0 +1,53 @@ +datasource db { + provider = "postgresql" + url = env("DATABASE_URL") +} + +generator client { + provider = "prisma-client-js" +} + +model recipes { + id Int @id @default(autoincrement()) + name String @unique(map: "recipes_name_unique") @db.VarChar(255) + cuisine String @db.VarChar(255) + created_at DateTime @default(now()) @db.Timestamptz(6) + updated_at DateTime @default(now()) @db.Timestamptz(6) + author String? @db.VarChar(255) + stars Int? + prep_minutes Int? + cook_minutes Int? + recipeIngredients recipe_ingredients[] + recipeSteps recipe_steps[] +} + +model recipe_ingredients { + id Int @id @default(autoincrement()) + recipe_id Int + ingredient_id Int? + quantity String? @db.VarChar(255) + unit String? @db.VarChar(255) + notes String? @db.VarChar(255) + created_at DateTime @default(now()) @db.Timestamptz(6) + updated_at DateTime @default(now()) @db.Timestamptz(6) + raw String? @default("") @db.VarChar(255) + recipes recipes? @relation(fields: [recipe_id], references: [id]) + recipesId Int? + + @@index([ingredient_id], map: "recipe_ingredients_ingredient_id_index") + @@index([recipe_id], map: "recipe_ingredients_recipe_id_index") +} + +model recipe_steps { + id Int @id @default(autoincrement()) + recipe_id Int? + step_number Int? + instruction String? @db.VarChar(510) + created_at DateTime @default(now()) @db.Timestamptz(6) + updated_at DateTime @default(now()) @db.Timestamptz(6) + recipes recipes? @relation(fields: [recipe_id], references: [id]) + recipesId Int? + + @@unique([recipe_id, step_number], map: "recipe_steps_recipe_id_step_number_unique") + @@index([recipe_id], map: "recipe_steps_recipe_id_index") +} diff --git a/backend/src/controllers/recipeController.js b/backend/src/controllers/recipeController.js new file mode 100644 index 0000000..be9284e --- /dev/null +++ b/backend/src/controllers/recipeController.js @@ -0,0 +1,89 @@ +const RecipeModel = require("../models/recipeModel"); +const model = new RecipeModel(); + +exports.test = async (req, res) => { + console.log("test"); + res.json({ env: process.env.NODE_ENV }); +}; + +exports.getAllRecipes = async (req, res) => { + try { + const recipes = await model.getAllRecipes(); + res.json(recipes); + } catch (error) { + res.status(500).json({ + msg: "Failed to fetch all recipes", + source: "recipeController", + error: error.message, + }); + } +}; + +exports.getRecipeById = async (req, res) => { + const id = parseInt(req.params.id, 10); + try { + const recipe = await model.findById(id); + if (recipe) { + res.json(recipe); + } else { + res.status(404).json({ msg: "Recipe not found" }); + } + } catch (error) { + res.status(500).json({ + msg: "Failed to fetch recipe", + source: "recipeController", + error: error.message, + }); + } +}; + +exports.addRecipe = async (req, res) => { + if (process.env.NODE_ENV === "demo") { + return; + } + try { + const createdRecipe = await model.addRecipe(req.body); + res.status(201).json(createdRecipe); + } catch (error) { + res.status(500).json({ + msg: "Failed to add recipe", + source: "recipeController", + error: error.message, + }); + } +}; + +exports.setStars = async (req, res) => { + if (process.env.NODE_ENV === "demo") { + return; + } + const id = parseInt(req.body.id, 10); + const stars = parseInt(req.body.stars, 10); + try { + const createdRecipe = await model.setStars(id, stars); + res.status(202).json(createdRecipe); + } catch (error) { + res.status(500).json({ + msg: "Failed to set stars", + source: "recipeController", + error: error.message, + }); + } +}; + +exports.deleteRecipe = async (req, res) => { + if (process.env.NODE_ENV === "demo") { + return; + } + const id = parseInt(req.body.id, 10); + try { + await model.deleteRecipe(id); + res.json({ success: "true" }); + } catch (error) { + res.status(500).json({ + msg: "Failed to delete recipe", + source: "recipeController", + error: error.message, + }); + } +}; diff --git a/backend/src/index.js b/backend/src/index.js new file mode 100644 index 0000000..1b914be --- /dev/null +++ b/backend/src/index.js @@ -0,0 +1,41 @@ +const express = require("express"); +const cors = require("cors"); +const { PrismaClient } = require("@prisma/client"); +const appRoutes = require("./routes/appRoutes"); + +const app = express(); +const port = process.env.PORT || 3000; +const prisma = new PrismaClient(); + +function setupMiddleware(app) { + app.use(cors()); + app.use(express.json()); + app.use("/api", appRoutes); +} + +setupMiddleware(app); + +// Start server +async function startServer() { + try { + app.listen(port); + console.log(`Server is running on http://localhost:${port}`); + } catch (error) { + console.error("Error starting the server:", error); + } +} + +process.on("SIGINT", async () => { + try { + await prisma.$disconnect(); + console.log("Prisma client disconnected"); + process.exit(0); + } catch (error) { + console.error("Error disconnecting Prisma client:", error); + process.exit(1); + } +}); + +startServer(); + +module.exports = { app, prisma }; diff --git a/backend/src/models/recipeModel.js b/backend/src/models/recipeModel.js new file mode 100644 index 0000000..9c93965 --- /dev/null +++ b/backend/src/models/recipeModel.js @@ -0,0 +1,134 @@ +const { PrismaClient } = require("@prisma/client"); +const Logger = require("../utils/logger.js"); +const logger = new Logger(); + +class recipeModel { + constructor() { + this.prisma = new PrismaClient(); + } + + async getAllRecipes() { + try { + return await this.prisma.recipes.findMany(); + } catch (err) { + console.error("Error fetching all recipies:", err); + throw new Error(err.message); + } + } + + async findById(id) { + try { + const recipe = await this.prisma.recipes.findUnique({ + where: { id }, + include: { recipeSteps: true, recipeIngredients: true }, + }); + if (!recipe) { + logger.warn(`recipe with id ${id} cannot be found`); + return null; + } + const data = { + details: { + id: recipe.id, + name: recipe.name, + author: recipe.author, + cuisine: recipe.cuisine, + stars: recipe.stars, + prep_minutes: recipe.prep_minutes, + cook_minutes: recipe.cook_minutes, + }, + ingredients: recipe.recipeIngredients.map((ing) => ing.raw), + steps: recipe.recipeSteps.map((step, idx) => ({ + step_idx: step.step_number, + instruction: step.instruction, + })), + }; + return data; + } catch (err) { + console.log("Error finding recipe:", err); + logger.error("error finding recipe", err); + throw new Error(err.message); + } + } + async addRecipe(recipeData) { + const { + name, + author, + cuisine, + stars, + ingredients, + steps, + prep_minutes, + cook_minutes, + } = recipeData; + try { + const createdRecipe = await this.prisma.recipes.create({ + data: { + name, + author, + cuisine, + prep_minutes, + cook_minutes, + stars, + recipeIngredients: { + create: ingredients.map((ing) => ({ raw: ing })), + }, + recipeSteps: { + create: Object.keys(steps).map((stepNumber) => ({ + step_number: parseInt(stepNumber), + instruction: steps[stepNumber], + })), + }, + }, + }); + + logger.info("new recipe created", { + id: createdRecipe.id, + name: createdRecipe.name, + }); + return createdRecipe; + } catch (error) { + console.log(error); + logger.error("error creating recipe", err); + throw new Error("Failed to add recipe"); + } + } + + async setStars(id, stars) { + try { + await this.prisma.recipes.update({ + where: { id }, + data: { stars }, + }); + return { message: "stars updated" }; + } catch (err) { + console.error("Error updating stars:", err); + logger.error("error setting stars", err); + throw new Error(err.message); + } + } + + async deleteRecipe(id) { + try { + await this.prisma.recipe_ingredients.deleteMany({ + where: { recipe_id: id }, + }); + + await this.prisma.recipe_steps.deleteMany({ + where: { recipe_id: id }, + }); + const deletedRecipe = await this.prisma.recipes.delete({ + where: { id }, + }); + logger.info("recipe deleted", { + id: deletedRecipe.id, + name: deletedRecipe.name, + }); + return { message: "Recipe deleted successfully" }; + } catch (err) { + console.error("Error deleting recipe:", err); + logger.error("error deleting recipe", err); + throw new Error(err.message); + } + } +} +module.exports = recipeModel; diff --git a/backend/src/routes/appRoutes.js b/backend/src/routes/appRoutes.js new file mode 100644 index 0000000..cbac0a0 --- /dev/null +++ b/backend/src/routes/appRoutes.js @@ -0,0 +1,18 @@ +const express = require("express"); +const recipeController = require("../controllers/recipeController"); + +const router = express.Router(); + +router.get("/test", recipeController.test); + +router.get("/recipes", recipeController.getAllRecipes); + +router.get("/recipe/:id", recipeController.getRecipeById); + +router.post("/add-recipe", recipeController.addRecipe); + +router.post("/set-stars", recipeController.setStars); + +router.delete("/delete-recipe", recipeController.deleteRecipe); + +module.exports = router; diff --git a/backend/src/utils/logger.js b/backend/src/utils/logger.js new file mode 100644 index 0000000..6c2b66a --- /dev/null +++ b/backend/src/utils/logger.js @@ -0,0 +1,33 @@ +const fs = require("fs"); + +class Logger { + constructor(filePath) { + this.filePath = "/logs/app.log"; + } + + log(level, message, params) { + const logEntry = { + timestamp: new Date().toISOString(), + level: level, + message: message, + params: params, + }; + fs.appendFile(this.filePath, JSON.stringify(logEntry) + "\n", (err) => { + if (err) throw err; + }); + } + + info(message, params = {}) { + this.log("info", message, params); + } + + warn(message, params = {}) { + this.log("warn", message, params); + } + + error(message, params = {}) { + this.log("error", message, params); + } +} + +module.exports = Logger; diff --git a/backend/tsconfig.json b/backend/tsconfig.json new file mode 100644 index 0000000..26426e2 --- /dev/null +++ b/backend/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "target": "ES2020", + "module": "CommonJS", + "moduleResolution": "node", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "skipLibCheck": true, + "outDir": "dist" + }, + "include": [ + "src", + "scripts" + ] +} diff --git a/docker-compose.yaml b/docker-compose.yaml index 26e5f54..7bf2207 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,7 +12,7 @@ services: ports: - "${DB_PORT}:5432" volumes: - - ./postgres/db:/var/lib/postgresql/data + - ./db:/var/lib/postgresql/data backend: image: recipes_backend container_name: recipes_backend_${ID} @@ -24,6 +24,7 @@ services: - "${BACKEND_PORT}:3000" volumes: - ./backend:/usr/src/app + - ./logs:/logs environment: - NODE_ENV=${NODE_ENV} - DB_USER=${DB_USER} @@ -40,5 +41,6 @@ services: - "${FRONTEND_PORT}:80" volumes: - ./frontend:/usr/src/app + - "$FRONTEND_BUILD_DIR:/usr/src/app/dist" environment: - NODE_ENV=${NODE_ENV} diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 56cf382..571a3b1 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -10,5 +10,4 @@ COPY . . EXPOSE 80 -# CMD ["npm", "run", "$NODE_ENV"] CMD npm run $NODE_ENV diff --git a/frontend/src/pages/RecipeIngredients.tsx b/frontend/src/pages/RecipeIngredients.tsx index bbdf549..d9c85e1 100644 --- a/frontend/src/pages/RecipeIngredients.tsx +++ b/frontend/src/pages/RecipeIngredients.tsx @@ -1,10 +1,8 @@ import { getRecipeIngredients } from "../services/frontendApi.js"; import { useState, useEffect } from "react"; -import { type Ingredient } from "../types/Recipe.ts" function RecipeIngredients() { - - const [recipeIngredients, setRecipeIngredients] = useState([]); + const [recipeIngredients, setRecipeIngredients] = useState([]); const [error, setError] = useState(null); const [loading, setLoading] = useState(true); @@ -13,36 +11,32 @@ function RecipeIngredients() { try { const recipeIngredients = await getRecipeIngredients(); setRecipeIngredients(recipeIngredients); - console.log(recipeIngredients) + console.log(recipeIngredients); } catch (err) { console.log(err); setError("Failed to load recipe ingredients..."); - console.log(error) + console.log(error); } finally { setLoading(false); } }; loadRecipeIngredients(); }, []); - console.log(recipeIngredients) + console.log(recipeIngredients); return ( - // should this be a string[]? only if we are only returning raw. otherwise i will need to type and return the ingredient object. This template shoudl work for steps though, so maybe setting that up is a good first step -
+
{loading ? (
Loading...
) : (
- {recipeIngredients.map(ing => ( -
  • - {ing.raw} -
    • + {recipeIngredients.map((ing, idx) => ( +
  • {ing}
    • ))}
    )}
    - ) - + ); } -export default RecipeIngredients +export default RecipeIngredients; diff --git a/frontend/src/pages/RecipePage.tsx b/frontend/src/pages/RecipePage.tsx index 97ee6c4..9fd23ab 100644 --- a/frontend/src/pages/RecipePage.tsx +++ b/frontend/src/pages/RecipePage.tsx @@ -1,17 +1,21 @@ import { useParams, useNavigate, Link } from "react-router-dom"; import { useState, useEffect } from "react"; -import { getRecipeById, deleteRecipe, setDBStars } from "../services/frontendApi.js"; -import { type Recipe, type Ingredient } from "../types/Recipe" -import Modal from '../components/Modal.tsx' -import DemoModal from '../components/DemoModal.tsx' -import StarRating from "../components/StarRating.tsx" -import TimeDisplay from '../components/TimeDisplay.tsx' +import { + getRecipeById, + deleteRecipe, + setDBStars, +} from "../services/frontendApi.js"; +import { type Recipe } from "../types/Recipe"; +import Modal from "../components/Modal.tsx"; +import DemoModal from "../components/DemoModal.tsx"; +import StarRating from "../components/StarRating.tsx"; +import TimeDisplay from "../components/TimeDisplay.tsx"; function RecipePage() { const [recipe, setRecipe] = useState({ details: {}, ingredients: [], - steps: [] + steps: [], }); const [error, setError] = useState(null); const [loading, setLoading] = useState(true); @@ -20,16 +24,21 @@ function RecipePage() { const [showConfirmModal, setShowConfirmModal] = useState(false); const [showDemoModal, setShowDemoModal] = useState(false); const { id } = useParams(); - const isWebSource = recipe && recipe.details && recipe.details.author - ? /http|com/.test(recipe.details.author) //etc - : false; + const isWebSource = + recipe && recipe.details && recipe.details.author + ? /http|com/.test(recipe.details.author) //etc + : false; const navigate = useNavigate(); - const openModal = () => { setShowConfirmModal(true) }; - const closeModal = () => { setShowConfirmModal(false) }; + const openModal = () => { + setShowConfirmModal(true); + }; + const closeModal = () => { + setShowConfirmModal(false); + }; const confirmDelete = () => { - if (process.env.NODE_ENV === 'demo') { + if (process.env.NODE_ENV === "demo") { closeModal(); setShowDemoModal(true); } else { @@ -43,13 +52,13 @@ function RecipePage() { try { const recipe = await getRecipeById(id); if (!recipe.details) { - setError("Sorry, this recipe no longer exists") + setError("Sorry, this recipe no longer exists"); } else { setRecipe(recipe); - setStars(recipe.details?.stars ?? 0) + setStars(recipe.details?.stars ?? 0); setInitialStars(recipe.details?.stars ?? 0); - if (process.env.NODE_ENV === 'dev') { - console.log(recipe) + if (process.env.NODE_ENV === "dev") { + console.log(recipe); } } } catch (error) { @@ -77,38 +86,56 @@ function RecipePage() { const handleDelete = async (id: number | void) => { try { await deleteRecipe(id); - navigate('/') + navigate("/"); } catch (error) { console.error("Error deleting recipe:", error); } }; return (
    - - {loading ? (
    Loading...
    ) : error ? (
    {error}
    - + Return to Cookbook
    ) : ( -
    - -

    {recipe.details.name}

    - + +

    + {recipe.details.name} +

    +
    -

    {recipe.details.cuisine}

    -

    prep: | cook:

    +

    + {recipe.details.cuisine} +

    +

    + prep: {" "} + | cook:{" "} + +

    @@ -118,10 +145,10 @@ function RecipePage() { Ingredients:
      - {recipe.ingredients.map((ingredient: Ingredient, index) => ( + {recipe.ingredients.map((ingredient: string, index) => (
    • - {ingredient.raw} + {ingredient}
      • ))}
    @@ -132,14 +159,20 @@ function RecipePage() { Instructions:
      - {recipe.steps && Object.keys(recipe.steps || {}).map((stepNumber) => ( -
    1. - - {recipe.steps[parseInt(stepNumber)].step_number} - - {recipe.steps[parseInt(stepNumber)].instruction} -
      2. - ))} + {recipe.steps && + Object.keys(recipe.steps || {}).map((stepNumber) => ( +
    2. + + {recipe.steps[parseInt(stepNumber)].step_number} + + + {recipe.steps[parseInt(stepNumber)].instruction} + +
      3. + ))}
    @@ -152,13 +185,15 @@ function RecipePage() { From the kitchen of {recipe.details.author} )} - setStars(newRating)} /> + setStars(newRating)} + />
    - ) - } + )} setShowDemoModal(false)} /> )} - + ); } diff --git a/frontend/src/services/frontendApi.js b/frontend/src/services/frontendApi.js index 69117c9..eeb08ee 100644 --- a/frontend/src/services/frontendApi.js +++ b/frontend/src/services/frontendApi.js @@ -1,27 +1,27 @@ -const baseUrl = process.env.NODE_ENV !== 'dev' - ? '/' - : 'http://localhost:3000/'; +const baseUrl = + process.env.NODE_ENV !== "dev" ? "/api" : "http://localhost:3000/api"; export const getRecipes = async () => { - const response = await fetch(`${baseUrl}backend/recipes`); + console.log(`${baseUrl}/recipes`); + const response = await fetch(`${baseUrl}/recipes`); const data = await response.json(); return data; }; export const getRecipeSteps = async () => { - const response = await fetch(`${baseUrl}backend/recipe-steps`); + const response = await fetch(`${baseUrl}/recipe-steps`); const data = await response.json(); return data; }; export const getRecipeIngredients = async () => { - const response = await fetch(`${baseUrl}backend/recipe-ingredients`); + const response = await fetch(`${baseUrl}/recipe-ingredients`); const data = await response.json(); return data; }; export const getRecipeById = async (id) => { - const response = await fetch(`${baseUrl}backend/recipe/${id}`); + const response = await fetch(`${baseUrl}/recipe/${id}`); const data = await response.json(); if (!data || !data.details) { return { details: null }; @@ -32,7 +32,7 @@ export const getRecipeById = async (id) => { export const addRecipe = async (recipeData) => { console.log(JSON.stringify(recipeData)); // return - const response = await fetch(`${baseUrl}backend/add-recipe`, { + const response = await fetch(`${baseUrl}/add-recipe`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(recipeData), @@ -45,7 +45,7 @@ export const addRecipe = async (recipeData) => { export const setDBStars = async (id, stars) => { console.log(JSON.stringify({ id: id, stars: stars })); // return - const response = await fetch(`${baseUrl}backend/set-stars`, { + const response = await fetch(`${baseUrl}/set-stars`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ id: id, stars: stars }), @@ -58,7 +58,7 @@ export const setDBStars = async (id, stars) => { export const deleteRecipe = async (id) => { console.log(id); // return - const response = await fetch(`${baseUrl}backend/delete-recipe`, { + const response = await fetch(`${baseUrl}/delete-recipe`, { method: "DELETE", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ id }), diff --git a/frontend/src/types/Recipe.ts b/frontend/src/types/Recipe.ts index 97298aa..eedf2cb 100644 --- a/frontend/src/types/Recipe.ts +++ b/frontend/src/types/Recipe.ts @@ -4,13 +4,6 @@ interface Step { instruction: string; } -interface Ingredient { - id?: number; - name?: string; - quantity?: number; - unit?: string; - raw?: string; -} interface Recipe { details: { id?: number; @@ -20,8 +13,8 @@ interface Recipe { cuisine?: string; prep_minutes?: number; cook_minutes?: number; - }, - ingredients: Ingredient[], + }; + ingredients: string[]; steps: Step[]; } // smaller Recipe type returned by backend at /recipes for all @@ -34,5 +27,4 @@ interface RecipeSmall { prep_minutes: number; } - -export type { Recipe, Ingredient, Step, RecipeSmall } +export type { Recipe, Step, RecipeSmall }; diff --git a/postgres/docker-compose.yaml b/postgres/docker-compose.yaml deleted file mode 100644 index 0e4eb1a..0000000 --- a/postgres/docker-compose.yaml +++ /dev/null @@ -1,15 +0,0 @@ -services: - db: - container_name: recipe_postgres - image: docker.io/library/postgres:17 - restart: always - env_file: - - .env - environment: - - POSTGRES_USER=${DB_USER} - - POSTGRES_PASSWORD=${DB_PASSWORD} - - POSTGRES_DB=${DB_NAME} - ports: - - "5432:5432" - volumes: - - ./db:/var/lib/postgresql/data