updated

client/src/pages/Admin/Credits.js

@@ -12,21 +12,44 @@ function Credits() {
     {
       title: "Sender's Name",
       dataIndex: "senderName",
-      render: (_, record) => {
-        return record.user ? record.user.fname : "";
-      },
+      render: (_, record) => (
+        <span style={{ color: '#203545' }}>
+          {record.user ? record.user.fname : ""}
+        </span>
+      ),
     },
     {
       title: "Project Name",
       dataIndex: "projectName",
+      render: (text) => (
+        <span
+          style={{
+            fontSize: "16px",
+            color: "#652A0E",
+            backgroundColor: "#FFF39A",
+          }}
+        >
+          {text}
+        </span>
+      ),
     },
     {
       title: "Start Date",
       dataIndex: "startDate",
+      render: (record) => {
+        return (
+          <span style={{ color: "blueviolet" }}>{new Date(record).toLocaleDateString()}</span>
+        );
+      }
     },
     {
       title: "End Date",
       dataIndex: "endDate",
+      render: (record) => {
+        return (
+          <span style={{ color: "red" }}>{new Date(record).toLocaleDateString()}</span>
+        );
+      }
     },
     {
       title: "Baseline Emission Amt",
@@ -58,8 +81,11 @@ function Credits() {
     {
       title: "Added On",
       dataIndex: "createdAt",
-      render: (text, record) =>
-        moment(record.createdAt).format("DD-MM-YYYY hh:mm A"),
+      render: (text, record) => (
+        <span style={{ color: '#888' }}>
+          {moment(record.createdAt).format("DD-MM-YYYY hh:mm A")}
+        </span>
+      ),
     },
     {
       title: "Action",

client/src/pages/Admin/SellCredits.js

@@ -17,12 +17,21 @@ function SellCredits() {
         },
       },
       {
-        title: "Credits",
+        title: "Carbon Credits",
         dataIndex: "sellCredits",
       },
       {
-        title: "date",
+        title: "Bidding Deadline",
         dataIndex: "sellBeforeDate",
+        render: (text, record) =>
+          moment(record.sellBeforeDate).format("DD-MM-YYYY hh:mm A"),
+      },
+      {
+        title: "Selling Status",
+        dataIndex: "selling_status",
+        render: (text, record) => {
+          return record.selling_status.toUpperCase();
+        },
       },
       {
         title: "Status",

client/src/pages/CarbonCredits/Bids.js

@@ -79,7 +79,7 @@ function Bids({ showBidsModal, setShowBidsModal, selectedSellCredit }) {
       // notify buyer for the credits
       const notify1 = {
         title: "Congratulations! 🎉",
-        message: `You have earned ${selectedSellCredit.sellCredits} Carbon Credits from ${selectedSellCredit.user.fname}`,
+        message: `You have earned ${selectedSellCredit.sellCredits} Carbon Credits from ${selectedSellCredit.seller.fname}`,
         user: id,
         onClick: `/profile`,
         read: false,

client/src/pages/CarbonCredits/Credits.js

@@ -68,6 +68,17 @@ function Credits() {
     {
       title: "Project Name",
       dataIndex: "projectName",
+      render: (text) => (
+        <span
+          style={{
+            fontSize: "16px",
+            color: "#652A0E",
+            backgroundColor: "#FFF39A",
+          }}
+        >
+          {text}
+        </span>
+      ),
     },
     {
       title: "Project Type",
@@ -78,7 +89,7 @@ function Credits() {
       dataIndex: "startDate",
       render: (record) => {
         return (
-          <span>{new Date(record).toLocaleDateString()}</span>
+          <span style={{ color: "blueviolet" }}>{new Date(record).toLocaleDateString()}</span>
         );
       }
     },
@@ -87,7 +98,7 @@ function Credits() {
       dataIndex: "endDate",
       render: (record) => {
         return (
-          <span>{new Date(record).toLocaleDateString()}</span>
+          <span style={{ color: "red" }}>{new Date(record).toLocaleDateString()}</span>
         );
       }
     },
@@ -102,14 +113,29 @@ function Credits() {
     {
       title: "Trees",
       dataIndex: "numOfTrees",
+      render: (record) => {
+        return (
+          <span style={{ color: "darkgreen" }}>{record}</span>
+        );
+      }
     },
     {
       title: "Solar Panels",
       dataIndex: "numOfSolarPanels",
+      render: (record) => {
+        return (
+          <span style={{ color: "darkgreen" }}>{record}</span>
+        );
+      }
     },
     {
       title: "Electricity Consumption",
       dataIndex: "electricity",
+      render: (record) => {
+        return (
+          <span style={{ color: "darkgreen" }}>{record}</span>
+        );
+      }
     },
     {
       title: "Status",

client/src/pages/Register.js

@@ -234,15 +234,14 @@ const Register = () => {
             <button className="btn" onClick={addUserdata}>
               Sign Up
             </button>
-            <p>
+            <p className="para">
               Already have an Account? <NavLink to="/login">Login</NavLink>
             </p>
           </form>
         </div>
       </section>
       </div>
     </div>
-
     </>
   );
 };

server/routes/creditsFormRoute.js

@@ -228,10 +228,17 @@ router.put(
   async (req, res) => {
     try {
       const { status } = req.body;
-      await CreditForm.findByIdAndUpdate(req.params.id, { status });
+      const updatedForm = await CreditForm.findByIdAndUpdate(req.params.id, { status });
 
       // send notification to user
-
+      const newNotification = new Notification({
+        user: updatedForm.user,
+        message: `Your Generation Form has been ${status}`,
+        title: "Generation Status Updated",
+        onClick: `/profile`,
+        read: false,
+      });
+      await newNotification.save();
       res.send({
         success: true,
         message: "Form status updated Successfully",

server/routes/sellCreditsRoute.js

@@ -9,6 +9,7 @@ const { uploadImageCloudinary } = require("../db/uploadClodinary");
 const userdb = require("../models/user");
 const creditdb = require("../models/credits");
 const { serialize } = require("v8");
+const Notification = require("../models/notification");
 
 // create a new sell credit form
 router.post("/sell-credit-forms", authenticate, async (req, res) => {
@@ -22,6 +23,18 @@ router.post("/sell-credit-forms", authenticate, async (req, res) => {
     await newForm.save();
     user.rewardCredits += 25;
     await user.save();
+    // send notification to admin
+    const admins = await userdb.find({ role: "admin" });
+    admins.forEach(async (admin) => {
+      const newNotification = new Notification({
+        user: admin._id,
+        message: `New Form added by ${user.fname}`,
+        title: "Carbon Credits Selling Form",
+        onClick: `/admin`,
+        read: false,
+      });
+      await newNotification.save();
+    });
     res.send({
       success: true,
       message: "Form Submitted Successfully",
@@ -39,8 +52,7 @@ router.get("/get-all-sell-credit-forms", authenticate, async (req, res) => {
   try {
     const forms = await sell_creditforms
       .find()
-      .populate("user", "fname")
-      .populate("user", "profilePicture")
+      .populate("user", "fname profilePicture")
       .sort({ createdAt: -1 });
     res.send({
       success: true,