Skip to content

Commit

Permalink
Merge pull request #152 from Trisha-tech/revert-145-Navbar_and_context
Browse files Browse the repository at this point in the history
Revert "Added the context  and redux for cart,wishlist,searchBar,pricefilter."
  • Loading branch information
Trisha-tech authored Jun 2, 2024
2 parents ed0466b + d38c2f9 commit 75c5a75
Show file tree
Hide file tree
Showing 34 changed files with 205 additions and 1,392 deletions.
118 changes: 0 additions & 118 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@
"@heroicons/react": "^2.1.3",
"@mui/icons-material": "^5.15.17",
"@mui/material": "^5.15.17",
"@reduxjs/toolkit": "^2.2.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"axios": "^1.6.8",
"jwt-decode": "^4.0.0",
"lottie-react": "^2.4.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hot-toast": "^2.4.1",
"react-icons": "^5.2.1",
"react-redux": "^9.1.2",
"react-router-dom": "^6.23.1",
"react-scripts": "^5.0.1",
"web-vitals": "^2.1.4"
Expand Down
4 changes: 1 addition & 3 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
import "./App.css";
// import {Outlet} from "react-router-dom";
import { Navbar, Footer } from './Components/index.js';
import { Product } from './Components/index';
import { ProfilePage, Product } from './Components/index';
import LoginPage from './Pages/LoginPage.jsx';
import SignUpPage from './Pages/SignUpPage.jsx';
import Cart from './Pages/Cart.jsx';
import Profile from "./Pages/Profile.jsx";
import Orders from './Pages/Orders.jsx';
import Wishlist from './Pages/Wishlist.jsx';
import HomePage from './Pages/Home.jsx';
Expand Down Expand Up @@ -34,7 +33,6 @@ function App() {
<Route path="/wishlist" element={<Wishlist/>} />
<Route path="/cart" element={<Cart/>} />
<Route path="/orders" element={<Orders/>} />
<Route path="/profile" element={<Profile/>}/>
</Routes>
<Toast position="bottom-right"/>
<Footer/>
Expand Down
20 changes: 20 additions & 0 deletions client/src/Components/Card/ProductCard.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.fa-heart
{
overflow: hidden;
color: var(--red-color);
}

.added-to-wishlist-btn
{
position: absolute;
top: 0;
right: 0;
border: none;
border-radius: 50%;
margin: 0.8rem 1.1rem 0 0;
}

.added-to-wishlist-btn:hover
{
background-color: var(--grey);
}
Loading

0 comments on commit 75c5a75

Please sign in to comment.