From 4aa4f5a6d2abfd504c3076f895ba12739514ce24 Mon Sep 17 00:00:00 2001 From: garimasingh22 <44470092+garimasingh22@users.noreply.github.com> Date: Sun, 16 Aug 2020 10:57:31 +0530 Subject: [PATCH 1/5] checking check --- public/css/style.css | 36 +++++++----- routes/api/market.js | 12 ++-- views/market.ejs | 132 ++++++++++++++++++++++++++++++++++--------- views/portfolio.ejs | 16 +++--- 4 files changed, 142 insertions(+), 54 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 2d24345..b061066 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -2,24 +2,32 @@ html, body { - margin: 0; - padding: 0; - width: 100%; - height: 100%; - overflow-x: hidden; - box-sizing: border-box; + margin: 0; + padding: 0; + width: 100%; + height: 100%; + overflow-x: hidden; + box-sizing: border-box; + background-color: rgb(226, 232, 240); } .data-table { - display: flex; - justify-content: center; - align-items: center; - margin: 50px 0 30px 0; + display: flex; + justify-content: center; + align-items: center; + margin: 50px 0 30px 0; } .chartjs-container { - position: relative; - margin: auto; - height: 75vh; - width: 75vw; + position: relative; + margin: auto; + height: 75vh; + width: 75vw; } + +.symbolicon { + font-size: 72px; + background: -webkit-linear-gradient(#eee, #333); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} \ No newline at end of file diff --git a/routes/api/market.js b/routes/api/market.js index 63b9a32..a31e6bf 100644 --- a/routes/api/market.js +++ b/routes/api/market.js @@ -5,6 +5,7 @@ const router = express.Router(); const alpha = require("alphavantage")({ key: process.env.ALPHA_VANTAGE_KEY }); const jsonData = require("../../config/data-compact.json"); +const jsonData1 = require("../../config/data-total.json"); const { ensureAuth, ensureGuest } = require("../../middleware/auth"); // TODO @@ -14,10 +15,11 @@ const { ensureAuth, ensureGuest } = require("../../middleware/auth"); // @desc Market page // @route GET /Market // @access Private -router.get("/", ensureAuth, async (req, res) => { - res - .status(200) - .render("market", { layout: "layouts/app", jsonData, href: "/market" }); +router.get("/", ensureAuth, async(req, res) => { + res + .status(200) + .render("market", { layout: "layouts/app", jsonData1, href: "/market" }, { layout: "layouts/app", jsonData, href: "/market" }); }); -module.exports = router; + +module.exports = router; \ No newline at end of file diff --git a/views/market.ejs b/views/market.ejs index 25803b9..e5da917 100644 --- a/views/market.ejs +++ b/views/market.ejs @@ -1,30 +1,108 @@ -
-
-
- <% for(var i=0; i < jsonData.length; i++) { %> - -
- - ecommerce - -
-

- <%- jsonData[i]["Symbol"] %> -

-

- <%- jsonData[i]["Company Name"] %> -

- ">VIEW - ">BUY -

$0.00

+
+ +
+

Favorite Stocks

+
+
+ +
+ <% for(var i=0; i < jsonData1.length; i++) { %> + + +
+ + + ecommerce + + +
+

+ <%- jsonData1[i]["Symbol"] %> +

+

+ <%- jsonData1[i]["Company Name"] %> +

+ + + + +

$0.00

+
+
+ + + <% } %> +
+ + + +
+

Trending Stocks

-
- <% } %> +
+ <% for(var i=0; i < jsonData1.length; i++) { %> + +
+ + + + ecommerce + + +
+

+ <%- jsonData1[i]["Symbol"] %> +

+

+ <%- jsonData1[i]["Company Name"] %> +

+ + + + +

$0.00

+
+
+ + + <% } %> +
+ + + +
+
+ + +
+
-
-
+ + + \ No newline at end of file diff --git a/views/portfolio.ejs b/views/portfolio.ejs index 4eb6946..4dda434 100644 --- a/views/portfolio.ejs +++ b/views/portfolio.ejs @@ -25,11 +25,11 @@ -
+
-
+

$40,342.04

@@ -39,13 +39,13 @@ -
+
-
+

- $40,342.04 + $ 40,342.04

Profit / Loss
@@ -53,11 +53,11 @@ -
+
-
+

$40,342.04

@@ -515,4 +515,4 @@
Load more
- + \ No newline at end of file From c9c59212f59b54e956ac64f259f4ca305bc930b7 Mon Sep 17 00:00:00 2001 From: garimasingh22 <44470092+garimasingh22@users.noreply.github.com> Date: Sun, 16 Aug 2020 21:53:45 +0530 Subject: [PATCH 2/5] commit 2nd time --- routes/api/market.js | 2 +- views/market.ejs | 140 +++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/routes/api/market.js b/routes/api/market.js index a31e6bf..a3283b4 100644 --- a/routes/api/market.js +++ b/routes/api/market.js @@ -18,7 +18,7 @@ const { ensureAuth, ensureGuest } = require("../../middleware/auth"); router.get("/", ensureAuth, async(req, res) => { res .status(200) - .render("market", { layout: "layouts/app", jsonData1, href: "/market" }, { layout: "layouts/app", jsonData, href: "/market" }); + .render("market", { layout: "layouts/app", jsonData, jsonData1, href: "/market" }); }); diff --git a/views/market.ejs b/views/market.ejs index e5da917..4be11c1 100644 --- a/views/market.ejs +++ b/views/market.ejs @@ -6,92 +6,92 @@
- <% for(var i=0; i < jsonData1.length; i++) { %> - - -
- - - ecommerce - - -
-

- <%- jsonData1[i]["Symbol"] %> -

-

- <%- jsonData1[i]["Company Name"] %> -

- - - - -

$0.00

+ +

$0.00

+
+ + + <% } %>
- <% } %> -
- - - -
-

Trending Stocks

-
- -
- <% for(var i=0; i < jsonData1.length; i++) { %> - -
- - - - ecommerce - - -
-

- <%- jsonData1[i]["Symbol"] %> -

-

- <%- jsonData1[i]["Company Name"] %> -

- - - - -

$0.00

-
-
+

$0.00

+
+
- <% } %> -
+ <% } %> +
- -
-
- - -
-
-
+
+
+
\ No newline at end of file From 10f03b1be0f8586a2cddf01e77fda18e42f66bdc Mon Sep 17 00:00:00 2001 From: garimasingh22 <44470092+garimasingh22@users.noreply.github.com> Date: Sun, 16 Aug 2020 23:54:50 +0530 Subject: [PATCH 3/5] ui part done pagination not implemented --- routes/api/main.js | 31 ++++++ routes/api/market.js | 20 +++- views/market.ejs | 227 ++++++++++++++++++++++++++++++++----------- 3 files changed, 217 insertions(+), 61 deletions(-) create mode 100644 routes/api/main.js diff --git a/routes/api/main.js b/routes/api/main.js new file mode 100644 index 0000000..aa10437 --- /dev/null +++ b/routes/api/main.js @@ -0,0 +1,31 @@ +// var router = require('express').Router() +// // var faker = require('faker') +// var jsonData = require("../../config/data-total.json") + + +// // adding pagination + +// router.get('/:page', function(req, res, next) { +// var perPage = 9 +// var page = req.params.page || 1 + +// jsonData +// .find({}) +// .skip((perPage * page) - perPage) +// .limit(perPage) +// .exec(function(err, products) { +// jsonData.count().exec(function(err, count) { +// if (err) return next(err) +// res.render("market", { +// layout: "layouts/app", +// jsonData, +// href: "/market", +// products: products, +// current: page, +// pages: Math.ceil(count / perPage) +// }) +// }) +// }) +// }) + +// module.exports = router \ No newline at end of file diff --git a/routes/api/market.js b/routes/api/market.js index a3283b4..8040c4f 100644 --- a/routes/api/market.js +++ b/routes/api/market.js @@ -4,10 +4,24 @@ const express = require("express"); const router = express.Router(); const alpha = require("alphavantage")({ key: process.env.ALPHA_VANTAGE_KEY }); -const jsonData = require("../../config/data-compact.json"); -const jsonData1 = require("../../config/data-total.json"); +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]); +}; + // TODO // Implement Stocks Search // https://www.alphavantage.co/documentation/#symbolsearch @@ -18,7 +32,7 @@ const { ensureAuth, ensureGuest } = require("../../middleware/auth"); router.get("/", ensureAuth, async(req, res) => { res .status(200) - .render("market", { layout: "layouts/app", jsonData, jsonData1, href: "/market" }); + .render("market", { layout: "layouts/app", jsonData, href: "/market" }); }); diff --git a/views/market.ejs b/views/market.ejs index 4be11c1..cd43928 100644 --- a/views/market.ejs +++ b/views/market.ejs @@ -6,92 +6,94 @@
- <% for(var i=0; i < jsonData.length; i++) { %> + <% for(var i=1; i < jsonData[0]["dataLast1"]; i++) { %> + + +
+ + + ecommerce + + +
+

+ <%- jsonData[i]["Symbol"] %> +

+

+ <%- jsonData[i]["Company Name"] %> +

+ + + + +

$0.00

+
+
+ + + <% } %> +
+ + + + +
+
+

Trending Stocks

+
+ +
+ <% for(var i=jsonData[0]["dataStart2"]; i < jsonData.length; i++) { %> + +
+ ecommerce - +

- <%- jsonData[i].Symbol %> + <%- jsonData[i]["Symbol"] %>

<%- jsonData[i]["Company Name"] %>

- + - +

$0.00

<% } %> -
- - - -
-

Trending Stocks

-
+
-
- <% for(var i=0; i < jsonData.length; i++) { %> - -
-
- - - ecommerce -
- <%- jsonData[i].Symbol %> -
- -
-

- <%- jsonData[i].Symbol %> -

-

- <%- jsonData[i]["Company Name"] %> -

- - - - -

$0.00

-
-
- - <% } %> -
- - - -
-
- - -
+
+
+
+
+
+ +
+

Favorite Stocks

+
+
+ +
+ <% for(var i=1; i < jsonData[0]["dataLast1"]; i++) { %> + + +
+ + + ecommerce + + +
+

+ <%- jsonData[i]["Symbol"] %> +

+

+ <%- jsonData[i]["Company Name"] %> +

+ + + + +

$0.00

+
+
+ + + <% } %> +
+ + + +
+

Trending Stocks

+
+ +
+ <% for(var i=jsonData[0]["dataStart2"]; i < jsonData.length; i++) { %> + +
+ + + + ecommerce + + +
+

+ <%- jsonData[i]["Symbol"] %> +

+

+ <%- jsonData[i]["Company Name"] %> +

+ + + + +

$0.00

+
+ + + <% } %> +
+ + + +
+
+ +
+
+
+ + +
\ No newline at end of file From 8529826e98aa21a2e43df64a93927272c6363d0d Mon Sep 17 00:00:00 2001 From: garimasingh22 <44470092+garimasingh22@users.noreply.github.com> Date: Mon, 17 Aug 2020 17:11:43 +0530 Subject: [PATCH 4/5] market section ui improvement --- routes/api/main.js | 31 ------------- views/market.ejs | 111 +------------------------------------------- views/portfolio.ejs | 5 ++ 3 files changed, 6 insertions(+), 141 deletions(-) delete mode 100644 routes/api/main.js diff --git a/routes/api/main.js b/routes/api/main.js deleted file mode 100644 index aa10437..0000000 --- a/routes/api/main.js +++ /dev/null @@ -1,31 +0,0 @@ -// var router = require('express').Router() -// // var faker = require('faker') -// var jsonData = require("../../config/data-total.json") - - -// // adding pagination - -// router.get('/:page', function(req, res, next) { -// var perPage = 9 -// var page = req.params.page || 1 - -// jsonData -// .find({}) -// .skip((perPage * page) - perPage) -// .limit(perPage) -// .exec(function(err, products) { -// jsonData.count().exec(function(err, count) { -// if (err) return next(err) -// res.render("market", { -// layout: "layouts/app", -// jsonData, -// href: "/market", -// products: products, -// current: page, -// pages: Math.ceil(count / perPage) -// }) -// }) -// }) -// }) - -// module.exports = router \ No newline at end of file diff --git a/views/market.ejs b/views/market.ejs index cd43928..cfb0b72 100644 --- a/views/market.ejs +++ b/views/market.ejs @@ -41,8 +41,7 @@ - -
+

Trending Stocks

@@ -106,114 +105,6 @@
-
- -
-

Favorite Stocks

-
-
- -
- <% for(var i=1; i < jsonData[0]["dataLast1"]; i++) { %> - - -
- - - ecommerce - - -
-

- <%- jsonData[i]["Symbol"] %> -

-

- <%- jsonData[i]["Company Name"] %> -

- - - - -

$0.00

-
-
- - - <% } %> -
- - - -
-

Trending Stocks

-
- -
- <% for(var i=jsonData[0]["dataStart2"]; i < jsonData.length; i++) { %> - -
- - - - ecommerce - - -
-

- <%- jsonData[i]["Symbol"] %> -

-

- <%- jsonData[i]["Company Name"] %> -

- - - - -

$0.00

-
-
- - - <% } %> -
- - - -
-
- - -
-
-
- - -
\ No newline at end of file diff --git a/views/portfolio.ejs b/views/portfolio.ejs index 4dda434..75547a5 100644 --- a/views/portfolio.ejs +++ b/views/portfolio.ejs @@ -1,5 +1,7 @@
+ +
@@ -515,4 +517,7 @@
Load more
+ + +
\ No newline at end of file From 52f97c8435773824008160bbe4ee4d90db9a9d46 Mon Sep 17 00:00:00 2001 From: garimasingh22 <44470092+garimasingh22@users.noreply.github.com> Date: Mon, 17 Aug 2020 18:01:33 +0530 Subject: [PATCH 5/5] Solved the view and cart link bug --- views/market.ejs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/views/market.ejs b/views/market.ejs index 1dcea13..eb8f80a 100644 --- a/views/market.ejs +++ b/views/market.ejs @@ -23,11 +23,11 @@ <%- jsonData[i]["Company Name"] %> @@ -67,11 +67,11 @@ <%- jsonData[i]["Company Name"] %>