Merge pull request #1365 from Tanmay-Mirgal/main

Bug fixed on main,contact and dashbaord page
codervivek5 · Jun 16, 2024 · cadb472 · cadb472
2 parents a1c85d1 + 981b26d
commit cadb472
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/Front-with-React/VigyBag/src/main.jsx b/Front-with-React/VigyBag/src/main.jsx
@@ -8,17 +8,22 @@ import {
   createBrowserRouter,
   createRoutesFromElements,
 } from 'react-router-dom';
-import Categories from './pages/Categories';
+import Categories from './pages/Categories/Categories';
 import Login from './pages/Login/Login';
 import Toys from './pages/gifts/Toys';
 import DecorativeItems from './pages/Category/DecorativeItems';
 import AboutUs from './pages/About/AboutUs';
 import Gifts from './pages/gifts/Gifts';
-import Contact from './pages/Contact';
-import Dashboard from './pages/Dashboard';
+import Contact from './pages/Contacts/Contact';
+import Dashboard from './pages/Dashboard/Dashboard';
 import Home from './pages/Home/Home';
 import Layout from './Layout';
 import Team from './components/Team/Team';
+import Confirmation from './pages/Confirmation/Confirmation'
+import Cancellation from './pages/Cancellation/Cancellation'
+import OrderDetails from './pages/Order/Orderdetails';
+import MyOrders from './pages/Order/MyOrders';
+import BambooProducts from './pages/ProductsPage/BambooProducts';
 
 const router = createBrowserRouter(
   createRoutesFromElements(
@@ -42,6 +47,11 @@ const router = createBrowserRouter(
       <Route path="team" element={<Team />} />
       <Route path="login" element={<Login />} />
       <Route path="dashboard" element={<Dashboard />} />
+      <Route path="confirm" element={<Confirmation />} />
+      <Route path="cancel" element={<Cancellation />} />
+      <Route path="orderDetails" element={<OrderDetails/>} />
+      <Route path="myOrders" element={<MyOrders/>} />
+      <Route path="bambooProducts" element={<BambooProducts/>} />
     </Route>,
   ),
 );

diff --git a/Front-with-React/VigyBag/src/pages/Contacts/Contact.jsx b/Front-with-React/VigyBag/src/pages/Contacts/Contact.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { FaEnvelope, FaPhone } from 'react-icons/fa';
-import Logo from '../assets/offical_logo.png';
+import Logo from '../../assets/offical_logo.png';
 
 const ContactForm = () => {
   return (

diff --git a/Front-with-React/VigyBag/src/pages/Dashboard/Dashboard.jsx b/Front-with-React/VigyBag/src/pages/Dashboard/Dashboard.jsx
@@ -1,21 +1,21 @@
 import React, { useState } from 'react';
-import granola from '../assets/granola.jpg';
-import cuttery from '../assets/cuttery-set.jpg';
-import basket from '../assets/basket.png';
-import shawls from '../assets/shawals.jpg';
-import notebooks from '../assets/eco-friendly-notebooks.jpeg';
-import toothbrushes from '../assets/Bamboo-Toothbrush-Set.jpeg';
-import towels from '../assets/Organic Cotton Towels.jpg';
-import shoppingBags from '../assets/Reusable-Shopping-Bags.jpeg';
-import phoneCase from '../assets/Biodegradable-Phone-Case.jpeg';
-import journals from '../assets/Recycled-Paper-Journals.webp';
-import waterBottle from '../assets/Glass-Water-Bottle.webp';
-import teaSet from '../assets/Organic-Tea-Set.webp';
+import granola from '../../assets/granola.jpg';
+import cuttery from '../../assets/cuttery-set.jpg';
+import basket from '../../assets/basket.png';
+import shawls from '../../assets/shawals.jpg';
+import notebooks from '../../assets/eco-friendly-notebooks.jpeg';
+import toothbrushes from '../../assets/Bamboo-Toothbrush-Set.jpeg';
+import towels from '../../assets/Organic Cotton Towels.jpg';
+import shoppingBags from '../../assets/Reusable-Shopping-Bags.jpeg';
+import phoneCase from '../../assets/Biodegradable-Phone-Case.jpeg';
+import journals from '../../assets/Recycled-Paper-Journals.webp';
+import waterBottle from '../../assets/Glass-Water-Bottle.webp';
+import teaSet from '../../assets/Organic-Tea-Set.webp';
 import { FaSearch } from 'react-icons/fa';
-import carryBag from '../assets/vigybag-carry-bag.png';
-import profile from '../assets/profile.png';
-import ProductCard from '../components/ProductCard/ProductCard';
-import Aside from '../components/Aside/Aside';
+import carryBag from '../../assets/vigybag-carry-bag.png';
+import profile from '../../assets/profile.png';
+import ProductCard from '../../components/ProductCard/ProductCard';
+import Aside from '../../components/Aside/Aside';
 
 const Dashboard = () => {