Skip to content

Commit d4f6a09

Browse files
authored
Merge pull request #63 from indrasuthar07/bug/cart-fixed
bug: integrated cart's frontend with backend+ other issues resolved
2 parents 6eb7d5e + b015ec4 commit d4f6a09

File tree

14 files changed

+959
-1421
lines changed

14 files changed

+959
-1421
lines changed

backend/src/routes/cartRoutes.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ import {
66
getCart,
77
checkout,
88
} from "../controllers/cart.controller";
9+
import { authenticate } from "../middleware/authMiddleware";
910

1011
const router: Router = express.Router();
1112

12-
router.post("/", addItem);
13-
router.patch("/:itemId", updateQuantity);
14-
router.delete("/:itemId", removeItem);
15-
router.get("/", getCart);
16-
router.post("/checkout", checkout);
13+
//Protected routes
14+
router.post("/", authenticate, addItem);
15+
router.patch("/:itemId", authenticate, updateQuantity);
16+
router.delete("/:itemId", authenticate, removeItem);
17+
router.get("/", authenticate, getCart);
18+
router.post("/checkout", authenticate, checkout);
1719

18-
export default router;
20+
export default router;

frontend/.env

Whitespace-only changes.

frontend/package-lock.json

Lines changed: 27 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/App.tsx

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,37 @@ import Browse from "./pages/Browse";
99
import Sell from "./pages/Sell";
1010
import ProductDetailsPage from "./pages/ProductDetail";
1111
import Navbar from "./components/Navbar";
12-
import { CartProvider } from "./components/CartContext.jsx";
13-
import Home from "./pages/Home.jsx";
14-
import Cart from "./pages/Cart.jsx";
12+
import { CartProvider } from "./components/CartContext";
13+
import Cart from "./pages/Cart";
1514
import Payment from "./pages/Payment";
1615
import Dashboard from "./pages/Dashboard";
16+
1717
const queryClient = new QueryClient();
1818

1919
const App = () => (
2020
<QueryClientProvider client={queryClient}>
2121
<TooltipProvider>
2222
<Toaster />
23-
24-
<BrowserRouter>
25-
<Navbar />
26-
<div className="pt-[50px]">
27-
<CartProvider>
28-
29-
<Routes>
30-
<Route path="/" element={<Index />} />
31-
32-
<Route path="/signup" element={<SignUp />} />
33-
<Route path="/signin" element={<SignIn />} />
34-
<Route path="/browse" element={<Browse />} />
35-
<Route path="/product/:id" element={<ProductDetailsPage />} />
36-
<Route path="/CartHome" element={<Home />} />
37-
<Route path="/cart" element={<Cart />} />
38-
<Route path="/payment" element={<Payment />} />
39-
<Route path="/sell" element={<Sell />} />
40-
<Route path="/dashboard" element={<Dashboard />} />
41-
</Routes>
42-
</CartProvider>
43-
</div>
44-
</BrowserRouter>
23+
<CartProvider>
24+
<BrowserRouter>
25+
<Navbar />
26+
<div className="pt-[50px]">
27+
<Routes>
28+
<Route path="/" element={<Index />} />
29+
<Route path="/signup" element={<SignUp />} />
30+
<Route path="/signin" element={<SignIn />} />
31+
<Route path="/browse" element={<Browse />} />
32+
<Route path="/product/:id" element={<ProductDetailsPage />} />
33+
<Route path="/cart" element={<Cart />} />
34+
<Route path="/payment" element={<Payment />} />
35+
<Route path="/sell" element={<Sell />} />
36+
<Route path="/dashboard" element={<Dashboard />} />
37+
</Routes>
38+
</div>
39+
</BrowserRouter>
40+
</CartProvider>
4541
</TooltipProvider>
4642
</QueryClientProvider>
4743
);
4844

49-
export default App;
45+
export default App;

frontend/src/components/CartContext.jsx

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)