diff --git a/config/data-total.json b/config/data-total.json index 813e313..5f6eea4 100644 --- a/config/data-total.json +++ b/config/data-total.json @@ -1,8 +1,4 @@ [ - { - "Company Name": "iShares MSCI All Country Asia Information Technology Index Fund", - "Symbol": "AAIT" - }, { "Company Name": "American Airlines Group, Inc.", "Symbol": "AAL" @@ -31,10 +27,6 @@ "Company Name": "Atlas Air Worldwide Holdings", "Symbol": "AAWW" }, - { - "Company Name": "iShares MSCI All Country Asia ex Japan Index Fund", - "Symbol": "AAXJ" - }, { "Company Name": "Aoxin Tianli Group, Inc.", "Symbol": "ABAC" @@ -167,14 +159,6 @@ "Company Name": "Acura Pharmaceuticals, Inc.", "Symbol": "ACUR" }, - { - "Company Name": "iShares MSCI ACWI Index Fund", - "Symbol": "ACWI" - }, - { - "Company Name": "iShares MSCI ACWI ex US Index Fund", - "Symbol": "ACWX" - }, { "Company Name": "Acxiom Corporation", "Symbol": "ACXM" diff --git a/package-lock.json b/package-lock.json index 9b08d97..09b4cc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1239,6 +1239,11 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, + "nodemailer": { + "version": "6.4.11", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz", + "integrity": "sha512-BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ==" + }, "nodemon": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz", diff --git a/package.json b/package.json index d8beb9a..185f8c0 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "mongoose": "^5.9.25", "mongoose-float": "^1.0.4", "morgan": "^1.10.0", + "nodemailer": "^6.4.11", "npm": "^6.14.7", "passport": "^0.4.1", "passport-google-oauth20": "^2.0.0", diff --git a/routes/api/done.js b/routes/api/done.js index b76ba37..2ef5466 100644 --- a/routes/api/done.js +++ b/routes/api/done.js @@ -7,8 +7,11 @@ const { ensureAuth, ensureGuest } = require("../../middleware/auth"); // @desc Done page // @route GET /done // @access Private -router.get("/", ensureGuest, (req, res) => { - res.status(200).render("done"); +router.get("/", ensureAuth, (req, res) => { + res.status(200) + .render("done"); }); -module.exports = router; + + +module.exports = router; \ No newline at end of file diff --git a/routes/api/market.js b/routes/api/market.js index 00ef505..e9c98b0 100644 --- a/routes/api/market.js +++ b/routes/api/market.js @@ -2,25 +2,10 @@ const express = require("express"); const router = express.Router(); -const alpha = require("alphavantage")({ key: process.env.ALPHA_VANTAGE_KEY }); - -var jsonData = []; -const jsonData1 = require("../../config/data-compact.json"); -const jsonData2 = require("../../config/data-total.json"); const { ensureAuth, ensureGuest } = require("../../middleware/auth"); -const dataCnt1 = jsonData1.length; -const dataCnt2 = jsonData2.length; -const dataLast1 = dataCnt1 + 1; -const dataStart2 = dataCnt1 + 1; - -jsonData.push({ data1: dataCnt1, data2: dataCnt2, dataLast1: dataLast1, dataStart2: dataStart2 }) -for (var i = 0; i < dataCnt1; i++) { - jsonData.push(jsonData1[i]); -}; -for (var i = 0; i < dataCnt2; i++) { - jsonData.push(jsonData2[i]); -}; +const compactData = require("../../config/data-compact.json"); +const totalData = require("../../config/data-total.json"); // TODO // Implement Stocks Search @@ -29,9 +14,42 @@ for (var i = 0; i < dataCnt2; i++) { // @desc Market page // @route GET /Market // @access Privat -router.get("/", ensureAuth, async(req, res) => { - res.status(200).render("market", { layout: "layouts/app", jsonData, href: '/market', avatar: req.user.image }); +router.get("/", ensureAuth, async (req, res) => { + let min = 0; + let max = 75; + + res.status(200).render("market", { + layout: "layouts/app", + compactData, + totalData, + min, + max, + href: "/market", + avatar: req.user.image, + }); }); +// @desc Market page +// @route GET /Market/:page +// @access Private +router.get("/:page", ensureAuth, async (req, res) => { + let page = req.params.page - 1; + let min = page * 75; + let max = page * 75 + 75; + + if (page <= 0 || page >= 39) { + res.status(200).redirect("/market"); + } else { + res.status(200).render("market", { + layout: "layouts/app", + compactData, + totalData, + min, + max, + href: "/market", + avatar: req.user.image, + }); + } +}); -module.exports = router; \ No newline at end of file +module.exports = router; diff --git a/views/done.ejs b/views/done.ejs index 828c36c..d761622 100644 --- a/views/done.ejs +++ b/views/done.ejs @@ -1 +1,185 @@ -
+ Thankyou for using TradeByte +
+