From 3de9f1b0e26a49b19bbc4f62b3693d05bed2be0b Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 24 Oct 2025 10:21:44 -0400 Subject: [PATCH 01/46] feat: integrate google analytics to track page views across all react routes --- public/index.html | 2 +- src/App.tsx | 7 +++++++ src/components/SearchPage/SubjectCard.tsx | 7 ++++++- src/hooks/useGAPageviews.tsx | 25 +++++++++++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/hooks/useGAPageviews.tsx diff --git a/public/index.html b/public/index.html index 87030c6..4b59e1f 100644 --- a/public/index.html +++ b/public/index.html @@ -125,7 +125,7 @@ } gtag("js", new Date()); - gtag("config", "G-F0BKEF4Y2R"); + gtag("config", "G-F0BKEF4Y2R", { send_page_view: false }); diff --git a/src/App.tsx b/src/App.tsx index 92a3d73..9ddbd35 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,8 +2,14 @@ import { GlobalStyles } from "@mui/material"; import { ThemeProvider } from "@mui/material/styles"; import Routes from "components/Routes"; import theme from "design/theme"; +import { useGAPageviews } from "hooks/useGAPageviews"; import { BrowserRouter } from "react-router-dom"; +function GATracker() { + useGAPageviews(); + return null; +} + const App = () => { return ( @@ -15,6 +21,7 @@ const App = () => { }} /> + diff --git a/src/components/SearchPage/SubjectCard.tsx b/src/components/SearchPage/SubjectCard.tsx index 866e0ae..93038e3 100644 --- a/src/components/SearchPage/SubjectCard.tsx +++ b/src/components/SearchPage/SubjectCard.tsx @@ -42,7 +42,12 @@ const SubjectCard: React.FC = ({ if (genderCode) { if (genderCode === "000F") genderDisplay = "Female"; - else if (genderCode === "000M") genderDisplay = "Male"; + else if ( + genderCode === "000M" || + genderCode === ",M,F" || + genderCode === ",M,M" + ) + genderDisplay = "Male"; } // cover age string to readable format diff --git a/src/hooks/useGAPageviews.tsx b/src/hooks/useGAPageviews.tsx new file mode 100644 index 0000000..61c50a2 --- /dev/null +++ b/src/hooks/useGAPageviews.tsx @@ -0,0 +1,25 @@ +import { useEffect } from "react"; +import { useLocation } from "react-router-dom"; + +declare global { + interface Window { + gtag?: (...args: any[]) => void; + } +} + +export function useGAPageviews(measurementId = "G-F0BKEF4Y2R") { + const location = useLocation(); + + useEffect(() => { + // guard for dev or if gtag not yet loaded + if (typeof window.gtag !== "function") return; + + const path = location.pathname + location.search + location.hash; + + // GA4 recommended SPA approach: call config on each route change + window.gtag("config", measurementId, { + page_path: path, + page_title: document.title, + }); + }, [location, measurementId]); +} From 17a8b77a12728f512379d1ffccf741fa544a48bc Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 24 Oct 2025 14:31:27 -0400 Subject: [PATCH 02/46] Add backend setup packages --- .gitignore | 8 +- backend/.env.example | 23 + backend/.gitignore | 28 + backend/package-lock.json | 3022 +++++++++++++++++++++++++++++++++++++ backend/package.json | 28 + 5 files changed, 3108 insertions(+), 1 deletion(-) create mode 100644 backend/.env.example create mode 100644 backend/.gitignore create mode 100644 backend/package-lock.json create mode 100644 backend/package.json diff --git a/.gitignore b/.gitignore index f037b8c..6c62e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,10 @@ node_modules .DS_Store package-lock.json -build \ No newline at end of file +build + +#backend +backend/node_modules/ +backend/.env +backend/*.sqlite +!backend/package-lock.json \ No newline at end of file diff --git a/backend/.env.example b/backend/.env.example new file mode 100644 index 0000000..06565b6 --- /dev/null +++ b/backend/.env.example @@ -0,0 +1,23 @@ +# Server Configuration +PORT=5000 +NODE_ENV=development + +# Database Configuration +# For local development (SQLite) +DB_DIALECT=sqlite +DB_STORAGE=./database.sqlite + +# For production (PostgreSQL) - uncomment and fill these +# DB_DIALECT=postgres +# DB_HOST=localhost +# DB_PORT=5432 +# DB_NAME=neurojson_db +# DB_USER=your_username +# DB_PASSWORD=your_password + +# JWT Secret +JWT_SECRET=your-super-secret-jwt-key-change-this-in-production + +# CORS Origin (your React frontend URL) +CORS_ORIGIN=http://localhost:3000 + diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..5d8c05b --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1,28 @@ +# Environment variables +.env +.env.local +.env.*.local +!.env.example + +# Database files (SQLite) +*.sqlite +*.sqlite3 +*.db + +# Dependencies +node_modules/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Logs +logs/ +*.log + +# OS files +.DS_Store +Thumbs.db + +# Build output +dist/ +build/ \ No newline at end of file diff --git a/backend/package-lock.json b/backend/package-lock.json new file mode 100644 index 0000000..fbd5596 --- /dev/null +++ b/backend/package-lock.json @@ -0,0 +1,3022 @@ +{ + "name": "backend", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "backend", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "bcrypt": "^6.0.0", + "cors": "^2.8.5", + "dotenv": "^17.2.3", + "express": "^5.1.0", + "jsonwebtoken": "^9.0.2", + "pg": "^8.16.3", + "pg-hstore": "^2.3.4", + "sequelize": "^6.37.7", + "sqlite3": "^5.1.7" + }, + "devDependencies": { + "nodemon": "^3.1.10" + } + }, + "node_modules/@gar/promisify": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "license": "MIT", + "optional": true + }, + "node_modules/@npmcli/fs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", + "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" + } + }, + "node_modules/@npmcli/move-file": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", + "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", + "deprecated": "This functionality has been moved to @npmcli/fs", + "license": "MIT", + "optional": true, + "dependencies": { + "mkdirp": "^1.0.4", + "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/debug": { + "version": "4.1.12", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", + "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", + "license": "MIT", + "dependencies": { + "@types/ms": "*" + } + }, + "node_modules/@types/ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz", + "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==", + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "24.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz", + "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==", + "license": "MIT", + "dependencies": { + "undici-types": "~7.16.0" + } + }, + "node_modules/@types/validator": { + "version": "13.15.3", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.15.3.tgz", + "integrity": "sha512-7bcUmDyS6PN3EuD9SlGGOxM77F8WLVsrwkxyWxKnxzmXoequ6c7741QBrANq6htVRGOITJ7z72mTP6Z4XyuG+Q==", + "license": "MIT" + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "license": "ISC", + "optional": true + }, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "license": "MIT", + "dependencies": { + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agentkeepalive": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz", + "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "humanize-ms": "^1.2.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "license": "MIT", + "optional": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "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/aproba": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", + "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==", + "license": "ISC", + "optional": true + }, + "node_modules/are-we-there-yet": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", + "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "optional": true, + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "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==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/bcrypt": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-6.0.0.tgz", + "integrity": "sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^8.3.0", + "node-gyp-build": "^4.8.4" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/bcrypt/node_modules/node-addon-api": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz", + "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==", + "license": "MIT", + "engines": { + "node": "^18 || ^20 || >= 21" + } + }, + "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/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "license": "MIT", + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/body-parser": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", + "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.0", + "http-errors": "^2.0.0", + "iconv-lite": "^0.6.3", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.0", + "type-is": "^2.0.0" + }, + "engines": { + "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==", + "devOptional": 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/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/cacache": { + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", + "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "@npmcli/fs": "^1.0.0", + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "engines": { + "node": ">= 10" + } + }, + "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", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "license": "ISC", + "optional": true, + "bin": { + "color-support": "bin.js" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "license": "ISC", + "optional": true + }, + "node_modules/content-disposition": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz", + "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "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.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "license": "MIT", + "dependencies": { + "mimic-response": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "license": "MIT", + "optional": true + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, + "node_modules/dotenv": { + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dottie": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz", + "integrity": "sha512-iGCHkfUc5kFekGiqhe8B/mdaurD+lakO9txNnTvKtA6PISrw86LgqHvRzWYPyoE2Ph5aMIrCw9/uko6XHTKCwA==", + "license": "MIT" + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT", + "optional": true + }, + "node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/encoding": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", + "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", + "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/err-code": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "license": "MIT", + "optional": true + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "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==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "license": "MIT" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "license": "(MIT OR WTFPL)", + "engines": { + "node": ">=6" + } + }, + "node_modules/express": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz", + "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==", + "license": "MIT", + "dependencies": { + "accepts": "^2.0.0", + "body-parser": "^2.2.0", + "content-disposition": "^1.0.0", + "content-type": "^1.0.5", + "cookie": "^0.7.1", + "cookie-signature": "^1.2.1", + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "finalhandler": "^2.1.0", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "merge-descriptors": "^2.0.0", + "mime-types": "^3.0.0", + "on-finished": "^2.4.1", + "once": "^1.4.0", + "parseurl": "^1.3.3", + "proxy-addr": "^2.0.7", + "qs": "^6.14.0", + "range-parser": "^1.2.1", + "router": "^2.2.0", + "send": "^1.1.0", + "serve-static": "^2.2.0", + "statuses": "^2.0.1", + "type-is": "^2.0.1", + "vary": "^1.1.2" + }, + "engines": { + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "license": "MIT" + }, + "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", + "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "on-finished": "^2.4.1", + "parseurl": "^1.3.3", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz", + "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC", + "optional": true + }, + "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", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gauge": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", + "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "optional": true, + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.3", + "console-control-strings": "^1.1.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.7", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.5" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", + "license": "MIT" + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "optional": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "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", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC", + "optional": true + }, + "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", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "license": "ISC", + "optional": true + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/http-cache-semantics": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", + "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", + "license": "BSD-2-Clause", + "optional": true + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-errors/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "license": "MIT", + "optional": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/humanize-ms": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", + "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "ms": "^2.0.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "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/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "license": "ISC", + "optional": true + }, + "node_modules/inflection": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.4.tgz", + "integrity": "sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==", + "engines": [ + "node >= 0.4.0" + ], + "license": "MIT" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "optional": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "license": "ISC" + }, + "node_modules/ip-address": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz", + "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "license": "MIT", + "engines": { + "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-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-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "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-lambda": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "license": "MIT", + "optional": true + }, + "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/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC", + "optional": true + }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "license": "MIT", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jwa": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz", + "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "^1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "license": "MIT", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "license": "ISC", + "optional": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-fetch-happen": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", + "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", + "license": "ISC", + "optional": true, + "dependencies": { + "agentkeepalive": "^4.1.3", + "cacache": "^15.2.0", + "http-cache-semantics": "^4.1.0", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-lambda": "^1.0.1", + "lru-cache": "^6.0.0", + "minipass": "^3.1.3", + "minipass-collect": "^1.0.2", + "minipass-fetch": "^1.3.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^0.6.2", + "promise-retry": "^2.0.1", + "socks-proxy-agent": "^6.0.0", + "ssri": "^8.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/make-fetch-happen/node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/media-typer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz", + "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/merge-descriptors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz", + "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz", + "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==", + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-response": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "devOptional": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-collect": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", + "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-fetch": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", + "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", + "license": "MIT", + "optional": true, + "dependencies": { + "minipass": "^3.1.0", + "minipass-sized": "^1.0.3", + "minizlib": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "optionalDependencies": { + "encoding": "^0.1.12" + } + }, + "node_modules/minipass-flush": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", + "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minipass-pipeline": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass-sized": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", + "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "license": "MIT" + }, + "node_modules/moment": { + "version": "2.30.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/moment-timezone": { + "version": "0.5.48", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz", + "integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==", + "license": "MIT", + "dependencies": { + "moment": "^2.29.4" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "license": "MIT" + }, + "node_modules/negotiator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-abi": { + "version": "3.78.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.78.0.tgz", + "integrity": "sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==", + "license": "MIT", + "dependencies": { + "semver": "^7.3.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "license": "MIT" + }, + "node_modules/node-gyp": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", + "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", + "license": "MIT", + "optional": true, + "dependencies": { + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.6", + "make-fetch-happen": "^9.1.0", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.2", + "which": "^2.0.2" + }, + "bin": { + "node-gyp": "bin/node-gyp.js" + }, + "engines": { + "node": ">= 10.12.0" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "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/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "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/npmlog": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", + "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "optional": true, + "dependencies": { + "are-we-there-yet": "^3.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.3", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "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", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "license": "MIT", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-to-regexp": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", + "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/pg": { + "version": "8.16.3", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz", + "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==", + "license": "MIT", + "dependencies": { + "pg-connection-string": "^2.9.1", + "pg-pool": "^3.10.1", + "pg-protocol": "^1.10.3", + "pg-types": "2.2.0", + "pgpass": "1.0.5" + }, + "engines": { + "node": ">= 16.0.0" + }, + "optionalDependencies": { + "pg-cloudflare": "^1.2.7" + }, + "peerDependencies": { + "pg-native": ">=3.0.1" + }, + "peerDependenciesMeta": { + "pg-native": { + "optional": true + } + } + }, + "node_modules/pg-cloudflare": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz", + "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==", + "license": "MIT", + "optional": true + }, + "node_modules/pg-connection-string": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz", + "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==", + "license": "MIT" + }, + "node_modules/pg-hstore": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.4.tgz", + "integrity": "sha512-N3SGs/Rf+xA1M2/n0JBiXFDVMzdekwLZLAO0g7mpDY9ouX+fDI7jS6kTq3JujmYbtNSJ53TJ0q4G98KVZSM4EA==", + "license": "MIT", + "dependencies": { + "underscore": "^1.13.1" + }, + "engines": { + "node": ">= 0.8.x" + } + }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-pool": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz", + "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==", + "license": "MIT", + "peerDependencies": { + "pg": ">=8.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", + "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", + "license": "MIT" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/pgpass": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz", + "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==", + "license": "MIT", + "dependencies": { + "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/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/prebuild-install": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", + "license": "MIT", + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^2.0.0", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", + "license": "ISC", + "optional": true + }, + "node_modules/promise-retry": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", + "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "license": "MIT", + "optional": true, + "dependencies": { + "err-code": "^2.0.2", + "retry": "^0.12.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "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/pump": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz", + "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==", + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.7.0", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "bin": { + "rc": "cli.js" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "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/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/retry-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-7.1.1.tgz", + "integrity": "sha512-hMD7odLOt3LkTjcif8aRZqi/hybjpLNgSk5oF5FCowfCjok6LukpN2bDX7R5wDmbgBQFn7YoBxSagmtXHaJYJw==", + "license": "MIT" + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "optional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/router": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", + "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.4.0", + "depd": "^2.0.0", + "is-promise": "^4.0.0", + "parseurl": "^1.3.3", + "path-to-regexp": "^8.0.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "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", + "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.5", + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "etag": "^1.8.1", + "fresh": "^2.0.0", + "http-errors": "^2.0.0", + "mime-types": "^3.0.1", + "ms": "^2.1.3", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "statuses": "^2.0.1" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/sequelize": { + "version": "6.37.7", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.7.tgz", + "integrity": "sha512-mCnh83zuz7kQxxJirtFD7q6Huy6liPanI67BSlbzSYgVNl5eXVdE2CN1FuAeZwG1SNpGsNRCV+bJAVVnykZAFA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/sequelize" + } + ], + "license": "MIT", + "dependencies": { + "@types/debug": "^4.1.8", + "@types/validator": "^13.7.17", + "debug": "^4.3.4", + "dottie": "^2.0.6", + "inflection": "^1.13.4", + "lodash": "^4.17.21", + "moment": "^2.29.4", + "moment-timezone": "^0.5.43", + "pg-connection-string": "^2.6.1", + "retry-as-promised": "^7.0.4", + "semver": "^7.5.4", + "sequelize-pool": "^7.1.0", + "toposort-class": "^1.0.1", + "uuid": "^8.3.2", + "validator": "^13.9.0", + "wkx": "^0.5.0" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependenciesMeta": { + "ibm_db": { + "optional": true + }, + "mariadb": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "oracledb": { + "optional": true + }, + "pg": { + "optional": true + }, + "pg-hstore": { + "optional": true + }, + "snowflake-sdk": { + "optional": true + }, + "sqlite3": { + "optional": true + }, + "tedious": { + "optional": true + } + } + }, + "node_modules/sequelize-pool": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz", + "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg==", + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==", + "license": "MIT", + "dependencies": { + "encodeurl": "^2.0.0", + "escape-html": "^1.0.3", + "parseurl": "^1.3.3", + "send": "^1.2.0" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC", + "optional": true + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC", + "optional": true + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/simple-get": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, + "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/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", + "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", + "license": "MIT", + "optional": true, + "dependencies": { + "ip-address": "^10.0.1", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks-proxy-agent": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz", + "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==", + "license": "MIT", + "optional": true, + "dependencies": { + "agent-base": "^6.0.2", + "debug": "^4.3.3", + "socks": "^2.6.2" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/split2": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", + "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", + "license": "ISC", + "engines": { + "node": ">= 10.x" + } + }, + "node_modules/sqlite3": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.7.tgz", + "integrity": "sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "dependencies": { + "bindings": "^1.5.0", + "node-addon-api": "^7.0.0", + "prebuild-install": "^7.1.1", + "tar": "^6.1.11" + }, + "optionalDependencies": { + "node-gyp": "8.x" + }, + "peerDependencies": { + "node-gyp": "8.x" + }, + "peerDependenciesMeta": { + "node-gyp": { + "optional": true + } + } + }, + "node_modules/ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "optional": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "optional": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "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/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar-fs": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", + "license": "MIT", + "dependencies": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + } + }, + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, + "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", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/toposort-class": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", + "integrity": "sha512-OsLcGGbYF3rMjPUf8oKktyvCiUxSbqMMS39m33MAjLTC1DVIH6x3WSt63/M77ihI09+Sdfk1AXvfhCEeUmC7mg==", + "license": "MIT" + }, + "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/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/type-is": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", + "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "license": "MIT", + "dependencies": { + "content-type": "^1.0.5", + "media-typer": "^1.1.0", + "mime-types": "^3.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "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/underscore": { + "version": "1.13.7", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", + "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", + "license": "MIT" + }, + "node_modules/undici-types": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "license": "MIT" + }, + "node_modules/unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "license": "ISC", + "optional": true, + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "node_modules/unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/validator": { + "version": "13.15.15", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz", + "integrity": "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "optional": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "license": "ISC", + "optional": true, + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wkx": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", + "integrity": "sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==", + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + } + } +} diff --git a/backend/package.json b/backend/package.json new file mode 100644 index 0000000..922e286 --- /dev/null +++ b/backend/package.json @@ -0,0 +1,28 @@ +{ + "name": "backend", + "version": "1.0.0", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node src/server.js", + "dev": "nodemon src/server.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "description": "", + "dependencies": { + "bcrypt": "^6.0.0", + "cors": "^2.8.5", + "dotenv": "^17.2.3", + "express": "^5.1.0", + "jsonwebtoken": "^9.0.2", + "pg": "^8.16.3", + "pg-hstore": "^2.3.4", + "sequelize": "^6.37.7", + "sqlite3": "^5.1.7" + }, + "devDependencies": { + "nodemon": "^3.1.10" + } +} From c386f7ffb574e0f7d9a1e27680fb344469d941cf Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 24 Oct 2025 16:00:37 -0400 Subject: [PATCH 03/46] add .sequlizerc and config files --- backend/.sequelizerc | 9 + backend/config/config.js | 29 ++ backend/models/index.js | 43 ++ backend/package-lock.json | 814 ++++++++++++++++++++++++++++++++- backend/package.json | 3 +- backend/src/config/database.js | 23 + backend/src/models/index.js | 0 backend/src/server.js | 3 + 8 files changed, 912 insertions(+), 12 deletions(-) create mode 100644 backend/.sequelizerc create mode 100644 backend/config/config.js create mode 100644 backend/models/index.js create mode 100644 backend/src/config/database.js create mode 100644 backend/src/models/index.js create mode 100644 backend/src/server.js diff --git a/backend/.sequelizerc b/backend/.sequelizerc new file mode 100644 index 0000000..e468f76 --- /dev/null +++ b/backend/.sequelizerc @@ -0,0 +1,9 @@ +// backend/.sequelizerc +const path = require("path"); + +module.exports = { + config: path.resolve("config", "config.js"), + "models-path": path.resolve("src", "models"), + "seeders-path": path.resolve("seeders"), + "migrations-path": path.resolve("migrations"), +}; diff --git a/backend/config/config.js b/backend/config/config.js new file mode 100644 index 0000000..7c15ed9 --- /dev/null +++ b/backend/config/config.js @@ -0,0 +1,29 @@ +require("dotenv").config(); + +module.exports = { + development: { + dialect: "sqlite", + storage: "./database.sqlite", + logging: console.log, + }, + test: { + dialect: "sqlite", + storage: ":memory:", + logging: false, + }, + production: { + dialect: "postgres", + host: process.env.DB_HOST, + port: parseInt(process.env.DB_PORT || "5432"), + database: process.env.DB_NAME, + username: process.env.DB_USER, + password: process.env.DB_PASSWORD, + logging: false, + pool: { + max: 5, + min: 0, + acquire: 30000, + idle: 10000, + }, + }, +}; diff --git a/backend/models/index.js b/backend/models/index.js new file mode 100644 index 0000000..024200e --- /dev/null +++ b/backend/models/index.js @@ -0,0 +1,43 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const Sequelize = require('sequelize'); +const process = require('process'); +const basename = path.basename(__filename); +const env = process.env.NODE_ENV || 'development'; +const config = require(__dirname + '/../config/config.json')[env]; +const db = {}; + +let sequelize; +if (config.use_env_variable) { + sequelize = new Sequelize(process.env[config.use_env_variable], config); +} else { + sequelize = new Sequelize(config.database, config.username, config.password, config); +} + +fs + .readdirSync(__dirname) + .filter(file => { + return ( + file.indexOf('.') !== 0 && + file !== basename && + file.slice(-3) === '.js' && + file.indexOf('.test.js') === -1 + ); + }) + .forEach(file => { + const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes); + db[model.name] = model; + }); + +Object.keys(db).forEach(modelName => { + if (db[modelName].associate) { + db[modelName].associate(db); + } +}); + +db.sequelize = sequelize; +db.Sequelize = Sequelize; + +module.exports = db; diff --git a/backend/package-lock.json b/backend/package-lock.json index fbd5596..7295bc9 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -20,7 +20,8 @@ "sqlite3": "^5.1.7" }, "devDependencies": { - "nodemon": "^3.1.10" + "nodemon": "^3.1.10", + "sequelize-cli": "^6.6.3" } }, "node_modules/@gar/promisify": { @@ -30,6 +31,109 @@ "license": "MIT", "optional": true }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@npmcli/fs": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", @@ -56,6 +160,24 @@ "node": ">=10" } }, + "node_modules/@one-ini/wasm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", + "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -160,12 +282,28 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "devOptional": true, "license": "MIT", - "optional": true, "engines": { "node": ">=8" } }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -202,6 +340,16 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -285,6 +433,13 @@ "readable-stream": "^3.4.0" } }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true, + "license": "MIT" + }, "node_modules/body-parser": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz", @@ -471,6 +626,38 @@ "node": ">=6" } }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -481,6 +668,16 @@ "color-support": "bin.js" } }, + "node_modules/commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -488,6 +685,17 @@ "devOptional": true, "license": "MIT" }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -547,6 +755,21 @@ "node": ">= 0.10" } }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -645,6 +868,13 @@ "node": ">= 0.4" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT" + }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -654,6 +884,51 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/editorconfig": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", + "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@one-ini/wasm": "0.1.1", + "commander": "^10.0.0", + "minimatch": "9.0.1", + "semver": "^7.5.3" + }, + "bin": { + "editorconfig": "bin/editorconfig" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/editorconfig/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/editorconfig/node_modules/minimatch": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", + "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -664,8 +939,8 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT", - "optional": true + "devOptional": true, + "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", @@ -742,6 +1017,16 @@ "node": ">= 0.4" } }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -844,6 +1129,36 @@ "node": ">= 0.8" } }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -868,6 +1183,22 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -932,6 +1263,16 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -1026,8 +1367,8 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC", - "optional": true + "devOptional": true, + "license": "ISC" }, "node_modules/has-flag": { "version": "3.0.0", @@ -1272,6 +1613,22 @@ "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", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "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", @@ -1286,8 +1643,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "devOptional": true, "license": "MIT", - "optional": true, "engines": { "node": ">=8" } @@ -1332,8 +1689,152 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "devOptional": true, + "license": "ISC" + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-beautify": { + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz", + "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==", + "dev": true, + "license": "MIT", + "dependencies": { + "config-chain": "^1.1.13", + "editorconfig": "^1.0.4", + "glob": "^10.4.2", + "js-cookie": "^3.0.5", + "nopt": "^7.2.1" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/js-beautify/node_modules/abbrev": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", + "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "dev": true, "license": "ISC", - "optional": true + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/js-beautify/node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/js-beautify/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/js-beautify/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/js-beautify/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/js-beautify/node_modules/nopt": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", + "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "dev": true, + "license": "ISC", + "dependencies": { + "abbrev": "^2.0.0" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/jsonfile": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", + "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } }, "node_modules/jsonwebtoken": { "version": "9.0.2", @@ -1901,6 +2402,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0" + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -1920,6 +2428,57 @@ "node": ">=0.10.0" } }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/path-scurry/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/path-to-regexp": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", @@ -2031,6 +2590,13 @@ "split2": "^4.1.0" } }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -2130,6 +2696,13 @@ "node": ">=10" } }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", + "dev": true, + "license": "ISC" + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -2257,6 +2830,37 @@ "node": ">=8.10.0" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", @@ -2428,6 +3032,29 @@ } } }, + "node_modules/sequelize-cli": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-6.6.3.tgz", + "integrity": "sha512-1YYPrcSRt/bpMDDSKM5ubY1mnJ2TEwIaGZcqITw4hLtGtE64nIqaBnLtMvH8VKHg6FbWpXTiFNc2mS/BtQCXZw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fs-extra": "^9.1.0", + "js-beautify": "1.15.4", + "lodash": "^4.17.21", + "picocolors": "^1.1.1", + "resolve": "^1.22.1", + "umzug": "^2.3.0", + "yargs": "^16.2.0" + }, + "bin": { + "sequelize": "lib/sequelize", + "sequelize-cli": "lib/sequelize" + }, + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/sequelize-pool": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz", @@ -2465,6 +3092,29 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "license": "ISC" }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", @@ -2711,8 +3361,24 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, "license": "MIT", - "optional": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -2726,8 +3392,22 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "license": "MIT", - "optional": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -2757,6 +3437,19 @@ "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", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/tar": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", @@ -2881,6 +3574,19 @@ "node": ">= 0.6" } }, + "node_modules/umzug": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/umzug/-/umzug-2.3.0.tgz", + "integrity": "sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bluebird": "^3.7.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", @@ -2920,6 +3626,16 @@ "imurmurhash": "^0.1.4" } }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -2966,8 +3682,8 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "devOptional": true, "license": "ISC", - "optional": true, "dependencies": { "isexe": "^2.0.0" }, @@ -2997,6 +3713,43 @@ "@types/node": "*" } }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -3012,11 +3765,50 @@ "node": ">=0.4" } }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } } } } diff --git a/backend/package.json b/backend/package.json index 922e286..e59448f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -23,6 +23,7 @@ "sqlite3": "^5.1.7" }, "devDependencies": { - "nodemon": "^3.1.10" + "nodemon": "^3.1.10", + "sequelize-cli": "^6.6.3" } } diff --git a/backend/src/config/database.js b/backend/src/config/database.js new file mode 100644 index 0000000..58f396a --- /dev/null +++ b/backend/src/config/database.js @@ -0,0 +1,23 @@ +const { Sequelize } = require("sequelize"); +require("dotenv").config(); + +const env = process.env.NODE_ENV || "development"; +const config = require("../../config/config")[env]; + +// Create sequelize instance from config +const sequelize = new Sequelize(config); + +const connectDatabase = async () => { + try { + await sequelize.authenticate(); + console.log( + `Database connection established successfully (${config.dialect})` + ); + console.log("Database ready (use migrations to update schema)"); + } catch (error) { + console.error("Unable to connect to the database:", error); + process.exit(1); + } +}; + +module.exports = { sequelize, connectDatabase }; diff --git a/backend/src/models/index.js b/backend/src/models/index.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/server.js b/backend/src/server.js new file mode 100644 index 0000000..6076f35 --- /dev/null +++ b/backend/src/server.js @@ -0,0 +1,3 @@ +const express = require("express"); +const cors = require("cors"); +require("dotenv").config(); From 61fe73bf0069fab21c523437bb1a11aaa1d62abe Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 27 Oct 2025 14:06:35 -0400 Subject: [PATCH 04/46] add backend source directories and models --- backend/src/controllers/auth.controller.js | 0 backend/src/controllers/dataset.controller.js | 0 backend/src/middleware/auth.middleware.js | 0 backend/src/models/Dataset.js | 41 ++++ backend/src/models/User.js | 64 +++++++ backend/src/models/index.js | 180 ++++++++++++++++++ backend/src/routes/auth.routes.js | 0 backend/src/routes/dataset.routes.js | 0 8 files changed, 285 insertions(+) create mode 100644 backend/src/controllers/auth.controller.js create mode 100644 backend/src/controllers/dataset.controller.js create mode 100644 backend/src/middleware/auth.middleware.js create mode 100644 backend/src/models/Dataset.js create mode 100644 backend/src/models/User.js create mode 100644 backend/src/routes/auth.routes.js create mode 100644 backend/src/routes/dataset.routes.js diff --git a/backend/src/controllers/auth.controller.js b/backend/src/controllers/auth.controller.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/middleware/auth.middleware.js b/backend/src/middleware/auth.middleware.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/models/Dataset.js b/backend/src/models/Dataset.js new file mode 100644 index 0000000..86411f2 --- /dev/null +++ b/backend/src/models/Dataset.js @@ -0,0 +1,41 @@ +const { DataTypes, Model } = require("sequelize"); +const { sequelize } = require("../config/database"); + +class Dataset extends Model {} + +Dataset.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + couch_db: { + type: DataTypes.TEXT, + allowNull: false, + }, + ds_id: { + type: DataTypes.TEXT, + allowNull: false, + }, + views_count: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: 0, + }, + }, + { + sequelize, + tableName: "datasets", + timestamps: false, + underscored: true, + indexes: [ + { + unique: true, + fields: ["couch_db", "ds_id"], + }, + ], + } +); + +module.exports = Dataset; diff --git a/backend/src/models/User.js b/backend/src/models/User.js new file mode 100644 index 0000000..82de79b --- /dev/null +++ b/backend/src/models/User.js @@ -0,0 +1,64 @@ +const { DataTypes, Model } = require("sequelize"); +const { sequelize } = require("../config/database"); +const bcrypt = require("bcrypt"); + +class User extends Model { + async comparePassword(password) { + return bcrypt.compare(password, this.hashed_password); + } + + async hashPassword(password) { + const salt = await bcrypt.genSalt(10); + this.hashed_password = await bcrypt.hash(password, salt); + } +} + +User.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + orcid_id: { + type: DataTypes.TEXT, + allowNull: true, + unique: true, + }, + username: { + type: DataTypes.STRING(255), + allowNull: false, + unique: true, + }, + hashed_password: { + type: DataTypes.STRING(255), + allowNull: false, + }, + email: { + type: DataTypes.TEXT, + allowNull: false, + unique: true, + validate: { + isEmail: true, + }, + }, + created_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + updated_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + }, + { + sequelize, + tableName: "users", + timestamps: true, + underscored: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +module.exports = User; diff --git a/backend/src/models/index.js b/backend/src/models/index.js index e69de29..6eaf6eb 100644 --- a/backend/src/models/index.js +++ b/backend/src/models/index.js @@ -0,0 +1,180 @@ +const { DataTypes, Model } = require("sequelize"); +const { sequelize } = require("../config/database"); +const User = require("../models/User"); +const Dataset = require("../models/Dataset"); + +// DatasetLike Model +class DatasetLike extends Model {} + +DatasetLike.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + }, + dataset_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + }, + created_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + }, + { + sequelize, + tableName: "dataset_likes", + timestamps: true, + underscored: true, + createdAt: "created_at", + updatedAt: false, + } +); + +// SavedDataset Model +class SavedDataset extends Model {} + +SavedDataset.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + }, + dataset_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + }, + created_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + }, + { + sequelize, + tableName: "saved_datasets", + timestamps: true, + underscored: true, + createdAt: "created_at", + updatedAt: false, + } +); + +// Comment Model +class Comment extends Model {} + +Comment.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + }, + dataset_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + }, + body: { + type: DataTypes.TEXT, + allowNull: true, + }, + created_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + updated_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + }, + { + sequelize, + tableName: "comments", + timestamps: true, + underscored: true, + createdAt: "created_at", + updatedAt: "updated_at", + } +); + +// ViewHistory Model +class ViewHistory extends Model {} + +ViewHistory.init( + { + id: { + type: DataTypes.INTEGER, + autoIncrement: true, + primaryKey: true, + }, + user_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + }, + dataset_id: { + type: DataTypes.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + }, + viewed_at: { + type: DataTypes.DATE, + defaultValue: DataTypes.NOW, + }, + }, + { + sequelize, + tableName: "view_history", + timestamps: true, + underscored: true, + createdAt: "viewed_at", + updatedAt: false, + } +); + +// Define Associations +User.hasMany(DatasetLike, { foreignKey: "user_id", as: "likes" }); +DatasetLike.belongsTo(User, { foreignKey: "user_id" }); diff --git a/backend/src/routes/auth.routes.js b/backend/src/routes/auth.routes.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/routes/dataset.routes.js b/backend/src/routes/dataset.routes.js new file mode 100644 index 0000000..e69de29 From 2afa8af4a47e5cf99b8734dac7dba29f5844acc9 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 27 Oct 2025 14:15:37 -0400 Subject: [PATCH 05/46] defined associations between tables --- backend/src/models/index.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/backend/src/models/index.js b/backend/src/models/index.js index 6eaf6eb..940b123 100644 --- a/backend/src/models/index.js +++ b/backend/src/models/index.js @@ -178,3 +178,33 @@ ViewHistory.init( // Define Associations User.hasMany(DatasetLike, { foreignKey: "user_id", as: "likes" }); DatasetLike.belongsTo(User, { foreignKey: "user_id" }); + +User.hasMany(SavedDataset, { foreignKey: "user_id", as: "savedDatasets" }); +SavedDataset.belongsTo(User, { foreignKey: "user_id" }); + +User.hasMany(Comment, { foreignKey: "user_id", as: "comments" }); +Comment.belongsTo(User, { foreignKey: "user_id" }); + +User.hasMany(ViewHistory, { foreignKey: "user_id", as: "viewHistory" }); +ViewHistory.belongsTo(User, { foreignKey: "user_id" }); + +Dataset.hasMany(DatasetLike, { foreignKey: "dataset_id", as: "likes" }); +DatasetLike.belongsTo(Dataset, { foreignKey: "dataset_id" }); + +Dataset.hasMany(SavedDataset, { foreignKey: "dataset_id", as: "savedBy" }); +SavedDataset.belongsTo(Dataset, { foreignKey: "dataset_id" }); + +Dataset.hasMany(Comment, { foreignKey: "dataset_id", as: "comments" }); +Comment.belongsTo(Dataset, { foreignKey: "dataset_id" }); + +Dataset.hasMany(ViewHistory, { foreignKey: "dataset_id", as: "viewHistory" }); +ViewHistory.belongsTo(Dataset, { foreignKey: "dataset_id" }); + +module.exports = { + User, + Dataset, + DatasetLike, + SavedDataset, + Comment, + ViewHistory, +}; From e9144488bb002fdb45721eee77077d2e30cd98c7 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 27 Oct 2025 16:48:32 -0400 Subject: [PATCH 06/46] add server.js to start the backend server --- backend/src/controllers/auth.controller.js | 56 ++++++++++++++++++++++ backend/src/server.js | 53 ++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/backend/src/controllers/auth.controller.js b/backend/src/controllers/auth.controller.js index e69de29..6154e35 100644 --- a/backend/src/controllers/auth.controller.js +++ b/backend/src/controllers/auth.controller.js @@ -0,0 +1,56 @@ +const jwt = require("jsonwebtoken"); +const { User } = require("../models"); + +const JWT_SECRET = process.env.JWT_SECRET; + +const register = async (req, res) => { + try { + const { username, email, password, orcid_id } = req.body; + + // check if user already exists + const existingUser = await User.findOne({ + where: { email }, + }); + + if (existingUser) { + return res + .status(400) + .json({ message: "User already exists with this email" }); + } + + // create new user + const user = await User.create({ + username, + email, + hashed_password: "", + orcid_id, + }); + + // hash password + await user.hashPassword(password); + await user.save(); + + // generate JWT token + const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { + expiresIn: "1h", + }); + + res.status(201).json({ + message: "User registered successfully", + token, + user: { + id: user.id, + username: user.username, + email: user.email, + orcid_id: user.orcid_id, + }, + }); + } catch (error) { + console.error("Registration error:", error); + res + .status(500) + .json({ message: "Error registering user", error: error.message }); + } +}; + +const login = async (req, res) => {}; diff --git a/backend/src/server.js b/backend/src/server.js index 6076f35..16de258 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -1,3 +1,56 @@ const express = require("express"); const cors = require("cors"); require("dotenv").config(); +const { connectDatabase } = require("./config/database"); +// const authRoutes = require('./routes/auth.routes'); +// const datasetRoutes = require('./routes/dataset.routes'); + +const app = express(); +const PORT = process.env.PORT || 5000; + +// Middleware +app.use( + cors({ + origin: process.env.CORS_ORIGIN || "http://localhost:3000", + credentials: true, + }) +); +app.use(express.json()); +app.use(express.urlencoded({ extended: true })); + +// Routes +// app.use('/api/auth', authRoutes); +// app.use('/api/datasets', datasetRoutes); + +// health check endpoint +app.get("/api/health", (req, res) => { + res.status(200).json({ + status: "OK", + message: "server is running", + environment: process.env.NODE_ENV || "development", + }); +}); + +// 404 handler +app.use((req, res) => { + res.status(404).json({ message: "Route not found" }); +}); + +// start server +const startServer = async () => { + try { + await connectDatabase(); + + app.listen(PORT, () => { + console.log(`🚀 Server is running on port ${PORT}`); + console.log(`📡 API available at http://localhost:${PORT}/api`); + console.log(`🌍 Environment: ${process.env.NODE_ENV || "development"}`); + }); + } catch (error) { + console.error("❌ Failed to start server:", error); + process.exit(1); + } +}; + +startServer(); +module.exports = app; From cb77cbafe8996940c7eee3b285efb975bc56af8c Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Tue, 28 Oct 2025 14:27:45 -0400 Subject: [PATCH 07/46] updated package.json script --- backend/package.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/package.json b/backend/package.json index e59448f..3971634 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,9 +5,19 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "start": "node src/server.js", - "dev": "nodemon src/server.js" + "dev": "nodemon src/server.js", + "migrate": "npx sequelize-cli db:migrate", + "migrate:undo": "npx sequelize-cli db:migrate:undo", + "migrate:undo:all": "npx sequelize-cli db:migrate:undo:all", + "seed": "npx sequelize-cli db:seed:all", + "seed:undo": "npx sequelize-cli db:seed:undo:all", + "db:reset": "npx sequelize-cli db:migrate:undo:all && npx sequelize-cli db:migrate" }, - "keywords": [], + "keywords": [ + "express", + "sequelize", + "javascript" + ], "author": "", "license": "ISC", "description": "", From dd1b3e399b73a43efb93bbc71a072a06e02914e8 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 29 Oct 2025 12:06:52 -0400 Subject: [PATCH 08/46] add migration files for database set up --- .../migrations/20251028184256-create-users.js | 60 +++++++++++++++++++ .../20251028184358-create-datasets.js | 37 ++++++++++++ .../20251028184628-create-dataset-likes.js | 50 ++++++++++++++++ .../20251028184649-create-saved-datasets.js | 50 ++++++++++++++++ .../20251028184704-create-comments.js | 57 ++++++++++++++++++ .../20251028184721-create-view-history.js | 49 +++++++++++++++ 6 files changed, 303 insertions(+) create mode 100644 backend/migrations/20251028184256-create-users.js create mode 100644 backend/migrations/20251028184358-create-datasets.js create mode 100644 backend/migrations/20251028184628-create-dataset-likes.js create mode 100644 backend/migrations/20251028184649-create-saved-datasets.js create mode 100644 backend/migrations/20251028184704-create-comments.js create mode 100644 backend/migrations/20251028184721-create-view-history.js diff --git a/backend/migrations/20251028184256-create-users.js b/backend/migrations/20251028184256-create-users.js new file mode 100644 index 0000000..3b17a6e --- /dev/null +++ b/backend/migrations/20251028184256-create-users.js @@ -0,0 +1,60 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + /** + * Add altering commands here. + * + * Example: + * await queryInterface.createTable('users', { id: Sequelize.INTEGER }); + */ + await queryInterface.createTable("users", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + orcid_id: { + type: Sequelize.STRING(255), + allowNull: true, + unique: true, + }, + username: { + type: Sequelize.STRING(255), + allowNull: false, + unique: true, + }, + hashed_password: { + type: Sequelize.STRING(255), + allowNull: false, + }, + email: { + type: Sequelize.STRING(255), + allowNull: false, + unique: true, + }, + created_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + updated_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + }); + }, + + async down(queryInterface, Sequelize) { + /** + * Add reverting commands here. + * + * Example: + * await queryInterface.dropTable('users'); + */ + await queryInterface.dropTable("users"); + }, +}; diff --git a/backend/migrations/20251028184358-create-datasets.js b/backend/migrations/20251028184358-create-datasets.js new file mode 100644 index 0000000..538512b --- /dev/null +++ b/backend/migrations/20251028184358-create-datasets.js @@ -0,0 +1,37 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable("datasets", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + couch_db: { + type: Sequelize.STRING(255), + allowNull: false, + }, + ds_id: { + type: Sequelize.STRING(255), + allowNull: false, + }, + views_count: { + type: Sequelize.INTEGER, + allowNull: true, + defaultValue: 0, + }, + }); + // Add unique constraint on couch_db + ds_id + await queryInterface.addIndex("datasets", ["couch_db", "ds_id"], { + unique: true, + name: "datasets_couch_db_ds_id_unique", + }); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.dropTable("datasets"); + }, +}; diff --git a/backend/migrations/20251028184628-create-dataset-likes.js b/backend/migrations/20251028184628-create-dataset-likes.js new file mode 100644 index 0000000..657436f --- /dev/null +++ b/backend/migrations/20251028184628-create-dataset-likes.js @@ -0,0 +1,50 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable("dataset_likes", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + user_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + dataset_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + created_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + }); + + // Add unique constraint to prevent duplicate likes + await queryInterface.addIndex("dataset_likes", ["user_id", "dataset_id"], { + unique: true, + name: "dataset_likes_user_dataset_unique", + }); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.dropTable("dataset_likes"); + }, +}; diff --git a/backend/migrations/20251028184649-create-saved-datasets.js b/backend/migrations/20251028184649-create-saved-datasets.js new file mode 100644 index 0000000..43c8643 --- /dev/null +++ b/backend/migrations/20251028184649-create-saved-datasets.js @@ -0,0 +1,50 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable("saved_datasets", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + user_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + dataset_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + created_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + }); + + // Add unique constraint to prevent duplicate saves + await queryInterface.addIndex("saved_datasets", ["user_id", "dataset_id"], { + unique: true, + name: "saved_datasets_user_dataset_unique", + }); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.dropTable("saved_datasets"); + }, +}; diff --git a/backend/migrations/20251028184704-create-comments.js b/backend/migrations/20251028184704-create-comments.js new file mode 100644 index 0000000..3c641f5 --- /dev/null +++ b/backend/migrations/20251028184704-create-comments.js @@ -0,0 +1,57 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable("comments", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + user_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + dataset_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + body: { + type: Sequelize.TEXT, + allowNull: false, + }, + created_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + updated_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + }); + + // Add indexes for common queries + await queryInterface.addIndex("comments", ["dataset_id"]); + await queryInterface.addIndex("comments", ["user_id"]); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.dropTable("comments"); + }, +}; diff --git a/backend/migrations/20251028184721-create-view-history.js b/backend/migrations/20251028184721-create-view-history.js new file mode 100644 index 0000000..e5bf65c --- /dev/null +++ b/backend/migrations/20251028184721-create-view-history.js @@ -0,0 +1,49 @@ +"use strict"; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable("view_history", { + id: { + type: Sequelize.INTEGER, + autoIncrement: true, + primaryKey: true, + allowNull: false, + }, + user_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "users", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + dataset_id: { + type: Sequelize.INTEGER, + allowNull: false, + references: { + model: "datasets", + key: "id", + }, + onUpdate: "CASCADE", + onDelete: "CASCADE", + }, + viewed_at: { + type: Sequelize.DATE, + allowNull: false, + defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), + }, + }); + + // Add indexes for common queries + await queryInterface.addIndex("view_history", ["user_id"]); + await queryInterface.addIndex("view_history", ["dataset_id"]); + await queryInterface.addIndex("view_history", ["viewed_at"]); + }, + + async down(queryInterface, Sequelize) { + await queryInterface.dropTable("view_history"); + }, +}; From 26ade55a7abccd378574480ad533b7b92fb4cec0 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 29 Oct 2025 12:38:28 -0400 Subject: [PATCH 09/46] update users migration file; closes #104 --- backend/migrations/20251028184256-create-users.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backend/migrations/20251028184256-create-users.js b/backend/migrations/20251028184256-create-users.js index 3b17a6e..8c45139 100644 --- a/backend/migrations/20251028184256-create-users.js +++ b/backend/migrations/20251028184256-create-users.js @@ -21,6 +21,16 @@ module.exports = { allowNull: true, unique: true, }, + google_id: { + type: Sequelize.STRING(255), + allowNull: true, + unique: true, + }, + github_id: { + type: Sequelize.STRING(255), + allowNull: true, + unique: true, + }, username: { type: Sequelize.STRING(255), allowNull: false, From d85c503446e3cef5e573e46dba1ca3e645a6347a Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 29 Oct 2025 18:09:02 -0400 Subject: [PATCH 10/46] add register function --- .../migrations/20251028184256-create-users.js | 2 +- backend/src/controllers/auth.controller.js | 82 ++++++++++++++++--- backend/src/models/User.js | 8 +- backend/src/routes/auth.routes.js | 1 + backend/src/server.js | 46 +++++++++-- 5 files changed, 116 insertions(+), 23 deletions(-) diff --git a/backend/migrations/20251028184256-create-users.js b/backend/migrations/20251028184256-create-users.js index 8c45139..7ff7f25 100644 --- a/backend/migrations/20251028184256-create-users.js +++ b/backend/migrations/20251028184256-create-users.js @@ -38,7 +38,7 @@ module.exports = { }, hashed_password: { type: Sequelize.STRING(255), - allowNull: false, + allowNull: true, }, email: { type: Sequelize.STRING(255), diff --git a/backend/src/controllers/auth.controller.js b/backend/src/controllers/auth.controller.js index 6154e35..df5d0d3 100644 --- a/backend/src/controllers/auth.controller.js +++ b/backend/src/controllers/auth.controller.js @@ -1,35 +1,82 @@ const jwt = require("jsonwebtoken"); const { User } = require("../models"); +const bcrypt = require("bcrypt"); const JWT_SECRET = process.env.JWT_SECRET; const register = async (req, res) => { try { - const { username, email, password, orcid_id } = req.body; + const { username, email, password, orcid_id, google_id, github_id } = + req.body; - // check if user already exists - const existingUser = await User.findOne({ + // check if OAuth or traditional signup + const isOAuthSignup = orcid_id || google_id || github_id; + + // validate required fields + if (!username || !email) { + return res.status(400).json({ + message: "Username and email are required", + }); + } + + // traditional signup: password is required + if (!isOAuthSignup && !password) { + return res.status(400).json({ + message: "Password is required for traditional registration", + }); + } + + // OAuth signup: password should not be provided + if (isOAuthSignup && password) { + return res.status(400).json({ + message: "Password should not be provided for OAuth registration", + }); + } + + if (password && password.length < 8) { + return res.status(400).json({ + message: "Password must be at least 8 characters long", + }); + } + + // check if email already exists + const existingEmail = await User.findOne({ where: { email }, }); - if (existingUser) { + if (existingEmail) { return res .status(400) .json({ message: "User already exists with this email" }); } + // check if username already exists + const existingUsername = await User.findOne({ + where: { username }, + }); + + if (existingUsername) { + return res.status(400).json({ + message: "Username is already taken", + }); + } + + // hash password + let hashedPassword = null; + if (password) { + hashedPassword = await bcrypt.hash(password, 10); + } + // create new user const user = await User.create({ username, email, - hashed_password: "", - orcid_id, + hashed_password: hashedPassword, + orcid_id: orcid_id || null, + google_id: google_id || null, + github_id: github_id || null, }); - // hash password - await user.hashPassword(password); - await user.save(); - // generate JWT token const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { expiresIn: "1h", @@ -42,11 +89,24 @@ const register = async (req, res) => { id: user.id, username: user.username, email: user.email, - orcid_id: user.orcid_id, }, }); } catch (error) { console.error("Registration error:", error); + + if (error.name === "SequelizeValidationError") { + return res.status(400).json({ + message: "Validation error", + errors: error.errors.map((e) => e.message), + }); + } + + if (error.name === "SequelizeUniqueConstraintError") { + return res.status(400).json({ + message: "Email or username already exists", + }); + } + res .status(500) .json({ message: "Error registering user", error: error.message }); diff --git a/backend/src/models/User.js b/backend/src/models/User.js index 82de79b..a3e19cd 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -7,10 +7,10 @@ class User extends Model { return bcrypt.compare(password, this.hashed_password); } - async hashPassword(password) { - const salt = await bcrypt.genSalt(10); - this.hashed_password = await bcrypt.hash(password, salt); - } + // async hashPassword(password) { + // const salt = await bcrypt.genSalt(10); + // this.hashed_password = await bcrypt.hash(password, salt); + // } } User.init( diff --git a/backend/src/routes/auth.routes.js b/backend/src/routes/auth.routes.js index e69de29..afe09fa 100644 --- a/backend/src/routes/auth.routes.js +++ b/backend/src/routes/auth.routes.js @@ -0,0 +1 @@ +const express = require("express"); diff --git a/backend/src/server.js b/backend/src/server.js index 16de258..b25680e 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -1,7 +1,8 @@ const express = require("express"); const cors = require("cors"); require("dotenv").config(); -const { connectDatabase } = require("./config/database"); +const { connectDatabase, sequelize } = require("./config/database"); + // const authRoutes = require('./routes/auth.routes'); // const datasetRoutes = require('./routes/dataset.routes'); @@ -23,12 +24,43 @@ app.use(express.urlencoded({ extended: true })); // app.use('/api/datasets', datasetRoutes); // health check endpoint -app.get("/api/health", (req, res) => { - res.status(200).json({ - status: "OK", - message: "server is running", - environment: process.env.NODE_ENV || "development", - }); +// app.get("/api/health", (req, res) => { +// res.status(200).json({ +// status: "OK", +// message: "server is running", +// environment: process.env.NODE_ENV || "development", +// }); +// }); +// In your routes or server.js + +app.get("/api/health", async (req, res) => { + try { + // Test database connection + await sequelize.authenticate(); + + // Optional: Count records in a table + const userCount = (await sequelize.models.User?.count()) || 0; + + res.json({ + status: "OK", + message: "server is running", + environment: process.env.NODE_ENV || "development", + database: { + connected: true, + dialect: sequelize.getDialect(), + userCount: userCount, + }, + }); + } catch (error) { + res.status(500).json({ + status: "ERROR", + message: "Database connection failed", + database: { + connected: false, + error: error.message, + }, + }); + } }); // 404 handler From 21be5112ea349275cd894352655e28586c54d147 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Thu, 30 Oct 2025 11:24:19 -0400 Subject: [PATCH 11/46] add login function --- backend/src/controllers/auth.controller.js | 59 +++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/auth.controller.js b/backend/src/controllers/auth.controller.js index df5d0d3..5f7cc8b 100644 --- a/backend/src/controllers/auth.controller.js +++ b/backend/src/controllers/auth.controller.js @@ -113,4 +113,61 @@ const register = async (req, res) => { } }; -const login = async (req, res) => {}; +const login = async (req, res) => { + try { + const { email, password } = req.body; + + // validate required fields + if (!email || !password) { + return res.status(400).json({ + message: "Email and password are required", + }); + } + + // find user + const user = await User.findOne({ where: { email } }); + + if (!user) { + return res.status(401).json({ message: "Invalid credentials" }); + } + + // check if user has a password(not OAuth-only user) + if (!user.hashed_password) { + // Could check which OAuth provider they used + let oauthProvider = "OAuth"; + if (user.google_id) oauthProvider = "Google"; + else if (user.github_id) oauthProvider = "GitHub"; + else if (user.orcid_id) oauthProvider = "ORCID"; + + return res.status(400).json({ + message: `This account uses ${oauthProvider} login. Please sign in with ${oauthProvider}.`, + }); + } + + // check password + const isPasswordValid = await user.comparePassword(password); + + if (!isPasswordValid) { + console.warn(`Failed login attempt for email: ${email}`); + return res.status(401).json({ message: "Invalid credentials" }); + } + + // generate JWT token + const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { + expiresIn: "1h", + }); + + res.status(200).json({ + message: "Login successful", + token, + user: { + id: user.id, + username: user.username, + email: user.email, + }, + }); + } catch (error) { + console.error("Login error:", error); + res.status(500).json({ message: "Error logging in", error: error.message }); + } +}; From 54e5fbdd7d2ca8c34c51c6769b87ea6839cf3e1e Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 31 Oct 2025 15:26:16 -0400 Subject: [PATCH 12/46] implement HttpOnly cookie-based authentication --- backend/package-lock.json | 20 +++ backend/package.json | 1 + backend/src/controllers/auth.controller.js | 108 ++++++++++++++-- backend/src/middleware/auth.middleware.js | 141 +++++++++++++++++++++ backend/src/routes/auth.routes.js | 17 +++ backend/src/server.js | 10 +- 6 files changed, 286 insertions(+), 11 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 7295bc9..03858db 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -10,6 +10,7 @@ "license": "ISC", "dependencies": { "bcrypt": "^6.0.0", + "cookie-parser": "^1.4.7", "cors": "^2.8.5", "dotenv": "^17.2.3", "express": "^5.1.0", @@ -733,6 +734,25 @@ "node": ">= 0.6" } }, + "node_modules/cookie-parser": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "license": "MIT", + "dependencies": { + "cookie": "0.7.2", + "cookie-signature": "1.0.6" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/cookie-parser/node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" + }, "node_modules/cookie-signature": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", diff --git a/backend/package.json b/backend/package.json index 3971634..0fb585f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -23,6 +23,7 @@ "description": "", "dependencies": { "bcrypt": "^6.0.0", + "cookie-parser": "^1.4.7", "cors": "^2.8.5", "dotenv": "^17.2.3", "express": "^5.1.0", diff --git a/backend/src/controllers/auth.controller.js b/backend/src/controllers/auth.controller.js index 5f7cc8b..19b4735 100644 --- a/backend/src/controllers/auth.controller.js +++ b/backend/src/controllers/auth.controller.js @@ -1,9 +1,11 @@ const jwt = require("jsonwebtoken"); const { User } = require("../models"); const bcrypt = require("bcrypt"); +const { setTokenCookie } = require("../middleware/auth.middleware"); const JWT_SECRET = process.env.JWT_SECRET; +// register new user const register = async (req, res) => { try { const { username, email, password, orcid_id, google_id, github_id } = @@ -78,13 +80,16 @@ const register = async (req, res) => { }); // generate JWT token - const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { - expiresIn: "1h", - }); + // const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { + // expiresIn: "1h", + // }); + + //set suthentication cookie + setTokenCookie(res, user); res.status(201).json({ message: "User registered successfully", - token, + // token, user: { id: user.id, username: user.username, @@ -101,6 +106,7 @@ const register = async (req, res) => { }); } + // handle sequelize unique constraint errors if (error.name === "SequelizeUniqueConstraintError") { return res.status(400).json({ message: "Email or username already exists", @@ -113,6 +119,7 @@ const register = async (req, res) => { } }; +// login user const login = async (req, res) => { try { const { email, password } = req.body; @@ -124,7 +131,7 @@ const login = async (req, res) => { }); } - // find user + // find user by email const user = await User.findOne({ where: { email } }); if (!user) { @@ -153,13 +160,16 @@ const login = async (req, res) => { } // generate JWT token - const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { - expiresIn: "1h", - }); + // const token = jwt.sign({ userId: user.id, email: user.email }, JWT_SECRET, { + // expiresIn: "1h", + // }); + + // set authentication cookie + setTokenCookie(res, user); res.status(200).json({ message: "Login successful", - token, + // token, user: { id: user.id, username: user.username, @@ -171,3 +181,83 @@ const login = async (req, res) => { res.status(500).json({ message: "Error logging in", error: error.message }); } }; + +// get current authenticated user +const getCurrentUser = async (req, res) => { + try { + // user already loaded by restoreUser middleware + const user = req.user; + + if (!user) { + return res.status(401).json({ + message: "Not authenticated", + }); + } + + res.status(200).json({ + user: { + id: user.id, + username: user.username, + email: user.email, + created_at: user.created_at, + updated_at: user.updated_at, + }, + }); + } catch (error) { + console.error("Get current user error:", error); + res.status(500).json({ + message: "Error fetching user", + error: error.message, + }); + } + + // try { + // const userId = req.userId; + // const user = await User.findByPk(userId, { + // attributes: [ + // "id", + // "username", + // "email", + // "created_at", + // "orcid_id", + // "google_id", + // "github_id", + // ], + // }); + // if (!user) { + // return res.status(404).json({ + // message: "User not found", + // }); + // } + // res.status(200).json({ user }); + // } catch (error) { + // console.error("Get current user error:", error); + // res + // .status(500) + // .json({ message: "Error fetching user", error: error.message }); + // } +}; + +// logout user +const logout = async (req, res) => { + try { + // clear the authentication cookie + res.clearCookie("token"); + res.status(200).json({ + message: "Logged out successfully", + }); + } catch (error) { + console.error("Logout error:", error); + res.status(500).json({ + message: "Error logging out", + error: error.message, + }); + } +}; + +module.exports = { + register, + login, + getCurrentUser, + logout, +}; diff --git a/backend/src/middleware/auth.middleware.js b/backend/src/middleware/auth.middleware.js index e69de29..3f00fc5 100644 --- a/backend/src/middleware/auth.middleware.js +++ b/backend/src/middleware/auth.middleware.js @@ -0,0 +1,141 @@ +const jwt = require("jsonwebtoken"); +const { User } = require("../models"); + +const JWT_SECRET = process.env.JWT_SECRET; +const JWT_EXPIRES_IN = process.env.JWT_EXPIRES_IN || "3600"; + +const setTokenCookie = (res, user) => { + // create safe user object for token + const safeUser = { + id: user.id, + email: user.email, + username: user.username, + }; + + // sign JWT token + const token = jwt.sign({ data: safeUser }, JWT_SECRET, { + expiresIn: parseInt(JWT_EXPIRES_IN), + }); + + const isProduction = process.env.NODE_ENV === "production"; + + //set token in HttpOnly cookie + res.cookie("token", token, { + maxAge: JWT_EXPIRES_IN * 1000, // Convert to milliseconds + httpOnly: true, // Cookie cannot be accessed by client-side JavaScript + secure: isProduction, // cookie only sent over HTTPS in production + sameSite: isProduction ? "Lax" : "Lax", // CSRF protection + }); + + return token; +}; + +// restore user from JWT cookie on every request +const restoreUser = (req, res, next) => { + // get token from cookies + const { token } = req.cookies; + + // initialize user as null + req.user = null; + + // if no token, continue without user + if (!token) { + return next(); + } + + // verify and decode token + return jwt.verify(token, JWT_SECRET, null, async (error, jwtPayload) => { + if (error) { + res.clearCookie("token"); + return next(); + } + + try { + // extract user id from token payload + const { id } = jwtPayload.data; + + //load user from database + req.user = await User.findByPk(id, { + attributes: { + include: ["id", "username", "email", "created_at", "updated_at"], + exclude: ["hashed_password"], // Never send password + }, + }); + } catch (error) { + res.clearCookie("token"); + return next(); + } + + if (!req.user) { + res.clearCookie("token"); + } + + return next(); + }); +}; + +// require authentication - user must be logged in +const requireAuth = (req, res, next) => { + // check if user exists + if (req.user) { + return next(); + } + + // user not authenticated + return res.status(401).json({ + message: "Authentication required", + }); +}; + +// const authenticateToken = (req, res, next) => { +// try { +// // Get token from header +// const authHeader = req.headers.authorization; + +// if (!authHeader) { +// return res.status(401).json({ +// message: "No authorization token provided", +// }); +// } + +// // Token format: "Bearer " +// const token = authHeader.split(" ")[1]; + +// if (!token) { +// return res.status(401).json({ +// message: "Invalid token format", +// }); +// } + +// // Verify token +// const decoded = jwt.verify(token, JWT_SECRET); + +// // Add userId to request object +// req.userId = decoded.userId; +// req.userEmail = decoded.email; + +// next(); // Continue to the route handler +// } catch (error) { +// if (error.name === "TokenExpiredError") { +// return res.status(401).json({ +// message: "Token has expired", +// }); +// } +// if (error.name === "JsonWebTokenError") { +// return res.status(401).json({ +// message: "Invalid token", +// }); +// } +// return res.status(401).json({ +// message: "Authentication failed", +// }); +// } +// }; + +// module.exports = { authenticateToken }; + +module.exports = { + setTokenCookie, + restoreUser, + requireAuth, +}; diff --git a/backend/src/routes/auth.routes.js b/backend/src/routes/auth.routes.js index afe09fa..05b40a6 100644 --- a/backend/src/routes/auth.routes.js +++ b/backend/src/routes/auth.routes.js @@ -1 +1,18 @@ const express = require("express"); +const { + register, + login, + getCurrentUser, + logout, +} = require("../controllers/auth.controller"); +// const { authenticateToken } = require("../middleware/auth.middleware"); +const { requireAuth } = require("../middleware/auth.middleware"); + +const router = express.Router(); + +router.post("/register", register); +router.post("/login", login); +router.get("/me", requireAuth, getCurrentUser); +router.post("/logout", requireAuth, logout); + +module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index b25680e..6735574 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -1,9 +1,11 @@ const express = require("express"); const cors = require("cors"); +const cookieParser = require("cookie-parser"); require("dotenv").config(); const { connectDatabase, sequelize } = require("./config/database"); +const { restoreUser } = require("./middleware/auth.middleware"); -// const authRoutes = require('./routes/auth.routes'); +const authRoutes = require("./routes/auth.routes"); // const datasetRoutes = require('./routes/dataset.routes'); const app = express(); @@ -18,9 +20,13 @@ app.use( ); app.use(express.json()); app.use(express.urlencoded({ extended: true })); +app.use(cookieParser()); // parse cookies + +// restore user on every request +app.use(restoreUser); // Routes -// app.use('/api/auth', authRoutes); +app.use("/api/auth", authRoutes); // app.use('/api/datasets', datasetRoutes); // health check endpoint From a35b749ad6aca5f8e52361d6d05b136cd0b10084 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 31 Oct 2025 16:14:11 -0400 Subject: [PATCH 13/46] add create dataset and like a dataset functions --- backend/src/controllers/dataset.controller.js | 58 +++++++++++++++++++ backend/src/models/Dataset.js | 4 +- backend/src/models/User.js | 16 ++++- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index e69de29..0ee8225 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -0,0 +1,58 @@ +const { + Dataset, + DatasetLike, + SavedDataset, + Comment, + ViewHistory, +} = require("../models"); +const COUCHDB_BASE_URL = + process.env.COUCHDB_BASE_URL || "https://neurojson.org/io"; + +// get or create dataset in SQL database +const getOrCreateDataset = async (couch_db, ds_id) => { + let dataset = await Dataset.findOne({ + where: { couch_db, ds_id }, + }); + + if (!dataset) { + dataset = await Dataset.create({ + couch_db, + ds_id, + views_count: 0, + }); + } + + return dataset; +}; + +// like a dataset +const likeDataset = async (req, res) => { + try { + const user = req.user; + const { couch_db, ds_id } = req.body; + const dataset = await getOrCreateDataset(couch_db, ds_id); + + // check if already liked + const existingLike = await DatasetLike.findOne({ + where: { user_id: user.id, dataset_id: dataset.id }, + }); + + if (existingLike) { + return res.status(400).json({ + message: "Dataset already liked", + }); + } + + await DatasetLike.create({ + user_id: user.id, + dataset_id: dataset.id, + }); + + res.status(201).json({ message: "Dataset liked successfully" }); + } catch (error) { + console.error("Like dataset error:", error); + res + .status(500) + .json({ message: "Error liking dataset", error: error.message }); + } +}; diff --git a/backend/src/models/Dataset.js b/backend/src/models/Dataset.js index 86411f2..b3679a5 100644 --- a/backend/src/models/Dataset.js +++ b/backend/src/models/Dataset.js @@ -11,11 +11,11 @@ Dataset.init( primaryKey: true, }, couch_db: { - type: DataTypes.TEXT, + type: DataTypes.STRING(255), allowNull: false, }, ds_id: { - type: DataTypes.TEXT, + type: DataTypes.STRING(255), allowNull: false, }, views_count: { diff --git a/backend/src/models/User.js b/backend/src/models/User.js index a3e19cd..a79431d 100644 --- a/backend/src/models/User.js +++ b/backend/src/models/User.js @@ -21,7 +21,17 @@ User.init( primaryKey: true, }, orcid_id: { - type: DataTypes.TEXT, + type: DataTypes.STRING(255), + allowNull: true, + unique: true, + }, + google_id: { + type: DataTypes.STRING(255), + allowNull: true, + unique: true, + }, + github_id: { + type: DataTypes.STRING(255), allowNull: true, unique: true, }, @@ -32,10 +42,10 @@ User.init( }, hashed_password: { type: DataTypes.STRING(255), - allowNull: false, + allowNull: true, }, email: { - type: DataTypes.TEXT, + type: DataTypes.STRING(255), allowNull: false, unique: true, validate: { From e5c4b8d2aed5544022ba8abe803aefe755324b9d Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 31 Oct 2025 16:27:17 -0400 Subject: [PATCH 14/46] add unlike a dataset and save a dataset functions --- backend/src/controllers/dataset.controller.js | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 0ee8225..2203903 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -1,3 +1,4 @@ +const { dataURItoBlob } = require("@rjsf/utils"); const { Dataset, DatasetLike, @@ -56,3 +57,65 @@ const likeDataset = async (req, res) => { .json({ message: "Error liking dataset", error: error.message }); } }; + +// unlike a dataset +const unlikeDataset = async (req, res) => { + try { + const user = req.user; + const { couch_db, ds_id } = req.body; + + const dataset = await Dataset.findOne({ + where: { couch_db, ds_id }, + }); + if (!dataset) { + return res.status(404).json({ message: "Dataset not found" }); + } + + const deleted = await DatasetLike.destroy({ + where: { user_id: user.id, dataset_id: dataset.id }, + }); + if (deleted === 0) { + return res.status(404).json({ message: "Like not found" }); + } + + res.status(200).json({ + message: "Dataset unliked successfully", + }); + } catch (error) { + console.error("Unlike dataset error:", error); + res + .status(500) + .json({ message: "Error unliking dataset", error: error.message }); + } +}; + +// save a dataset(bookmark) +const saveDataset = async (res, req) => { + try { + const user = req.user; + const { couch_db, ds_id } = req.body; + + const dataset = await getOrCreateDataset(couch_db, ds_id); + const existingSave = await SavedDataset.findOne({ + where: { + user_id: user.id, + dataset_id: dataset.id, + }, + }); + + if (existingSave) { + return res.status(400).json({ message: "Dataset already saved" }); + } + + await SavedDataset.create({ + user_id: user.id, + dataset_id: dataset.id, + }); + res.status(200).json({ message: "Dataset saved successfully" }); + } catch (error) { + console.error("Save dataset error:", error); + res + .status(500) + .json({ message: "Error saving dataset", error: error.message }); + } +}; From 436b7aef9d8b9e163ef10e6c3b0b23976b8cfe5d Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Fri, 31 Oct 2025 16:59:52 -0400 Subject: [PATCH 15/46] add unsave a dataset function --- backend/src/controllers/dataset.controller.js | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 2203903..43e4178 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -119,3 +119,40 @@ const saveDataset = async (res, req) => { .json({ message: "Error saving dataset", error: error.message }); } }; + +// unsave a dataset +const unsaveDataset = async (req, res) => { + try { + const user = req.user; + const { couch_db, ds_id } = req.body; + + const dataset = await Dataset.findOne({ + where: { + couch_db, + ds_id, + }, + }); + + if (!dataset) { + return res.status(404).json({ message: "Dataset not found" }); + } + + const deleted = await SavedDataset.destroy({ + where: { + user_id: user.id, + dataset_id: dataset.id, + }, + }); + + if (deleted === 0) { + return res.status(404).json({ message: "Saved dataset not found" }); + } + + res.status(200).json({ message: "Dataset unsaved successfully" }); + } catch (error) { + console.error("Unsave dataset error:", error); + res + .status(500) + .json({ message: "Error unsaving dataset", error: error.message }); + } +}; From 07370575760f3f816be0563c252e61cf841ba90d Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 3 Nov 2025 14:32:21 -0500 Subject: [PATCH 16/46] add addcomment to a dataset function --- backend/src/controllers/dataset.controller.js | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 43e4178..edb276c 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -1,4 +1,3 @@ -const { dataURItoBlob } = require("@rjsf/utils"); const { Dataset, DatasetLike, @@ -156,3 +155,25 @@ const unsaveDataset = async (req, res) => { .json({ message: "Error unsaving dataset", error: error.message }); } }; + +// add a comment to a dataset +const addComment = async (req, res) => { + try { + const user = req.user; + const { couch_db, ds_id, body } = req.body; + + const dataset = await getOrCreateDataset(couch_db, ds_id); + + const comment = await Comment.create({ + user_id: user.id, + dataset_id: dataset.id, + body, + }); + res.status(201).json({ message: "Comment added successfully", comment }); + } catch (error) { + console.error("Add comment error:", error); + res + .status(500) + .json({ message: "Error adding comment", error: error.message }); + } +}; From cda5cebdc403f3f304b6da1cd20bc323c632e91a Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 3 Nov 2025 14:43:12 -0500 Subject: [PATCH 17/46] add getComments function --- backend/src/controllers/dataset.controller.js | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index edb276c..da25069 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -1,3 +1,4 @@ +const { data } = require("jquery"); const { Dataset, DatasetLike, @@ -177,3 +178,31 @@ const addComment = async (req, res) => { .json({ message: "Error adding comment", error: error.message }); } }; + +// get comments for a dataset +const getComments = async (req, res) => { + try { + const { couch_db, ds_id } = req.query; + const dataset = await Dataset.findOne({ + where: { + couch_db, + ds_id, + }, + }); + + if (!dataset) { + return res.status(200).json({ comments: [] }); + } + + const comments = await Comment.findAll({ + where: { dataset_id: dataset.id }, + order: [["created_at", "DESC"]], + }); + res.status(200).json({ comments }); + } catch (error) { + console.error("Get comments error:", error); + res + .status(500) + .json({ message: "Error fetching comments", error: error.message }); + } +}; From 947cbb98d130059763774749ca86de79a5a25bb9 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 3 Nov 2025 14:55:40 -0500 Subject: [PATCH 18/46] add deleteComment function --- backend/src/controllers/dataset.controller.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index da25069..3129888 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -206,3 +206,36 @@ const getComments = async (req, res) => { .json({ message: "Error fetching comments", error: error.message }); } }; + +// delete a comment +const deleteComment = async (req, res) => { + try { + const user = req.user; + const { commentId } = req.params; // get comment id from url + + const comment = await Comment.findByPk(commentId); + if (!comment) { + return res.status(404).json({ + message: "Comment not found", + }); + } + + if (comment.user_id !== user.id) { + return res.status(403).json({ + message: "You can only delete your own comments", + }); + } + + // delete the comment + await comment.destroy(); + res.status(200).json({ + message: "Comment deleted successfully", + }); + } catch (error) { + console.error("Delete comment error:", error); + res.status(500).json({ + message: "Error deleting comment", + error: error.message, + }); + } +}; From ae287746d5c6d6ac26ab1e472e68350dc12a83fe Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 3 Nov 2025 15:05:19 -0500 Subject: [PATCH 19/46] add updateComment function --- backend/src/controllers/dataset.controller.js | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 3129888..699fca7 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -239,3 +239,55 @@ const deleteComment = async (req, res) => { }); } }; + +// update a comment +const updateComment = async (req, res) => { + try { + const user = req.user; + const { commentId } = req.params; + const { body } = req.body; + // validate - body is required + if (!body || body.trim() === "") { + return res.status(400).json({ + message: "Comment body is required", + }); + } + + // find the comment + const comment = await Comment.findByPk(commentId); + if (!comment) { + return res.status(404).json({ + message: "Comment not found", + }); + } + + // check if user is the owner of the comment + if (comment.user_id !== user.id) { + return res.status(403).json({ + message: "You can only update your own comments", + }); + } + + // update the comment + comment.body = body; + await comment.save(); + + res.status(200).json({ + message: "Comment updated successfully", + comment: { + id: comment.id, + body: comment.body, + user_id: comment.user_id, + dataset_id: comment.dataset_id, + created_at: comment.created_at, + updated_at: comment.updated_at, + }, + }); + } catch (error) { + console.error("Update comment error:", error); + res.status(500).json({ + message: "Error updating comment", + error: error.message, + }); + } +}; From 7c5b6e0b2fdc7ba000aa63faf2c8e93aa5ed4f34 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 3 Nov 2025 16:53:16 -0500 Subject: [PATCH 20/46] add getUserSavedDatasets and trackView functions --- backend/src/controllers/dataset.controller.js | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 699fca7..09e6c3d 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -1,10 +1,10 @@ -const { data } = require("jquery"); const { Dataset, DatasetLike, SavedDataset, Comment, ViewHistory, + SavedDataset, } = require("../models"); const COUCHDB_BASE_URL = process.env.COUCHDB_BASE_URL || "https://neurojson.org/io"; @@ -120,6 +120,23 @@ const saveDataset = async (res, req) => { } }; +// get user's saved datasets +const getUserSavedDatasets = async (req, res) => { + try { + const user = req.user; + const savedDataset = await SavedDataset.findAll({ + where: {user_id: user.id}, + include: [{model: Dataset, as : "Dataset"}], + order:[["created_at", "DESC"]] + }); + res.status(200).json({savedDataset}) + + } catch(error) { + console.error('Get saved datasets error:', error); + res.status(500).json({ message: 'Error fetching saved datasets', error: error.message }); + } +} + // unsave a dataset const unsaveDataset = async (req, res) => { try { @@ -157,6 +174,8 @@ const unsaveDataset = async (req, res) => { } }; + + // add a comment to a dataset const addComment = async (req, res) => { try { @@ -291,3 +310,42 @@ const updateComment = async (req, res) => { }); } }; + +// track view +const trackView = async (req, res) => { + try { + const user = req.user; + const { couch_db, ds_id } = req.body; + const dataset = await getOrCreateDataset(couch_db, ds_id); + // Increment view count + dataset.views_count = (dataset.views_count || 0) + 1; + await dataset.save(); + + // track user view history + await ViewHistory.create({ + user_id: user.id, + dataset_id: dataset.id, + }); + + res.status(200).json({ message: "View tracked successfully" }); + } catch (error) { + console.error("Track view error:", error); + res.status(500).json({ + message: "Error tracking view", + error: error.message, + }); + } +}; + +module.exports = { + likeDataset, + unlikeDataset, + saveDataset, + getUserSavedDatasets, + unsaveDataset, + addComment, + getComments, + deleteComment, + updateComment, + trackView, +} From 4ed1fcd3071e1fb60cd6add704270b4a5d07a4fe Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Tue, 4 Nov 2025 14:00:14 -0500 Subject: [PATCH 21/46] add datasets route and endpoints --- backend/src/controllers/dataset.controller.js | 54 +++++++++---------- backend/src/routes/dataset.routes.js | 40 ++++++++++++++ backend/src/server.js | 4 +- 3 files changed, 68 insertions(+), 30 deletions(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 09e6c3d..69d40fb 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -4,7 +4,6 @@ const { SavedDataset, Comment, ViewHistory, - SavedDataset, } = require("../models"); const COUCHDB_BASE_URL = process.env.COUCHDB_BASE_URL || "https://neurojson.org/io"; @@ -122,20 +121,21 @@ const saveDataset = async (res, req) => { // get user's saved datasets const getUserSavedDatasets = async (req, res) => { - try { - const user = req.user; - const savedDataset = await SavedDataset.findAll({ - where: {user_id: user.id}, - include: [{model: Dataset, as : "Dataset"}], - order:[["created_at", "DESC"]] - }); - res.status(200).json({savedDataset}) - - } catch(error) { - console.error('Get saved datasets error:', error); - res.status(500).json({ message: 'Error fetching saved datasets', error: error.message }); - } -} + try { + const user = req.user; + const savedDataset = await SavedDataset.findAll({ + where: { user_id: user.id }, + include: [{ model: Dataset, as: "Dataset" }], + order: [["created_at", "DESC"]], + }); + res.status(200).json({ savedDataset }); + } catch (error) { + console.error("Get saved datasets error:", error); + res + .status(500) + .json({ message: "Error fetching saved datasets", error: error.message }); + } +}; // unsave a dataset const unsaveDataset = async (req, res) => { @@ -174,8 +174,6 @@ const unsaveDataset = async (req, res) => { } }; - - // add a comment to a dataset const addComment = async (req, res) => { try { @@ -338,14 +336,14 @@ const trackView = async (req, res) => { }; module.exports = { - likeDataset, - unlikeDataset, - saveDataset, - getUserSavedDatasets, - unsaveDataset, - addComment, - getComments, - deleteComment, - updateComment, - trackView, -} + likeDataset, + unlikeDataset, + saveDataset, + getUserSavedDatasets, + unsaveDataset, + addComment, + getComments, + deleteComment, + updateComment, + trackView, +}; diff --git a/backend/src/routes/dataset.routes.js b/backend/src/routes/dataset.routes.js index e69de29..2095812 100644 --- a/backend/src/routes/dataset.routes.js +++ b/backend/src/routes/dataset.routes.js @@ -0,0 +1,40 @@ +const express = require("express"); +const { + likeDataset, + unlikeDataset, + saveDataset, + unsaveDataset, + addComment, + getComments, + deleteComment, + updateComment, + trackView, + getUserSavedDatasets, +} = require("../controllers/dataset.controller"); + +const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); + +const router = express.Router(); + +// Apply restoreUser to all routes +router.use(restoreUser); + +// Like/Unlike routes (require authentication) +router.post("/like", requireAuth, likeDataset); +router.delete("/unlike", requireAuth, unlikeDataset); + +// Save/Unsave routes (require authentication) +router.post("/save", requireAuth, saveDataset); +router.delete("/unsave", requireAuth, unsaveDataset); +router.get("/saved", requireAuth, getUserSavedDatasets); + +// Comment routes +router.post("/comment", requireAuth, addComment); +router.get("/comments", getComments); // Public - no auth required +router.put("/comment/:commentId", requireAuth, updateComment); +router.delete("/comment/:commentId", requireAuth, deleteComment); + +// View tracking (require authentication) +router.post("/view", requireAuth, trackView); + +module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index 6735574..be6a4db 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -6,7 +6,7 @@ const { connectDatabase, sequelize } = require("./config/database"); const { restoreUser } = require("./middleware/auth.middleware"); const authRoutes = require("./routes/auth.routes"); -// const datasetRoutes = require('./routes/dataset.routes'); +const datasetRoutes = require("./routes/dataset.routes"); const app = express(); const PORT = process.env.PORT || 5000; @@ -27,7 +27,7 @@ app.use(restoreUser); // Routes app.use("/api/auth", authRoutes); -// app.use('/api/datasets', datasetRoutes); +app.use("/api/datasets", datasetRoutes); // health check endpoint // app.get("/api/health", (req, res) => { From 482cca68ec4b6693c1da6b1e07559c2628069689 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Tue, 4 Nov 2025 15:03:43 -0500 Subject: [PATCH 22/46] modify trackView function to check if the dataset has been viewed before create a new record --- backend/src/controllers/dataset.controller.js | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 69d40fb..4f15b60 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -89,7 +89,7 @@ const unlikeDataset = async (req, res) => { }; // save a dataset(bookmark) -const saveDataset = async (res, req) => { +const saveDataset = async (req, res) => { try { const user = req.user; const { couch_db, ds_id } = req.body; @@ -319,13 +319,31 @@ const trackView = async (req, res) => { dataset.views_count = (dataset.views_count || 0) + 1; await dataset.save(); - // track user view history - await ViewHistory.create({ - user_id: user.id, - dataset_id: dataset.id, + // check if user has viewed this dataset before + const existingView = await ViewHistory.findOne({ + where: { + user_id: user.id, + dataset_id: dataset.id, + }, }); - res.status(200).json({ message: "View tracked successfully" }); + if (existingView) { + existingView.viewed_at = new Date(); + await existingView.save(); + } else { + await ViewHistory.create({ + user_id: user.id, + dataset_id: dataset.id, + }); + } + + res + .status(200) + .json({ + message: "View tracked successfully", + viewCount: dataset.views_count, + isNewView: !existingView, + }); } catch (error) { console.error("Track view error:", error); res.status(500).json({ From a6da1b38f8fe3f8851ac63bf8db80667485496c4 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Tue, 4 Nov 2025 15:24:01 -0500 Subject: [PATCH 23/46] add recently viewed endpoint --- backend/src/controllers/dataset.controller.js | 52 ++++++++++++++++--- backend/src/routes/dataset.routes.js | 2 + 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index 4f15b60..d7cc595 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -337,13 +337,11 @@ const trackView = async (req, res) => { }); } - res - .status(200) - .json({ - message: "View tracked successfully", - viewCount: dataset.views_count, - isNewView: !existingView, - }); + res.status(200).json({ + message: "View tracked successfully", + viewCount: dataset.views_count, + isNewView: !existingView, + }); } catch (error) { console.error("Track view error:", error); res.status(500).json({ @@ -353,6 +351,45 @@ const trackView = async (req, res) => { } }; +// get user's recently viewed datasets +const getRecentlyViewed = async (req, res) => { + try { + const user = req.user; + const limit = parseInt(req.query.limit) || 6; + + const recentViews = await ViewHistory.findAll({ + where: { user_id: user.id }, + include: [ + { + model: Dataset, + attributes: ["id", "couch_db", "ds_id", "views_count"], + }, + ], + order: [["viewed_at", "DESC"]], + limit: limit, + }); + + // map to cleaner format + const datasets = recentViews.map((view) => ({ + couch_db: view.Dataset.couch_db, + ds_id: view.Dataset.ds_id, + views_count: view.Dataset.views_count, + last_viewed: view.viewed_at, + })); + + res.status(200).json({ + recentlyViewed: datasets, + datasetsCount: datasets.length, + }); + } catch (error) { + console.error("Get recently viewed error:", error); + res.status(500).json({ + message: "Error fetching recently viewed datasets", + error: error.message, + }); + } +}; + module.exports = { likeDataset, unlikeDataset, @@ -364,4 +401,5 @@ module.exports = { deleteComment, updateComment, trackView, + getRecentlyViewed, }; diff --git a/backend/src/routes/dataset.routes.js b/backend/src/routes/dataset.routes.js index 2095812..1b0149b 100644 --- a/backend/src/routes/dataset.routes.js +++ b/backend/src/routes/dataset.routes.js @@ -10,6 +10,7 @@ const { updateComment, trackView, getUserSavedDatasets, + getRecentlyViewed, } = require("../controllers/dataset.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); @@ -36,5 +37,6 @@ router.delete("/comment/:commentId", requireAuth, deleteComment); // View tracking (require authentication) router.post("/view", requireAuth, trackView); +router.get("/recently-viewed", requireAuth, getRecentlyViewed); module.exports = router; From 49cfb7eca16d5c5e0a3dd307929136106d1897b1 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Tue, 4 Nov 2025 15:30:54 -0500 Subject: [PATCH 24/46] add get most viewed datasets endpoint --- backend/src/controllers/dataset.controller.js | 24 +++++++++++++++++++ backend/src/routes/dataset.routes.js | 2 ++ 2 files changed, 26 insertions(+) diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/dataset.controller.js index d7cc595..7dcc96f 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/dataset.controller.js @@ -390,6 +390,29 @@ const getRecentlyViewed = async (req, res) => { } }; +// get most viewd datasets +const getMostViewed = async (req, res) => { + try { + const limit = parseInt(req.query.limit) || 10; + const topDatasets = await Dataset.findAll({ + order: [["views_count", "DESC"]], + limit: limit, + attributes: ["id", "couch_db", "ds_id", "views_count"], + }); + + res.status(200).json({ + mostViewed: topDatasets, + datasetsCount: topDatasets.length, + }); + } catch (error) { + console.error("Get most viewed error:", error); + res.status(500).json({ + message: "Error fetching most viewed datasets", + error: error.message, + }); + } +}; + module.exports = { likeDataset, unlikeDataset, @@ -402,4 +425,5 @@ module.exports = { updateComment, trackView, getRecentlyViewed, + getMostViewed, }; diff --git a/backend/src/routes/dataset.routes.js b/backend/src/routes/dataset.routes.js index 1b0149b..3c1822e 100644 --- a/backend/src/routes/dataset.routes.js +++ b/backend/src/routes/dataset.routes.js @@ -11,6 +11,7 @@ const { trackView, getUserSavedDatasets, getRecentlyViewed, + getMostViewed, } = require("../controllers/dataset.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); @@ -38,5 +39,6 @@ router.delete("/comment/:commentId", requireAuth, deleteComment); // View tracking (require authentication) router.post("/view", requireAuth, trackView); router.get("/recently-viewed", requireAuth, getRecentlyViewed); +router.get("/most-viewed", getMostViewed); module.exports = router; From b98a2f3473372cdd5e0790d4626649141ea624be Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 5 Nov 2025 15:19:36 -0500 Subject: [PATCH 25/46] add user button on the nav bar --- backend/src/server.js | 9 - src/components/NavBar/NavItems.tsx | 412 +++++++++++++++++------------ src/components/User/UserButton.tsx | 197 ++++++++++++++ src/components/User/UserLogin.tsx | 0 src/components/User/UserSignup.tsx | 0 5 files changed, 433 insertions(+), 185 deletions(-) create mode 100644 src/components/User/UserButton.tsx create mode 100644 src/components/User/UserLogin.tsx create mode 100644 src/components/User/UserSignup.tsx diff --git a/backend/src/server.js b/backend/src/server.js index be6a4db..9250eff 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -30,15 +30,6 @@ app.use("/api/auth", authRoutes); app.use("/api/datasets", datasetRoutes); // health check endpoint -// app.get("/api/health", (req, res) => { -// res.status(200).json({ -// status: "OK", -// message: "server is running", -// environment: process.env.NODE_ENV || "development", -// }); -// }); -// In your routes or server.js - app.get("/api/health", async (req, res) => { try { // Test database connection diff --git a/src/components/NavBar/NavItems.tsx b/src/components/NavBar/NavItems.tsx index 58acd82..c27dbb8 100644 --- a/src/components/NavBar/NavItems.tsx +++ b/src/components/NavBar/NavItems.tsx @@ -1,4 +1,5 @@ import { Toolbar, Grid, Button, Typography, Box, Tooltip } from "@mui/material"; +import UserButton from "components/User/UserButton"; import { Colors } from "design/theme"; import React from "react"; import { useNavigate, Link } from "react-router-dom"; @@ -7,79 +8,104 @@ import RoutesEnum from "types/routes.enum"; const NavItems: React.FC = () => { const navigate = useNavigate(); + // for user test + const isLoggedIn = false; + const userName = "John Doe"; + const handleLogout = () => { + // TODO: Implement your logout logic here + console.log("Logging out..."); + // Example: dispatch(logout()) or authService.logout() + }; + return ( - - + // + // + + - - navigate("/")} + sx={{ + height: { xs: 50, sm: 65, md: 80 }, + width: "auto", + display: { xs: "block", sm: "block", md: "none" }, + }} + > + - - + NeuroJSON.io + + + Free Data Worth Sharing + + + {/* */} + + {/* // */} - {/* Navigation links*/} - + {/* Navigation links*/} + {/* { mb: { xs: 1 }, rowGap: { xs: 1, sm: 2 }, }} - > - {[ - { text: "About", url: RoutesEnum.ABOUT }, - { text: "Wiki", url: "https://neurojson.org/Wiki" }, - { text: "Search", url: RoutesEnum.SEARCH }, - { text: "Databases", url: RoutesEnum.DATABASES }, - { - text: "V1", - url: "https://neurojson.io/v1", - tooltip: "Visit the previous version of website", - }, - ].map(({ text, url, tooltip }) => ( - - {tooltip ? ( - */} + + {[ + { text: "About", url: RoutesEnum.ABOUT }, + { text: "Wiki", url: "https://neurojson.org/Wiki" }, + { text: "Search", url: RoutesEnum.SEARCH }, + { text: "Databases", url: RoutesEnum.DATABASES }, + { + text: "V1", + url: "https://neurojson.io/v1", + tooltip: "Visit the previous version of website", + }, + ].map(({ text, url, tooltip }) => ( + + {tooltip ? ( + + + - - - {text} - - - - ) : url?.startsWith("https") ? ( - - - {text} - - - ) : ( - - - {text} - - - )} - - ))} + {text} + + + + ) : url?.startsWith("https") ? ( + + + {text} + + + ) : ( + + + {text} + + + )} - - + ))} + + + {/* User Button */} + + {/* */} + + {/* */} + {/* */} + {/* */} + {/* */} ); }; diff --git a/src/components/User/UserButton.tsx b/src/components/User/UserButton.tsx new file mode 100644 index 0000000..3438533 --- /dev/null +++ b/src/components/User/UserButton.tsx @@ -0,0 +1,197 @@ +import { + AccountCircle, // Login, + // PersonAdd, + Dashboard, + Settings, + ManageAccounts, // Logout, +} from "@mui/icons-material"; +import { + IconButton, + Menu, + MenuItem, + Divider, + ListItemIcon, + ListItemText, +} from "@mui/material"; +import { alpha } from "@mui/material/styles"; +import { Colors } from "design/theme"; +import React, { useState } from "react"; +import { useNavigate } from "react-router-dom"; +import RoutesEnum from "types/routes.enum"; + +interface UserButtonProps { + isLoggedIn: boolean; + userName?: string; + onLogout?: () => void; +} + +const UserButton: React.FC = ({ + isLoggedIn, + userName, + onLogout, +}) => { + const [anchorEl, setAnchorEl] = useState(null); + const navigate = useNavigate(); + const open = Boolean(anchorEl); + + const handleClick = (event: React.MouseEvent) => { + setAnchorEl(event.currentTarget); + }; + + const handleClose = () => { + setAnchorEl(null); + }; + + return ( + <> + + + + + + {!isLoggedIn ? ( + <> + handleMenuItemClick(RoutesEnum.LOGIN)} + > + {/* + + */} + Sign In + + + handleMenuItemClick(RoutesEnum.SIGNUP)} + > + {/* + + */} + Create Account + + + ) : ( + // menu for lonin user + <> + {userName && ( + <> + + + + + + )} + handleMenuItemClick(RoutesEnum.DASHBOARD)} + > + + + + Dashboard + + + handleMenuItemClick(RoutesEnum.SETTINGS)} + > + + + + Settings + + + handleMenuItemClick(RoutesEnum.USER_MANAGEMENT)} + > + + + + User Management + + + + + + {/* + + */} + Logout + + + )} + + + ); +}; + +export default UserButton; diff --git a/src/components/User/UserLogin.tsx b/src/components/User/UserLogin.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/User/UserSignup.tsx b/src/components/User/UserSignup.tsx new file mode 100644 index 0000000..e69de29 From 83bbe3d34c47469e450759e8d36fc40010f69961 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 15:22:43 -0500 Subject: [PATCH 26/46] add users routes --- backend/package-lock.json | 132 ++++++++++++++++++ backend/package.json | 1 + backend/src/controllers/couchdb.controller.js | 29 ++++ backend/src/routes/activities.routes.js | 0 backend/src/routes/couchdb.routes.js | 9 ++ backend/src/routes/dbs.routes.js | 0 backend/src/routes/users.routes.js | 22 +++ backend/src/server.js | 2 + 8 files changed, 195 insertions(+) create mode 100644 backend/src/controllers/couchdb.controller.js create mode 100644 backend/src/routes/activities.routes.js create mode 100644 backend/src/routes/couchdb.routes.js create mode 100644 backend/src/routes/dbs.routes.js create mode 100644 backend/src/routes/users.routes.js diff --git a/backend/package-lock.json b/backend/package-lock.json index 03858db..4989a14 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "axios": "^1.13.2", "bcrypt": "^6.0.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", @@ -341,6 +342,12 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "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/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -351,6 +358,17 @@ "node": ">= 4.0.0" } }, + "node_modules/axios": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz", + "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -669,6 +687,18 @@ "color-support": "bin.js" } }, + "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", @@ -831,6 +861,15 @@ "node": ">=4.0.0" } }, + "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/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -1037,6 +1076,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/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -1149,6 +1203,26 @@ "node": ">= 0.8" } }, + "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", @@ -1179,6 +1253,43 @@ "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/form-data/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/form-data/node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -1412,6 +1523,21 @@ "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/has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -2736,6 +2862,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/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", diff --git a/backend/package.json b/backend/package.json index 0fb585f..ea0dca2 100644 --- a/backend/package.json +++ b/backend/package.json @@ -22,6 +22,7 @@ "license": "ISC", "description": "", "dependencies": { + "axios": "^1.13.2", "bcrypt": "^6.0.0", "cookie-parser": "^1.4.7", "cors": "^2.8.5", diff --git a/backend/src/controllers/couchdb.controller.js b/backend/src/controllers/couchdb.controller.js new file mode 100644 index 0000000..2d401b9 --- /dev/null +++ b/backend/src/controllers/couchdb.controller.js @@ -0,0 +1,29 @@ +const axios = require("axios"); +const COUCHDB_BASE_URL = + process.env.COUCHDB_BASE_URL || + "https://cors.redoc.ly/https://neurojson.io:7777"; + +// get registry +const getRegistry = async (req, res) => { + try { + console.log("hit the route"); + const response = await axios.get(`${COUCHDB_BASE_URL}/sys/registry`, { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + }); + console.log("have response"); + res.status(200).json(response.data); + } catch (error) { + console.error("Error fetching registry:", error.message); + res.status(error.response?.status || 500).json({ + message: "Error fetching registry", + error: error.message, + }); + } +}; + +module.exports = { + getRegistry, +}; diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/routes/couchdb.routes.js b/backend/src/routes/couchdb.routes.js new file mode 100644 index 0000000..156a2e2 --- /dev/null +++ b/backend/src/routes/couchdb.routes.js @@ -0,0 +1,9 @@ +const express = require("express"); + +const { getRegistry } = require("../controllers/couchdb.controller"); + +const router = express.Router(); + +router.get("/registry", getRegistry); + +module.exports = router; diff --git a/backend/src/routes/dbs.routes.js b/backend/src/routes/dbs.routes.js new file mode 100644 index 0000000..e69de29 diff --git a/backend/src/routes/users.routes.js b/backend/src/routes/users.routes.js new file mode 100644 index 0000000..282e56d --- /dev/null +++ b/backend/src/routes/users.routes.js @@ -0,0 +1,22 @@ +const express = require("express"); +const { + getUserSavedDatasets, + getUserLikedDatasets, + getUserComments, + getUserRecentlyViewed, +} = require("../controllers/dataset.controller"); +const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); + +const router = express.Router(); + +// Apply authentication middleware to all user routes +router.use(restoreUser); +router.use(requireAuth); + +// User collections +router.get("/me/saved-datasets", getUserSavedDatasets); +router.get("/me/liked-datasets", getUserLikedDatasets); +router.get("/me/comments", getUserComments); +router.get("/me/recently-viewed", getUserRecentlyViewed); + +module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index 9250eff..6204dd0 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -7,6 +7,7 @@ const { restoreUser } = require("./middleware/auth.middleware"); const authRoutes = require("./routes/auth.routes"); const datasetRoutes = require("./routes/dataset.routes"); +const couchdbRoutes = require("./routes/couchdb.routes"); const app = express(); const PORT = process.env.PORT || 5000; @@ -28,6 +29,7 @@ app.use(restoreUser); // Routes app.use("/api/auth", authRoutes); app.use("/api/datasets", datasetRoutes); +app.use("/api/couchdb", couchdbRoutes); // health check endpoint app.get("/api/health", async (req, res) => { From 6e5aa8cb6f01d068fbd58ca7aa1b999b2e7b8191 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 15:26:57 -0500 Subject: [PATCH 27/46] add dbs routes --- backend/src/routes/dbs.routes.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/backend/src/routes/dbs.routes.js b/backend/src/routes/dbs.routes.js index e69de29..86611e3 100644 --- a/backend/src/routes/dbs.routes.js +++ b/backend/src/routes/dbs.routes.js @@ -0,0 +1,25 @@ +const express = require("express"); +const { + getDbList, + getDbStats, + getDbInfo, + getDbDatasets, + searchAllDatabases, + searchDatabase, +} = require("../controllers/couchdb.controller"); + +const router = express.Router(); + +// Database list and stats +router.get("/", getDbList); +router.get("/stats", getDbStats); + +// cross dbs search +router.post("/search", searchAllDatabases); + +// Specific database routes +router.get("/:dbName", getDbInfo); +router.get("/:dbName/datasets", getDbDatasets); +router.post("/:dbName/search", searchDatabase); // search within one db + +module.exports = router; From 99cd3be103d461ce34ca34fed2bab8c4af34db5d Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 15:29:04 -0500 Subject: [PATCH 28/46] add datasets routes --- backend/src/routes/datasets.routes.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 backend/src/routes/datasets.routes.js diff --git a/backend/src/routes/datasets.routes.js b/backend/src/routes/datasets.routes.js new file mode 100644 index 0000000..d89a803 --- /dev/null +++ b/backend/src/routes/datasets.routes.js @@ -0,0 +1,13 @@ +const express = require("express"); +const { + getDatasetDetail, + getDatasetMeta, +} = require("../controllers/couchdb.controller"); + +const router = express.Router(); + +// Dataset routes +router.get("/:dbName/:datasetId", getDatasetDetail); +router.get("/:dbName/:datasetId/meta", getDatasetMeta); + +module.exports = router; From c25a1d2867745f9cbb1d8a7c7537508877949d45 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 15:43:34 -0500 Subject: [PATCH 29/46] add activities routes --- backend/src/routes/activities.routes.js | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index e69de29..f9a455b 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -0,0 +1,47 @@ +const express = require("express"); +const { + likeDataset, + unlikeDataset, + saveDataset, + unsaveDataset, + addComment, + getComments, + deleteComment, + updateComment, + trackView, + getMostViewedDatasets, +} = require("../controllers/activity.controller"); +const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); + +const router = express.Router(); + +// Apply restoreUser to all routes +router.use(restoreUser); + +// Like/Unlike routes (require authentication) +router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); +router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); + +// Save/Unsave routes (require authentication) +router.post("/datasets/:dbName/:datasetId/save", requireAuth, saveDataset); +router.delete("/datasets/:dbName/:datasetId/save", requireAuth, unsaveDataset); + +// Comment routes +router.post("/datasets/:dbName/:datasetId/comments", requireAuth, addComment); +router.get("/datasets/:dbName/:datasetId/comments", getComments); // Public +router.put( + "/datasets/:dbName/:datasetId/comments/:commentId", + requireAuth, + updateComment +); +router.delete( + "/datasets/:dbName/:datasetId/comments/:commentId", + requireAuth, + deleteComment +); + +// View tracking +router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); +router.get("/datasets/most-viewed", getMostViewedDatasets); // Public + +module.exports = router; From c83cb0faeb8fb3d59e6003524b256f5c60e374df Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 16:03:23 -0500 Subject: [PATCH 30/46] add getDbStats and getDbInfo functions --- backend/src/controllers/couchdb.controller.js | 51 ++++++++++++++++--- backend/src/routes/activities.routes.js | 1 + backend/src/routes/auth.routes.js | 1 + backend/src/routes/datasets.routes.js | 1 + backend/src/routes/dbs.routes.js | 1 + backend/src/routes/users.routes.js | 1 + 6 files changed, 49 insertions(+), 7 deletions(-) diff --git a/backend/src/controllers/couchdb.controller.js b/backend/src/controllers/couchdb.controller.js index 2d401b9..d490948 100644 --- a/backend/src/controllers/couchdb.controller.js +++ b/backend/src/controllers/couchdb.controller.js @@ -3,27 +3,64 @@ const COUCHDB_BASE_URL = process.env.COUCHDB_BASE_URL || "https://cors.redoc.ly/https://neurojson.io:7777"; -// get registry -const getRegistry = async (req, res) => { +// get all dbs list (registry) +const getDbList = async (req, res) => { try { - console.log("hit the route"); const response = await axios.get(`${COUCHDB_BASE_URL}/sys/registry`, { headers: { Origin: "https://neurojson.io", "X-Requested-With": "XMLHttpRequest", }, }); - console.log("have response"); res.status(200).json(response.data); } catch (error) { - console.error("Error fetching registry:", error.message); + console.error("Error fetching db list(registry):", error.message); res.status(error.response?.status || 500).json({ - message: "Error fetching registry", + message: "Error fetching db list(registry)", + error: error.message, + }); + } +}; + +// get db stats +const getDbStats = async (req, res) => { + try { + const response = await axios.get( + "https://neurojson.org/io/search.cgi?dbstats=1" + ); + res.status(200).json(response.data); + } catch (error) { + console.error("Error fetching db stats:", error.message); + res.status(error.response?.status || 500).json({ + message: "Error fetching database stats", + error: error.message, + }); + } +}; + +// get database info +const getDbInfo = async (req, res) => { + try { + const { dbName } = req.params; + const response = await axios.get(`${COUCHDB_BASE_URL}/${dbName}`, { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + }); + res.status(200).json(response.data); + } catch (error) { + console.error( + `Error fetching db info for ${req.params.dbName}:`, + error.message + ); + res.status(error.response?.status || 500).json({ + message: "Error fetching database info", error: error.message, }); } }; module.exports = { - getRegistry, + getDbList, }; diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index f9a455b..3e2469b 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -1,3 +1,4 @@ +// request send to postgres const express = require("express"); const { likeDataset, diff --git a/backend/src/routes/auth.routes.js b/backend/src/routes/auth.routes.js index 05b40a6..b251668 100644 --- a/backend/src/routes/auth.routes.js +++ b/backend/src/routes/auth.routes.js @@ -1,3 +1,4 @@ +// request send to postgres const express = require("express"); const { register, diff --git a/backend/src/routes/datasets.routes.js b/backend/src/routes/datasets.routes.js index d89a803..cdaad01 100644 --- a/backend/src/routes/datasets.routes.js +++ b/backend/src/routes/datasets.routes.js @@ -1,3 +1,4 @@ +// request send to couchdb const express = require("express"); const { getDatasetDetail, diff --git a/backend/src/routes/dbs.routes.js b/backend/src/routes/dbs.routes.js index 86611e3..d7dc611 100644 --- a/backend/src/routes/dbs.routes.js +++ b/backend/src/routes/dbs.routes.js @@ -1,3 +1,4 @@ +// request send to couchdb const express = require("express"); const { getDbList, diff --git a/backend/src/routes/users.routes.js b/backend/src/routes/users.routes.js index 282e56d..da819f6 100644 --- a/backend/src/routes/users.routes.js +++ b/backend/src/routes/users.routes.js @@ -1,3 +1,4 @@ +// request send to postgres const express = require("express"); const { getUserSavedDatasets, From 27d7e0924b74f94b974a28ea7b6e2bf8f169cec3 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 17:03:36 -0500 Subject: [PATCH 31/46] add cross database search function --- backend/src/controllers/couchdb.controller.js | 108 ++++++++++++++++++ backend/src/routes/activities.routes.js | 68 +++++------ backend/src/routes/couchdb.routes.js | 4 +- backend/src/routes/datasets.routes.js | 8 +- backend/src/routes/dbs.routes.js | 8 +- backend/src/routes/users.routes.js | 12 +- backend/src/server.js | 18 ++- 7 files changed, 171 insertions(+), 55 deletions(-) diff --git a/backend/src/controllers/couchdb.controller.js b/backend/src/controllers/couchdb.controller.js index d490948..21bd3d4 100644 --- a/backend/src/controllers/couchdb.controller.js +++ b/backend/src/controllers/couchdb.controller.js @@ -38,6 +38,78 @@ const getDbStats = async (req, res) => { } }; +// cross-database search +const searchAllDatabases = async (req, res) => { + try { + const formData = req.body; + const map = { + keyword: "keyword", + age_min: "agemin", + age_max: "agemax", + task_min: "taskmin", + task_max: "taskmax", + run_min: "runmin", + run_max: "runmax", + sess_min: "sessmin", + sess_max: "sessmax", + modality: "modality", + run_name: "run", + type_name: "type", + session_name: "session", + task_name: "task", + limit: "limit", + skip: "skip", + count: "count", + unique: "unique", + gender: "gender", + database: "dbname", + dataset: "dsname", + subject: "subname", + }; + + const params = new URLSearchParams(); + params.append("_get", "dbname, dsname, json"); + + Object.keys(formData).forEach((key) => { + let val = formData[key]; + if (val === "" || val === "any" || val === undefined || val === null) { + return; + } + + const queryKey = map[key]; + if (!queryKey) return; + + if (key.startsWith("age")) { + params.append(queryKey, String(Math.floor(val * 100)).padStart(5, "0")); + } else if (key === "gender") { + params.append(queryKey, val[0]); + } else if (key === "modality") { + params.append(queryKey, val.replace(/.*\(/, "").replace(/\).*/, "")); + } else { + params.append(queryKey, val.toString()); + } + }); + + const queryString = `?${params.toString()}`; + const response = await axios.get( + `https://cors.redoc.ly/https://neurojson.org/io/search.cgi${queryString}`, + { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + } + ); + res.status(200).json(response.data); + } catch (error) { + console.error("Error searching all databases:", error.message); + res.status(error.response?.status || 500).json({ + message: "Error searching databases", + error: error.message, + }); + } +}; + // get database info const getDbInfo = async (req, res) => { try { @@ -61,6 +133,42 @@ const getDbInfo = async (req, res) => { } }; +// get all datasets in a db (paginated) +const getDbDatasets = async (req, res) => { + try { + const { dbName } = req.params; + const { offset = 0, limit = 10 } = req.query; + + const response = await axios.get( + `${COUCHDB_BASE_URL}/${dbName}/_design/qq/_view/dbinfo`, + { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + params: { + limit: parseInt(limit), + skip: parseInt(offset), + }, + } + ); + res.status(200).json(response.data); + } catch (error) { + console.error( + `Error fetching datasets for ${req.params.dbName}:`, + error.message + ); + res.status(error.response?.status || 500).json({ + message: "Error fetching datasets", + error: error.message, + }); + } +}; + module.exports = { getDbList, + getDbStats, + getDbInfo, + getDbDatasets, + searchAllDatabases, }; diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index 3e2469b..210983c 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -1,48 +1,48 @@ // request send to postgres const express = require("express"); const { - likeDataset, - unlikeDataset, - saveDataset, - unsaveDataset, - addComment, - getComments, - deleteComment, - updateComment, - trackView, - getMostViewedDatasets, + // likeDataset, + // unlikeDataset, + // saveDataset, + // unsaveDataset, + // addComment, + // getComments, + // deleteComment, + // updateComment, + // trackView, + // getMostViewedDatasets, } = require("../controllers/activity.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); const router = express.Router(); -// Apply restoreUser to all routes -router.use(restoreUser); +// // Apply restoreUser to all routes +// router.use(restoreUser); -// Like/Unlike routes (require authentication) -router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); -router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); +// // Like/Unlike routes (require authentication) +// router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); +// router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); -// Save/Unsave routes (require authentication) -router.post("/datasets/:dbName/:datasetId/save", requireAuth, saveDataset); -router.delete("/datasets/:dbName/:datasetId/save", requireAuth, unsaveDataset); +// // Save/Unsave routes (require authentication) +// router.post("/datasets/:dbName/:datasetId/save", requireAuth, saveDataset); +// router.delete("/datasets/:dbName/:datasetId/save", requireAuth, unsaveDataset); -// Comment routes -router.post("/datasets/:dbName/:datasetId/comments", requireAuth, addComment); -router.get("/datasets/:dbName/:datasetId/comments", getComments); // Public -router.put( - "/datasets/:dbName/:datasetId/comments/:commentId", - requireAuth, - updateComment -); -router.delete( - "/datasets/:dbName/:datasetId/comments/:commentId", - requireAuth, - deleteComment -); +// // Comment routes +// router.post("/datasets/:dbName/:datasetId/comments", requireAuth, addComment); +// router.get("/datasets/:dbName/:datasetId/comments", getComments); // Public +// router.put( +// "/datasets/:dbName/:datasetId/comments/:commentId", +// requireAuth, +// updateComment +// ); +// router.delete( +// "/datasets/:dbName/:datasetId/comments/:commentId", +// requireAuth, +// deleteComment +// ); -// View tracking -router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); -router.get("/datasets/most-viewed", getMostViewedDatasets); // Public +// // View tracking +// router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); +// router.get("/datasets/most-viewed", getMostViewedDatasets); // Public module.exports = router; diff --git a/backend/src/routes/couchdb.routes.js b/backend/src/routes/couchdb.routes.js index 156a2e2..79648d3 100644 --- a/backend/src/routes/couchdb.routes.js +++ b/backend/src/routes/couchdb.routes.js @@ -1,9 +1,9 @@ const express = require("express"); -const { getRegistry } = require("../controllers/couchdb.controller"); +// const { getRegistry } = require("../controllers/couchdb.controller"); const router = express.Router(); -router.get("/registry", getRegistry); +// router.get("/registry", getRegistry); module.exports = router; diff --git a/backend/src/routes/datasets.routes.js b/backend/src/routes/datasets.routes.js index cdaad01..8d917d5 100644 --- a/backend/src/routes/datasets.routes.js +++ b/backend/src/routes/datasets.routes.js @@ -1,14 +1,14 @@ // request send to couchdb const express = require("express"); const { - getDatasetDetail, - getDatasetMeta, + // getDatasetDetail, + // getDatasetMeta, } = require("../controllers/couchdb.controller"); const router = express.Router(); // Dataset routes -router.get("/:dbName/:datasetId", getDatasetDetail); -router.get("/:dbName/:datasetId/meta", getDatasetMeta); +// router.get("/:dbName/:datasetId", getDatasetDetail); +// router.get("/:dbName/:datasetId/meta", getDatasetMeta); module.exports = router; diff --git a/backend/src/routes/dbs.routes.js b/backend/src/routes/dbs.routes.js index d7dc611..d11f970 100644 --- a/backend/src/routes/dbs.routes.js +++ b/backend/src/routes/dbs.routes.js @@ -6,7 +6,7 @@ const { getDbInfo, getDbDatasets, searchAllDatabases, - searchDatabase, + // searchDatabase, } = require("../controllers/couchdb.controller"); const router = express.Router(); @@ -15,12 +15,12 @@ const router = express.Router(); router.get("/", getDbList); router.get("/stats", getDbStats); -// cross dbs search -router.post("/search", searchAllDatabases); +// cross-database search +router.get("/search", searchAllDatabases); // Specific database routes router.get("/:dbName", getDbInfo); router.get("/:dbName/datasets", getDbDatasets); -router.post("/:dbName/search", searchDatabase); // search within one db +// router.post("/:dbName/search", searchDatabase); // search within one db module.exports = router; diff --git a/backend/src/routes/users.routes.js b/backend/src/routes/users.routes.js index da819f6..ef47073 100644 --- a/backend/src/routes/users.routes.js +++ b/backend/src/routes/users.routes.js @@ -2,9 +2,9 @@ const express = require("express"); const { getUserSavedDatasets, - getUserLikedDatasets, - getUserComments, - getUserRecentlyViewed, + // getUserLikedDatasets, + // getUserComments, + // getUserRecentlyViewed, } = require("../controllers/dataset.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); @@ -16,8 +16,8 @@ router.use(requireAuth); // User collections router.get("/me/saved-datasets", getUserSavedDatasets); -router.get("/me/liked-datasets", getUserLikedDatasets); -router.get("/me/comments", getUserComments); -router.get("/me/recently-viewed", getUserRecentlyViewed); +// router.get("/me/liked-datasets", getUserLikedDatasets); +// router.get("/me/comments", getUserComments); +// router.get("/me/recently-viewed", getUserRecentlyViewed); module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index 6204dd0..716134e 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -6,8 +6,12 @@ const { connectDatabase, sequelize } = require("./config/database"); const { restoreUser } = require("./middleware/auth.middleware"); const authRoutes = require("./routes/auth.routes"); -const datasetRoutes = require("./routes/dataset.routes"); -const couchdbRoutes = require("./routes/couchdb.routes"); +// const userRoutes = require("./routes/users.routes"); +// const activitiesRoutes = require("./routes/activities.routes"); +const dbsRoutes = require("./routes/dbs.routes"); +// const datasetsRoutes = require("./routes/datasets.routes"); +// const datasetRoutes = require("./routes/dataset.routes"); +// const couchdbRoutes = require("./routes/couchdb.routes"); const app = express(); const PORT = process.env.PORT || 5000; @@ -27,9 +31,13 @@ app.use(cookieParser()); // parse cookies app.use(restoreUser); // Routes -app.use("/api/auth", authRoutes); -app.use("/api/datasets", datasetRoutes); -app.use("/api/couchdb", couchdbRoutes); +app.use("/api/v1/auth", authRoutes); +// app.use("/api/v1/users", userRoutes); +// app.use("/api/v1/activities", activitiesRoutes); +app.use("/api/v1/dbs", dbsRoutes); +// app.use("/api/v1/datasets", datasetsRoutes); +// app.use("/api/datasets", datasetRoutes); +// app.use("/api/couchdb", couchdbRoutes); // health check endpoint app.get("/api/health", async (req, res) => { From ffadbca20166563b47a5a7f221d6e9e1cff50c20 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 17:49:02 -0500 Subject: [PATCH 32/46] add get dataset detail function --- backend/src/controllers/couchdb.controller.js | 38 +++++++++++++++++++ backend/src/routes/datasets.routes.js | 4 +- backend/src/server.js | 4 +- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/backend/src/controllers/couchdb.controller.js b/backend/src/controllers/couchdb.controller.js index 21bd3d4..cea8a7b 100644 --- a/backend/src/controllers/couchdb.controller.js +++ b/backend/src/controllers/couchdb.controller.js @@ -165,10 +165,48 @@ const getDbDatasets = async (req, res) => { } }; +// get dataset detail +const getDatasetDetail = async (req, res) => { + try { + const { dbName, datasetId } = req.params; + const { rev } = req.query; + + const params = { + revs_info: true, + }; + + if (rev) { + params.rev = rev; + } + + const response = await axios.get( + `${COUCHDB_BASE_URL}/${dbName}/${datasetId}`, + { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + params, + } + ); + res.status(200).json(response.data); + } catch (error) { + console.error( + `Error fetching dataset ${req.params.datasetId} from ${req.params.dbName}:`, + error.message + ); + res.status(error.response?.status || 500).json({ + message: "Error fetching dataset detail", + error: error.message, + }); + } +}; + module.exports = { getDbList, getDbStats, getDbInfo, getDbDatasets, searchAllDatabases, + getDatasetDetail, }; diff --git a/backend/src/routes/datasets.routes.js b/backend/src/routes/datasets.routes.js index 8d917d5..4dd622d 100644 --- a/backend/src/routes/datasets.routes.js +++ b/backend/src/routes/datasets.routes.js @@ -1,14 +1,14 @@ // request send to couchdb const express = require("express"); const { - // getDatasetDetail, + getDatasetDetail, // getDatasetMeta, } = require("../controllers/couchdb.controller"); const router = express.Router(); // Dataset routes -// router.get("/:dbName/:datasetId", getDatasetDetail); +router.get("/:dbName/:datasetId", getDatasetDetail); // router.get("/:dbName/:datasetId/meta", getDatasetMeta); module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index 716134e..e9afac1 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -9,7 +9,7 @@ const authRoutes = require("./routes/auth.routes"); // const userRoutes = require("./routes/users.routes"); // const activitiesRoutes = require("./routes/activities.routes"); const dbsRoutes = require("./routes/dbs.routes"); -// const datasetsRoutes = require("./routes/datasets.routes"); +const datasetsRoutes = require("./routes/datasets.routes"); // const datasetRoutes = require("./routes/dataset.routes"); // const couchdbRoutes = require("./routes/couchdb.routes"); @@ -35,7 +35,7 @@ app.use("/api/v1/auth", authRoutes); // app.use("/api/v1/users", userRoutes); // app.use("/api/v1/activities", activitiesRoutes); app.use("/api/v1/dbs", dbsRoutes); -// app.use("/api/v1/datasets", datasetsRoutes); +app.use("/api/v1/datasets", datasetsRoutes); // app.use("/api/datasets", datasetRoutes); // app.use("/api/couchdb", couchdbRoutes); From 743ce10f70c810f82173600b9ab4810fbe1b8c59 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 10 Nov 2025 18:18:14 -0500 Subject: [PATCH 33/46] modify like route --- ...t.controller.js => activity.controller.js} | 6 ++-- backend/src/controllers/couchdb.controller.js | 36 +++++++++++++++++++ backend/src/routes/activities.routes.js | 6 ++-- backend/src/routes/couchdb.routes.js | 9 ----- backend/src/routes/datasets.routes.js | 4 +-- backend/src/server.js | 6 ++-- 6 files changed, 47 insertions(+), 20 deletions(-) rename backend/src/controllers/{dataset.controller.js => activity.controller.js} (97%) delete mode 100644 backend/src/routes/couchdb.routes.js diff --git a/backend/src/controllers/dataset.controller.js b/backend/src/controllers/activity.controller.js similarity index 97% rename from backend/src/controllers/dataset.controller.js rename to backend/src/controllers/activity.controller.js index 7dcc96f..73272ec 100644 --- a/backend/src/controllers/dataset.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -29,8 +29,10 @@ const getOrCreateDataset = async (couch_db, ds_id) => { const likeDataset = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id } = req.body; - const dataset = await getOrCreateDataset(couch_db, ds_id); + const { dbName, datasetId } = req.params; + // const { couch_db, ds_id } = req.body; + const dataset = await getOrCreateDataset(dbName, datasetId); + // const dataset = await getOrCreateDataset(couch_db, ds_id); // check if already liked const existingLike = await DatasetLike.findOne({ diff --git a/backend/src/controllers/couchdb.controller.js b/backend/src/controllers/couchdb.controller.js index cea8a7b..ac75807 100644 --- a/backend/src/controllers/couchdb.controller.js +++ b/backend/src/controllers/couchdb.controller.js @@ -202,6 +202,41 @@ const getDatasetDetail = async (req, res) => { } }; +// get dataset metadata +const getDatasetMeta = async (req, res) => { + try { + const { dbName, datasetId } = req.params; + const response = await axios.get( + `${COUCHDB_BASE_URL}/${dbName}/_design/qq/_view/dbinfo`, + { + headers: { + Origin: "https://neurojson.io", + "X-Requested-With": "XMLHttpRequest", + }, + params: { + key: JSON.stringify(datasetId), + // include_docs: true, + }, + } + ); + res.status(200).json(response.data); + } catch (error) { + console.error( + `Error fetching dataset metadata ${req.params.datasetId}:`, + error.message + ); + res.status(error.response?.status || 500).json({ + message: "Error fetching dataset metadata", + error: error.message, + }); + } +}; + +// search within a specific database +// const searchDatabase = async(req, res) => { + +// } + module.exports = { getDbList, getDbStats, @@ -209,4 +244,5 @@ module.exports = { getDbDatasets, searchAllDatabases, getDatasetDetail, + getDatasetMeta, }; diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index 210983c..5480fb1 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -1,7 +1,7 @@ // request send to postgres const express = require("express"); const { - // likeDataset, + likeDataset, // unlikeDataset, // saveDataset, // unsaveDataset, @@ -17,10 +17,10 @@ const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); const router = express.Router(); // // Apply restoreUser to all routes -// router.use(restoreUser); +router.use(restoreUser); // // Like/Unlike routes (require authentication) -// router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); +router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); // router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); // // Save/Unsave routes (require authentication) diff --git a/backend/src/routes/couchdb.routes.js b/backend/src/routes/couchdb.routes.js deleted file mode 100644 index 79648d3..0000000 --- a/backend/src/routes/couchdb.routes.js +++ /dev/null @@ -1,9 +0,0 @@ -const express = require("express"); - -// const { getRegistry } = require("../controllers/couchdb.controller"); - -const router = express.Router(); - -// router.get("/registry", getRegistry); - -module.exports = router; diff --git a/backend/src/routes/datasets.routes.js b/backend/src/routes/datasets.routes.js index 4dd622d..cdaad01 100644 --- a/backend/src/routes/datasets.routes.js +++ b/backend/src/routes/datasets.routes.js @@ -2,13 +2,13 @@ const express = require("express"); const { getDatasetDetail, - // getDatasetMeta, + getDatasetMeta, } = require("../controllers/couchdb.controller"); const router = express.Router(); // Dataset routes router.get("/:dbName/:datasetId", getDatasetDetail); -// router.get("/:dbName/:datasetId/meta", getDatasetMeta); +router.get("/:dbName/:datasetId/meta", getDatasetMeta); module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index e9afac1..c988920 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -7,11 +7,10 @@ const { restoreUser } = require("./middleware/auth.middleware"); const authRoutes = require("./routes/auth.routes"); // const userRoutes = require("./routes/users.routes"); -// const activitiesRoutes = require("./routes/activities.routes"); +const activitiesRoutes = require("./routes/activities.routes"); const dbsRoutes = require("./routes/dbs.routes"); const datasetsRoutes = require("./routes/datasets.routes"); // const datasetRoutes = require("./routes/dataset.routes"); -// const couchdbRoutes = require("./routes/couchdb.routes"); const app = express(); const PORT = process.env.PORT || 5000; @@ -33,11 +32,10 @@ app.use(restoreUser); // Routes app.use("/api/v1/auth", authRoutes); // app.use("/api/v1/users", userRoutes); -// app.use("/api/v1/activities", activitiesRoutes); +app.use("/api/v1/activities", activitiesRoutes); app.use("/api/v1/dbs", dbsRoutes); app.use("/api/v1/datasets", datasetsRoutes); // app.use("/api/datasets", datasetRoutes); -// app.use("/api/couchdb", couchdbRoutes); // health check endpoint app.get("/api/health", async (req, res) => { From 75e670db1509ef9e96ae04b36791cdcefeb5cecc Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:21:30 -0500 Subject: [PATCH 34/46] modify unlike dataset function --- backend/src/controllers/activity.controller.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 73272ec..da770f0 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -30,9 +30,7 @@ const likeDataset = async (req, res) => { try { const user = req.user; const { dbName, datasetId } = req.params; - // const { couch_db, ds_id } = req.body; const dataset = await getOrCreateDataset(dbName, datasetId); - // const dataset = await getOrCreateDataset(couch_db, ds_id); // check if already liked const existingLike = await DatasetLike.findOne({ @@ -63,10 +61,10 @@ const likeDataset = async (req, res) => { const unlikeDataset = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id } = req.body; + const { dbName, datasetId } = req.params; const dataset = await Dataset.findOne({ - where: { couch_db, ds_id }, + where: { couch_db: dbName, ds_id: datasetId }, }); if (!dataset) { return res.status(404).json({ message: "Dataset not found" }); From 3b500eeffb37117d599c1091a9d3f5a14cfe2f92 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:24:30 -0500 Subject: [PATCH 35/46] modify save dataset function --- backend/src/controllers/activity.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index da770f0..7313ce1 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -92,9 +92,9 @@ const unlikeDataset = async (req, res) => { const saveDataset = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id } = req.body; + const { dbName, datasetId } = req.params; - const dataset = await getOrCreateDataset(couch_db, ds_id); + const dataset = await getOrCreateDataset(dbName, datasetId); const existingSave = await SavedDataset.findOne({ where: { user_id: user.id, From 6aa6403d712e0c2be3b7e9759ebe7ccd8a7843ee Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:26:14 -0500 Subject: [PATCH 36/46] modify unsave dataset function --- backend/src/controllers/activity.controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 7313ce1..3b09477 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -141,12 +141,12 @@ const getUserSavedDatasets = async (req, res) => { const unsaveDataset = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id } = req.body; + const { dbName, datasetId } = req.params; const dataset = await Dataset.findOne({ where: { - couch_db, - ds_id, + couch_db: dbName, + ds_id: datasetId, }, }); From b68b16f5541b49825f35e53fbd3c18d6bc4e96f6 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:29:46 -0500 Subject: [PATCH 37/46] modify add comment function --- backend/src/controllers/activity.controller.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 3b09477..e9a9d45 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -178,15 +178,21 @@ const unsaveDataset = async (req, res) => { const addComment = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id, body } = req.body; + const { dbName, datasetId } = req.params; + const { body } = req.body; - const dataset = await getOrCreateDataset(couch_db, ds_id); + if (!body || body.trim() === "") { + return res.status(400).json({ message: "Comment body is required" }); + } + + const dataset = await getOrCreateDataset(dbName, datasetId); const comment = await Comment.create({ user_id: user.id, dataset_id: dataset.id, body, }); + res.status(201).json({ message: "Comment added successfully", comment }); } catch (error) { console.error("Add comment error:", error); From 78e8f4a38bc090db25f3f25f60d73959eae0fe1a Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:34:20 -0500 Subject: [PATCH 38/46] modify get all comments for a dataset function --- backend/src/controllers/activity.controller.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index e9a9d45..034abd8 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -4,6 +4,7 @@ const { SavedDataset, Comment, ViewHistory, + User, } = require("../models"); const COUCHDB_BASE_URL = process.env.COUCHDB_BASE_URL || "https://neurojson.org/io"; @@ -205,11 +206,11 @@ const addComment = async (req, res) => { // get comments for a dataset const getComments = async (req, res) => { try { - const { couch_db, ds_id } = req.query; + const { dbName, datasetId } = req.params; const dataset = await Dataset.findOne({ where: { - couch_db, - ds_id, + couch_db: dbName, + ds_id: datasetId, }, }); @@ -219,6 +220,12 @@ const getComments = async (req, res) => { const comments = await Comment.findAll({ where: { dataset_id: dataset.id }, + include: [ + { + model: User, + attributes: ["id", "username"], + }, + ], order: [["created_at", "DESC"]], }); res.status(200).json({ comments }); From 907581df9b72ca3a31bfe6b85a8ac92e6b91f5c1 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:37:48 -0500 Subject: [PATCH 39/46] modify update a comment function --- .../src/controllers/activity.controller.js | 75 ++++++++++--------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 034abd8..615a274 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -237,12 +237,20 @@ const getComments = async (req, res) => { } }; -// delete a comment -const deleteComment = async (req, res) => { +// update a comment +const updateComment = async (req, res) => { try { const user = req.user; - const { commentId } = req.params; // get comment id from url + const { commentId } = req.params; + const { body } = req.body; + // validate - body is required + if (!body || body.trim() === "") { + return res.status(400).json({ + message: "Comment body is required", + }); + } + // find the comment const comment = await Comment.findByPk(commentId); if (!comment) { return res.status(404).json({ @@ -250,40 +258,44 @@ const deleteComment = async (req, res) => { }); } + // check if user is the owner of the comment if (comment.user_id !== user.id) { return res.status(403).json({ - message: "You can only delete your own comments", + message: "Not authorized to update this comment", }); } - // delete the comment - await comment.destroy(); + // update the comment + comment.body = body; + await comment.save(); + res.status(200).json({ - message: "Comment deleted successfully", + message: "Comment updated successfully", + comment, + // comment: { + // id: comment.id, + // body: comment.body, + // user_id: comment.user_id, + // dataset_id: comment.dataset_id, + // created_at: comment.created_at, + // updated_at: comment.updated_at, + // }, }); } catch (error) { - console.error("Delete comment error:", error); + console.error("Update comment error:", error); res.status(500).json({ - message: "Error deleting comment", + message: "Error updating comment", error: error.message, }); } }; -// update a comment -const updateComment = async (req, res) => { +// delete a comment +const deleteComment = async (req, res) => { try { const user = req.user; - const { commentId } = req.params; - const { body } = req.body; - // validate - body is required - if (!body || body.trim() === "") { - return res.status(400).json({ - message: "Comment body is required", - }); - } + const { commentId } = req.params; // get comment id from url - // find the comment const comment = await Comment.findByPk(commentId); if (!comment) { return res.status(404).json({ @@ -291,32 +303,21 @@ const updateComment = async (req, res) => { }); } - // check if user is the owner of the comment if (comment.user_id !== user.id) { return res.status(403).json({ - message: "You can only update your own comments", + message: "You can only delete your own comments", }); } - // update the comment - comment.body = body; - await comment.save(); - + // delete the comment + await comment.destroy(); res.status(200).json({ - message: "Comment updated successfully", - comment: { - id: comment.id, - body: comment.body, - user_id: comment.user_id, - dataset_id: comment.dataset_id, - created_at: comment.created_at, - updated_at: comment.updated_at, - }, + message: "Comment deleted successfully", }); } catch (error) { - console.error("Update comment error:", error); + console.error("Delete comment error:", error); res.status(500).json({ - message: "Error updating comment", + message: "Error deleting comment", error: error.message, }); } From 5324a42325c0684170734519264e285accc173a3 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:39:41 -0500 Subject: [PATCH 40/46] modify delete a comment function --- backend/src/controllers/activity.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 615a274..42adcf9 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -294,7 +294,7 @@ const updateComment = async (req, res) => { const deleteComment = async (req, res) => { try { const user = req.user; - const { commentId } = req.params; // get comment id from url + const { commentId } = req.params; const comment = await Comment.findByPk(commentId); if (!comment) { @@ -305,7 +305,7 @@ const deleteComment = async (req, res) => { if (comment.user_id !== user.id) { return res.status(403).json({ - message: "You can only delete your own comments", + message: "Not authorized to delete this comment", }); } From 804a65c6850542c5a68f784d16132b22a06d1259 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 11:43:53 -0500 Subject: [PATCH 41/46] modify track view function --- backend/src/controllers/activity.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 42adcf9..485c102 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -327,8 +327,8 @@ const deleteComment = async (req, res) => { const trackView = async (req, res) => { try { const user = req.user; - const { couch_db, ds_id } = req.body; - const dataset = await getOrCreateDataset(couch_db, ds_id); + const { dbName, datasetId } = req.params; + const dataset = await getOrCreateDataset(dbName, datasetId); // Increment view count dataset.views_count = (dataset.views_count || 0) + 1; await dataset.save(); From d98748fb6ac77c36caa7efb961131582703dad1f Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 14:50:02 -0500 Subject: [PATCH 42/46] add users route and controller file --- .../src/controllers/activity.controller.js | 75 +----------- backend/src/controllers/user.controller.js | 112 ++++++++++++++++++ backend/src/routes/activities.routes.js | 54 ++++----- backend/src/routes/dataset.routes.js | 44 ------- backend/src/routes/users.routes.js | 14 +-- backend/src/server.js | 6 +- 6 files changed, 147 insertions(+), 158 deletions(-) create mode 100644 backend/src/controllers/user.controller.js delete mode 100644 backend/src/routes/dataset.routes.js diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 485c102..8c24594 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -6,8 +6,6 @@ const { ViewHistory, User, } = require("../models"); -const COUCHDB_BASE_URL = - process.env.COUCHDB_BASE_URL || "https://neurojson.org/io"; // get or create dataset in SQL database const getOrCreateDataset = async (couch_db, ds_id) => { @@ -120,24 +118,6 @@ const saveDataset = async (req, res) => { } }; -// get user's saved datasets -const getUserSavedDatasets = async (req, res) => { - try { - const user = req.user; - const savedDataset = await SavedDataset.findAll({ - where: { user_id: user.id }, - include: [{ model: Dataset, as: "Dataset" }], - order: [["created_at", "DESC"]], - }); - res.status(200).json({ savedDataset }); - } catch (error) { - console.error("Get saved datasets error:", error); - res - .status(500) - .json({ message: "Error fetching saved datasets", error: error.message }); - } -}; - // unsave a dataset const unsaveDataset = async (req, res) => { try { @@ -272,14 +252,6 @@ const updateComment = async (req, res) => { res.status(200).json({ message: "Comment updated successfully", comment, - // comment: { - // id: comment.id, - // body: comment.body, - // user_id: comment.user_id, - // dataset_id: comment.dataset_id, - // created_at: comment.created_at, - // updated_at: comment.updated_at, - // }, }); } catch (error) { console.error("Update comment error:", error); @@ -365,47 +337,8 @@ const trackView = async (req, res) => { } }; -// get user's recently viewed datasets -const getRecentlyViewed = async (req, res) => { - try { - const user = req.user; - const limit = parseInt(req.query.limit) || 6; - - const recentViews = await ViewHistory.findAll({ - where: { user_id: user.id }, - include: [ - { - model: Dataset, - attributes: ["id", "couch_db", "ds_id", "views_count"], - }, - ], - order: [["viewed_at", "DESC"]], - limit: limit, - }); - - // map to cleaner format - const datasets = recentViews.map((view) => ({ - couch_db: view.Dataset.couch_db, - ds_id: view.Dataset.ds_id, - views_count: view.Dataset.views_count, - last_viewed: view.viewed_at, - })); - - res.status(200).json({ - recentlyViewed: datasets, - datasetsCount: datasets.length, - }); - } catch (error) { - console.error("Get recently viewed error:", error); - res.status(500).json({ - message: "Error fetching recently viewed datasets", - error: error.message, - }); - } -}; - // get most viewd datasets -const getMostViewed = async (req, res) => { +const getMostViewedDatasets = async (req, res) => { try { const limit = parseInt(req.query.limit) || 10; const topDatasets = await Dataset.findAll({ @@ -431,13 +364,11 @@ module.exports = { likeDataset, unlikeDataset, saveDataset, - getUserSavedDatasets, unsaveDataset, addComment, getComments, - deleteComment, updateComment, + deleteComment, trackView, - getRecentlyViewed, - getMostViewed, + getMostViewedDatasets, }; diff --git a/backend/src/controllers/user.controller.js b/backend/src/controllers/user.controller.js new file mode 100644 index 0000000..a8fe5d1 --- /dev/null +++ b/backend/src/controllers/user.controller.js @@ -0,0 +1,112 @@ +const { + Dataset, + DatasetLike, + SavedDataset, + Comment, + ViewHistory, + User, +} = require("../models"); +const { likeDataset } = require("./activity.controller"); + +// get user's liked datasets +const getUserLikedDatasets = async (req, res) => { + try { + const user = req.user; + const likeDataset = await DatasetLike.findAll({ + where: { user_id: user.id }, + include: [{ model: Dataset }], + order: [["created_at", "DESC"]], + }); + + res.status(200).json({ likeDataset }); + } catch (error) { + console.error("Get liked datasets error:", error); + res + .status(500) + .json({ message: "Error fetching liked datasets", error: error.message }); + } +}; + +// get user's saved datasets +const getUserSavedDatasets = async (req, res) => { + try { + const user = req.user; + const savedDataset = await SavedDataset.findAll({ + where: { user_id: user.id }, + include: [{ model: Dataset, as: "Dataset" }], + order: [["created_at", "DESC"]], + }); + res.status(200).json({ savedDataset }); + } catch (error) { + console.error("Get saved datasets error:", error); + res + .status(500) + .json({ message: "Error fetching saved datasets", error: error.message }); + } +}; + +// get user's comments +const getUserComments = async (req, res) => { + try { + const user = req.user; + const comments = await Comment.findAll({ + where: { user_id: user.id }, + include: [{ model: Dataset, as: "Dataset" }], + order: [["created_at", "DESC"]], + }); + + res.status(200).json({ comments }); + } catch (error) { + console.error("Get user comments error:", error); + res + .status(500) + .json({ message: "Error fetching user comments", error: error.message }); + } +}; + +// get user's recently viewed datasets +const getUserRecentlyViewed = async (req, res) => { + try { + const user = req.user; + const limit = parseInt(req.query.limit) || 6; + + const recentViews = await ViewHistory.findAll({ + where: { user_id: user.id }, + include: [ + { + model: Dataset, + attributes: ["id", "couch_db", "ds_id", "views_count"], + }, + ], + order: [["viewed_at", "DESC"]], + limit: limit, + }); + + // map to cleaner format + // const datasets = recentViews.map((view) => ({ + // dbName: view.Dataset.couch_db, + // datasetId: view.Dataset.ds_id, + // views_count: view.Dataset.views_count, + // last_viewed: view.viewed_at, + // })); + + res.status(200).json({ + recentViews, + datasetsCount: recentViews.length, + // recentlyViewed: datasets, + }); + } catch (error) { + console.error("Get recently viewed error:", error); + res.status(500).json({ + message: "Error fetching recently viewed datasets", + error: error.message, + }); + } +}; + +module.exports = { + getUserLikedDatasets, + getUserSavedDatasets, + getUserComments, + getUserRecentlyViewed, +}; diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index 5480fb1..83930c3 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -2,47 +2,39 @@ const express = require("express"); const { likeDataset, - // unlikeDataset, - // saveDataset, - // unsaveDataset, - // addComment, - // getComments, - // deleteComment, - // updateComment, - // trackView, - // getMostViewedDatasets, + unlikeDataset, + saveDataset, + unsaveDataset, + addComment, + getComments, + updateComment, + deleteComment, + trackView, + getMostViewedDatasets, } = require("../controllers/activity.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); const router = express.Router(); -// // Apply restoreUser to all routes +// Apply restoreUser to all routes router.use(restoreUser); -// // Like/Unlike routes (require authentication) +// Like/Unlike routes (require authentication) router.post("/datasets/:dbName/:datasetId/like", requireAuth, likeDataset); -// router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); +router.delete("/datasets/:dbName/:datasetId/like", requireAuth, unlikeDataset); -// // Save/Unsave routes (require authentication) -// router.post("/datasets/:dbName/:datasetId/save", requireAuth, saveDataset); -// router.delete("/datasets/:dbName/:datasetId/save", requireAuth, unsaveDataset); +// Save/Unsave routes (require authentication) +router.post("/datasets/:dbName/:datasetId/save", requireAuth, saveDataset); +router.delete("/datasets/:dbName/:datasetId/save", requireAuth, unsaveDataset); -// // Comment routes -// router.post("/datasets/:dbName/:datasetId/comments", requireAuth, addComment); -// router.get("/datasets/:dbName/:datasetId/comments", getComments); // Public -// router.put( -// "/datasets/:dbName/:datasetId/comments/:commentId", -// requireAuth, -// updateComment -// ); -// router.delete( -// "/datasets/:dbName/:datasetId/comments/:commentId", -// requireAuth, -// deleteComment -// ); +// Comment routes +router.post("/datasets/:dbName/:datasetId/comments", requireAuth, addComment); +router.get("/datasets/:dbName/:datasetId/comments", getComments); // Public +router.put("/comments/:commentId", requireAuth, updateComment); +router.delete("/comments/:commentId", requireAuth, deleteComment); -// // View tracking -// router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); -// router.get("/datasets/most-viewed", getMostViewedDatasets); // Public +// View tracking +router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); +router.get("/datasets/most-viewed", getMostViewedDatasets); // Public module.exports = router; diff --git a/backend/src/routes/dataset.routes.js b/backend/src/routes/dataset.routes.js deleted file mode 100644 index 3c1822e..0000000 --- a/backend/src/routes/dataset.routes.js +++ /dev/null @@ -1,44 +0,0 @@ -const express = require("express"); -const { - likeDataset, - unlikeDataset, - saveDataset, - unsaveDataset, - addComment, - getComments, - deleteComment, - updateComment, - trackView, - getUserSavedDatasets, - getRecentlyViewed, - getMostViewed, -} = require("../controllers/dataset.controller"); - -const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); - -const router = express.Router(); - -// Apply restoreUser to all routes -router.use(restoreUser); - -// Like/Unlike routes (require authentication) -router.post("/like", requireAuth, likeDataset); -router.delete("/unlike", requireAuth, unlikeDataset); - -// Save/Unsave routes (require authentication) -router.post("/save", requireAuth, saveDataset); -router.delete("/unsave", requireAuth, unsaveDataset); -router.get("/saved", requireAuth, getUserSavedDatasets); - -// Comment routes -router.post("/comment", requireAuth, addComment); -router.get("/comments", getComments); // Public - no auth required -router.put("/comment/:commentId", requireAuth, updateComment); -router.delete("/comment/:commentId", requireAuth, deleteComment); - -// View tracking (require authentication) -router.post("/view", requireAuth, trackView); -router.get("/recently-viewed", requireAuth, getRecentlyViewed); -router.get("/most-viewed", getMostViewed); - -module.exports = router; diff --git a/backend/src/routes/users.routes.js b/backend/src/routes/users.routes.js index ef47073..e1e2bc6 100644 --- a/backend/src/routes/users.routes.js +++ b/backend/src/routes/users.routes.js @@ -1,11 +1,11 @@ // request send to postgres const express = require("express"); const { + getUserLikedDatasets, getUserSavedDatasets, - // getUserLikedDatasets, - // getUserComments, - // getUserRecentlyViewed, -} = require("../controllers/dataset.controller"); + getUserComments, + getUserRecentlyViewed, +} = require("../controllers/user.controller"); const { restoreUser, requireAuth } = require("../middleware/auth.middleware"); const router = express.Router(); @@ -15,9 +15,9 @@ router.use(restoreUser); router.use(requireAuth); // User collections +router.get("/me/liked-datasets", getUserLikedDatasets); router.get("/me/saved-datasets", getUserSavedDatasets); -// router.get("/me/liked-datasets", getUserLikedDatasets); -// router.get("/me/comments", getUserComments); -// router.get("/me/recently-viewed", getUserRecentlyViewed); +router.get("/me/comments", getUserComments); +router.get("/me/recently-viewed", getUserRecentlyViewed); module.exports = router; diff --git a/backend/src/server.js b/backend/src/server.js index c988920..2d6767f 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -6,11 +6,10 @@ const { connectDatabase, sequelize } = require("./config/database"); const { restoreUser } = require("./middleware/auth.middleware"); const authRoutes = require("./routes/auth.routes"); -// const userRoutes = require("./routes/users.routes"); +const userRoutes = require("./routes/users.routes"); const activitiesRoutes = require("./routes/activities.routes"); const dbsRoutes = require("./routes/dbs.routes"); const datasetsRoutes = require("./routes/datasets.routes"); -// const datasetRoutes = require("./routes/dataset.routes"); const app = express(); const PORT = process.env.PORT || 5000; @@ -31,11 +30,10 @@ app.use(restoreUser); // Routes app.use("/api/v1/auth", authRoutes); -// app.use("/api/v1/users", userRoutes); +app.use("/api/v1/users", userRoutes); app.use("/api/v1/activities", activitiesRoutes); app.use("/api/v1/dbs", dbsRoutes); app.use("/api/v1/datasets", datasetsRoutes); -// app.use("/api/datasets", datasetRoutes); // health check endpoint app.get("/api/health", async (req, res) => { From 1a7721641c1ca458a23534c1329e8536f6195f9f Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Wed, 12 Nov 2025 15:38:13 -0500 Subject: [PATCH 43/46] modify track views controller --- .../src/controllers/activity.controller.js | 62 ++++++++++++------- backend/src/controllers/user.controller.js | 9 --- backend/src/routes/activities.routes.js | 2 +- 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 8c24594..37f6b27 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -295,38 +295,56 @@ const deleteComment = async (req, res) => { } }; -// track view +// function1: increment view count +const incrementViewCount = async (dbName, datasetId) => { + const dataset = await getOrCreateDataset(dbName, datasetId); + dataset.views_count = (dataset.views_count || 0) + 1; + await dataset.save(); + return dataset; +}; + +// function2: add or update a viewed history +const trackUserHistory = async (userId, datasetId) => { + const existingView = await ViewHistory.findOne({ + where: { + user_id: userId, + dataset_id: datasetId, + }, + }); + + if (existingView) { + existingView.viewed_at = new Date(); + await existingView.save(); + return { isNew: false }; + } else { + // create new record + await ViewHistory.create({ + user_id: userId, + dataset_id: datasetId, + }); + return { isNew: true }; + } +}; + +// combined function1+2 const trackView = async (req, res) => { try { const user = req.user; const { dbName, datasetId } = req.params; - const dataset = await getOrCreateDataset(dbName, datasetId); - // Increment view count - dataset.views_count = (dataset.views_count || 0) + 1; - await dataset.save(); + const dataset = await incrementViewCount(dbName, datasetId); - // check if user has viewed this dataset before - const existingView = await ViewHistory.findOne({ - where: { - user_id: user.id, - dataset_id: dataset.id, - }, - }); - - if (existingView) { - existingView.viewed_at = new Date(); - await existingView.save(); - } else { - await ViewHistory.create({ - user_id: user.id, - dataset_id: dataset.id, - }); + // track personal history + let historyResult = null; + if (user) { + historyResult = await trackUserHistory(user.id, dataset.id); } res.status(200).json({ message: "View tracked successfully", viewCount: dataset.views_count, - isNewView: !existingView, + personalHistoryTracked: !!historyResult, + isNewView: historyResult?.isNew, + isAuthenticated: !!user, }); } catch (error) { console.error("Track view error:", error); diff --git a/backend/src/controllers/user.controller.js b/backend/src/controllers/user.controller.js index a8fe5d1..8ea0c7e 100644 --- a/backend/src/controllers/user.controller.js +++ b/backend/src/controllers/user.controller.js @@ -82,18 +82,9 @@ const getUserRecentlyViewed = async (req, res) => { limit: limit, }); - // map to cleaner format - // const datasets = recentViews.map((view) => ({ - // dbName: view.Dataset.couch_db, - // datasetId: view.Dataset.ds_id, - // views_count: view.Dataset.views_count, - // last_viewed: view.viewed_at, - // })); - res.status(200).json({ recentViews, datasetsCount: recentViews.length, - // recentlyViewed: datasets, }); } catch (error) { console.error("Get recently viewed error:", error); diff --git a/backend/src/routes/activities.routes.js b/backend/src/routes/activities.routes.js index 83930c3..02ca128 100644 --- a/backend/src/routes/activities.routes.js +++ b/backend/src/routes/activities.routes.js @@ -34,7 +34,7 @@ router.put("/comments/:commentId", requireAuth, updateComment); router.delete("/comments/:commentId", requireAuth, deleteComment); // View tracking -router.post("/datasets/:dbName/:datasetId/views", requireAuth, trackView); +router.post("/datasets/:dbName/:datasetId/views", trackView); // Public router.get("/datasets/most-viewed", getMostViewedDatasets); // Public module.exports = router; From 4458bbf055a8c3ad1c302879e25eef3abf219703 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Thu, 13 Nov 2025 10:36:41 -0500 Subject: [PATCH 44/46] modify the timestamp of veiwed history --- .../20251028184721-create-view-history.js | 6 ++++- .../src/controllers/activity.controller.js | 25 ++++++++++++++++--- backend/src/models/index.js | 9 ++++--- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/backend/migrations/20251028184721-create-view-history.js b/backend/migrations/20251028184721-create-view-history.js index e5bf65c..89c900d 100644 --- a/backend/migrations/20251028184721-create-view-history.js +++ b/backend/migrations/20251028184721-create-view-history.js @@ -33,7 +33,6 @@ module.exports = { viewed_at: { type: Sequelize.DATE, allowNull: false, - defaultValue: Sequelize.literal("CURRENT_TIMESTAMP"), }, }); @@ -41,6 +40,11 @@ module.exports = { await queryInterface.addIndex("view_history", ["user_id"]); await queryInterface.addIndex("view_history", ["dataset_id"]); await queryInterface.addIndex("view_history", ["viewed_at"]); + await queryInterface.addConstraint("view_history", { + fields: ["user_id", "dataset_id"], + type: "unique", + name: "unique_user_dataset_view", + }); }, async down(queryInterface, Sequelize) { diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 37f6b27..5a420c3 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -305,6 +305,9 @@ const incrementViewCount = async (dbName, datasetId) => { // function2: add or update a viewed history const trackUserHistory = async (userId, datasetId) => { + console.log("=== trackUserHistory called ==="); + console.log("userId:", userId); + console.log("datasetId:", datasetId); const existingView = await ViewHistory.findOne({ where: { user_id: userId, @@ -312,17 +315,32 @@ const trackUserHistory = async (userId, datasetId) => { }, }); + console.log("existingView found:", !!existingView); + if (existingView) { + console.log("OLD viewed_at:", existingView.viewed_at); existingView.viewed_at = new Date(); + console.log("NEW viewed_at (before save):", existingView.viewed_at); + // Tell Sequelize this field changed + existingView.changed("viewed_at", true); + console.log("Changed fields:", existingView.changed()); await existingView.save(); - return { isNew: false }; + console.log("After save, viewed_at:", existingView.viewed_at); + + await existingView.reload(); + console.log("After reload, viewed_at:", existingView.viewed_at); + + return { isNew: false, viewed_at: existingView.viewed_at }; } else { // create new record - await ViewHistory.create({ + console.log("Creating new view record"); + const newView = await ViewHistory.create({ user_id: userId, dataset_id: datasetId, + viewed_at: new Date(), }); - return { isNew: true }; + console.log("Created view with viewed_at:", newView.viewed_at); + return { isNew: true, viewed_at: newView.viewed_at }; } }; @@ -344,6 +362,7 @@ const trackView = async (req, res) => { viewCount: dataset.views_count, personalHistoryTracked: !!historyResult, isNewView: historyResult?.isNew, + viewed_at: historyResult?.viewed_at, isAuthenticated: !!user, }); } catch (error) { diff --git a/backend/src/models/index.js b/backend/src/models/index.js index 940b123..f10461d 100644 --- a/backend/src/models/index.js +++ b/backend/src/models/index.js @@ -162,16 +162,17 @@ ViewHistory.init( }, viewed_at: { type: DataTypes.DATE, - defaultValue: DataTypes.NOW, + // defaultValue: DataTypes.NOW, }, }, { sequelize, tableName: "view_history", - timestamps: true, + // timestamps: true, + timestamps: false, underscored: true, - createdAt: "viewed_at", - updatedAt: false, + // createdAt: "viewed_at", + // updatedAt: false, } ); From 5249a98fe2e5b23b93e3d016e1ac4cf36c1dc7de Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Thu, 13 Nov 2025 11:00:07 -0500 Subject: [PATCH 45/46] clean the console log in activity controller --- backend/src/controllers/activity.controller.js | 14 -------------- backend/src/models/index.js | 4 ---- 2 files changed, 18 deletions(-) diff --git a/backend/src/controllers/activity.controller.js b/backend/src/controllers/activity.controller.js index 5a420c3..2765202 100644 --- a/backend/src/controllers/activity.controller.js +++ b/backend/src/controllers/activity.controller.js @@ -305,9 +305,6 @@ const incrementViewCount = async (dbName, datasetId) => { // function2: add or update a viewed history const trackUserHistory = async (userId, datasetId) => { - console.log("=== trackUserHistory called ==="); - console.log("userId:", userId); - console.log("datasetId:", datasetId); const existingView = await ViewHistory.findOne({ where: { user_id: userId, @@ -315,31 +312,20 @@ const trackUserHistory = async (userId, datasetId) => { }, }); - console.log("existingView found:", !!existingView); - if (existingView) { - console.log("OLD viewed_at:", existingView.viewed_at); existingView.viewed_at = new Date(); - console.log("NEW viewed_at (before save):", existingView.viewed_at); // Tell Sequelize this field changed existingView.changed("viewed_at", true); - console.log("Changed fields:", existingView.changed()); await existingView.save(); - console.log("After save, viewed_at:", existingView.viewed_at); - - await existingView.reload(); - console.log("After reload, viewed_at:", existingView.viewed_at); return { isNew: false, viewed_at: existingView.viewed_at }; } else { // create new record - console.log("Creating new view record"); const newView = await ViewHistory.create({ user_id: userId, dataset_id: datasetId, viewed_at: new Date(), }); - console.log("Created view with viewed_at:", newView.viewed_at); return { isNew: true, viewed_at: newView.viewed_at }; } }; diff --git a/backend/src/models/index.js b/backend/src/models/index.js index f10461d..c613110 100644 --- a/backend/src/models/index.js +++ b/backend/src/models/index.js @@ -162,17 +162,13 @@ ViewHistory.init( }, viewed_at: { type: DataTypes.DATE, - // defaultValue: DataTypes.NOW, }, }, { sequelize, tableName: "view_history", - // timestamps: true, timestamps: false, underscored: true, - // createdAt: "viewed_at", - // updatedAt: false, } ); From 04aa905ce8086cdf48e5a9c0f6242f3241c4f346 Mon Sep 17 00:00:00 2001 From: elainefan331 Date: Mon, 17 Nov 2025 11:26:21 -0500 Subject: [PATCH 46/46] adjust age display in subjectcard --- src/components/SearchPage/SubjectCard.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/SearchPage/SubjectCard.tsx b/src/components/SearchPage/SubjectCard.tsx index 93038e3..a05aa48 100644 --- a/src/components/SearchPage/SubjectCard.tsx +++ b/src/components/SearchPage/SubjectCard.tsx @@ -8,7 +8,7 @@ import RoutesEnum from "types/routes.enum"; interface SubjectCardProps { dbname: string; dsname: string; - agemin: string; + age: string; subj: string; parsedJson: { key: string[]; @@ -26,7 +26,7 @@ interface SubjectCardProps { const SubjectCard: React.FC = ({ dbname, dsname, - agemin, + age, subj, parsedJson, index, @@ -52,8 +52,8 @@ const SubjectCard: React.FC = ({ // cover age string to readable format let ageDisplay = "N/A"; - if (agemin) { - const ageNum = parseInt(agemin, 10) / 100; + if (age) { + const ageNum = parseInt(age, 10) / 100; if (Number.isInteger(ageNum)) { ageDisplay = `${ageNum} years`; } else {