From c75aebaf23a5710275f59eb0d8e014fd5f6109b3 Mon Sep 17 00:00:00 2001 From: Krish-Panchani Date: Sat, 14 Oct 2023 11:14:34 +0530 Subject: [PATCH 1/9] Fixed Navbar links --- src/components/AboutUs-section/AboutUs.jsx | 2 +- src/components/Contact-section/Contact.jsx | 2 +- src/components/Header-section/Navbar.jsx | 10 ++++++---- src/components/Services-section/Services-section.jsx | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/AboutUs-section/AboutUs.jsx b/src/components/AboutUs-section/AboutUs.jsx index 54536f6d..459775ac 100644 --- a/src/components/AboutUs-section/AboutUs.jsx +++ b/src/components/AboutUs-section/AboutUs.jsx @@ -2,7 +2,7 @@ import rentBoardImg from "../.././assets/Images/rent-board.png"; import "./AboutUs-section.css"; const AboutUs = () => { return ( -
+
About Us
{ return ( <> -
+

Contact Us

diff --git a/src/components/Header-section/Navbar.jsx b/src/components/Header-section/Navbar.jsx index 74ba132e..6a9724b9 100644 --- a/src/components/Header-section/Navbar.jsx +++ b/src/components/Header-section/Navbar.jsx @@ -8,19 +8,21 @@ const Navbar = () => { diff --git a/src/components/Services-section/Services-section.jsx b/src/components/Services-section/Services-section.jsx index 79a4a108..b8de4ca4 100644 --- a/src/components/Services-section/Services-section.jsx +++ b/src/components/Services-section/Services-section.jsx @@ -5,7 +5,7 @@ import placeName from "./placeName"; const Services = () => { return ( <> -

+

Our Services Includes

From 589667145e01e90e76728aebfe70ff86556ac0c7 Mon Sep 17 00:00:00 2001 From: manish-bhukar Date: Sun, 15 Oct 2023 10:08:54 +0530 Subject: [PATCH 2/9] Date dynamic version --- src/components/Footer-section/Footer.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Footer-section/Footer.jsx b/src/components/Footer-section/Footer.jsx index 7f15ec0e..38c180bf 100644 --- a/src/components/Footer-section/Footer.jsx +++ b/src/components/Footer-section/Footer.jsx @@ -1,6 +1,7 @@ import logo from "../../assets/Images/logo.png"; import { FaTwitter, FaGithub, FaInstagram } from "react-icons/fa"; - +let date=new Date(); +let year=date.getFullYear(); const Footer = () => { return (
@@ -49,7 +50,7 @@ const Footer = () => {

- © {new Date().getFullYear()} || All Rights Reserved || + © {year} || All Rights Reserved || The Virtual World Maker

From 0c3ac95ff0907b652730794d69feee2027dd9b6d Mon Sep 17 00:00:00 2001 From: Krish-Panchani Date: Sun, 15 Oct 2023 10:12:29 +0530 Subject: [PATCH 3/9] Added Navbar links & resolved conflicts --- src/components/Header-section/Navbar.jsx | 41 ++++++------------------ 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/components/Header-section/Navbar.jsx b/src/components/Header-section/Navbar.jsx index 38bde8c7..0ca88dab 100644 --- a/src/components/Header-section/Navbar.jsx +++ b/src/components/Header-section/Navbar.jsx @@ -23,28 +23,6 @@ const Navbar = () => { return ( <> -<<<<<<< HEAD - ); }; -export default Navbar; +export default Navbar; \ No newline at end of file From b33562eca366f18ddff4cc8e72f099fc6df0d275 Mon Sep 17 00:00:00 2001 From: vashu kashyap Date: Sun, 15 Oct 2023 23:12:56 +0530 Subject: [PATCH 4/9] link added --- src/components/Header-section/Header.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Header-section/Header.jsx b/src/components/Header-section/Header.jsx index d9674d47..399dc784 100644 --- a/src/components/Header-section/Header.jsx +++ b/src/components/Header-section/Header.jsx @@ -1,4 +1,5 @@ import '../Header-section/Header-section.css' +import { Link } from "react-router-dom"; import Navbar from './Navbar'; const Header = () => { return ( @@ -8,7 +9,9 @@ const Header = () => {

Welcome to Rentalog

Rentalog is the ultimate solution for landlords looking to simplify their rent management process. Keep track of your renters personal details, their payment history, and much more with ease.

- + + +
From 3a0fb0c0857c64cda41826bfc638431749fbaaea Mon Sep 17 00:00:00 2001 From: jinaybarot Date: Sun, 15 Oct 2023 23:13:40 +0530 Subject: [PATCH 5/9] change contact us form styling --- src/components/Contact-section/ContactForm.jsx | 8 ++++---- tailwind.config.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Contact-section/ContactForm.jsx b/src/components/Contact-section/ContactForm.jsx index 90fc25d4..eb43b69b 100644 --- a/src/components/Contact-section/ContactForm.jsx +++ b/src/components/Contact-section/ContactForm.jsx @@ -25,24 +25,24 @@ const ContactForm = () => {