Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature Updated for issue: #638 #655

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import './App.css';
import './Animations.css';
import { Navbar, Footer } from './Components/index.js';
import { Navbar, Footer } from './components/index.js';
// import { ProfilePage, Product } from './Components/index.js';
import { Product } from './Components/index.js';
import { Product } from './components/index.js';
import RomancePage from './Pages/RomancePage.jsx';
import ActionPage from './Pages/ActionPage.jsx';
import ThrillerPage from './Pages/ThrillerPage.jsx';
Expand All @@ -26,9 +26,9 @@ import FAQ from "./Pages/Faq.jsx";
import AboutUs from "./Pages/AboutUs.jsx";
import { OrderList } from "./Pages/Orders.jsx";
import Contributors from "./Pages/Contributors.jsx";
import Preloader from "./Components/Preloader.jsx";
// import Preloader from "./Components/Preloader.jsx";
import { Toast } from "./Toast/Toast.js";
import GoToTop from "./Components/GoToTop.jsx";
import GoToTop from "./components/GoToTop.jsx";
import License from "./Pages/Licensing.jsx";
import CustomerProfile from "./Pages/CustomerProfile.jsx";
import GiftCards from "./Pages/GiftCards.jsx";
Expand Down Expand Up @@ -93,7 +93,7 @@ function App() {
</Routes>
<Toast position="bottom-right" />
<Footer darkMode={darkMode} /> {/* Pass darkMode prop here */}
<Preloader /> {/* Ensure Preloader is correctly styled */}
{/*<Preloader />*/} {/* Ensure Preloader is correctly styled */}
<GoToTop /> {/* Added GoToTop component */}
<ChatBotEmbed />

Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/AboutUs.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';
import { Link } from 'react-router-dom';

const AboutUs = () => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/CancelReturns.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';

const PrivacyPolicy = () => {
useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/Careers.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';

const Careers = () => {
useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/Cart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
removeItemFromCart,
} from "../api/api.js";
import "./Cart.css";
import Preloader from "../Components/Preloader";
import Preloader from "../components/Preloader";
import { useToast } from "../Context/ToastContext";
import { useNavigate } from "react-router-dom";
import { useAuth } from "../Context/AuthContext";
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/Contact.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import Preloader from "../Components/Preloader";
import Preloader from "../components/Preloader";
import { FaLinkedin, FaGithub, FaEnvelope, FaPhoneAlt } from "react-icons/fa";
// import "./Contact.css";
function Contact() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/Contributors.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react';
import axios from 'axios';
import './Contributors.css';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';

function Contributors() {
const [contributors, setContributors] = useState([]);
Expand Down
12 changes: 6 additions & 6 deletions client/src/Pages/CustomerProfile.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useState } from "react";
import Sidebar from "../Components/CustomerProfile/Sidebar";
import Profile from "../Components/CustomerProfile/Profile";
import Orders from "../Components/CustomerProfile/Orders";
import Pancard from "../Components/CustomerProfile/Pancard";
import DeliveryLocation from "../Components/CustomerProfile/DeliveryLocation";
import Giftcard from "../Components/CustomerProfile/Giftcard";
import Sidebar from "../components/CustomerProfile/Sidebar";
import Profile from "../components/CustomerProfile/Profile";
import Orders from "../components/CustomerProfile/Orders";
import Pancard from "../components/CustomerProfile/Pancard";
import DeliveryLocation from "../components/CustomerProfile/DeliveryLocation";
import Giftcard from "../components/CustomerProfile/Giftcard";
const CustomerProfile = () => {
const [activeSection, setActiveSection] = useState("profile");

Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/Faq.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState,useEffect } from 'react';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';

const FAQ = () => {
const faqs = [
Expand Down
2 changes: 1 addition & 1 deletion client/src/Pages/GiftCards.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import Preloader from '../Components/Preloader';
import Preloader from '../components/Preloader';

const GiftCards = () => {
useEffect(() => {
Expand Down
Loading