Skip to content

Commit

Permalink
Merge branch 'docker'
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelberston committed Nov 11, 2024
2 parents d643554 + f2c3e8d commit 9b1ad27
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 119 deletions.
2 changes: 1 addition & 1 deletion backend/psql.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { Pool } = require('pg');

const pool = new Pool({
user: process.env.DB_USER,
host: 'localhost',
host: process.env.DD_URL,
database: process.env.DB_NAME,
password: '',
port: 5432
Expand Down
72 changes: 72 additions & 0 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
"homepage": "https://github.com/samuelberston/secure-auth-project#readme",
"dependencies": {
"cookie-parser": "^1.4.7",
"dompurify": "^3.1.7",
"express": "^4.21.1",
"http-proxy-middleware": "^3.0.3"
},
"devDependencies": {
"axios": "^1.7.7",
"nodemon": "^3.1.7"
}
}
117 changes: 0 additions & 117 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"author": "",
"license": "ISC",
"devDependencies": {
"axios": "^1.7.7",
"@babel/preset-env": "^7.26.0",
"@eslint/js": "^9.14.0",
"@testing-library/dom": "^10.4.0",
Expand All @@ -25,7 +26,6 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nodemon": "^3.1.7",
"sinon": "^19.0.2",
"supertest": "^7.0.0"
}
}

0 comments on commit 9b1ad27

Please sign in to comment.