solved merge conflict
This commit is contained in:
commit
605c7b3734
48 files changed
+1170
-147
No files matched your search
+26
-1
@@ -1,3 +1,4 @@
|
||||
const getRates = require("../util/exchangeRate");
|
||||
const status = require("../util/statuses");
|
||||
const ObjectId = require('mongodb').ObjectId;
|
||||
const session = require("express-session");
|
||||
@@ -62,7 +63,16 @@ module.exports = (middleware, users, plans, assets) => {
|
||||
router.use(middleware);
|
||||
|
||||
router.get('/home', async (req, res) => {
|
||||
res.render('dashboard', { user: req.session.user });
|
||||
// if no session with geoData
|
||||
if (!req.session.geoData) {
|
||||
req.session.geoData = {
|
||||
country: null,
|
||||
toCurrencyRates: [],
|
||||
};
|
||||
}
|
||||
|
||||
res.render('dashboard', { user: req.user, geoData: req.session.geoData });
|
||||
|
||||
return res.status(status.Ok);
|
||||
});
|
||||
|
||||
@@ -469,6 +479,21 @@ module.exports = (middleware, users, plans, assets) => {
|
||||
return res.status(status.InternalServerError).redirect("/profile");
|
||||
});
|
||||
});
|
||||
router.get("/exRates/:lat/:lon", async (req, res) => {
|
||||
if (!req.session.geoData.country) {
|
||||
const response = await fetch(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${req.params.lat},${req.params.lon}&result_type=country&key=${process.env.geolocation_api}`);
|
||||
const data = await response.json();
|
||||
|
||||
country = data.results[0].formatted_address;
|
||||
let results = await getRates(country);
|
||||
req.session.geoData = {
|
||||
country: results.abbreviation,
|
||||
toCurrencyRates: results.exRates
|
||||
}
|
||||
}
|
||||
|
||||
return res.status(status.Ok).send({ data: req.session.geoData });
|
||||
})
|
||||
|
||||
return router;
|
||||
};
|
||||
Reference in new issue
Block a user