From 3aedd9c2cf6454933e0e8304d3e57dee5161b11e Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:55:40 +0530 Subject: [PATCH 1/7] =?UTF-8?q?side=20icon=20changes=E2=9C=8C=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Benefit/Benefit.jsx | 16 ++++++++++++++++ src/Pages/{ => Expenses}/Expenses.jsx | 2 +- src/Pages/Gifts/Gifts.jsx | 16 ++++++++++++++++ src/Pages/HelpAndSupport/HelpAndSupport.jsx | 16 ++++++++++++++++ src/Routes/Routes.js | 8 +++++++- 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 src/Pages/Benefit/Benefit.jsx rename src/Pages/{ => Expenses}/Expenses.jsx (85%) create mode 100644 src/Pages/Gifts/Gifts.jsx create mode 100644 src/Pages/HelpAndSupport/HelpAndSupport.jsx diff --git a/src/Pages/Benefit/Benefit.jsx b/src/Pages/Benefit/Benefit.jsx new file mode 100644 index 0000000..dc60deb --- /dev/null +++ b/src/Pages/Benefit/Benefit.jsx @@ -0,0 +1,16 @@ +import { Box } from "@chakra-ui/react"; +import React from "react"; +import MiniHeader from "../../Components/MiniHeader"; + +const Benefit = () => { + return ( + + + + ); +}; + +export default Benefit; diff --git a/src/Pages/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx similarity index 85% rename from src/Pages/Expenses.jsx rename to src/Pages/Expenses/Expenses.jsx index 07e8f36..0c7c467 100644 --- a/src/Pages/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -1,6 +1,6 @@ import { Box } from "@chakra-ui/react"; import React from "react"; -import MiniHeader from "../Components/MiniHeader"; +import MiniHeader from "../../Components/MiniHeader"; const Expenses = () => { return ( diff --git a/src/Pages/Gifts/Gifts.jsx b/src/Pages/Gifts/Gifts.jsx new file mode 100644 index 0000000..e303615 --- /dev/null +++ b/src/Pages/Gifts/Gifts.jsx @@ -0,0 +1,16 @@ +import { Box } from "@chakra-ui/react"; +import React from "react"; +import MiniHeader from "../../Components/MiniHeader"; + +const Gifts = () => { + return ( + + + + ); +}; + +export default Gifts; diff --git a/src/Pages/HelpAndSupport/HelpAndSupport.jsx b/src/Pages/HelpAndSupport/HelpAndSupport.jsx new file mode 100644 index 0000000..88b46fe --- /dev/null +++ b/src/Pages/HelpAndSupport/HelpAndSupport.jsx @@ -0,0 +1,16 @@ +import { Box } from "@chakra-ui/react"; +import React from "react"; +import MiniHeader from "../../Components/MiniHeader"; + +const HelpAndSupport = () => { + return ( + + + + ); +}; + +export default HelpAndSupport; diff --git a/src/Routes/Routes.js b/src/Routes/Routes.js index da015a6..98875ff 100644 --- a/src/Routes/Routes.js +++ b/src/Routes/Routes.js @@ -1,7 +1,10 @@ import Dashbaord from "../Pages/Dashbaord"; -import Expenses from "../Pages/Expenses"; import Report from "../Pages/Report/Report"; import Requests from "../Pages/Requests/Requests"; +import Expenses from "../Pages/Expenses/Expenses"; +import Benefit from "../Pages/Benefit/Benefit"; +import Gifts from "../Pages/Gifts/Gifts"; +import HelpAndSupport from "../Pages/HelpAndSupport/HelpAndSupport"; export const RouteLink = [ @@ -9,4 +12,7 @@ export const RouteLink = [ { path: "/expenses", Component: Expenses }, { path: "/reports", Component: Report }, { path: "/requests", Component: Requests }, + { path: "/benefit", Component: Benefit }, + { path: "/gifts", Component: Gifts }, + { path: "/help-support", Component: HelpAndSupport }, ]; From 2cf3f29940bab7dcb7fa9c905d435891b37d7ebd Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:21:47 +0530 Subject: [PATCH 2/7] =?UTF-8?q?card=F0=9F=92=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/HeaderMain.jsx | 2 +- src/Components/MiniHeader.jsx | 3 ++- src/Pages/Expenses/Expenses.jsx | 26 ++++++++++++++------------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx index c8e77e7..18143b4 100644 --- a/src/Components/HeaderMain.jsx +++ b/src/Components/HeaderMain.jsx @@ -49,7 +49,7 @@ const HeaderMain = ({ return ( { const navigate = useNavigate(); const [firstPart, secondPart] = title.split(/ (.+)/); - return ( + return ( {backButton && ( navigate(-1)} as={ArrowBackIcon} diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index fff7957..0ca5306 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -1,9 +1,10 @@ import { Box, Button, HStack, Image, Text, VStack } from "@chakra-ui/react"; import React from "react"; -import MiniHeader from "../Components/MiniHeader"; -import logo_card from "../assets/logo_card.svg"; -import TRANSCORP_LOGO from "../assets/TRANSCORP_LOGO.svg"; -import RuPay from '../assets/rupayImg.png' +// import MiniHeader from "../Components/MiniHeader"; +import logo_card from "../../assets/logo_card.svg"; +import TRANSCORP_LOGO from "../../assets/TRANSCORP_LOGO.svg"; +import RuPay from '../../assets/rupayImg.png' +import MiniHeader from "../../Components/MiniHeader"; const Expenses = () => { return ( @@ -13,22 +14,22 @@ const Expenses = () => { subTitle={"Lorem ipsum dolor sit amet, consectetur adipiscing elit."} /> - + - - + + { alignItems={"start"} justifyContent={"space-between"} > - 1234 5678 1234 5678 + 1234 5678 1234 5678 @@ -55,15 +57,15 @@ const Expenses = () => { {/* */} - + From 9416deb041381da8485b44ce6f78de777ee8f754 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:27:54 +0530 Subject: [PATCH 3/7] =?UTF-8?q?cardhight=F0=9F=92=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Expenses/Expenses.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index 0ca5306..ac63c4d 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -14,7 +14,7 @@ const Expenses = () => { subTitle={"Lorem ipsum dolor sit amet, consectetur adipiscing elit."} /> - + Date: Thu, 5 Sep 2024 17:52:08 +0530 Subject: [PATCH 4/7] =?UTF-8?q?Tilt=20Update=20=F0=9F=80=84=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 7 +++++++ package.json | 1 + src/Pages/Expenses/Expenses.jsx | 28 ++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f85cd87..888f23b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "redux-persist": "^6.0.0", "redux-persist-transform-encrypt": "^5.1.1", "uuid": "^10.0.0", + "vanilla-tilt": "^1.8.1", "xlsx": "^0.18.5", "yup": "^1.4.0" }, @@ -6233,6 +6234,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/vanilla-tilt": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/vanilla-tilt/-/vanilla-tilt-1.8.1.tgz", + "integrity": "sha512-hPB1XUsnh+SIeVSW2beb5RnuFxz4ZNgxjGD78o52F49gS4xaoLeEMh9qrQnJrnEn/vjjBI7IlxrrXmz4tGV0Kw==", + "license": "MIT" + }, "node_modules/vite": { "version": "5.2.9", "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.9.tgz", diff --git a/package.json b/package.json index fc21f64..4c8b075 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "redux-persist": "^6.0.0", "redux-persist-transform-encrypt": "^5.1.1", "uuid": "^10.0.0", + "vanilla-tilt": "^1.8.1", "xlsx": "^0.18.5", "yup": "^1.4.0" }, diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index ac63c4d..a0ed7f4 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -1,12 +1,28 @@ import { Box, Button, HStack, Image, Text, VStack } from "@chakra-ui/react"; -import React from "react"; +import React, { useEffect, useRef } from "react"; // import MiniHeader from "../Components/MiniHeader"; import logo_card from "../../assets/logo_card.svg"; import TRANSCORP_LOGO from "../../assets/TRANSCORP_LOGO.svg"; import RuPay from '../../assets/rupayImg.png' import MiniHeader from "../../Components/MiniHeader"; +import VanillaTilt from "vanilla-tilt"; const Expenses = () => { + const tiltRef = useRef(null); + + useEffect(() => { + if (tiltRef.current) { + VanillaTilt.init(tiltRef.current, { + max: 15, + speed: 500, + scale:1.01, + glare: true, + "max-glare": 0.5, + }); + } + return () => tiltRef.current.vanillaTilt.destroy(); // Cleanup on unmount + }, []); + return ( { subTitle={"Lorem ipsum dolor sit amet, consectetur adipiscing elit."} /> - + + + - + @@ -73,7 +93,7 @@ const Expenses = () => { - + From b37c85b5c3a57822d564d144fc558ded627a7703 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 5 Sep 2024 17:58:00 +0530 Subject: [PATCH 5/7] =?UTF-8?q?Tilt=20Fix=20=F0=9F=AB=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Expenses/Expenses.jsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index a0ed7f4..e590907 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -11,16 +11,20 @@ const Expenses = () => { const tiltRef = useRef(null); useEffect(() => { - if (tiltRef.current) { - VanillaTilt.init(tiltRef.current, { - max: 15, - speed: 500, - scale:1.01, + const node = tiltRef.current; + if (node) { + VanillaTilt.init(node, { + max: 25, + speed: 400, glare: true, "max-glare": 0.5, }); } - return () => tiltRef.current.vanillaTilt.destroy(); // Cleanup on unmount + return () => { + if (node && node.vanillaTilt) { + node.vanillaTilt.destroy(); + } + }; }, []); return ( From 0841b296b76dd1fd035a4bb5f88524f04bd90b8b Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 5 Sep 2024 18:47:58 +0530 Subject: [PATCH 6/7] =?UTF-8?q?Tilt=20Fixed=20=F0=9F=AB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Expenses/Expenses.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index e590907..e978604 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -97,7 +97,7 @@ const Expenses = () => { - + From b5c1b2c0c58557f8cd608405d0912575dd24e9ac Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 5 Sep 2024 19:53:47 +0530 Subject: [PATCH 7/7] update --- src/Pages/Expenses/Expenses.jsx | 46 ++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/src/Pages/Expenses/Expenses.jsx b/src/Pages/Expenses/Expenses.jsx index e978604..b0e94f6 100644 --- a/src/Pages/Expenses/Expenses.jsx +++ b/src/Pages/Expenses/Expenses.jsx @@ -7,6 +7,35 @@ import RuPay from '../../assets/rupayImg.png' import MiniHeader from "../../Components/MiniHeader"; import VanillaTilt from "vanilla-tilt"; + +const InternalCard = ({title1, subTitle1, title2, subbTitle2}) =>{ + return( + + + + {title1} + + + + {subTitle1} + + + + + + + + {title2} + + + + {subbTitle2} + + + + ) +} + const Expenses = () => { const tiltRef = useRef(null); @@ -28,7 +57,7 @@ const Expenses = () => { }, []); return ( - + { - - + + + + + + + + + + + ); }; export default Expenses; + +