SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing conflicts and merging dev

Browse Source
This commit is contained in:
knighthawk4227 committed 2025-05-08 10:44:38 -07:00
2 parents 7a5d2e7490 32437a6e36
commit c64da1de46
3 files changed
+66 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/public/svgs/flags/EUR.svg
+28
View File
@@ -0,0 +1,28 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-eu" viewBox="0 0 640 480">
<defs>
<g id="eu-d">
<g id="eu-b">
<path id="eu-a" d="m0-1-.3 1 .5.1z"/>
<use xlink:href="#eu-a" transform="scale(-1 1)"/>
</g>
<g id="eu-c">
<use xlink:href="#eu-b" transform="rotate(72)"/>
<use xlink:href="#eu-b" transform="rotate(144)"/>
</g>
<use xlink:href="#eu-c" transform="scale(-1 1)"/>
</g>
</defs>
<path fill="#039" d="M0 0h640v480H0z"/>
<g fill="#fc0" transform="translate(320 242.3)scale(23.7037)">
<use xlink:href="#eu-d" width="100%" height="100%" y="-6"/>
<use xlink:href="#eu-d" width="100%" height="100%" y="6"/>
<g id="eu-e">
<use xlink:href="#eu-d" width="100%" height="100%" x="-6"/>
<use xlink:href="#eu-d" width="100%" height="100%" transform="rotate(-144 -2.3 -2.1)"/>
<use xlink:href="#eu-d" width="100%" height="100%" transform="rotate(144 -2.1 -2.3)"/>
<use xlink:href="#eu-d" width="100%" height="100%" transform="rotate(72 -4.7 -2)"/>
<use xlink:href="#eu-d" width="100%" height="100%" transform="rotate(72 -5 .5)"/>
</g>
<use xlink:href="#eu-e" width="100%" height="100%" transform="scale(-1 1)"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

src/router/user.js
+35 -9
View File
@@ -78,7 +78,12 @@ module.exports = (middleware, users, plans, assets) => {
router.get('/assets', async (req, res) => {
let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
res.render('assets', { user: req.session.user, errMessage: req.session.errMessage, assets: userAssets });
res.render('assets', {
user: req.session.user,
errMessage: req.session.errMessage,
assets: userAssets,
geoData: req.session.geoData
});
return res.status(status.Ok);
});
@@ -89,7 +94,8 @@ module.exports = (middleware, users, plans, assets) => {
// console.log(userPlans);
res.render('plans', {
user: req.session.user,
plans: userPlans
plans: userPlans,
geoData: req.session.geoData
});
} catch (err) {
console.error("Error fetching plans:", err);
@@ -119,7 +125,8 @@ module.exports = (middleware, users, plans, assets) => {
// console.log("Found plan:", plan);
res.render('planDetail', {
user: req.session.user,
plan: plan
plan: plan,
geoData: req.session.geoData
});
} catch (err) {
@@ -136,7 +143,11 @@ module.exports = (middleware, users, plans, assets) => {
}
const errMessage = req.session.errMessage;
req.session.errMessage = "";
res.render('newPlan', { user: req.session.user, errMessage: errMessage });
res.render('newPlan', {
user: req.session.user,
errMessage: errMessage,
geoData: req.session.geoData
});
});
router.post('/newPlan', async (req, res) => {
@@ -180,24 +191,38 @@ module.exports = (middleware, users, plans, assets) => {
});
router.get('/more', (req, res) => {
res.render('more', { user: req.session.user });
res.render('more', {
user: req.session.user,
geoData: req.session.geoData
});
return res.status(status.Ok);
});
router.get('/profile', (req, res) => {
res.render('profile', { user: req.session.user, errMessage: req.session.errMessage });
res.render('profile', {
user: req.session.user,
errMessage: req.session.errMessage,
geoData: req.session.geoData
});
return res.status(status.Ok);
});
router.get('/settings', (req, res) => {
res.render('settings', { user: req.session.user });
res.render('settings', {
user: req.session.user,
geoData: req.session.geoData
});
return res.status(status.Ok);
});
router.get('/questionnaire', (req, res) => {
const errMessage = req.session.errMessage;
req.session.errMessage = "";
res.render('questionnaire', { user: req.session.user, errMessage: errMessage });
res.render('questionnaire', {
user: req.session.user,
errMessage: errMessage,
geoData: req.session.geoData
});
});
router.post('/questionnaire', (req, res) => {
@@ -488,7 +513,8 @@ module.exports = (middleware, users, plans, assets) => {
let results = await getRates(country);
req.session.geoData = {
country: results.abbreviation,
toCurrencyRates: results.exRates
toCurrencyRates: results.exRates,
geoData: req.session.geoData
}
}