diff --git a/src/public/scripts/dollarFormat.js b/src/public/scripts/dollarFormat.js index 6539f64..a22f2c5 100644 --- a/src/public/scripts/dollarFormat.js +++ b/src/public/scripts/dollarFormat.js @@ -1,14 +1,19 @@ +/** + * Function takes in a number and formats it to currency + * @param {integer} + * @returns nuber formatted in currency + */ + document.addEventListener("DOMContentLoaded", () => { const number = document.querySelectorAll(".planGoal"); number.forEach(value => { num = parseFloat(value.textContent); if (num >= 999999) { - value.textContent = (num /= 1000000).toFixed(2) + "M"; - console.log(value.textContent); + value.textContent = "$" + (num /= 1000000) + "M"; } else if (num > 999) { - value.textContent = (num /= 1000).toFixed(2) + "K"; + value.textContent = "$" + (num /= 1000) + "k"; } else { - return num; + return "$" + num; } }); }); diff --git a/src/router/user.js b/src/router/user.js index 83ef7b3..7a25e91 100644 --- a/src/router/user.js +++ b/src/router/user.js @@ -95,10 +95,11 @@ module.exports = (middleware, users, plans, assets) => { const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray(); - res.render('dashboard', { + res.render('dashboard', { user: req.session.user, geoData: req.session.geoData, - plans: updatedUserPlans, }); + plans: updatedUserPlans, + }); return res.status(status.Ok); }); @@ -338,7 +339,7 @@ module.exports = (middleware, users, plans, assets) => { } let redirect = referrer.includes("?profile") ? "/profile" : - referrer != "/home" ? "/plans" : referrer; + referrer != "/home" ? "/plans" : referrer; return res.status(status.Ok).redirect(redirect); }); @@ -362,7 +363,7 @@ module.exports = (middleware, users, plans, assets) => { if (valid.err) { req.session.errMessage = "Invalid input", - res.status(status.BadRequest); + res.status(status.BadRequest); return res.redirect("/profile"); } @@ -510,7 +511,7 @@ module.exports = (middleware, users, plans, assets) => { if (valid.err) { req.session.errMessage = "Invalid input", - res.status(status.BadRequest); + res.status(status.BadRequest); return res.redirect("/assets"); } diff --git a/src/views/dashboard.ejs b/src/views/dashboard.ejs index 4f22cd0..d306208 100644 --- a/src/views/dashboard.ejs +++ b/src/views/dashboard.ejs @@ -11,10 +11,10 @@ class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">Create new plan -
-
+
+
<% plans.forEach(plan=> { %> - <%- include('./partials/dashboardBox.ejs', {plan: plan}) %> + <%- include('./partials/dashboardBox.ejs', {thing: plan}) %> <% }); %>
diff --git a/src/views/partials/dashboardBox.ejs b/src/views/partials/dashboardBox.ejs index eda67ad..6e9fc0c 100644 --- a/src/views/partials/dashboardBox.ejs +++ b/src/views/partials/dashboardBox.ejs @@ -1,34 +1,34 @@ -