Merge pull request #66 from cd-sigma/main

Build
cd-sigma · Dec 9, 2023 · 7598ec5 · 7598ec5
2 parents 338f487 + 4934a02
commit 7598ec5
Show file tree

Hide file tree

Showing 16 changed files with 189 additions and 87 deletions.
diff --git a/backend/api/controllers/alert.controller.js b/backend/api/controllers/alert.controller.js
@@ -1,4 +1,7 @@
 const mongoLib = require("../../lib/mongo.lib");
+const emailLib = require("../../lib/email.lib");
+const slackLib = require("../../lib/slack.lib");
+const discordLib = require("../../lib/discord.lib");
 const responseLib = require("../../lib/response.lib");
 const validatorUtil = require("../../util/validators.util");
 
@@ -20,6 +23,8 @@ async function subscribeToEmail(req, res) {
  $addToSet: {alertPreferences: alertTypeEnum.EMAIL}, email: email
  });
 
+ await emailLib.sendEmail(email, "Welcome To finSafe", "You have successfully subscribed to finSafe for alerts.")
+
  return responseLib.sendResponse(res, "Subscribed to email successfully!", null, resStatusEnum.SUCCESS);
  } catch (error) {
  return responseLib.sendResponse(res, null, error, resStatusEnum.INTERNAL_SERVER_ERROR)
@@ -40,6 +45,8 @@ async function subscribeToSlack(req, res) {
  $addToSet: {alertPreferences: alertTypeEnum.SLACK}, slackWebhook: webhook
  });
 
+ await slackLib.sendAlert(webhook, "Welcome To finSafe", "You have successfully subscribed to finSafe for alerts.")
+
  return responseLib.sendResponse(res, "Subscribed to slack successfully!", null, resStatusEnum.SUCCESS);
  } catch (error) {
  return responseLib.sendResponse(res, null, error, resStatusEnum.INTERNAL_SERVER_ERROR)
@@ -60,6 +67,8 @@ async function subscribeToDiscord(req, res) {
  $addToSet: {alertPreferences: alertTypeEnum.DISCORD}, discordWebhook: webhook
  });
 
+ await discordLib.sendAlert(webhook, "Welcome To finSafe", "You have successfully subscribed to finSafe for alerts.")
+
  return responseLib.sendResponse(res, "Subscribed to discord successfully!", null, resStatusEnum.SUCCESS);
  } catch (error) {
  return responseLib.sendResponse(res, null, error, resStatusEnum.INTERNAL_SERVER_ERROR)

diff --git a/backend/api/controllers/token.controller.js b/backend/api/controllers/token.controller.js
@@ -6,7 +6,9 @@ const priceLib = require("../../lib/price.lib")
 const responseLib = require("../../lib/response.lib")
 const validatorsUtil = require("../../util/validators.util")
 const resStatusEnum = require("../../enum/res.status.enum")
-
+const tokenLogoModel = require("../../model/token.logo.model");
+const { mongo } = require("mongoose");
+const mongoLib = require("../../lib/mongo.lib");
 async function getTokenInfo(req, res) {
  try {
  let web3 = await web3Lib.getWebSocketWeb3Instance(process.env.ETH_NODE_WS_URL);
@@ -16,23 +18,28 @@ async function getTokenInfo(req, res) {
  return responseLib.sendResponse(res, null, "Missing token Address", resStatusEnum.VALIDATION_ERROR)
  }
  tokenAddress = tokenAddress.toLowerCase()
- const url = `https://api.1inch.dev/token/v1.2/1/custom/${tokenAddress}`;
+ const tokenPrice = await priceLib.getTokenPriceFromChainlinkPriceOracle("eth", tokenAddress, web3)
+ const logoExist = await mongoLib.findOneByQuery(tokenLogoModel, {address : tokenAddress} )
 
+ if(validatorsUtil.isNotEmpty(logoExist)){
+ return responseLib.sendResponse(res,{ logo: logoExist.logo, price: tokenPrice.usdPrice } , null ,resStatusEnum.SUCCESS)
+ }
+
+ const url = `https://api.1inch.dev/token/v1.2/1/custom/${tokenAddress}`;
  const config = {
  headers: {
  "Authorization": `Bearer ${apiKeyConfig["1inch"]}`
  }, params: {}
  };
-
  const response = await axios.get(url, config);
+
  if (validatorsUtil.isEmpty(response) || validatorsUtil.isEmpty(response.data)) {
  return responseLib.sendResponse(res, null, "token not available", resStatusEnum.INTERNAL_SERVER_ERROR)
  }
-
- const tokenPrice = await priceLib.getTokenPriceFromChainlinkPriceOracle("eth", tokenAddress, web3)
- response.data.price = tokenPrice.usdPrice
- return responseLib.sendResponse(res, response.data, null, resStatusEnum.SUCCESS)
-
+
+ await mongoLib.findOneAndUpdate(tokenLogoModel , { address : response.data.address.toLowerCase() } , {logo :response.data.logoURI } ,{upsert : true})
+ return responseLib.sendResponse(res, { logo : response.data.logoURI , price : tokenPrice.usdPrice }, null, resStatusEnum.SUCCESS)
+
  } catch (error) {
  return responseLib.sendResponse(res, null, error, resStatusEnum.INTERNAL_SERVER_ERROR)
  }

diff --git a/backend/lib/alert.lib.js b/backend/lib/alert.lib.js
@@ -88,7 +88,7 @@ async function generateAlert(address, timestamp, title, body) {
 
 function isValidPushAlert(alert) {
  try {
- if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.address) || validatorUtil.isEmpty(alert.title) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.timestamp)) {
+ if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.address) || validatorUtil.isEmpty(alert.title) || validatorUtil.isEmpty(alert.body) || validatorUtil.isNil(alert.timestamp)) {
  return false;
  }
  return true;
@@ -99,7 +99,7 @@ function isValidPushAlert(alert) {
 
 function isValidEmailAlert(alert) {
  try {
- if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.email) || validatorUtil.isEmpty(alert.subject) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.timestamp)) {
+ if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.email) || validatorUtil.isEmpty(alert.subject) || validatorUtil.isEmpty(alert.body) || validatorUtil.isNil(alert.timestamp)) {
  return false;
  }
  return true;
@@ -110,7 +110,7 @@ function isValidEmailAlert(alert) {
 
 function isValidSlackAlert(alert) {
  try {
- if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.title) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.webhook) || validatorUtil.isEmpty(alert.timestamp)) {
+ if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.title) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.webhook) || validatorUtil.isNil(alert.timestamp)) {
  return false;
  }
  return true;
@@ -121,7 +121,7 @@ function isValidSlackAlert(alert) {
 
 function isValidDiscordAlert(alert) {
  try {
- if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.webhook) || validatorUtil.isEmpty(alert.timestamp)) {
+ if (validatorUtil.isEmpty(alert) || validatorUtil.isEmpty(alert.body) || validatorUtil.isEmpty(alert.webhook) || validatorUtil.isNil(alert.timestamp)) {
  return false;
  }
  return true;

diff --git a/backend/model/token.logo.model.js b/backend/model/token.logo.model.js
@@ -0,0 +1,18 @@
+const mongoose = require("mongoose")
+const dbEnum = require("../enum/db.enum")
+
+const tokenLogo = new mongoose.Schema(
+ {
+ address: {
+ type: String,
+ },
+ logo: {
+ type: String,
+ }
+ },
+ {timestamps: true},
+)
+
+tokenLogo.index({address: 1})
+
+module.exports = mongoose.connection.useDb(dbEnum.FINSAFE).model("logo", tokenLogo)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -12,6 +12,7 @@
  "@testing-library/user-event": "^13.5.0",
  "axios": "^1.6.2",
  "body-parser": "^1.20.2",
+ "dayjs": "^1.11.10",
  "express": "^4.18.2",
  "react": "^18.2.0",
  "react-dom": "^18.2.0",

diff --git a/frontend/src/api/axios.instance.js b/frontend/src/api/axios.instance.js
@@ -11,4 +11,8 @@ let tokenAxios = axios.create({
  baseURL: "https://finsafe-backend.insidefi.io/token/"
 });
 
-export { userAxios, tokenAxios };
+let feedAxios = axios.create({
+ baseURL:"https://finsafe-backend.insidefi.io/feed/"
+});
+
+export { userAxios, tokenAxios ,feedAxios};
diff --git a/frontend/src/api/profile.api.js b/frontend/src/api/profile.api.js
@@ -1,4 +1,4 @@
-import { userAxios, tokenAxios } from "./axios.instance";
+import {userAxios, tokenAxios, feedAxios} from "./axios.instance";
 
 export const getPortfolioDetails = async (address) => {
  try {
@@ -22,3 +22,14 @@ export const getTokenDetails = async (token) => {
  console.log(`Error occured while fetching token details`, err);
  }
 };
+export const getFeedDetails = async (address) => {
+ try {
+ const response = await feedAxios.get(`${address}?limit=20`);
+ const { result } = response.data;
+ console.log(result);
+ const alert=result.data.alerts;
+ return alert;
+ } catch (err) {
+ console.log(`Error occured while fetching feed details`, err);
+ }
+}
diff --git a/frontend/src/components/HomePage.jsx b/frontend/src/components/HomePage.jsx
@@ -2,10 +2,13 @@ import React, {useState} from "react";
 import Web3 from "web3";
 import ConnectWalletButton from "./ConnectWalltet/Walltet";
 import axios from "axios";
+import {useUserStore} from "../store/userStore";
 import Onboarding from "./Onboarding/Onboarding";
+
 const HomePage = () => {
  const [loading, setLoading] = useState(false);
- const [address, setAddress] = useState("");
+ const userAddress = useUserStore((state) => state.userAddress);
+ const setUserAddress = useUserStore((state) => state.setUserAddress)
  const [open, setOpen] = useState(false);
  const onPressConnect = async () => {
  setLoading(true);
@@ -18,7 +21,7 @@ const HomePage = () => {
  });
 
  let account = Web3.utils.toChecksumAddress(accounts[0]);
- setAddress(account);
+ setUserAddress(account);
  account = account.toLowerCase();
  // get nonce
  const nonce = await axios.get(
@@ -35,8 +38,6 @@ const HomePage = () => {
  params: [message, account],
  });
 
- console.log(signature);
- // send signature to backend
 
  const response = await axios.post(
  "https://finsafe-backend.insidefi.io/user/validate/signature",
@@ -45,7 +46,6 @@ const HomePage = () => {
  signature: signature,
  }
  );
-
  if (response.data.status === 200) {
  setOpen(true);
  }
@@ -56,8 +56,9 @@ const HomePage = () => {
 
  setLoading(false);
  };
+ console.log(userAddress)
 
- const onPressLogout = () => setAddress("");
+ const onPressLogout = () => setUserAddress("");
  return (
  <div
  style={{
@@ -75,7 +76,7 @@ const HomePage = () => {
  onPressConnect={onPressConnect}
  onPressLogout={onPressLogout}
  loading={loading}
- address={address}
+ address={userAddress}
  />
  <Onboarding open={open} setOpen={setOpen} />
  </div>

diff --git a/frontend/src/components/PortfolioDetails.jsx b/frontend/src/components/PortfolioDetails.jsx
@@ -1,9 +1,5 @@
 import React, { useState, useEffect } from "react";
 import {
- Accordion,
- AccordionSummary,
- AccordionDetails,
- Typography,
  Table,
  TableBody,
  TableCell,
@@ -12,28 +8,37 @@ import {
  TableRow,
  Paper,
 } from "@mui/material";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+import { useUserStore } from "../store/userStore";
 
-import { getPortfolioDetails } from "../api/profile.api";
+import { getPortfolioDetails, getTokenDetails } from "../api/profile.api";
 
 const PortfolioDetails = () => {
- const [expanded, setExpanded] = useState(false);
  const [suppliedDetails, setSuppliedDetails] = useState([]);
  const [borrowedDetails, setBorrowedDetails] = useState([]);
- const handleAccordionChange = () => {
-  setExpanded((prevExpanded) => !prevExpanded);
- };
+ let userAddress = useUserStore((state) => state.userAddress);
+ userAddress = "0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c";
+
  const convertSuppliedToDesiredFormat = (array) => {
  let result = [];
- // array.map((value) => {
- // let obj = {};
- // obj.supplied = 
- // })
+ array.map(async (value) => {
+ const { token, balance, symbol } = value;
+ // const moreDetails = await getTokenDetails(token);
+ const moreDetails = {
+ logoURI:
+ "https://tokens-data.1inch.io/images/0xdac17f958d2ee523a2206206994597c13d831ec7.png",
+ price: 1,
+ };
+ let obj = {};
+ obj.logo = moreDetails?.logoURI;
+ obj.symbol = symbol;
+ obj.balance = balance.toFixed(2);
+ obj.price = (moreDetails?.price * balance).toFixed(2);
+ result.push(obj);
+ });
+ return result;
  };
  const callApis = async () => {
- const details = await getPortfolioDetails(
- "0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c"
- );
+ const details = await getPortfolioDetails(userAddress);
  const { metadata } = details[0];
  const { supplied, borrowed } = metadata;
  const derivedSupplied = convertSuppliedToDesiredFormat(supplied);
@@ -45,42 +50,37 @@ const PortfolioDetails = () => {
  }, []);
  console.log(suppliedDetails);
  return (
- <Accordion expanded={expanded} onChange={handleAccordionChange}>
- <AccordionSummary
- expandIcon={<ExpandMoreIcon />}
- aria-controls="panel-content"
- id="panel-header"
- >
- <Typography>Supplied</Typography>
- </AccordionSummary>
- <AccordionDetails>
- <TableContainer component={Paper}>
- <Table>
- <TableHead>
- <TableRow>
- <TableCell>Supplied</TableCell>
- <TableCell>Balance</TableCell>
- <TableCell>USD Value</TableCell>
- </TableRow>
- </TableHead>
- <TableBody>
- {/* Add your table rows here */}
- <TableRow>
- <TableCell>Item 1</TableCell>
- <TableCell>10</TableCell>
- <TableCell>$100</TableCell>
- </TableRow>
+ <TableContainer component={Paper}>
+ <Table>
+ <TableHead style={{marginBottom:"50px"}}>
+ <TableRow>
+ <TableCell>Supplied</TableCell>
+ <TableCell>Balance</TableCell>
+ <TableCell>USD Value</TableCell>
+ </TableRow>
+ </TableHead>
+ <TableBody>
+ {/* Add your table rows here */}
+ {suppliedDetails.map((value) => {
+ const { logo, balance, price, symbol } = value;
+ return (
  <TableRow>
- <TableCell>Item 2</TableCell>
- <TableCell>20</TableCell>
- <TableCell>$200</TableCell>
+ <TableCell>
+ <div style={{ display: "flex", alignItems: "center" }}>
+ <img src={logo} style={{ width: "30px" }} />
+ <span style={{ marginLeft: "10px" }}>{symbol}</span>
+ </div>
+ </TableCell>
+ <TableCell>
+ {balance} {symbol}
+ </TableCell>
+ <TableCell>${price}</TableCell>
  </TableRow>
- {/* Add more rows as needed */}
- </TableBody>
- </Table>
- </TableContainer>
- </AccordionDetails>
- </Accordion>
+ );
+ })}
+ </TableBody>
+ </Table>
+ </TableContainer>
  );
 };