Merge branch 'master' of TradeByte into fix/iampavangandhi#60

app.js

@@ -41,19 +41,19 @@ app.use(express.json());
 
 // Method override
 app.use(
-  methodOverride(function (req, res) {
-    if (req.body && typeof req.body === "object" && "_method" in req.body) {
-      // look in urlencoded POST bodies and delete it
-      let method = req.body._method;
-      delete req.body._method;
-      return method;
-    }
-  })
+    methodOverride(function(req, res) {
+        if (req.body && typeof req.body === "object" && "_method" in req.body) {
+            // look in urlencoded POST bodies and delete it
+            let method = req.body._method;
+            delete req.body._method;
+            return method;
+        }
+    })
 );
 
 // Logging
 if (process.env.NODE_ENV === "development") {
-  app.use(morgan("dev"));
+    app.use(morgan("dev"));
 }
 
 // EJS
@@ -66,12 +66,12 @@ app.use(expressLayouts);
 
 // Sessions
 app.use(
-  session({
-    secret: "keyboard cat",
-    resave: false,
-    saveUninitialized: false,
-    store: new MongoStore({ mongooseConnection: mongoose.connection }),
-  })
+    session({
+        secret: "keyboard cat",
+        resave: false,
+        saveUninitialized: false,
+        store: new MongoStore({ mongooseConnection: mongoose.connection }),
+    })
 );
 
 // cookie middleware
@@ -85,12 +85,12 @@ app.use(passport.session());
 app.use(flash());
 
 // Set Global variables
-app.use(function (req, res, next) {
-  res.locals.user = req.user || null;
-  res.locals.success_msg = req.flash("success_msg");
-  res.locals.error_msg = req.flash("error_msg");
-  res.locals.error = req.flash("error");
-  next();
+app.use(function(req, res, next) {
+    res.locals.user = req.user || null;
+    res.locals.success_msg = req.flash("success_msg");
+    res.locals.error_msg = req.flash("error_msg");
+    res.locals.error = req.flash("error");
+    next();
 });
 
 // Static folder
@@ -108,12 +108,13 @@ app.use("/done", require("./routes/api/done"));
 app.use("/addBalance", require("./routes/api/addBalance"));
 app.use("/transaction", require("./routes/api/transaction"));
 app.use("/search", require("./routes/api/search"));
+app.use("/edit", require("./routes/api/edit"));
 
 // Port: Love You 3000
 const PORT = process.env.PORT || 3000;
 
 // Server Listening
 app.listen(
-  PORT,
-  console.log(`Server running in ${process.env.NODE_ENV} mode on port ${PORT}`)
-);
+    PORT,
+    console.log(`Server running in ${process.env.NODE_ENV} mode on port ${PORT}`)
+);

config/data-compact.json

@@ -4,15 +4,15 @@
     "Symbol": "AAPL"
   },
   {
-    "Company Name": "Adobe Systems Incorporated",
+    "Company Name": "Adobe Systems",
     "Symbol": "ADBE"
   },
   {
     "Company Name": "Advent Software, Inc.",
     "Symbol": "ADVS"
   },
   {
-    "Company Name": "Advanced Micro Devices, Inc.",
+    "Company Name": "Advance Micro Devices",
     "Symbol": "AMD"
   },
   {
@@ -60,7 +60,7 @@
     "Symbol": "NVDA"
   },
   {
-    "Company Name": "QUALCOMM Incorporated",
+    "Company Name": "Qualcomm, Inc.",
     "Symbol": "QCOM"
   },
   {

public/css/tailwind.css

@@ -1,5 +1,7 @@
 @tailwind base;
+
 /* Custom CSS */
+
 /* Main CSS */
 
 html,
@@ -33,8 +35,6 @@ body {
 .user-profile {
   border-radius: 100px;
   border: 10px solid #1955e4;
-  width: 130px;
-  height: 130px;
 }
 
 .tick {
@@ -97,6 +97,21 @@ body {
   min-width: 400px;
 }
 
+.notification {
+  position: relative;
+  display: inline-block;
+}
+
+.notification .badge {
+  position: absolute;
+  top: -5px;
+  right: -5px;
+  padding: 5px 2px;
+  border-radius: 50%;
+  background-color: #0072ff;
+  color: white;
+}
+
 @media (max-width: 400px) {
   .min-w {
     min-width: 300px;
@@ -146,4 +161,4 @@ animated {
   }
 }
 
-@tailwind utilities;
+@tailwind utilities;

routes/api/edit.js

@@ -1 +1,59 @@
 // Edit Profile Route
+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
+router.get("/", ensureAuth, (req, res) => {
+  let avatar = req.user.image;
+
+  let displayName = req.user.displayName;
+  let firstName = req.user.firstName;
+  let lastName = req.user.lastName;
+  let email = req.user.email;
+
+  res.status(200).render("edit", {
+    layout: "layouts/app",
+    avatar,
+    displayName,
+    firstName,
+    lastName,
+    email,
+    href: "/edit",
+  });
+});
+
+router.put("/", ensureAuth, async (req, res) => {
+  try {
+    let curruser1 = await User.findById(req.user._id).lean();
+
+    curruser1.displayName = req.body.displayName;
+    curruser1.firstName = req.body.firstName;
+    curruser1.lastName = req.body.lastName;
+    curruser1.email = req.body.email;
+
+    curruser1 = await User.findOneAndUpdate(
+      { _id: curruser1._id },
+      {
+        firstName: curruser1.firstName,
+        lastName: curruser1.lastName,
+        email: curruser1.email,
+        displayName: curruser1.displayName,
+      },
+      {
+        new: true, // it will create a new one, if it doesn't exist
+        runValidators: true, // it check weather the fields are valid or not
+      }
+    );
+
+    res.redirect("/portfolio");
+  } catch (err) {
+    console.error(err);
+    return res.render("error/500");
+  }
+});
+
+module.exports = router;

routes/api/market.js

@@ -16,7 +16,7 @@ const totalData = require("../../config/data-total.json");
 // @access   Private
 router.get("/", ensureAuth, async (req, res) => {
   let min = 0;
-  let max = 75;
+  let max = 50;
 
   res.status(200).render("market", {
     layout: "layouts/app",
@@ -34,10 +34,10 @@ router.get("/", ensureAuth, async (req, res) => {
 // @access   Private
 router.get("/:page", ensureAuth, async (req, res) => {
   let page = req.params.page - 1;
-  let min = page * 75;
-  let max = page * 75 + 75;
+  let min = page * 50;
+  let max = page * 50 + 50;
 
-  if (page <= 0 || page >= 39) {
+  if (page <= 0 || page >= 59) {
     res.status(200).redirect("/market");
   } else {
     res.status(200).render("market", {

routes/api/view.js

@@ -105,7 +105,7 @@ router.get("/:symbol", ensureAuth, async (req, res) => {
     })
     .catch((err) => {
       console.error(err);
-      res.render("error/500");
+      res.render("error/404");
     });
 });
 

views/edit.ejs

@@ -1 +1,111 @@
-<h1>Edit Profile</h1>
+<main class="md:col-span-4 md:ml-56 lg:ml-64 md:pr-14 w-full">
+  <div class="container px-5 py-10 mx-auto md:px-auto">
+    <!-- header -->
+
+    <header class="my-4 absolute-center">
+      <span
+        class="text-gray-700 text-3xl font-semibold leading-none tracking-wider"
+        >Edit Profile</span
+      >
+    </header>
+
+    <hr class="line my-4" />
+
+    <!--form  -->
+
+    <form action="/edit" method="POST" class="w-full max-w-sm m-auto">
+      <input type="hidden" name="_method" value="PUT" />
+      <div class="md:flex md:items-center mb-6">
+        <div class="md:w-1/3">
+          <label
+            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            for="inline-full-name"
+          >
+            Display :
+          </label>
+        </div>
+        <div class="md:w-2/3">
+          <input
+            type="text"
+            id="displayName"
+            name="displayName"
+            value="<%=displayName%>"
+            class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-purple-500"
+          />
+        </div>
+      </div>
+      <div class="md:flex md:items-center mb-6">
+        <div class="md:w-1/3">
+          <label
+            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            for="inline-full-name"
+          >
+            First Name :
+          </label>
+        </div>
+        <div class="md:w-2/3">
+          <input
+            type="text"
+            name="firstName"
+            value="<%=firstName%>"
+            class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-purple-500"
+          />
+        </div>
+      </div>
+      <div class="md:flex md:items-center mb-6">
+        <div class="md:w-1/3">
+          <label
+            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            for="inline-full-name"
+          >
+            Last Name :
+          </label>
+        </div>
+        <div class="md:w-2/3">
+          <input
+            type="text"
+            id="lastName"
+            name="lastName"
+            value="<%=lastName%>"
+            class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-purple-500"
+          />
+        </div>
+      </div>
+      <div class="md:flex md:items-center mb-6">
+        <div class="md:w-1/3">
+          <label
+            class="block text-gray-500 font-bold md:text-right mb-1 md:mb-0 pr-4 mr-4"
+            for="inline-full-name"
+          >
+            Email :
+          </label>
+        </div>
+        <div class="md:w-2/3">
+          <input
+            class="bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full py-2 px-4 text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-purple-500"
+            type="email"
+            id="email"
+            name="email"
+            value="<%=email%>"
+          />
+        </div>
+      </div>
+
+      <div class="md:flex justify-center">
+        <input
+          type="submit"
+          value="Save"
+          class="save_btn ml-6 cursor-pointer lg:ml-24 btn mb-4 shadow bg-blue-700 hover:bg-blue-800 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
+        />
+
+        <button
+          class="mb-4 ml-6 shadow bg-yellow-500 hover:bg-yellow-600 focus:shadow-outline focus:outline-none text-white font-bold py-2 px-4 rounded"
+          type="button"
+          style="margin-left: 6px"
+        >
+          <a href="/portfolio">Cancel</a>
+        </button>
+      </div>
+    </form>
+  </div>
+</main>