From e40eae866aebca24a90a634b5aa32b8ce008deca Mon Sep 17 00:00:00 2001 From: Kshitij Date: Tue, 24 Jun 2025 13:50:01 +0530 Subject: [PATCH] Merged Salvi's commit he made to master branch (0ffcd1274d659b3e5c44a4813c57eb46e6ea4bed) for fixing UI changes. --- Frontend/src/App.jsx | 2 +- Frontend/src/pages/Home/Cards.jsx | 21 ++++++++++++++------- Frontend/src/pages/Home/Hero2.jsx | 2 +- Frontend/src/pages/Home/HomePage.jsx | 4 +++- Frontend/src/pages/Login/MainLoginPage.jsx | 3 --- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Frontend/src/App.jsx b/Frontend/src/App.jsx index f1e086e..bb0fe90 100644 --- a/Frontend/src/App.jsx +++ b/Frontend/src/App.jsx @@ -62,7 +62,7 @@ function App() { {/* 3. Pass language as prop to Navbar2 and Outlet if needed */} - +
{ export const CardWithImage = ({ language = "en" }) => { return ( -
+
{ ); }; -export const CardOnlyText = ({ headingText, bodyText, href, language = "en" }) => { +export const CardOnlyText = ({ + headingText, + bodyText, + href, + language = "en", +}) => { return ( ); @@ -116,7 +123,7 @@ export const CardOnlyText = ({ headingText, bodyText, href, language = "en" }) = export const CardWithButton = ({ language = "en" }) => { return ( -
+
{t("card_with_button_title", language)} @@ -153,10 +160,11 @@ export const CardWithButton = ({ language = "en" }) => { export const CardWithOnlyImage = ({ language = "en" }) => { return ( -
+ ); }; - diff --git a/Frontend/src/pages/Home/Hero2.jsx b/Frontend/src/pages/Home/Hero2.jsx index 2aef263..dce4aa4 100644 --- a/Frontend/src/pages/Home/Hero2.jsx +++ b/Frontend/src/pages/Home/Hero2.jsx @@ -43,7 +43,7 @@ function Hero2(props) { return (
- + diff --git a/Frontend/src/pages/Home/HomePage.jsx b/Frontend/src/pages/Home/HomePage.jsx index 221278c..8c55efe 100644 --- a/Frontend/src/pages/Home/HomePage.jsx +++ b/Frontend/src/pages/Home/HomePage.jsx @@ -4,13 +4,15 @@ import Hero from "./Hero"; import Testimonial from "./Testimonial"; import Hero2 from "./Hero2"; import Footer from "./Footer"; +import Navbar2 from "../../components/Navbar2"; const HomePage = () => { return ( <>
+ - +
diff --git a/Frontend/src/pages/Login/MainLoginPage.jsx b/Frontend/src/pages/Login/MainLoginPage.jsx index 15bad91..6acd31a 100644 --- a/Frontend/src/pages/Login/MainLoginPage.jsx +++ b/Frontend/src/pages/Login/MainLoginPage.jsx @@ -6,8 +6,6 @@ import Container from "../../components/Container.jsx"; const MainLoginPage = ({ language = "en" }) => { return ( <> - {/* If Navbar2 is used here, pass language */} - {/* Pass language to Outlet context for nested routes */} @@ -17,4 +15,3 @@ const MainLoginPage = ({ language = "en" }) => { }; export default MainLoginPage; -