Skip to content

Commit

Permalink
Merge branch 'dev' into BE/adding-hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucca-C committed Feb 2, 2024
2 parents 95eed39 + e17d4ef commit 1ee34a8
Showing 5 changed files with 500 additions and 546 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/pull-request-template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
name: TITLE HERE
about: ABOUT HERE
---

## Pull Request Overview
18 changes: 7 additions & 11 deletions be/routes.js
Original file line number Diff line number Diff line change
@@ -106,12 +106,8 @@ router.post("/atms/filter", async (req, res) => {
headers: { "Content-Type": "application/json" }
};

const filteredAtms = await axios(filterATMsConfig);

const formattedAtms = formatDataForDisplay(filteredAtms.data, true);

res.json(formattedAtms);

const data = await withCache(fetchFromAPI, "atms/filter", requestData, 'POST');
res.json(data);
} catch (error) {
console.error("Error in /atms/filter route:", error.message);
res.status(500).send("Error processing request");
@@ -162,11 +158,11 @@ router.post("/branches/filter", async (req, res) => {
return response.data;
}, "branches/filter", branchFilterCriteria, 'POST');

const filteredBranches = await axios(filterBranchesConfig);

const formattedBranches = formatDataForDisplay(filteredBranches.data, false);

res.json(formattedBranches);
res.json(data);
} catch (error) {
console.error("Error in /branches/filter route:", error.message);
res.status(500).send("Error processing request");
}
});


2 changes: 1 addition & 1 deletion fe/dist/style.css

Large diffs are not rendered by default.

Loading

0 comments on commit 1ee34a8

Please sign in to comment.