Skip to content

Commit

Permalink
Merge branch 'dev' into BE/adding-hooks
Browse files Browse the repository at this point in the history
Lucca-C committed Feb 2, 2024
2 parents 1ee34a8 + 023384e commit dc3daa3
Showing 6 changed files with 1,775 additions and 56 deletions.
4 changes: 2 additions & 2 deletions api/api_server.js
Original file line number Diff line number Diff line change
@@ -45,12 +45,12 @@ app.get("/", (req, res) => {
});

// 404 Error Handler (for any unhandled routes)
app.use((req, res, next) => {
app.use((req, res) => {
res.status(404).send("Resource not found");
});

// Generic Error Handler
app.use((error, req, res, next) => {
app.use((error, req, res) => {
console.error(error.stack);
res.status(500).send('Something broke!');
});
9 changes: 1 addition & 8 deletions api/atmRoutes.js
Original file line number Diff line number Diff line change
@@ -24,14 +24,7 @@ router.get("/api/atms", async (req, res) => {

router.post("/api/atms/filter", async (req, res) => {
try {
const defaultAccessibility = ["AudioCashMachine", "WheelchairAccess"];
const defaultATMServices = [
"CashWithdrawal",
"CashDeposits",
"PINChange",
"ChequeDeposits",
"Balance",
];


const atms = await db
.collection("ATMs")
3 changes: 2 additions & 1 deletion api/package.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node api_server.js"
"start": "node api_server.js",
"lint": "eslint ."
},
"author": "",
"license": "ISC",
905 changes: 883 additions & 22 deletions fe/node_modules/.package-lock.json

Large diffs are not rendered by default.

906 changes: 884 additions & 22 deletions fe/package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion fe/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"scripts": {
"build:css": "npx tailwindcss -i ./src/input.css -o ./dist/style.css --minify"
"build:css": "npx tailwindcss -i ./src/input.css -o ./dist/style.css --minify",
"lint": "eslint ."
},
"devDependencies": {
"tailwindcss": "^3.3.5"
},
"dependencies": {
"eslint": "^8.56.0",
"flowbite": "^2.2.1"
}
}

0 comments on commit dc3daa3

Please sign in to comment.