From c4f568571ba2264a536568c122e5118b7eaef5a2 Mon Sep 17 00:00:00 2001 From: Soni Dhruv Date: Sat, 18 May 2024 19:08:50 +0530 Subject: [PATCH 1/4] added link style --- src/Components/Hero/Hero.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Components/Hero/Hero.css b/src/Components/Hero/Hero.css index c4ec4b7..2c4c744 100644 --- a/src/Components/Hero/Hero.css +++ b/src/Components/Hero/Hero.css @@ -73,3 +73,7 @@ margin-top: 150px; margin-left: 138px; } + +.link{ + text-decoration: none; +} \ No newline at end of file From fc4b26c5b28e71b92b717d5db0c578f1f17b4f98 Mon Sep 17 00:00:00 2001 From: Soni Dhruv Date: Sat, 18 May 2024 19:09:03 +0530 Subject: [PATCH 2/4] added 2 routes for offers and collections --- src/App.js | 82 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 35 deletions(-) diff --git a/src/App.js b/src/App.js index f16fe66..898ae69 100644 --- a/src/App.js +++ b/src/App.js @@ -1,43 +1,55 @@ - -import './App.css'; -import Navbar from './Components/Navbar/Navbar'; -import { BrowserRouter,Routes,Route } from 'react-router-dom'; -import Shop from './Pages/Shop'; -import ShopCategory from './Pages/ShopCategory'; -import Product from './Pages/Product'; -import Cart from './Pages/Cart'; -import LoginSignup from './Pages/LoginSignup'; -import Footer from './Components/Footer/Footer'; -import men_banner from './Components/Assets/banner_mens.png' -import women_banner from './Components/Assets/banner_women.png' -import kids_banner from './Components/Assets/banner_kids.png' -import About from './Pages/About'; -import Contact from './Pages/Contact'; -import ScrollToTop from 'react-scroll-to-top'; -import { useContext,useEffect } from 'react'; -import { ShopContext } from './Context/ShopContext'; +import "./App.css"; +import Navbar from "./Components/Navbar/Navbar"; +import { BrowserRouter, Routes, Route } from "react-router-dom"; +import Shop from "./Pages/Shop"; +import ShopCategory from "./Pages/ShopCategory"; +import Product from "./Pages/Product"; +import Cart from "./Pages/Cart"; +import LoginSignup from "./Pages/LoginSignup"; +import Footer from "./Components/Footer/Footer"; +import men_banner from "./Components/Assets/banner_mens.png"; +import women_banner from "./Components/Assets/banner_women.png"; +import kids_banner from "./Components/Assets/banner_kids.png"; +import About from "./Pages/About"; +import Contact from "./Pages/Contact"; +import ScrollToTop from "react-scroll-to-top"; +import { useContext, useEffect } from "react"; +import { ShopContext } from "./Context/ShopContext"; +import Collections from "./Pages/Collections"; +import Offers from "./Pages/Offers"; function App() { - const {theme}=useContext(ShopContext); + const { theme } = useContext(ShopContext); return (
- - - } /> - } /> - } /> - } /> - }> - }/> - - } /> - } /> - } /> - } /> - -
+ + + } /> + } + /> + } + /> + } + /> + }> + } /> + + } /> + } /> + } /> + } /> + } /> + } /> + +
-

}/> +

} />
); } From f977bd277ed5ada889fd59518d1e2fb289e6cb34 Mon Sep 17 00:00:00 2001 From: Soni Dhruv Date: Sat, 18 May 2024 19:09:11 +0530 Subject: [PATCH 3/4] update hero div --- src/Components/Hero/Hero.jsx | 63 +++++++++++++++++++----------------- src/Pages/Collections.jsx | 9 ++++++ 2 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 src/Pages/Collections.jsx diff --git a/src/Components/Hero/Hero.jsx b/src/Components/Hero/Hero.jsx index 8a59f7a..85c8ba5 100644 --- a/src/Components/Hero/Hero.jsx +++ b/src/Components/Hero/Hero.jsx @@ -1,34 +1,37 @@ -import React, { useContext } from 'react' -import './Hero.css' -import hand_icon from '../Assets/hand_icon.png' -import arrow_icon from '../Assets/arrow.png' -import hero_image from '../Assets/hero_image.png' -import { ShopContext } from '../../Context/ShopContext' +import React, { useContext } from "react"; +import "./Hero.css"; +import hand_icon from "../Assets/hand_icon.png"; +import arrow_icon from "../Assets/arrow.png"; +import hero_image from "../Assets/hero_image.png"; +import { ShopContext } from "../../Context/ShopContext"; +import { Link } from "react-router-dom"; const Hero = () => { - const {theme}=useContext(ShopContext) - return ( -
-
-

NEW ARRIVALS ONLY

-
-
-

New

- -
-

Collections

-

For Everyone

-
-
-
Latest Collection
- -
-
-
- -
+ const { theme } = useContext(ShopContext); + return ( +
+
+

NEW ARRIVALS ONLY

+
+
+

New

+ +
+

Collections

+

For Everyone

- ) -} + +
+
Latest Collection
+ +
+ +
+
+ +
+
+ ); +}; -export default Hero +export default Hero; diff --git a/src/Pages/Collections.jsx b/src/Pages/Collections.jsx new file mode 100644 index 0000000..ee4a936 --- /dev/null +++ b/src/Pages/Collections.jsx @@ -0,0 +1,9 @@ +import React from 'react' + +const Collections = () => { + return ( +
Collections
+ ) +} + +export default Collections \ No newline at end of file From befc8aa715bcdd0d8ad1610f81b81a4fc95ac7a9 Mon Sep 17 00:00:00 2001 From: Soni Dhruv Date: Sat, 18 May 2024 19:09:21 +0530 Subject: [PATCH 4/4] added offers component --- src/Components/Offers/Offers.jsx | 39 +++++++++++++++++--------------- src/Pages/Offers.jsx | 7 ++++++ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 src/Pages/Offers.jsx diff --git a/src/Components/Offers/Offers.jsx b/src/Components/Offers/Offers.jsx index 12e5ce9..df97d92 100644 --- a/src/Components/Offers/Offers.jsx +++ b/src/Components/Offers/Offers.jsx @@ -1,23 +1,26 @@ -import React, { useContext } from 'react' -import './Offers.css' -import exclusive_image from '../Assets/exclusive_image.png' -import { ShopContext } from '../../Context/ShopContext' +import React, { useContext } from "react"; +import "./Offers.css"; +import exclusive_image from "../Assets/exclusive_image.png"; +import { ShopContext } from "../../Context/ShopContext"; +import { Link } from "react-router-dom"; const Offers = () => { - const {theme}=useContext(ShopContext); + const { theme } = useContext(ShopContext); return ( -
-
-

Exclusive

-

Offers For You

-

ONLY ON BEST SELLERS PRODUCTS

- + +
+
+

Exclusive

+

Offers For You

+

ONLY ON BEST SELLERS PRODUCTS

+ +
+
+ +
-
- -
-
- ) -} + + ); +}; -export default Offers +export default Offers; diff --git a/src/Pages/Offers.jsx b/src/Pages/Offers.jsx new file mode 100644 index 0000000..c80ddd7 --- /dev/null +++ b/src/Pages/Offers.jsx @@ -0,0 +1,7 @@ +import React from "react"; + +const Offers = () => { + return
Offers
; +}; + +export default Offers;