From 3f183b39e4e60551294c048e41fa7a6962ceee69 Mon Sep 17 00:00:00 2001 From: Pavan Gandhi Date: Sun, 30 Aug 2020 11:36:09 +0530 Subject: [PATCH] minor changes --- routes/api/done.js | 4 +++- routes/api/edit.js | 14 +++++++++++--- routes/api/index.js | 4 +++- routes/api/search.js | 7 +++++-- routes/api/user.js | 5 +++++ routes/api/view.js | 9 +++------ views/done.ejs | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/routes/api/done.js b/routes/api/done.js index 071dfdc..ababbd2 100644 --- a/routes/api/done.js +++ b/routes/api/done.js @@ -1,8 +1,10 @@ // Done Route +//jshint esversion:8 + const express = require("express"); const router = express.Router(); -const { ensureAuth, ensureGuest } = require("../../middleware/auth"); +const { ensureAuth } = require("../../middleware/auth"); // @desc Done page // @route GET /done diff --git a/routes/api/edit.js b/routes/api/edit.js index 9cec1bd..ff64701 100644 --- a/routes/api/edit.js +++ b/routes/api/edit.js @@ -1,12 +1,17 @@ -// Edit Profile Route +// Edit Profile Routes + +//jshint esversion:8 + const express = require("express"); const router = express.Router(); + const { ensureAuth } = require("../../middleware/auth"); const User = require("../../models/User.js"); -// @desc Show edit page -// @route GET /edit +// @desc Show edit page +// @route GET /edit +// @access Private router.get("/", ensureAuth, (req, res) => { let avatar = req.user.image; @@ -26,6 +31,9 @@ router.get("/", ensureAuth, (req, res) => { }); }); +// @desc Edit page +// @route PUT /edit +// @access Private router.put("/", ensureAuth, async (req, res) => { try { let curruser1 = await User.findById(req.user._id).lean(); diff --git a/routes/api/index.js b/routes/api/index.js index ab68b5b..eae3ce8 100644 --- a/routes/api/index.js +++ b/routes/api/index.js @@ -1,4 +1,6 @@ -// Index Route +// Index Routes + +//jshint esversion:8 const express = require("express"); const router = express.Router(); diff --git a/routes/api/search.js b/routes/api/search.js index 4985bb2..f1eac6b 100644 --- a/routes/api/search.js +++ b/routes/api/search.js @@ -1,8 +1,11 @@ -// search Routes +// Search Routes + +//jshint esversion:8 const express = require("express"); const router = express.Router(); -const { ensureAuth, ensureGuest } = require("../../middleware/auth"); + +const { ensureAuth } = require("../../middleware/auth"); const totalData = require("../../config/data-total.json"); diff --git a/routes/api/user.js b/routes/api/user.js index 040f36f..4389ba1 100644 --- a/routes/api/user.js +++ b/routes/api/user.js @@ -1,3 +1,7 @@ +// User Routes + +//jshint esversion:8 + const express = require("express"); const router = express.Router(); const passport = require("passport"); @@ -90,6 +94,7 @@ router.post("/signup", ensureGuest, (req, res) => { // @desc Submit Sign In Form // @route GET /user/signin +// @access Public router.post("/signin", ensureGuest, (req, res, next) => { passport.authenticate("local", { successRedirect: "/portfolio", diff --git a/routes/api/view.js b/routes/api/view.js index def71e8..4d37b98 100644 --- a/routes/api/view.js +++ b/routes/api/view.js @@ -4,11 +4,12 @@ const express = require("express"); const router = express.Router(); -const getPrice = require("../../helpers/getPrice"); + const alpha = require("alphavantage")({ key: process.env.ALPHA_VANTAGE_KEY, }); +const getPrice = require("../../helpers/getPrice"); const getOverview = require("../../helpers/getOverview"); const { ensureAuth } = require("../../middleware/auth"); @@ -38,14 +39,11 @@ router.get("/:symbol", ensureAuth, async (req, res) => { let weeksLow = data["weeksLow"]; let weeksHigh = data["weeksHigh"]; - // console.log(data); alpha.data .intraday(symbol, "compact", "json", "60min") .then((data) => { const intraDay = data["Time Series (60min)"]; - // const assetInformation = data["Meta Data"]["1. Information"]; - // const lastRefreshed = data["Meta Data"]["3. Last Refreshed"]; let dates = []; let opening = []; let closing = []; @@ -62,11 +60,10 @@ router.get("/:symbol", ensureAuth, async (req, res) => { closing.push(intraDay[keys[i]]["4. close"]); volumes.push(intraDay[keys[i]]["5. volume"]); } + // reverse so dates appear from left to right dates.reverse(); closing.reverse(); - // dates = JSON.stringify(dates); - // closing = JSON.stringify(closing); res.status(200).render("view", { layout: "layouts/app", diff --git a/views/done.ejs b/views/done.ejs index f46abd8..fc79210 100644 --- a/views/done.ejs +++ b/views/done.ejs @@ -97,7 +97,7 @@ onclick="back()" class="bg-gray-700 hover:bg-red-400 text-white font-bold py-2 px-5 mx-2 mt-4 mb-3 rounded-full" > - Cancel + Back